4 files changed, 63 insertions, 13 deletions

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index a6e3034cd4f5..0fc0f8ce66b3 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -4,10 +4,10 @@
 # Date created:         Sat Aug 3, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.12 1998/04/21 05:02:58 asami Exp $
+# $Id: Makefile,v 1.13 1998/04/24 07:04:07 obrien Exp $
 #
 
-DISTNAME=	rsync-1.7.4
+DISTNAME=	rsync-2.0.18
 CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/rsync/  \
 		ftp://sunsite.auc.dk/pub/unix/rsync/  \
@@ -18,19 +18,15 @@ MAINTAINER=     obrien@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 MAN1=		rsync.1
-
-post-patch:
-	@${CP} ${FILESDIR}/clientserver.c ${WRKSRC}
-	@${CP} ${FILESDIR}/README.daemon ${WRKSRC}
-	@${CP} ${FILESDIR}/rsyncd_trees.eg ${WRKSRC}
+MAN5=		rsyncd.conf.5
 
 post-install:
 	@strip ${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
-	${INSTALL_DATA} ${FILESDIR}/README.daemon ${PREFIX}/share/doc/rsync
-	${INSTALL_DATA} ${FILESDIR}/rsyncd_trees.eg ${PREFIX}/share/doc/rsync
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/rsync/distinfo b/net/rsync/distinfo
index f62f03728a3a..3dd657c5b4b9 100644
--- a/net/rsync/distinfo
+++ b/net/rsync/distinfo
@@ -1 +1 @@
-MD5 (rsync-1.7.4.tar.gz) = 288fc1ad0a3cba710ed832b8b117f0a5
+MD5 (rsync-2.0.18.tar.gz) = ffdbb121d522521d12e770e9b02bc728
diff --git a/net/rsync/files/patch-ai b/net/rsync/files/patch-ai
new file mode 100644
index 000000000000..8a278ce09a1d
--- /dev/null
+++ b/net/rsync/files/patch-ai
@@ -0,0 +1,53 @@
+*** rsyncd.conf.5.orig	Thu Jun 18 19:30:22 1998
+--- rsyncd.conf.5	Sat Jun 27 15:42:17 1998
+***************
+*** 66,72 ****
+  config file\&.
+  .PP 
+  Note that you should not send the rsync server a HUP signal to force
+! it to reread the \f(CW/etc/rsyncd\&.conf\fP\&. The file is re-read on each client
+  connection\&. 
+  .PP 
+  .SH "GLOBAL OPTIONS" 
+--- 66,72 ----
+  config file\&.
+  .PP 
+  Note that you should not send the rsync server a HUP signal to force
+! it to reread the \f(CW!!PREFIX!!/etc/rsyncd\&.conf\fP\&. The file is re-read on each client
+  connection\&. 
+  .PP 
+  .SH "GLOBAL OPTIONS" 
+***************
+*** 132,138 ****
+  The "path" option specifies the directory in the servers
+  filesystem to make available in this module\&. The rsync server will
+  chroot to this path before starting the file transfer with the
+! client\&. You must specify this option for each module in \f(CW/etc/rsyncd\&.conf\fP\&.
+  .IP 
+  .IP "\fBread only\fP" 
+  The "read only" option determines whether clients
+--- 132,138 ----
+  The "path" option specifies the directory in the servers
+  filesystem to make available in this module\&. The rsync server will
+  chroot to this path before starting the file transfer with the
+! client\&. You must specify this option for each module in \f(CW!!PREFIX!!/etc/rsyncd\&.conf\fP\&.
+  .IP 
+  .IP "\fBread only\fP" 
+  The "read only" option determines whether clients
+***************
+*** 335,341 ****
+  .PP 
+  .SH "FILES" 
+  .PP 
+! /etc/rsyncd\&.conf
+  .PP 
+  .SH "SEE ALSO" 
+  .PP 
+--- 335,341 ----
+  .PP 
+  .SH "FILES" 
+  .PP 
+! !!PREFIX!!/etc/rsyncd\&.conf
+  .PP 
+  .SH "SEE ALSO" 
+  .PP 
diff --git a/net/rsync/pkg-plist b/net/rsync/pkg-plist
index 6d472e8b62f9..49453a7d868b 100644
--- a/net/rsync/pkg-plist
+++ b/net/rsync/pkg-plist
@@ -1,6 +1,7 @@
 bin/rsync
-libexec/rsyncd
 man/man1/rsync.1.gz
-share/doc/rsync/README.daemon
-share/doc/rsync/rsyncd_trees.eg
+man/man5/rsyncd.conf.5.gz
+share/doc/rsync/README
+share/doc/rsync/COPYING
 share/doc/rsync/tech_report.tex
+@dirrm share/doc/rsync