Update rdiff-backup to 0.12.3 (Also fixes PR pkg/22095)

	- Over 1500 lines of changelog since 0.10.2
	- Now rdiff-backup writes metadata (uid, gid, mtime, etc.) to a
	  compressed text file in the rdiff-backup-data directory
	- No longer seems compelled to send symlinks every time

5 files changed, 25 insertions, 41 deletions

diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index ec9cd3d3135..5bce0d98f24 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:24:25 martti Exp $
+# $NetBSD: Makefile,v 1.5 2003/08/14 12:08:00 abs Exp $
 #
 
-DISTNAME=	rdiff-backup-0.10.2
-PKGREVISION=	1
+DISTNAME=	rdiff-backup-0.12.3
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://rdiff-backup.stanford.edu/
 
@@ -24,6 +23,8 @@ do-install:
 	cd ${WRKSRC}; ${PYTHONBIN} local_setup.py install \
 		--prefix=${PREFIX} --skip-build
 
+BUILDLINK_DEPENDS.librsync=	librsync>=0.9.6
+
 .include "../../devel/librsync/buildlink2.mk"
 .include "../../lang/python/application.mk"
 
diff --git a/sysutils/rdiff-backup/PLIST b/sysutils/rdiff-backup/PLIST
index 950322f9a55..6ad55811ad1 100644
--- a/sysutils/rdiff-backup/PLIST
+++ b/sysutils/rdiff-backup/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/10/15 15:16:02 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/08/14 12:08:00 abs Exp $
 bin/rdiff-backup
 lib/python2.2/site-packages/rdiff_backup/C.so
 lib/python2.2/site-packages/rdiff_backup/FilenameMapping.py
@@ -9,25 +9,23 @@ lib/python2.2/site-packages/rdiff_backup/Hardlink.py
 lib/python2.2/site-packages/rdiff_backup/Hardlink.pyc
 lib/python2.2/site-packages/rdiff_backup/Main.py
 lib/python2.2/site-packages/rdiff_backup/Main.pyc
-lib/python2.2/site-packages/rdiff_backup/MiscStats.py
-lib/python2.2/site-packages/rdiff_backup/MiscStats.pyc
 lib/python2.2/site-packages/rdiff_backup/Rdiff.py
 lib/python2.2/site-packages/rdiff_backup/Rdiff.pyc
 lib/python2.2/site-packages/rdiff_backup/Security.py
 lib/python2.2/site-packages/rdiff_backup/Security.pyc
 lib/python2.2/site-packages/rdiff_backup/SetConnections.py
 lib/python2.2/site-packages/rdiff_backup/SetConnections.pyc
+lib/python2.2/site-packages/rdiff_backup/TempFile.py
+lib/python2.2/site-packages/rdiff_backup/TempFile.pyc
 lib/python2.2/site-packages/rdiff_backup/Time.py
 lib/python2.2/site-packages/rdiff_backup/Time.pyc
 lib/python2.2/site-packages/rdiff_backup/__init__.py
 lib/python2.2/site-packages/rdiff_backup/__init__.pyc
 lib/python2.2/site-packages/rdiff_backup/_librsync.so
+lib/python2.2/site-packages/rdiff_backup/backup.py
+lib/python2.2/site-packages/rdiff_backup/backup.pyc
 lib/python2.2/site-packages/rdiff_backup/connection.py
 lib/python2.2/site-packages/rdiff_backup/connection.pyc
-lib/python2.2/site-packages/rdiff_backup/destructive_stepping.py
-lib/python2.2/site-packages/rdiff_backup/destructive_stepping.pyc
-lib/python2.2/site-packages/rdiff_backup/highlevel.py
-lib/python2.2/site-packages/rdiff_backup/highlevel.pyc
 lib/python2.2/site-packages/rdiff_backup/increment.py
 lib/python2.2/site-packages/rdiff_backup/increment.pyc
 lib/python2.2/site-packages/rdiff_backup/iterfile.py
@@ -40,10 +38,12 @@ lib/python2.2/site-packages/rdiff_backup/log.py
 lib/python2.2/site-packages/rdiff_backup/log.pyc
 lib/python2.2/site-packages/rdiff_backup/manage.py
 lib/python2.2/site-packages/rdiff_backup/manage.pyc
+lib/python2.2/site-packages/rdiff_backup/metadata.py
+lib/python2.2/site-packages/rdiff_backup/metadata.pyc
+lib/python2.2/site-packages/rdiff_backup/regress.py
+lib/python2.2/site-packages/rdiff_backup/regress.pyc
 lib/python2.2/site-packages/rdiff_backup/restore.py
 lib/python2.2/site-packages/rdiff_backup/restore.pyc
-lib/python2.2/site-packages/rdiff_backup/rlist.py
-lib/python2.2/site-packages/rdiff_backup/rlist.pyc
 lib/python2.2/site-packages/rdiff_backup/robust.py
 lib/python2.2/site-packages/rdiff_backup/robust.pyc
 lib/python2.2/site-packages/rdiff_backup/rorpiter.py
diff --git a/sysutils/rdiff-backup/distinfo b/sysutils/rdiff-backup/distinfo
index 3bbc7d325e7..aecff6adda4 100644
--- a/sysutils/rdiff-backup/distinfo
+++ b/sysutils/rdiff-backup/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/03/22 01:03:09 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/08/14 12:08:00 abs Exp $
 
-SHA1 (rdiff-backup-0.10.2.tar.gz) = 57725aa566648206323b2b597e2d2d29c7336b7c
-Size (rdiff-backup-0.10.2.tar.gz) = 110249 bytes
-SHA1 (patch-aa) = 26027114889f6dcbbca47d40227980b45a3d65ba
-SHA1 (patch-ab) = 123ad5cf21770ce882738b625eee3df457b55bf7
+SHA1 (rdiff-backup-0.12.3.tar.gz) = 33232de2da1a63b368da5589f4c036b20e8b70b0
+Size (rdiff-backup-0.12.3.tar.gz) = 117136 bytes
+SHA1 (patch-ab) = f6811affdb6c5dda7857ddfeb5965fd6a15ea63e
diff --git a/sysutils/rdiff-backup/patches/patch-aa b/sysutils/rdiff-backup/patches/patch-aa
deleted file mode 100644
index 1a08929b47f..00000000000
--- a/sysutils/rdiff-backup/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/15 15:16:02 agc Exp $
-
---- cmodule.c.orig	Thu Oct  3 00:11:33 2002
-+++ cmodule.c
-@@ -129,12 +129,12 @@ static PyObject *c_make_file_dict(self, 
- 	char devtype[2];
- #if defined(HAVE_LONG_LONG) && !defined(MS_WINDOWS)
- 	LONG_LONG devnums = (LONG_LONG)sbuf.st_rdev;
--	PyObject *major_num = PyLong_FromLongLong(devnums >> 8);
-+	PyObject *major_num = PyLong_FromLongLong(major(devnums));
- #else
- 	long int devnums = (long)sbuf.st_dev;
- 	PyObject *major_num = PyInt_FromLong(devnums >> 8);
- #endif
--	int minor_num = (int)(devnums & 0xff);
-+	int minor_num = (int)(minor(devnums));
- 	if S_ISCHR(mode) strcpy(devtype, "c");
- 	else strcpy(devtype, "b");
- 	return_val = Py_BuildValue("{s:s,s:O,s:l,s:l,s:l,s:O,s:O,s:l,s:N}",
diff --git a/sysutils/rdiff-backup/patches/patch-ab b/sysutils/rdiff-backup/patches/patch-ab
index 60ef158a4ad..c91d30cce54 100644
--- a/sysutils/rdiff-backup/patches/patch-ab
+++ b/sysutils/rdiff-backup/patches/patch-ab
@@ -1,18 +1,21 @@
-$NetBSD: patch-ab,v 1.2 2003/03/22 01:03:09 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2003/08/14 12:08:00 abs Exp $
 
---- setup.py.orig	Mon Jan 27 06:04:22 2003
+--- setup.py.orig	2003-08-09 00:26:18.000000000 +0100
 +++ setup.py
-@@ -19,9 +19,12 @@ setup(name="rdiff-backup",
+@@ -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=["rsync"])],
+ 							   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,
+ 					('share/doc/rdiff-backup-%s' % (version_string,),
  					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])])