Update to latest stable version, 1.2.2. Zillions of fixes and a some

new features.  See the bundled CHANGELOG for details.

Now requires at least python24.

Add PKGMANDIR support.

5 files changed, 29 insertions, 36 deletions

diff --git a/sysutils/rdiff-backup/DESCR b/sysutils/rdiff-backup/DESCR
index f723d0d6e97..7abf7b3dff6 100644
--- a/sysutils/rdiff-backup/DESCR
+++ b/sysutils/rdiff-backup/DESCR
@@ -1,8 +1,8 @@
-Rdiff-backup backs up one directory to another, possibly over a network.
+rdiff-backup backs up one directory to another, possibly over a network.
 The target directory ends up a copy of the source directory, but extra
 reverse diffs are stored in a special subdirectory of that target directory,
 so you can still recover files lost some time ago. The idea is to combine
-the best features of a mirror and an incremental backup. Rdiff-backup also
+the best features of a mirror and an incremental backup. rdiff-backup also
 preserves subdirectories, hard links, dev files, permissions, uid/gid
 ownership (if it is running as root), and modification times. Finally,
 rdiff-backup can operate in a bandwidth efficient manner over a pipe, like
diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index edb9ec69ba3..8ed1781ef1e 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2008/06/20 01:09:36 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.29 2008/10/30 04:40:26 snj Exp $
 
-DISTNAME=	rdiff-backup-1.0.5
+DISTNAME=	rdiff-backup-1.2.2
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://savannah.nongnu.org/download/rdiff-backup/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://www.nongnu.org/rdiff-backup/
 COMMENT=	Remote incremental backup utility
 
@@ -13,11 +12,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 PYDISTUTILSPKG=		yes
 
+PYTHON_VERSIONS_INCOMPATIBLE=	15 21 23
+
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	setup.py
-SUBST_SED.path=		-e "s|%%LOCALBASE%%|${LOCALBASE}|g"
-SUBST_MESSAGE.path=	Fixing paths.
+SUBST_SED.path=		-e "s|share/man|${PKGMANDIR}|"
+SUBST_MESSAGE.path=	Fixing path to manpages.
 
 BUILDLINK_API_DEPENDS.librsync+=	librsync>=0.9.6
 
diff --git a/sysutils/rdiff-backup/PLIST b/sysutils/rdiff-backup/PLIST
index c0569421140..86e41cc86d6 100644
--- a/sysutils/rdiff-backup/PLIST
+++ b/sysutils/rdiff-backup/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2005/09/18 13:03:15 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/10/30 04:40:26 snj Exp $
 bin/rdiff-backup
+bin/rdiff-backup-statistics
 ${PYSITELIB}/rdiff_backup/C.so
 ${PYSITELIB}/rdiff_backup/FilenameMapping.py
 ${PYSITELIB}/rdiff_backup/FilenameMapping.pyc
@@ -35,6 +36,9 @@ ${PYSITELIB}/rdiff_backup/_librsync.so
 ${PYSITELIB}/rdiff_backup/backup.py
 ${PYSITELIB}/rdiff_backup/backup.pyc
 ${PYSITELIB}/rdiff_backup/backup.pyo
+${PYSITELIB}/rdiff_backup/compare.py
+${PYSITELIB}/rdiff_backup/compare.pyc
+${PYSITELIB}/rdiff_backup/compare.pyo
 ${PYSITELIB}/rdiff_backup/connection.py
 ${PYSITELIB}/rdiff_backup/connection.pyc
 ${PYSITELIB}/rdiff_backup/connection.pyo
@@ -44,6 +48,9 @@ ${PYSITELIB}/rdiff_backup/eas_acls.pyo
 ${PYSITELIB}/rdiff_backup/fs_abilities.py
 ${PYSITELIB}/rdiff_backup/fs_abilities.pyc
 ${PYSITELIB}/rdiff_backup/fs_abilities.pyo
+${PYSITELIB}/rdiff_backup/hash.py
+${PYSITELIB}/rdiff_backup/hash.pyc
+${PYSITELIB}/rdiff_backup/hash.pyo
 ${PYSITELIB}/rdiff_backup/increment.py
 ${PYSITELIB}/rdiff_backup/increment.pyc
 ${PYSITELIB}/rdiff_backup/increment.pyo
@@ -59,6 +66,9 @@ ${PYSITELIB}/rdiff_backup/librsync.pyo
 ${PYSITELIB}/rdiff_backup/log.py
 ${PYSITELIB}/rdiff_backup/log.pyc
 ${PYSITELIB}/rdiff_backup/log.pyo
+${PYSITELIB}/rdiff_backup/longname.py
+${PYSITELIB}/rdiff_backup/longname.pyc
+${PYSITELIB}/rdiff_backup/longname.pyo
 ${PYSITELIB}/rdiff_backup/manage.py
 ${PYSITELIB}/rdiff_backup/manage.pyc
 ${PYSITELIB}/rdiff_backup/manage.pyo
@@ -92,7 +102,11 @@ ${PYSITELIB}/rdiff_backup/statistics.pyo
 ${PYSITELIB}/rdiff_backup/user_group.py
 ${PYSITELIB}/rdiff_backup/user_group.pyc
 ${PYSITELIB}/rdiff_backup/user_group.pyo
-man/man1/rdiff-backup.1
+${PYSITELIB}/rdiff_backup/win_acls.py
+${PYSITELIB}/rdiff_backup/win_acls.pyc
+${PYSITELIB}/rdiff_backup/win_acls.pyo
+${PKGMANDIR}/man1/rdiff-backup.1
+${PKGMANDIR}/man1/rdiff-backup-statistics.1
 share/doc/${PKGNAME}/CHANGELOG
 share/doc/${PKGNAME}/COPYING
 share/doc/${PKGNAME}/FAQ.html
diff --git a/sysutils/rdiff-backup/distinfo b/sysutils/rdiff-backup/distinfo
index 30f67e67bad..cabab832b49 100644
--- a/sysutils/rdiff-backup/distinfo
+++ b/sysutils/rdiff-backup/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2007/01/14 15:24:33 obache Exp $
+$NetBSD: distinfo,v 1.12 2008/10/30 04:40:26 snj Exp $
 
-SHA1 (rdiff-backup-1.0.5.tar.gz) = 4d33ef3d93532ce1746728e2c5687da354fafcec
-RMD160 (rdiff-backup-1.0.5.tar.gz) = 20b02096f2dac04c06d76337126252a1d84f4b8d
-Size (rdiff-backup-1.0.5.tar.gz) = 152215 bytes
-SHA1 (patch-ab) = f6811affdb6c5dda7857ddfeb5965fd6a15ea63e
+SHA1 (rdiff-backup-1.2.2.tar.gz) = 79e17d27475044c116d10a08cfe46816f74fce85
+RMD160 (rdiff-backup-1.2.2.tar.gz) = 79ce59aecd0a58ac2fff4bb8c34d5fc35f721fc9
+Size (rdiff-backup-1.2.2.tar.gz) = 192249 bytes
diff --git a/sysutils/rdiff-backup/patches/patch-ab b/sysutils/rdiff-backup/patches/patch-ab
deleted file mode 100644
index c91d30cce54..00000000000
--- a/sysutils/rdiff-backup/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/08/14 12:08:00 abs Exp $
-
---- setup.py.orig	2003-08-09 00:26:18.000000000 +0100
-+++ setup.py
-@@ -51,12 +51,13 @@ setup(name="rdiff-backup",
- 	  ext_modules = [Extension("rdiff_backup.C", ["cmodule.c"]),
- 					 Extension("rdiff_backup._librsync",
- 							   ["_librsyncmodule.c"],
--							   include_dirs=incdir_list,
--							   library_dirs=libdir_list,
-+							   include_dirs=['%%LOCALBASE%%/include'],
-+							   library_dirs=['%%LOCALBASE%%/lib'],
-+							   runtime_library_dirs=['%%LOCALBASE%%/lib'],
- 							   libraries=libname,
- 							   extra_link_args=lflags_arg)],
- 	  scripts = ['rdiff-backup'],
--	  data_files = [('share/man/man1', ['rdiff-backup.1']),
-+	  data_files = [('man/man1', ['rdiff-backup.1']),
- 					('share/doc/rdiff-backup-%s' % (version_string,),
- 					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])])
-