Hi,
I was looking at librsync because it failed to build with clang. The
problem was about inline functions in delta.c, which should really have
been static inline. Upstream already applied this change, which removes
a few private symbols from the lib. Also they switched to cmake, which
gives us a much simpler port. doxygen is detected at configure time,
but isn't run afterwards.
I have performed local tests using duplicity and rdiff-backup, all seems
to work fine, but more tests reports are always welcome.
ok?
Index: Makefile
===================================================================
RCS file: /d/cvs/ports/net/librsync/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 11 Mar 2016 20:28:29 -0000 1.16
+++ Makefile 20 Apr 2017 00:59:44 -0000
@@ -2,11 +2,11 @@
COMMENT= library for delta compression of streams
-V= 1.0.0
+V= 2.0.0
DISTNAME= librsync-$V
DISTFILES= ${DISTNAME}{v$V}.tar.gz
-SHARED_LIBS += rsync 2.0 # 2.0
+SHARED_LIBS += rsync 3.0 # 2.0
CATEGORIES= net
@@ -19,24 +19,13 @@ WANTLIB += bz2 c popt z
MASTER_SITES= https://github.com/librsync/librsync/archive/
-MODULES= devel/gettext
+MODULES= devel/cmake
-SEPARATE_BUILD= Yes
-CONFIGURE_STYLE= gnu
-AUTOCONF_VERSION= 2.69
-AUTOMAKE_VERSION= 1.15
-CONFIGURE_ARGS+= --disable-trace
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
- ${MODGNU_AUTOMAKE_DEPENDS} \
- devel/libtool
-LIB_DEPENDS= archivers/bzip2 \
- devel/popt
-
-post-patch:
- cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
+LIB_DEPENDS= archivers/bzip2 \
+ devel/popt
+
+post-install:
+ ${INSTALL_MAN} ${WRKSRC}/doc/rdiff.1 ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/librsync.3 ${PREFIX}/man/man3
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /d/cvs/ports/net/librsync/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 21 Aug 2015 19:43:04 -0000 1.3
+++ distinfo 20 Apr 2017 00:50:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (librsync-1.0.0.tar.gz) = IZWZhRaWDOhNk/iO47/ZL0MKFs26S100Vgo5+hP8r9k=
-SIZE (librsync-1.0.0.tar.gz) = 140451
+SHA256 (librsync-2.0.0.tar.gz) = tcTdEUKJgyA5OXeJ5C1P8NEQitqJznTxmZOYWT+uIWk=
+SIZE (librsync-2.0.0.tar.gz) = 155049
Index: pkg/PLIST
===================================================================
RCS file: /d/cvs/ports/net/librsync/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 16 Mar 2015 18:07:52 -0000 1.3
+++ pkg/PLIST 20 Apr 2017 00:59:48 -0000
@@ -2,8 +2,6 @@
@bin bin/rdiff
include/librsync-config.h
include/librsync.h
-lib/librsync.a
-lib/librsync.la
@lib lib/librsync.so.${LIBrsync_VERSION}
@man man/man1/rdiff.1
@man man/man3/librsync.3
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
