Date: Sat, 10 Oct 2009 08:58:53 -0700 From: Charlie Kester <corky1951@comcast.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/139485: [MAINTAINER PATCH] sysutils/rdup: update to 1.0.2 Message-ID: <20091010155545.7BCD91065670@hub.freebsd.org> Resent-Message-ID: <200910101600.n9AG01Md006945@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 139485
>Category: ports
>Synopsis: [MAINTAINER PATCH] sysutils/rdup: update to 1.0.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 10 16:00:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Charlie Kester <corky1951@comcast.net>
>Release: FreeBSD 7.2-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD bigbox.local 7.2-RELEASE-p3 FreeBSD 7.2-RELEASE-p3 #0: Wed Aug 19 06:50:21 PDT 2009 root@bigbox.local:/usr/obj/usr/src/sys/BIGBOX i386
>Description:
Update to version 1.0.2
rdup-ln and rdup-simple are now installed into ${PREFIX}/bin rather than the examples directory.
These scripts use the GNU versions of the date and cp utilities, so they have also been patched
to call gdate and gcp.
>How-To-Repeat:
>Fix:
--- rdup-1.0.2 begins here ---
diff -ruN /usr/ports/sysutils/rdup/Makefile ./rdup/Makefile
--- /usr/ports/sysutils/rdup/Makefile 2009-08-21 17:35:26.000000000 -0700
+++ ./rdup/Makefile 2009-10-10 00:06:57.000000000 -0700
@@ -7,7 +7,7 @@
#
PORTNAME= rdup
-PORTVERSION= 1.0.0
+PORTVERSION= 1.0.2
CATEGORIES= sysutils
MASTER_SITES= http://miek.nl/projects/rdup/
@@ -29,6 +29,8 @@
MAKEFILE= GNUmakefile
PLIST_FILES= bin/rdup \
+ bin/rdup-ln \
+ bin/rdup-simple \
bin/rdup-tr \
bin/rdup-up
@@ -38,21 +40,8 @@
MAN7= rdup-backups.7
-.ifndef(NOPORTEXAMPLES)
-PORTEXAMPLES= rdup-ln.sh \
- rdup-simple.sh
-.endif
-
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/lib/rdup|${EXAMPLESDIR}|g' \
- ${WRKSRC}/doc/rdup-backups.7
-
-post-install:
-.ifndef(NOPORTEXAMPLES)
- @${MKDIR} ${EXAMPLESDIR}
-.for example in ${PORTEXAMPLES}
- @${INSTALL_SCRIPT} ${WRKSRC}/sh/${example} ${EXAMPLESDIR}
-.endfor
-.endif
+ @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/sh/rdup-simple.in
+ @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' ${WRKSRC}/sh/rdup-ln
.include <bsd.port.mk>
diff -ruN /usr/ports/sysutils/rdup/distinfo ./rdup/distinfo
--- /usr/ports/sysutils/rdup/distinfo 2009-06-18 22:29:46.000000000 -0700
+++ ./rdup/distinfo 2009-10-09 20:50:08.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (rdup-1.0.0.tar.bz2) = 7c91411d0c563279d50f6a87e395039f
-SHA256 (rdup-1.0.0.tar.bz2) = b9e9341b9c2192f201a81a18550fb8f835ab1766e3c357ccdedc7df5f0df1f22
-SIZE (rdup-1.0.0.tar.bz2) = 1209801
+MD5 (rdup-1.0.2.tar.bz2) = e13445b11de1c3fe608903b086f05784
+SHA256 (rdup-1.0.2.tar.bz2) = 9ec0813f005d7fdaac634575b110bafd193cda81170806e59200e629c107189d
+SIZE (rdup-1.0.2.tar.bz2) = 1205906
diff -ruN /usr/ports/sysutils/rdup/files/patch-GNUmakefile.in ./rdup/files/patch-GNUmakefile.in
--- /usr/ports/sysutils/rdup/files/patch-GNUmakefile.in 2009-06-18 22:29:46.000000000 -0700
+++ ./rdup/files/patch-GNUmakefile.in 2009-10-09 20:50:16.000000000 -0700
@@ -1,14 +1,6 @@
---- GNUmakefile.in.orig 2009-05-28 10:39:19.000000000 -0700
-+++ GNUmakefile.in 2009-06-12 19:53:20.000000000 -0700
-@@ -4,7 +4,6 @@
- HDR=rdup.h rdup-tr.h rdup-up.h io.h common.h entry.h
- CMD=rdup rdup-tr rdup-up
- # installs to /usr/lib/rdup XXX TODO
--SH=rdup-ln.sh rdup-simple.sh
- MAN1_IN=rdup.1 rdup-tr.1 rdup-up.1
- MAN7_IN=rdup-backups.7
-
-@@ -20,7 +19,7 @@
+--- GNUmakefile.in.orig 2009-08-10 04:09:38.000000000 -0700
++++ GNUmakefile.in 2009-10-09 20:27:57.000000000 -0700
+@@ -19,7 +19,7 @@
sbindir=@sbindir@
mandir=@mandir@
sysconfdir=@sysconfdir@
@@ -17,21 +9,12 @@
ARCHIVE_L=@ARCHIVE_L@
NETTLE_L=@NETTLE_L@
-@@ -86,17 +85,13 @@
+@@ -89,8 +89,6 @@
install: all
mkdir -p ${DESTDIR}${mandir}/man1
- mkdir -p ${DESTDIR}${datadir}
- mkdir -p ${DESTDIR}${libdir}/rdup
for i in ${CMD}; do ${INSTALL} $$i ${DESTDIR}${bindir}/$$i ; done
-- for i in ${SH}; do ${INSTALL} sh/$$i ${DESTDIR}${libdir}/rdup/$$i ; done
+ for i in ${SH}; do ${INSTALL} sh/$$i ${DESTDIR}${bindir}/$$i ; done
for i in ${MAN1}; do [ -f $$i ] && ${INSTALL_DATA} $$i ${DESTDIR}${mandir}/man1/`basename $$i` ; done; exit 0
- for i in ${MAN7}; do [ -f $$i ] && ${INSTALL_DATA} $$i ${DESTDIR}${mandir}/man7/`basename $$i` ; done; exit 0
- $(MAKE) -C po install
-
- uninstall:
- for i in ${CMD}; do rm -f ${DESTDIR}${bindir}/$$i ; done
-- for i in ${SH}; do rm -f ${DESTDIR}${libdir}/rdup/$$i ; done
- for i in ${MAN1}; do rm -f ${DESTDIR}${mandir}/man1/`basename $$i` ; done
- for i in ${MAN7}; do rm -f ${DESTDIR}${mandir}/man7/`basename $$i` ; done
- $(MAKE) -C po uninstall
diff -ruN /usr/ports/sysutils/rdup/files/patch-configure.ac ./rdup/files/patch-configure.ac
--- /usr/ports/sysutils/rdup/files/patch-configure.ac 2009-07-05 08:59:04.000000000 -0700
+++ ./rdup/files/patch-configure.ac 1969-12-31 16:00:00.000000000 -0800
@@ -1,11 +0,0 @@
---- configure.ac.orig 2009-05-28 10:39:19.000000000 -0700
-+++ configure.ac 2009-06-30 17:49:08.000000000 -0700
-@@ -28,6 +28,8 @@
- #AM_GNU_GETTEXT([external])
- #AM_GNU_GETTEXT_VERSION
-
-+LIBS="-lgmp $LIBS"
-+
- AC_MSG_CHECKING([whether to enable nettle])
- AC_ARG_WITH(nettle,
- [ --with-nettle enable nettle support],
diff -ruN /usr/ports/sysutils/rdup/files/patch-rdup-ln ./rdup/files/patch-rdup-ln
--- /usr/ports/sysutils/rdup/files/patch-rdup-ln 1969-12-31 16:00:00.000000000 -0800
+++ ./rdup/files/patch-rdup-ln 2009-10-09 23:46:42.000000000 -0700
@@ -0,0 +1,23 @@
+--- sh/rdup-ln.orig 2009-10-09 23:37:34.000000000 -0700
++++ sh/rdup-ln 2009-10-09 23:39:40.000000000 -0700
+@@ -27,7 +27,7 @@
+ fi
+
+ DATESTR='+%Y%m/%d'
+-TODAY=$(date $DATESTR)
++TODAY=$(gdate $DATESTR)
+ TOPDIR=$1
+
+ if [[ -z $TOPDIR ]]; then
+@@ -44,9 +44,9 @@
+
+ let i=1
+ while [[ $i -le $LOOKBACK ]]; do
+- D=$(date $DATESTR --date "$i days ago")
++ D=$(gdate $DATESTR --date "$i days ago")
+ if [[ -d $TOPDIR/$D ]]; then
+- if ! cp -plr $TOPDIR/$D/* $TOPDIR/$TODAY; then
++ if ! gcp -plr $TOPDIR/$D/* $TOPDIR/$TODAY; then
+ exit 2
+ fi
+ exit 0
diff -ruN /usr/ports/sysutils/rdup/files/patch-rdup-simple.in ./rdup/files/patch-rdup-simple.in
--- /usr/ports/sysutils/rdup/files/patch-rdup-simple.in 1969-12-31 16:00:00.000000000 -0800
+++ ./rdup/files/patch-rdup-simple.in 2009-10-09 23:46:42.000000000 -0700
@@ -0,0 +1,11 @@
+--- sh/rdup-simple.in.orig 2009-10-09 23:37:15.000000000 -0700
++++ sh/rdup-simple.in 2009-10-09 23:44:36.000000000 -0700
+@@ -41,7 +41,7 @@
+ }
+
+ PROGNAME=$0
+-NOW=`date +%Y%m/%d`
++NOW=`gdate +%Y%m/%d`
+ DAYS=8
+ ssh=
+ trans=
diff -ruN /usr/ports/sysutils/rdup/pkg-descr ./rdup/pkg-descr
--- /usr/ports/sysutils/rdup/pkg-descr 2009-06-18 22:29:46.000000000 -0700
+++ ./rdup/pkg-descr 2009-10-09 23:59:05.000000000 -0700
@@ -4,8 +4,9 @@
files that have changed since the last backup. It also handles files that are
removed, allowing for correct incremental backups.
-Example scripts that implement a backup strategy are included.
-(These scripts require GNU date and cp, which are not installed by
-this FreeBSD port.)
+Example scripts named rdup-simple and rdup-ln are included to show how to
+implement a simple snapshot-style backup strategy. These bash scripts require
+GNU date and cp, which are not installed by this FreeBSD port. If you want to
+use the scripts, you should also install the sysutils/coreutils port.
WWW: http://miek.nl/projects/rdup
--- rdup-1.0.2 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091010155545.7BCD91065670>