diff options
| -rw-r--r-- | net/rsync/Makefile | 19 | ||||
| -rw-r--r-- | net/rsync/distinfo | 10 | ||||
| -rw-r--r-- | net/rsync/patches/patch-ab | 22 | ||||
| -rw-r--r-- | net/rsync/patches/patch-ac | 13 | ||||
| -rw-r--r-- | net/rsync/patches/patch-ad | 53 | ||||
| -rw-r--r-- | net/rsync/patches/patch-ae | 31 |
6 files changed, 138 insertions, 10 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index d34d1502fe6..fc71a451c7f 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2002/05/16 02:27:04 grant Exp $ +# $NetBSD: Makefile,v 1.45 2003/03/06 20:44:13 salo Exp $ +# -DISTNAME= rsync-2.5.5 +DISTNAME= rsync-2.5.6 CATEGORIES= net MASTER_SITES= http://rsync.samba.org/ftp/rsync/ \ ftp://rsync.samba.org/pub/rsync/ \ @@ -14,13 +15,17 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://rsync.samba.org/ COMMENT= Network file distribution/synchronisation utility +USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-included-popt -post-install: - @strip ${PREFIX}/bin/rsync - @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rsync - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rsync - ${INSTALL_DATA} ${WRKSRC}/tech_report.tex ${PREFIX}/share/doc/rsync +PKG_SYSCONFSUBDIR= rsync + +post-patch: + @cd ${WRKSRC} && \ + for f in rsync.h rsync.1 rsyncd.conf.5 ; do \ + ${MV} $${f} $${f}.orig; \ + ${SED} ${FILES_SUBST_SED} $${f}.orig > $${f}; \ + done .include "../../mk/bsd.pkg.mk" diff --git a/net/rsync/distinfo b/net/rsync/distinfo index 3788c69466f..30426a2cdaf 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.9 2002/05/16 02:23:00 grant Exp $ +$NetBSD: distinfo,v 1.10 2003/03/06 20:44:13 salo Exp $ -SHA1 (rsync-2.5.5.tar.gz) = b84dbaedcb8b0c1c6006a053e32b5629df7f458d -Size (rsync-2.5.5.tar.gz) = 398257 bytes +SHA1 (rsync-2.5.6.tar.gz) = ae64d0f6a22ac6f45ccd1258e80d17a35b28d798 +Size (rsync-2.5.6.tar.gz) = 584678 bytes SHA1 (patch-aa) = 27c2925b67d38132507a2e8e41ba7e406a9d9051 +SHA1 (patch-ab) = 3d0a64dd17c8f161c373b8b144991fcb26758c07 +SHA1 (patch-ac) = 6c0db05f23ed7794911f25d8fde6ef5a7b90bbea +SHA1 (patch-ad) = a6b10af0fe443b97ab93bfe8006cdb5969609841 +SHA1 (patch-ae) = 48799b1737e5f9979ea57dedf284b8e1c4701029 diff --git a/net/rsync/patches/patch-ab b/net/rsync/patches/patch-ab new file mode 100644 index 00000000000..204fb92cbed --- /dev/null +++ b/net/rsync/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.8 2003/03/06 20:44:14 salo Exp $ + +--- Makefile.in.orig 2003-01-20 19:26:14.000000000 +0100 ++++ Makefile.in 2003-03-06 20:50:23.000000000 +0100 +@@ -60,12 +60,11 @@ + man: rsync.1 rsyncd.conf.5 + + install: all +- -mkdir -p ${DESTDIR}${bindir} +- ${INSTALLCMD} ${STRIP} -m 755 rsync$(EXEEXT) ${DESTDIR}${bindir} +- -mkdir -p ${DESTDIR}${mandir}/man1 +- -mkdir -p ${DESTDIR}${mandir}/man5 +- ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1 +- ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5 ++ ${BSD_INSTALL_PROGRAM} rsync$(EXEEXT) ${DESTDIR}${bindir} ++ ${BSD_INSTALL_MAN} $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1 ++ ${BSD_INSTALL_MAN} $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5 ++ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/rsync ++ ${BSD_INSTALL_DATA} README tech_report.tex ${DESTDIR}${PREFIX}/share/doc/rsync + + install-strip: + $(MAKE) STRIP='-s' install diff --git a/net/rsync/patches/patch-ac b/net/rsync/patches/patch-ac new file mode 100644 index 00000000000..96d01486220 --- /dev/null +++ b/net/rsync/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.7 2003/03/06 20:44:14 salo Exp $ + +--- rsync.h.orig 2003-01-26 21:11:16.000000000 +0100 ++++ rsync.h 2003-03-06 21:25:18.000000000 +0100 +@@ -26,7 +26,7 @@ + #define RSYNC_RSH_ENV "RSYNC_RSH" + + #define RSYNC_NAME "rsync" +-#define RSYNCD_SYSCONF "/etc/rsyncd.conf" ++#define RSYNCD_SYSCONF "@PKG_SYSCONFDIR@/rsyncd.conf" + #define RSYNCD_USERCONF "rsyncd.conf" + + #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" diff --git a/net/rsync/patches/patch-ad b/net/rsync/patches/patch-ad new file mode 100644 index 00000000000..4db74e4af93 --- /dev/null +++ b/net/rsync/patches/patch-ad @@ -0,0 +1,53 @@ +$NetBSD: patch-ad,v 1.4 2003/03/06 20:44:14 salo Exp $ + +--- rsyncd.conf.5.orig 2003-01-27 04:07:18.000000000 +0100 ++++ rsyncd.conf.5 2003-03-06 20:31:52.000000000 +0100 +@@ -65,10 +65,10 @@ + and a single line something like this to /etc/inetd\&.conf: + .PP + .RS +-rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon ++rsync stream tcp nowait root @PREFIX@/bin/rsync rsyncd --daemon + .RE + .PP +-Replace "/usr/bin/rsync" with the path to where you have rsync installed on ++Replace "@PREFIX@/bin/rsync" with the path to where you have rsync installed on + your system\&. You will then need to send inetd a HUP signal to tell it to + reread its config file\&. + .PP +@@ -259,8 +259,8 @@ + 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)\&. The file must normally not be readable +-by "other"; see "strict modes"\&. ++(such as \f(CW@PKG_SYSCONFDIR@/rsyncd\&.secrets\fP)\&. The file must normally ++not be readable by "other"; see "strict modes"\&. + .IP + .IP "\fBstrict modes\fP" + The "strict modes" option determines whether or not +@@ -504,13 +504,13 @@ + path = /data/cvs + comment = CVS repository (requires authentication) + auth users = tridge, susan +- secrets file = /etc/rsyncd\&.secrets ++ secrets file = @PKG_SYSCONFDIR@/rsyncd\&.secrets + + .fi + + + .PP +-The /etc/rsyncd\&.secrets file would look something like this: ++The @PKG_SYSCONFDIR@/rsyncd\&.secrets file would look something like this: + .PP + tridge:mypass + .br +@@ -518,7 +518,7 @@ + .PP + .SH "FILES" + .PP +-/etc/rsyncd\&.conf or rsyncd\&.conf ++@PKG_SYSCONFDIR@/rsyncd\&.conf + .PP + .SH "SEE ALSO" + .PP diff --git a/net/rsync/patches/patch-ae b/net/rsync/patches/patch-ae new file mode 100644 index 00000000000..3e22df2c9f9 --- /dev/null +++ b/net/rsync/patches/patch-ae @@ -0,0 +1,31 @@ +$NetBSD: patch-ae,v 1.5 2003/03/06 20:44:15 salo Exp $ + +--- rsync.1.orig 2003-01-28 04:11:57.000000000 +0100 ++++ rsync.1 2003-03-06 21:00:02.000000000 +0100 +@@ -236,7 +236,7 @@ + .PP + An rsync server is configured using a config file\&. Please see the + rsyncd\&.conf(5) man page for more information\&. By default the configuration +-file is called /etc/rsyncd\&.conf, unless rsync is running over a remote ++file is called @PKG_SYSCONFDIR@/rsyncd\&.conf, unless rsync is running over a remote + shell program and is not running as root; in that case, the default name + is rsyncd\&.conf in the current directory on the remote computer + (typically $HOME)\&. +@@ -860,7 +860,7 @@ + .IP "\fB--config=FILE\fP" + This specifies an alternate config file than + the default\&. This is only relevant when --daemon is specified\&. +-The default is /etc/rsyncd\&.conf unless the daemon is running over ++The default is @PKG_SYSCONFDIR@/rsyncd\&.conf unless the daemon is running over + a remote shell program and the remote user is not root; in that case + the default is rsyncd\&.conf in the current directory (typically $HOME)\&. + .IP +@@ -1258,7 +1258,7 @@ + .PP + .SH "FILES" + .PP +-/etc/rsyncd\&.conf or rsyncd\&.conf ++@PKG_SYSCONFDIR@/rsyncd\&.conf or rsyncd\&.conf + .PP + .SH "SEE ALSO" + .PP |