diff options
author | Oliver Braun <obraun@FreeBSD.org> | 2003-01-28 16:50:01 +0000 |
---|---|---|
committer | Oliver Braun <obraun@FreeBSD.org> | 2003-01-28 16:50:01 +0000 |
commit | ce213d3b9b9007ee2d1f8ac89c5f1e7659ff1435 (patch) | |
tree | 37de6b907b4d244b56f94437c9935351e9d68689 /net/rsync | |
parent | add oinkmaster 0.6 (diff) |
Upgrade to 2.5.6.
SSH-patches are no longer needed, using ./configure --with-rsh=ssh instead.
Tested on sparc64 by: Hiroki Sato <hrs@eos.ocn.ne.jp>
Notes
Notes:
svn path=/head/; revision=74149
Diffstat (limited to 'net/rsync')
-rw-r--r-- | net/rsync/Makefile | 29 | ||||
-rw-r--r-- | net/rsync/distinfo | 2 | ||||
-rw-r--r-- | net/rsync/files/ssh-patch-README | 8 | ||||
-rw-r--r-- | net/rsync/files/ssh-patch-main.c | 5 | ||||
-rw-r--r-- | net/rsync/files/ssh-patch-options.c | 5 | ||||
-rw-r--r-- | net/rsync/files/ssh-patch-rsync.1 | 21 | ||||
-rw-r--r-- | net/rsync/files/ssh-patch-rsync.h | 8 |
7 files changed, 16 insertions, 62 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index f624aded744f..6da5fc19cc64 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -7,8 +7,7 @@ # PORTNAME= rsync -PORTVERSION= 2.5.5 -PORTREVISION= 1 +PORTVERSION= 2.5.6 CATEGORIES= net ipv6 MASTER_SITES= ftp://samba.anu.edu.au/pub/rsync/ \ ftp://sunsite.auc.dk/pub/unix/rsync/ \ @@ -23,11 +22,13 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_REINPLACE= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-debug + .if defined(WITH_POPT_PORT) CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" .else -CONFIGURE_ARGS= --with-included-popt +CONFIGURE_ARGS+= --with-included-popt .endif .include <bsd.port.pre.mk> @@ -39,14 +40,15 @@ USE_SSH?= no .endif .if ${USE_SSH:U} == YES -EXTRA_PATCHES= ${FILESDIR}/ssh-patch-* +CONFIGURE_ARGS+= --with-rsh=ssh .endif .if ${OSVERSION} >= 400014 -CONFIGURE_ARGS+= --disable-debug --enable-ipv6 +CONFIGURE_ARGS+= --enable-ipv6 .else -CONFIGURE_ARGS+= --disable-debug --disable-ipv6 +CONFIGURE_ARGS+= --disable-ipv6 .endif + MAN1= rsync.1 MAN5= rsyncd.conf.5 @@ -62,18 +64,17 @@ pre-configure: ${WRKSRC}/rsync.h ${WRKSRC}/rsync.1 ${WRKSRC}/rsyncd.conf.5 @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \ ${WRKSRC}/rsync.h ${WRKSRC}/zlib/zutil.h -.if defined(WITH_SSH) - @${REINPLACE_CMD} -e 's/"rsh"/"ssh"/g' ${WRKSRC}/rsync.h -.endif post-install: - @strip ${PREFIX}/bin/rsync + @{STRIP_CMD} ${PREFIX}/bin/rsync .if !defined(NOPORTDOCS) - @${MKDIR} ${PREFIX}/share/doc/rsync - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rsync - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/rsync - ${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${PREFIX}/share/doc/rsync + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${DOCSDIR} .endif +.if ${USE_SSH:U} == YES @${CAT} ${PKGMESSAGE} +.endif .include <bsd.port.post.mk> diff --git a/net/rsync/distinfo b/net/rsync/distinfo index b3fe3bf48f0d..767d7131850c 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1 +1 @@ -MD5 (rsync-2.5.5.tar.gz) = b34b5a5eed243fe18b667e2c1d34b3b6 +MD5 (rsync-2.5.6.tar.gz) = ec39fcea433df4d6a3a4e0896c655535 diff --git a/net/rsync/files/ssh-patch-README b/net/rsync/files/ssh-patch-README deleted file mode 100644 index 5daf36387947..000000000000 --- a/net/rsync/files/ssh-patch-README +++ /dev/null @@ -1,8 +0,0 @@ ---- README.orig Tue Sep 5 19:46:43 2000 -+++ README Thu Mar 8 03:31:32 2001 -@@ -60 +60 @@ -- -e, --rsh=COMMAND specify rsh replacement -+ -e, --rsh=COMMAND specify rsh replacement (default ssh) -@@ -96 +96 @@ --rsh or ssh system. Using ssh is recommended for its security -+rsh or ssh system. Using rsh is discouraged for lack of security diff --git a/net/rsync/files/ssh-patch-main.c b/net/rsync/files/ssh-patch-main.c deleted file mode 100644 index 295429f2476e..000000000000 --- a/net/rsync/files/ssh-patch-main.c +++ /dev/null @@ -1,5 +0,0 @@ ---- main.c.orig Tue Sep 5 19:46:43 2000 -+++ main.c Sat Apr 7 23:32:25 2001 -@@ -134 +134 @@ -- cmd = RSYNC_RSH; -+ cmd = RSYNC_SSH; diff --git a/net/rsync/files/ssh-patch-options.c b/net/rsync/files/ssh-patch-options.c deleted file mode 100644 index 8fe17d89eb6f..000000000000 --- a/net/rsync/files/ssh-patch-options.c +++ /dev/null @@ -1,5 +0,0 @@ ---- options.c.orig Thu Mar 8 03:31:32 2001 -+++ options.c Thu Mar 8 03:31:32 2001 -@@ -141 +141 @@ -- rprintf(F," -e, --rsh=COMMAND specify rsh replacement\n"); -+ rprintf(F," -e, --rsh=COMMAND specify rsh replacement (default %s)\n", RSYNC_SSH); diff --git a/net/rsync/files/ssh-patch-rsync.1 b/net/rsync/files/ssh-patch-rsync.1 deleted file mode 100644 index a8ab98002689..000000000000 --- a/net/rsync/files/ssh-patch-rsync.1 +++ /dev/null @@ -1,21 +0,0 @@ ---- rsync.1.orig Tue Sep 5 19:46:43 2000 -+++ rsync.1 Thu Mar 8 03:34:47 2001 -@@ -89,2 +89,2 @@ --Once installed you can use rsync to any machine that you can use rsh --to\&. rsync uses rsh for its communications, unless both the source and -+Once installed you can use rsync to any machine that you can use ssh -+to\&. rsync uses ssh for its communications, unless both the source and -@@ -93 +93 @@ --You can also specify an alternative to rsh, by either using the -e -+You can also specify an alternative to ssh, by either using the -e -@@ -273 +273 @@ -- -e, --rsh=COMMAND specify rsh replacement -+ -e, --rsh=COMMAND specify rsh replacement (default ssh) -@@ -566,2 +566,2 @@ --remote copies of rsync\&. By default, rsync will use rsh, but you may --like to instead use ssh because of its high security\&. -+remote copies of rsync\&. By default, rsync will use ssh, but you may -+need to use the much less secure rsh for compatibility reasons\&. -@@ -890 +890 @@ -- rsh remotehost /bin/true > out\&.dat -+ ssh remotehost /bin/true > out\&.dat diff --git a/net/rsync/files/ssh-patch-rsync.h b/net/rsync/files/ssh-patch-rsync.h deleted file mode 100644 index 444182bf9967..000000000000 --- a/net/rsync/files/ssh-patch-rsync.h +++ /dev/null @@ -1,8 +0,0 @@ ---- rsync.h.orig Sat Aug 19 06:10:39 2000 -+++ rsync.h Sat Apr 7 23:31:00 2001 -@@ -75,4 +75,5 @@ - #define RSYNC_RSH "rsh" - #endif -+#define RSYNC_SSH "ssh" - - #include <sys/types.h> |