[Midnightbsd-cvs] mports: net/rsync: Update to 3.0.2

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Apr 12 16:48:19 EDT 2008 

Log Message:
-----------
Update to 3.0.2

Modified Files:
--------------
    mports/net/rsync:
        Makefile (r1.5 -> r1.6)
        distinfo (r1.2 -> r1.3)
        pkg-plist (r1.1 -> r1.2)
    mports/net/rsync/files:
        rsyncd.conf.sample (r1.1 -> r1.2)
        rsyncd.sh.in (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/net/rsync/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/rsync/pkg-plist -L net/rsync/pkg-plist -u -r1.1 -r1.2
--- net/rsync/pkg-plist
+++ net/rsync/pkg-plist
@@ -1,4 +1,4 @@
- at comment $FreeBSD: ports/net/rsync/pkg-plist,v 1.10 2005/05/16 21:07:54 pav Exp $
+ at comment $MIdnightBSD$
 bin/rsync
 @unexec if cmp -s %D/etc/rsyncd.conf.sample %D/etc/rsyncd.conf; then rm -f %D/etc/rsyncd.conf; fi
 etc/rsyncd.conf.sample
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/rsync/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L net/rsync/Makefile -L net/rsync/Makefile -u -r1.5 -r1.6
--- net/rsync/Makefile
+++ net/rsync/Makefile
@@ -2,34 +2,34 @@
 # Date created:			  Sat Aug 3, 1996
 # Whom:				  David O'Brien (obrien at cs.ucdavis.edu)
 #
-# $MidnightBSD$
-# $FreeBSD: ports/net/rsync/Makefile,v 1.115 2006/09/02 08:00:16 pav Exp $
+# $MIdnightBSD$
+# $FreeBSD: ports/net/rsync/Makefile,v 1.131 2008/04/08 19:24:06 ehaupt Exp $
 #
 
 PORTNAME=	rsync
-PORTVERSION=	2.6.9
-PORTREVISION=	2
+PORTVERSION=	3.0.2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://rsync.samba.org/ftp/%SUBDIR%/ \
 		ftp://ftp.samba.org/pub/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/unix/%SUBDIR%/  \
 		ftp://ftp.sunet.se/pub/unix/admin/%SUBDIR%/  \
 		ftp://ftp.fu-berlin.de/pub/unix/network/%SUBDIR%/ \
-		http://www.mirrorservice.org/sites/rsync.samba.org/
+		http://www.mirrorservice.org/sites/rsync.samba.org/ \
+		CRITICAL
 MASTER_SITE_SUBDIR=	rsync
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A network file distribution/synchronization utility
+LICENSE=	gpl3
 
 USE_RC_SUBR=	rsyncd.sh
 SUB_LIST=	NAME=rsyncd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug --enable-ipv6 \
-		--with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf \
-		--mandir=${PREFIX}/man
+		--with-rsyncd-conf=${PREFIX}/etc/rsyncd.conf
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
-PATCH_STRIP=	-p1
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	NEWS README csprotocol.txt tech_report.tex
@@ -39,36 +39,44 @@
 MAN5=		rsyncd.conf.5
 
 OPTIONS=	POPT_PORT "Use popt from devel/popt instead of bundled one" off \
-		TIMELIMIT "Time limit patch" on \
-		FLAGS "File system flags support patch, adds --flags" off \
-		ACLS "ACL support patch, adds --acls" off \
-		SSH "Use SSH instead of RSH" on
+		SSH       "Use SSH instead of RSH" on \
+		FLAGS     "File system flags support patch, adds --fileflags" off \
+		ACL       "Add backward-compatibility for the --acls option" off \
+		ICONV     "Add iconv support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_POPT_PORT)
-LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-.else
-CONFIGURE_ARGS+=	--with-included-popt
+.if defined(WITH_ICONV) || defined(WITH_FLAGS) || defined(WITH_ACL) || make(makesum)
+DISTFILES+=	${PORTNAME}-patches-${PORTVERSION}${EXTRACT_SUFX}
 .endif
 
-.if defined(WITH_TIMELIMIT)
-EXTRA_PATCHES+=	${WRKSRC}/patches/time-limit.diff
+.if defined(WITH_ICONV)
+USE_ICONV=	yes
+CONFIGUREDCFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
+.else
+CONFIGURE_ARGS+=	--disable-iconv
 .endif
 
 .if defined(WITH_FLAGS)
-EXTRA_PATCHES+=	${WRKSRC}/patches/flags.diff
+USE_PERL5_BUILD=yes
+PATCH_STRIP=	-p1
+EXTRA_PATCHES+=	${WRKSRC}/patches/fileflags.diff
 .endif
 
-.if defined(WITH_ACLS)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patches-acls.diff ${WRKSRC}/patches/acls.diff
-CONFIGURE_ARGS+=--enable-acl-support
-
-.if defined(WITH_FLAGS)
-IGNORE=	can't be built: Flags and ACL patches can not be enabled at the same time.
+.if defined(WITH_ACL)
+USE_PERL5_BUILD=yes
+PATCH_STRIP=	-p1
+EXTRA_PATCHES+=	${WRKSRC}/patches/acls.diff
 .endif
+
+.if defined(WITH_POPT_PORT)
+LIB_DEPENDS+=	popt.0:${PORTSDIR}/devel/popt
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+.else
+CONFIGURE_ARGS+=	--with-included-popt
 .endif
 
 .if defined(WITHOUT_SSH)
@@ -85,9 +93,17 @@
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
 		${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h
 
+.if defined(WITHOUT_ICONV)
+post-configure:
+	@${REINPLACE_CMD} -e 's|-liconv||' ${WRKSRC}/Makefile
+.endif
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/rsync
 	@${INSTALL_DATA} ${FILESDIR}/rsyncd.conf.sample ${PREFIX}/etc/
+	@[ -f ${PREFIX}/etc/rsyncd.conf ] || \
+		${CP} ${PREFIX}/etc/rsyncd.conf.sample \
+		${PREFIX}/etc/rsyncd.conf
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net/rsync/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L net/rsync/distinfo -L net/rsync/distinfo -u -r1.2 -r1.3
--- net/rsync/distinfo
+++ net/rsync/distinfo
@@ -1,3 +1,6 @@
-MD5 (rsync-2.6.9.tar.gz) = 996d8d8831dbca17910094e56dcb5942
-SHA256 (rsync-2.6.9.tar.gz) = ca437301becd890e73300bc69a39189ff1564baa761948ff149b3dd7bde633f9
-SIZE (rsync-2.6.9.tar.gz) = 811841
+MD5 (rsync-3.0.2.tar.gz) = fd4c5d77d8cb7bb86ab209076fa214d9
+SHA256 (rsync-3.0.2.tar.gz) = cb934d7b185756b2b5c0d797045b2e4debcd2bacc8f1565f4e430f24a9d70fc9
+SIZE (rsync-3.0.2.tar.gz) = 765732
+MD5 (rsync-patches-3.0.2.tar.gz) = c076661c447ddc165f4ff427e7264a31
+SHA256 (rsync-patches-3.0.2.tar.gz) = 61242f7860d95f922696603174172185345aeb46efeb24e7fe207396fed41106
+SIZE (rsync-patches-3.0.2.tar.gz) = 154306
Index: rsyncd.sh.in
===================================================================
RCS file: /home/cvs/mports/net/rsync/files/rsyncd.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/rsync/files/rsyncd.sh.in -L net/rsync/files/rsyncd.sh.in -u -r1.1 -r1.2
--- net/rsync/files/rsyncd.sh.in
+++ net/rsync/files/rsyncd.sh.in
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# $MidnightBSD$
 # $FreeBSD: ports/net/rsync/files/rsyncd.sh.in,v 1.2 2006/02/20 20:47:29 dougb Exp $
 #
 
Index: rsyncd.conf.sample
===================================================================
RCS file: /home/cvs/mports/net/rsync/files/rsyncd.conf.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net/rsync/files/rsyncd.conf.sample -L net/rsync/files/rsyncd.conf.sample -u -r1.1 -r1.2
--- net/rsync/files/rsyncd.conf.sample
+++ net/rsync/files/rsyncd.conf.sample
@@ -1,5 +1,5 @@
 # rsyncd.conf - Example file, see rsyncd.conf(5)
-#
+# $MidnightBSD$
 
 # Set this if you want to stop rsync daemon with rc.d scripts
 pid file = /var/run/rsyncd.pid

More information about the Midnightbsd-cvs mailing list