Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Jan 2017 19:44:34 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432379 - in head: . net net/csync2 net/librsync net/librsync1 net/librsync2 sysutils/burp sysutils/duplicity sysutils/rdiff-backup sysutils/rdiff-backup-devel
Message-ID:  <201701241944.v0OJiYPk085981@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Jan 24 19:44:33 2017
New Revision: 432379
URL: https://svnweb.freebsd.org/changeset/ports/432379

Log:
  - Update librsync to 2.0.0 and move to net/librsync2.
    This is ABI-compatible with 1.0.0, but due to an accident
    upstream with releasing 1.0.1 with a reversed shlib version,
    they released 2.0.0 with only a restoration of the shlib
    version of 2.
  
  Submitted by:	Danilo G. Baio (dbaio) <dbaio@bsd.com.br>

Added:
  head/net/librsync2/
     - copied from r432374, head/net/librsync1/
Deleted:
  head/net/librsync1/
Modified:
  head/MOVED
  head/net/Makefile
  head/net/csync2/Makefile
  head/net/librsync/Makefile
  head/net/librsync2/Makefile
  head/net/librsync2/distinfo
  head/net/librsync2/pkg-plist
  head/sysutils/burp/Makefile
  head/sysutils/duplicity/Makefile
  head/sysutils/rdiff-backup-devel/Makefile
  head/sysutils/rdiff-backup/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Jan 24 19:38:02 2017	(r432378)
+++ head/MOVED	Tue Jan 24 19:44:33 2017	(r432379)
@@ -8995,3 +8995,4 @@ net/rwhoisd||2017-01-22|Has expired: No 
 devel/bunny||2017-01-22|Has expired: Superseded by a different project
 www/pligg||2017-01-22|Has expired: Abandonware
 x11-drivers/xf86-video-fbdev||2017-01-22|Linux only driver
+net/librsync1|net/librsync2|2017-01-24|Port renamed to librsync2

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Tue Jan 24 19:38:02 2017	(r432378)
+++ head/net/Makefile	Tue Jan 24 19:44:33 2017	(r432379)
@@ -363,7 +363,7 @@
     SUBDIR += librdkafka
     SUBDIR += librouteros
     SUBDIR += librsync
-    SUBDIR += librsync1
+    SUBDIR += librsync2
     SUBDIR += libsocket++
     SUBDIR += libsocketcpp
     SUBDIR += libsrtp

Modified: head/net/csync2/Makefile
==============================================================================
--- head/net/csync2/Makefile	Tue Jan 24 19:38:02 2017	(r432378)
+++ head/net/csync2/Makefile	Tue Jan 24 19:44:33 2017	(r432379)
@@ -13,7 +13,7 @@ COMMENT=	Cluster synchronization tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librsync.so.2:net/librsync1 \
+LIB_DEPENDS=	librsync.so.2:net/librsync2 \
 		libgnutls.so:security/gnutls \
 		libsqlite3.so:databases/sqlite3
 

Modified: head/net/librsync/Makefile
==============================================================================
--- head/net/librsync/Makefile	Tue Jan 24 19:38:02 2017	(r432378)
+++ head/net/librsync/Makefile	Tue Jan 24 19:44:33 2017	(r432379)
@@ -12,7 +12,7 @@ COMMENT=	Library for delta compression o
 
 LIB_DEPENDS=	libpopt.so:devel/popt
 
-CONFLICTS=	librsync1-*
+CONFLICTS=	librsync1-[0-9]* librsync2-[0-9]*
 
 USES=		gmake libtool
 USE_CSTD=	gnu89

Modified: head/net/librsync2/Makefile
==============================================================================
--- head/net/librsync1/Makefile	Tue Jan 24 18:53:07 2017	(r432374)
+++ head/net/librsync2/Makefile	Tue Jan 24 19:44:33 2017	(r432379)
@@ -2,30 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	librsync
-PORTVERSION=	1.0.0
+PORTVERSION=	2.0.0
 DISTVERSIONPREFIX=v
 CATEGORIES=	net devel
-PKGNAMESUFFIX=	1
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Library for delta compression of streams
 
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libpopt.so:devel/popt
 
-CONFLICTS=	librsync-*
+CONFLICTS=	librsync-[0-9]* librsync1-[0-9]*
 
 USE_GITHUB=	yes
 
-USES=		gmake libtool autoreconf
-USE_CSTD=	gnu89
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--enable-shared --disable-trace
+USES=		cmake perl5
+USE_PERL5=	build
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librsync.so.2.0.0
+	${INSTALL_MAN} ${WRKSRC}/doc/librsync.3 ${STAGEDIR}${MANPREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/doc/rdiff.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/net/librsync2/distinfo
==============================================================================
--- head/net/librsync1/distinfo	Tue Jan 24 18:53:07 2017	(r432374)
+++ head/net/librsync2/distinfo	Tue Jan 24 19:44:33 2017	(r432379)
@@ -1,2 +1,3 @@
-SHA256 (librsync-librsync-v1.0.0_GH0.tar.gz) = 2195998516960ce84d93f88ee3bfd92f430a16cdba4b5d34560a39fa13fcafd9
-SIZE (librsync-librsync-v1.0.0_GH0.tar.gz) = 140451
+TIMESTAMP = 1485198270
+SHA256 (librsync-librsync-v2.0.0_GH0.tar.gz) = b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169
+SIZE (librsync-librsync-v2.0.0_GH0.tar.gz) = 155049

Modified: head/net/librsync2/pkg-plist
==============================================================================
--- head/net/librsync1/pkg-plist	Tue Jan 24 18:53:07 2017	(r432374)
+++ head/net/librsync2/pkg-plist	Tue Jan 24 19:44:33 2017	(r432379)
@@ -1,7 +1,6 @@
 bin/rdiff
 include/librsync.h
 include/librsync-config.h
-lib/librsync.a
 lib/librsync.so
 lib/librsync.so.2
 lib/librsync.so.2.0.0

Modified: head/sysutils/burp/Makefile
==============================================================================
--- head/sysutils/burp/Makefile	Tue Jan 24 19:38:02 2017	(r432378)
+++ head/sysutils/burp/Makefile	Tue Jan 24 19:44:33 2017	(r432379)
@@ -13,7 +13,7 @@ LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/uthash.h:devel/uthash
-LIB_DEPENDS=	librsync.so:net/librsync1
+LIB_DEPENDS=	librsync.so:net/librsync2
 
 OPTIONS_DEFINE=		IPV6
 

Modified: head/sysutils/duplicity/Makefile
==============================================================================
--- head/sysutils/duplicity/Makefile	Tue Jan 24 19:38:02 2017	(r432378)
+++ head/sysutils/duplicity/Makefile	Tue Jan 24 19:44:33 2017	(r432379)
@@ -9,7 +9,7 @@ MASTER_SITES=	http://launchpad.net/dupli
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Backup tool that uses librsync and GnuPG
 
-LIB_DEPENDS=	librsync.so:net/librsync1
+LIB_DEPENDS=	librsync.so:net/librsync2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile
 
 USES=		python:2

Modified: head/sysutils/rdiff-backup-devel/Makefile
==============================================================================
--- head/sysutils/rdiff-backup-devel/Makefile	Tue Jan 24 19:38:02 2017	(r432378)
+++ head/sysutils/rdiff-backup-devel/Makefile	Tue Jan 24 19:44:33 2017	(r432379)
@@ -15,7 +15,7 @@ COMMENT=	Local/remote mirroring+incremen
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	librsync.so:net/librsync1
+LIB_DEPENDS=	librsync.so:net/librsync2
 
 CONFLICTS=	rdiff-backup-[0-9]*
 

Modified: head/sysutils/rdiff-backup/Makefile
==============================================================================
--- head/sysutils/rdiff-backup/Makefile	Tue Jan 24 19:38:02 2017	(r432378)
+++ head/sysutils/rdiff-backup/Makefile	Tue Jan 24 19:44:33 2017	(r432379)
@@ -14,7 +14,7 @@ COMMENT=	Local/remote mirroring+incremen
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	librsync.so:net/librsync1
+LIB_DEPENDS=	librsync.so:net/librsync2
 
 CONFLICTS=	rdiff-backup-devel-[0-9]* rdiff-backup-1.0*
 



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