Update to 1.3.1

* Convert to use FIND_PREFIX mechanism instead of LOCALBASE
* Set LICENSE

Changelog:
VERSION 1.3.1  (Aug 31 2008)
------------------------------------------------------------------------------
- Fix help message mixup in lines between -c and -t.
- Add more specific error messages for not currently implemented potential
  per backup point options, like cmd_preexec.
- Allow named pipe as logfile - suggested by Patrice Levesque.
- Include rsnapshot-copy script written by Matt McCutchen.
- Allow `backticks` in include_conf.
- Apply fix-sync_first-rollback.diff patch from Matt McCutchen (02 Apr 2008).
- hopefully fix bug with link_dest not being used on second and later backups
  when you have link_dest 1 and sync_first 1. (Ignore $sync_dir_was_present)
- Patch from Adam Greenbaum to allow passing of ssh arguments correctly.
- David Grant added rsync_numtries to rsnapshot.conf.
- Applied Ben Low's Linux LVM patch.
- Added stop_on_stale_lockfile, thanks to Henning Moll.
- Michael Ashley's fix for filter/space problems on the rsync command line.
- Remove trailing whitespace from command names in rsnapshot.conf.
- Warn about extra spaces between tab and argument.
- Added multi-line config options, thanks to Dieter Bloms.
- The 'interval' config option is now called 'retain'.
- chdir to avoid an obscure bug in some versions of GNU rm.
- Changed use_lazy_deletes option to use _delete.$$ directories.
- Added note about -H and hard links to docs for rsync_short_args.
- Include rsnapshot-diff.1 in rpm.
- Fix bug with rsnapshot sync the first time (when .sync does not exist)
  trying to copy hourly.0 to .sync, even if hourly.0 doesn't exist.
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=413439


VERSION 1.3.0  (Oct 21 2006)
------------------------------------------------------------------------------
- Add files rsnapreport.pl Upgrading_from_1.1 rsnapshot-HOWTO.en.html to rpm.
- fix a bug with removing interval.delete (with use_lazy_deletes).
- rsnapshot detects the global ssh_args option being set multiple times,
  and gives a config error suggesting the per-backup ssh_args instead.
- Move Upgrading section of INSTALL to docs/Upgrading_from_1.1.
- Incorporate patch from Alan Batie to fix bugs with include_conf.
- check for quoting on $rsync_long_args rather than just splitting on space.
- Change rsnapshot.conf default to have lockfile enabled.
- Check for stale lock files (PID not currently running).
- explicitly add mode 0644 to sysopen() to create lockfile
- give warning if write() or close() return 0 when writing/closing lockfile
- Make prev_max_interval "not present (yet), nothing to copy" message
  when rotating interval.0 more visible (level 3 instead of level 4).
- Add man page for rsnapshot-diff (generated from perldoc).
- Updates to rsnapshot man pages (via perldoc).
  - Use =item in AUTHORS section
  - move mis-placed =back
  - document stale lock file detection
  - strongly recommend using a lock file
  - add a chmod to example backup script
  - change crontab example for weekly from 4 "weekly"s per month to 1 per week
  - expand on why higher intervals are done first via cron.
- Change space to tab after #cmd_rsnapshot_diff in rsnapshot.conf.default.in.
- In rpm patch, set cmd_rsnapshot_diff to /usr/bin/rsnapshot-diff.
- Set the test scripts t/*.t.in to run from the source directory
  and create directory t/support/files/a if necessary.
- Trim comments in README about gnu cp versions > 5.3 since rsnapshot
  strips trailing slashes for gnu cp with rsnapshot 1.2.9 and later.
- Add pointers to HOWTO and utils/rsnapreport.pl in README.
- More examples (eg: timestamp backup_script) in rsnapshot.conf.default.in.
- Change "Perhaps this is not GNU cp?" error message.

3 files changed, 21 insertions, 12 deletions

diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile
index a59406fce4a..515dc61dbcd 100644
--- a/sysutils/rsnapshot/Makefile
+++ b/sysutils/rsnapshot/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2010/01/27 19:54:41 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2012/08/11 18:30:12 ryoon Exp $
 #
 
-DISTNAME=	rsnapshot-1.2.9
+DISTNAME=	rsnapshot-1.3.1
 CATEGORIES=	net
 MASTER_SITES=	http://www.rsnapshot.org/downloads/
 
 MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.rsnapshot.org/
 COMMENT=	Filesystem snapshot utility
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -25,9 +26,12 @@ DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 CONF_FILES+=	${EGDIR}/rsnapshot.conf.default \
 		${PKG_SYSCONFDIR}/rsnapshot.conf
 
+FIND_PREFIX:=	RSYNCDIR=rsync
+.include "../../mk/find-prefix.mk"
+
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
-CONFIGURE_ARGS+=	--with-rsync=${LOCALBASE}/bin/rsync
+CONFIGURE_ARGS+=	--with-rsync=${RSYNCDIR}/bin/rsync
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${DOCDIR} ${EGDIR}
 
diff --git a/sysutils/rsnapshot/distinfo b/sysutils/rsnapshot/distinfo
index 3f39ce3f933..b13ee356a9e 100644
--- a/sysutils/rsnapshot/distinfo
+++ b/sysutils/rsnapshot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2006/10/02 19:51:37 abs Exp $
+$NetBSD: distinfo,v 1.7 2012/08/11 18:30:12 ryoon Exp $
 
-SHA1 (rsnapshot-1.2.9.tar.gz) = eadf8c68eeba5e75ef84179d54666214ff9e7eb2
-RMD160 (rsnapshot-1.2.9.tar.gz) = 8574739936b6e6b802cbf66f0609807e1b60ee11
-Size (rsnapshot-1.2.9.tar.gz) = 177971 bytes
-SHA1 (patch-aa) = 60fb3b966727ef46bc7c5ea33c2171bb9b102b53
+SHA1 (rsnapshot-1.3.1.tar.gz) = a3aa3560dc389e1b00155a5869558522c4a29e05
+RMD160 (rsnapshot-1.3.1.tar.gz) = 948ee5669c5da0728f607007da4d5fbbcfcdd8c7
+Size (rsnapshot-1.3.1.tar.gz) = 215806 bytes
+SHA1 (patch-aa) = 3ee93516cd2ccf3e9f608019dd405cde9d3711e2
diff --git a/sysutils/rsnapshot/patches/patch-aa b/sysutils/rsnapshot/patches/patch-aa
index 6c38aeb1e41..4c27ff5bf66 100644
--- a/sysutils/rsnapshot/patches/patch-aa
+++ b/sysutils/rsnapshot/patches/patch-aa
@@ -1,13 +1,18 @@
-$NetBSD: patch-aa,v 1.4 2006/10/02 19:51:37 abs Exp $
+$NetBSD: patch-aa,v 1.5 2012/08/11 18:30:12 ryoon Exp $
 
---- Makefile.in.orig	2006-05-18 11:19:45.000000000 +0100
+--- Makefile.in.orig	2008-08-31 11:20:08.000000000 +0000
 +++ Makefile.in
-@@ -546,7 +546,7 @@ doc: man html
- man: rsnapshot.1
+@@ -549,11 +549,11 @@ doc: man html
+ man: $(man_MANS)
  rsnapshot.1 : rsnapshot
  	@# perl 5.8 for this
 -	/usr/bin/pod2man -c '' -n 'rsnapshot' -r '' rsnapshot > rsnapshot.1
 +	pod2man -c '' -n 'rsnapshot' -r '' rsnapshot > rsnapshot.1
  
+ rsnapshot-diff.1 : rsnapshot-diff
+ 	@# perl 5.8 for this
+-	/usr/bin/pod2man -c '' -n 'rsnapshot-diff' -r '' rsnapshot-diff > rsnapshot-diff.1
++	pod2man -c '' -n 'rsnapshot-diff' -r '' rsnapshot-diff > rsnapshot-diff.1
+ 
  html: rsnapshot.html
  rsnapshot.html: rsnapshot