From cbeaaa75ebc3be72a7a68d4caa8c801ba18062bb Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Tue, 12 Oct 1999 04:57:12 +0000
Subject: Use perl's in-place editing rather than large patches.

---
 net/rsync/Makefile       |  5 ++---
 net/rsync/files/patch-ai | 52 ------------------------------------------------
 2 files changed, 2 insertions(+), 55 deletions(-)

(limited to 'net')

diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index c23429f3d5a3..0c62db5412d0 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -23,9 +23,8 @@ MAN1=		rsync.1
 MAN5=		rsyncd.conf.5
 
 pre-configure:
-	@${MV} ${WRKSRC}/rsync.1 ${WRKSRC}/rsync.1.in
-	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g'  \
-		${WRKSRC}/rsync.1.in > ${WRKSRC}/rsync.1
+	@${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' ${WRKSRC}/rsync.1
+	@${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' ${WRKSRC}/rsyncd.conf.5
 
 post-install:
 	@strip ${PREFIX}/bin/rsync
diff --git a/net/rsync/files/patch-ai b/net/rsync/files/patch-ai
index 1ce40653f7a3..054882c62780 100644
--- a/net/rsync/files/patch-ai
+++ b/net/rsync/files/patch-ai
@@ -1,32 +1,5 @@
 --- rsyncd.conf.5.orig	Tue Apr  6 08:04:17 1999
 +++ rsyncd.conf.5	Tue Apr  6 14:43:50 1999
-@@ -66,7 +66,7 @@
- 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
-+it to reread the \f(CW!!PREFIX!!/etc/rsyncd\&.conf\fP\&. The file is re-read on each client
- connection\&. 
- .PP 
- .SH "GLOBAL OPTIONS" 
-@@ -128,7 +128,7 @@
- .IP "\fBpath\fP" 
- The "path" option specifies the directory in the servers
- filesystem to make available in this module\&.  You must specify this option
--for each module in \f(CW/etc/rsyncd\&.conf\fP\&.
-+for each module in \f(CW!!PREFIX!!/etc/rsyncd\&.conf\fP\&.
- .IP 
- .IP "\fBuse chroot\fP" 
- If "use chroot" is true, the rsync server will chroot
-@@ -239,7 +239,7 @@
- you may find that passwords longer than 8 characters don\'t work\&. 
- .IP 
- There is no default for the "secrets file" option, you must choose a name
--(such as \f(CW/etc/rsyncd\&.secrets\fP)\&.
-+(such as \f(CW!!PREFIX!!/etc/rsyncd\&.secrets\fP)\&.
- .IP 
- .IP "\fBstrict modes\fP" 
- The "strict modes" option determines whether or not 
 @@ -429,7 +429,7 @@
  .br 
  syslog facility = local5 
@@ -36,28 +9,3 @@
  .PP 
  
  .DS 
-@@ -454,13 +454,13 @@
-         path = /data/cvs
-         comment = CVS repository (requires authentication)
-         auth users = tridge, susan
--        secrets file = /etc/rsyncd\&.secrets
-+        secrets file = !!PREFIX!!/etc/rsyncd\&.secrets
- 
- .DE 
-  
- 
- .PP 
--The /etc/rsyncd\&.secrets file would look something like this:
-+The !!PREFIX!!/etc/rsyncd\&.secrets file would look something like this:
- .PP 
- tridge:mypass 
- .br 
-@@ -468,7 +468,7 @@
- .PP 
- .SH "FILES" 
- .PP 
--/etc/rsyncd\&.conf
-+!!PREFIX!!/etc/rsyncd\&.conf
- .PP 
- .SH "SEE ALSO" 
- .PP 
-- 
cgit v1.2.3