Update to version 0.9.6

PR:		55469
Submitted by:	Ports Fury

6 files changed, 18 insertions, 50 deletions

diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index f89107311454..66377cf4ac76 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -7,9 +7,10 @@
 #
 
 PORTNAME=	librsync
-PORTVERSION=	0.9.5.1
+PORTVERSION=	0.9.6
 CATEGORIES=	net
-MASTER_SITES=	http://rdiff-backup.stanford.edu/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for delta compression of streams
@@ -19,14 +20,18 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-shared --disable-trace
-USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
-MAN1=	rdiff.1
 MAN3=	librsync.3
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|= rdiff.1|=|g' ${WRKSRC}/doc/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/net/librsync/distinfo b/net/librsync/distinfo
index e5393148b75e..73adfe146916 100644
--- a/net/librsync/distinfo
+++ b/net/librsync/distinfo
@@ -1 +1 @@
-MD5 (librsync-0.9.5.1.tar.gz) = d65dcd7dce50ba71364a1c0b15ce21bd
+MD5 (librsync-0.9.6.tar.gz) = b2e7fb16f1e8f66f8397928dcc0436c8
diff --git a/net/librsync/files/patch-buf.c b/net/librsync/files/patch-buf.c
deleted file mode 100644
index 11b7dedcfd93..000000000000
--- a/net/librsync/files/patch-buf.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- buf.c.orig	Tue Mar 13 16:27:52 2001
-+++ buf.c	Tue Mar 13 16:28:53 2001
-@@ -40,6 +40,7 @@
-  */
- 
- 
-+#include <sys/types.h>
- #include <config.h>
- 
- #include <assert.h>
diff --git a/net/librsync/files/patch-ltmain.sh b/net/librsync/files/patch-ltmain.sh
index 478bd58c315c..19146a99dfd8 100644
--- a/net/librsync/files/patch-ltmain.sh
+++ b/net/librsync/files/patch-ltmain.sh
@@ -1,33 +1,6 @@
---- ltmain.sh.orig	Fri Sep  7 03:45:46 2001
-+++ ltmain.sh	Sat Mar  2 15:45:11 2002
-@@ -1040,7 +1040,7 @@
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
-@@ -1048,7 +1048,7 @@
- 	 fi
- 	 if test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -2439,7 +2439,7 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    ;;
- 	  *)
-@@ -4208,10 +4208,12 @@
+--- ltmain.sh.orig	Sat Jun 14 11:42:11 2003
++++ ltmain.sh	Mon Aug 11 13:59:20 2003
+@@ -4330,10 +4330,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/net/librsync/pkg-descr b/net/librsync/pkg-descr
index fc5fed29a4ed..573d1f8ebc3f 100644
--- a/net/librsync/pkg-descr
+++ b/net/librsync/pkg-descr
@@ -5,4 +5,4 @@ Unlike most diff programs, librsync does not require access to both of the
 files on the same machine, but rather only a short ``signature'' of the
 old file and the complete contents of the new file.
 
-WWW: http://rproxy.samba.org/
+WWW: http://librsync.sourceforge.net/
diff --git a/net/librsync/pkg-plist b/net/librsync/pkg-plist
index 4be1fc74746d..bbb09735eb80 100644
--- a/net/librsync/pkg-plist
+++ b/net/librsync/pkg-plist
@@ -1,5 +1,5 @@
-bin/rdiff
-include/rsync.h
+include/librsync.h
+include/librsync-config.h
 lib/librsync.a
 lib/librsync.so
 lib/librsync.so.1