Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Jun 2015 05:25:17 +0000 (UTC)
From:      Kevin Lo <kevlo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r390350 - in head/sysutils/zbackup: . files
Message-ID:  <201506230525.t5N5PHxl095276@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevlo
Date: Tue Jun 23 05:25:17 2015
New Revision: 390350
URL: https://svnweb.freebsd.org/changeset/ports/390350

Log:
  Update to 1.4.1

Added:
  head/sysutils/zbackup/files/patch-compression.cc   (contents, props changed)
  head/sysutils/zbackup/files/patch-dir.cc   (contents, props changed)
  head/sysutils/zbackup/files/patch-file.cc   (contents, props changed)
Modified:
  head/sysutils/zbackup/Makefile
  head/sysutils/zbackup/distinfo

Modified: head/sysutils/zbackup/Makefile
==============================================================================
--- head/sysutils/zbackup/Makefile	Tue Jun 23 03:52:44 2015	(r390349)
+++ head/sysutils/zbackup/Makefile	Tue Jun 23 05:25:17 2015	(r390350)
@@ -1,18 +1,22 @@
 # $FreeBSD$
 
 PORTNAME=	zbackup
-PORTVERSION=	1.3
+PORTVERSION=	1.4.1
 CATEGORIES=	sysutils
+MASTER_SITES=	https://github.com/zbackup/zbackup/archive/
+DISTNAME=	${PORTVERSION}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Versatile deduplicating backup tool
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf \
+		liblzo2.so:${PORTSDIR}/archivers/lzo2
 
 USES=		cmake
-USE_GITHUB=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 

Modified: head/sysutils/zbackup/distinfo
==============================================================================
--- head/sysutils/zbackup/distinfo	Tue Jun 23 03:52:44 2015	(r390349)
+++ head/sysutils/zbackup/distinfo	Tue Jun 23 05:25:17 2015	(r390350)
@@ -1,2 +1,2 @@
-SHA256 (zbackup-zbackup-1.3_GH0.tar.gz) = 0c85232918295984fccb35804dbaeaa38df13c923814640524a8d9de2c6db1ee
-SIZE (zbackup-zbackup-1.3_GH0.tar.gz) = 72268
+SHA256 (1.4.1.tar.gz) = a76d4cec6e027462c680ef1bbd143ad4c7d55a160a1474928d8caa792b13fac9
+SIZE (1.4.1.tar.gz) = 86570

Added: head/sysutils/zbackup/files/patch-compression.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/zbackup/files/patch-compression.cc	Tue Jun 23 05:25:17 2015	(r390350)
@@ -0,0 +1,11 @@
+--- compression.cc.orig	2015-06-23 12:18:26.923826000 +0800
++++ compression.cc	2015-06-23 12:19:37.282685000 +0800
+@@ -292,7 +292,7 @@
+   }
+ };
+ 
+-#include <endian.h>
++#include <machine/endian.h>
+ 
+ // like NoStreamEnDecoder, but also adds the uncompressed size before the stream
+ //NOTE You should make sure that the compression function doesn't overwrite any

Added: head/sysutils/zbackup/files/patch-dir.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/zbackup/files/patch-dir.cc	Tue Jun 23 05:25:17 2015	(r390350)
@@ -0,0 +1,11 @@
+--- dir.cc.orig	2015-06-23 12:16:14.909394000 +0800
++++ dir.cc	2015-06-23 12:16:22.284741000 +0800
+@@ -103,7 +103,7 @@
+     if ( !entryPtr )
+       return false;
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+     if ( fstatat( dirfd( dir ), entry.d_name, &entryStats,
+                   AT_SYMLINK_NOFOLLOW ) != 0 )
+ #else

Added: head/sysutils/zbackup/files/patch-file.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/zbackup/files/patch-file.cc	Tue Jun 23 05:25:17 2015	(r390350)
@@ -0,0 +1,21 @@
+--- file.cc.orig	2014-12-16 20:32:29.000000000 +0800
++++ file.cc	2015-06-23 13:16:37.741129000 +0800
+@@ -6,7 +6,7 @@
+ #include <unistd.h>
+ #include <cerrno>
+ #include <cstring>
+-#ifdef __APPLE__
++#if defined(__APPLE_) || defined(__FreeBSD__)
+   #include <sys/socket.h>
+ #else
+   #include <sys/sendfile.h>
+@@ -67,6 +67,9 @@
+       #ifdef __APPLE__
+       if ( -1 == sendfile(write_fd, read_fd, offset, &stat_buf.st_size, NULL, 0) )
+          throw exCantRename( from + " to " + to );
++      #elif defined(__FreeBSD__)
++      if ( -1 == sendfile(write_fd, read_fd, offset, stat_buf.st_size, NULL, NULL, 0) )
++         throw exCantRename( from + " to " + to );
+       #else
+       if ( -1 == sendfile(write_fd, read_fd, &offset, stat_buf.st_size) )
+          throw exCantRename( from + " to " + to );



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506230525.t5N5PHxl095276>