* Copy sysutils/rdiff-backup to sysutils/rdiff-backup10

* Upgrade sysutils/rdiff-backup from 1.0.5 to 1.2.0
* Minor changes in sysutils/rdiff-backup-devel in CONFLICTS and pkg-descr

PR:		ports/126313, ports/126314, ports/126315 (based on)
Submitted by:	Peter Schuller <peter.schuller@infidyne.com>

4 files changed, 39 insertions, 24 deletions

diff --git a/sysutils/rdiff-backup/Makefile b/sysutils/rdiff-backup/Makefile
index 6aa21b874f2a..f6b1bf395112 100644
--- a/sysutils/rdiff-backup/Makefile
+++ b/sysutils/rdiff-backup/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rdiff-backup
-PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTVERSION=	1.2.0
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
@@ -22,17 +21,19 @@ COMMENT=	Local/remote mirroring+incremental backup
 
 LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
 
-CONFLICTS=	rdiff-backup-devel-[0-9]*
+CONFLICTS=	rdiff-backup-devel-[0-9]* rdiff-backup10-[0-9]*
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-MAN1=		rdiff-backup.1
+MAN1=		rdiff-backup.1 rdiff-backup-statistics.1
 
 DOCFILES=	CHANGELOG README COPYING FAQ.html
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/rdiff-backup.1 ${PREFIX}/man/man1
+.for man in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${man} ${PREFIX}/man/man1
+.endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCFILES}
diff --git a/sysutils/rdiff-backup/distinfo b/sysutils/rdiff-backup/distinfo
index 5107e33d44ce..1e3ec7f27255 100644
--- a/sysutils/rdiff-backup/distinfo
+++ b/sysutils/rdiff-backup/distinfo
@@ -1,3 +1,3 @@
-MD5 (rdiff-backup-1.0.5.tar.gz) = fa2a165fa07a94be52c52e3545bc7758
-SHA256 (rdiff-backup-1.0.5.tar.gz) = 30e99e762162b3698c2c4fbd04d7c7d5fcb08accf200ef886be560226faf5a50
-SIZE (rdiff-backup-1.0.5.tar.gz) = 152215
+MD5 (rdiff-backup-1.2.0.tar.gz) = 65597d2d1ce12efe9ab2fa20cd029e0c
+SHA256 (rdiff-backup-1.2.0.tar.gz) = 2e9f8485f7dd662ec043e29101db4c80b83a56ef80a349d1f0bc7d73fc4e60fa
+SIZE (rdiff-backup-1.2.0.tar.gz) = 187974
diff --git a/sysutils/rdiff-backup/files/patch-setup.py b/sysutils/rdiff-backup/files/patch-setup.py
index f704a62d2a40..8feddf8522f0 100644
--- a/sysutils/rdiff-backup/files/patch-setup.py
+++ b/sysutils/rdiff-backup/files/patch-setup.py
@@ -1,8 +1,8 @@
---- setup.py.orig	Thu Jun 26 15:27:30 2003
-+++ setup.py	Thu Jul  3 15:09:19 2003
-@@ -41,6 +41,10 @@
- 		if '-lrsync' in LIBS:
- 			libname = []
+--- setup.py.orig	2008-08-06 21:24:28.756047734 +0200
++++ setup.py	2008-08-06 21:24:18.122056264 +0200
+@@ -58,6 +58,10 @@
+ 				'zipfile': None
+ 			})
  
 +LOCALBASE = os.getenv("LOCALBASE", "/usr/local")
 +include_dirs = ["%s/include" % LOCALBASE]
@@ -11,20 +11,21 @@
  setup(name="rdiff-backup",
  	  version=version_string,
  	  description="Local/remote mirroring+incremental backup",
-@@ -51,12 +55,9 @@
+@@ -68,14 +72,8 @@
  	  ext_modules = [Extension("rdiff_backup.C", ["cmodule.c"]),
  					 Extension("rdiff_backup._librsync",
  							   ["_librsyncmodule.c"],
 -							   include_dirs=incdir_list,
 -							   library_dirs=libdir_list,
--							   libraries=libname,
--							   extra_link_args=lflags_arg)],
-+							   libraries=["rsync"],
-+                                                           include_dirs=include_dirs,
-+                                                           library_dirs=library_dirs)],
- 	  scripts = ['rdiff-backup'],
--	  data_files = [('share/man/man1', ['rdiff-backup.1']),
++							   include_dirs=include_dirs,
++							   library_dirs=library_dirs,
+ 							   libraries=libname,
+ 							   extra_link_args=lflags_arg)],
+-	  scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
+-	  data_files = [('share/man/man1', ['rdiff-backup.1',
+-										'rdiff-backup-statistics.1']),
 -					('share/doc/rdiff-backup-%s' % (version_string,),
--					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])])
-+)
- 
+-					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
+-					**extra_options)
+-
++	  scripts = ['rdiff-backup', 'rdiff-backup-statistics'])
diff --git a/sysutils/rdiff-backup/pkg-plist b/sysutils/rdiff-backup/pkg-plist
index c2103b488cbc..7e16003dc242 100644
--- a/sysutils/rdiff-backup/pkg-plist
+++ b/sysutils/rdiff-backup/pkg-plist
@@ -1,4 +1,5 @@
 bin/rdiff-backup
+bin/rdiff-backup-statistics
 %%PYTHON_SITELIBDIR%%/rdiff_backup/C.so
 %%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/FilenameMapping.pyc
@@ -34,6 +35,9 @@ bin/rdiff-backup
 %%PYTHON_SITELIBDIR%%/rdiff_backup/backup.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/backup.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/backup.pyo
+%%PYTHON_SITELIBDIR%%/rdiff_backup/compare.py
+%%PYTHON_SITELIBDIR%%/rdiff_backup/compare.pyc
+%%PYTHON_SITELIBDIR%%/rdiff_backup/compare.pyo
 %%PYTHON_SITELIBDIR%%/rdiff_backup/connection.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/connection.pyo
@@ -43,6 +47,9 @@ bin/rdiff-backup
 %%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/fs_abilities.pyo
+%%PYTHON_SITELIBDIR%%/rdiff_backup/hash.py
+%%PYTHON_SITELIBDIR%%/rdiff_backup/hash.pyc
+%%PYTHON_SITELIBDIR%%/rdiff_backup/hash.pyo
 %%PYTHON_SITELIBDIR%%/rdiff_backup/increment.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/increment.pyo
@@ -58,6 +65,9 @@ bin/rdiff-backup
 %%PYTHON_SITELIBDIR%%/rdiff_backup/log.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/log.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/log.pyo
+%%PYTHON_SITELIBDIR%%/rdiff_backup/longname.py
+%%PYTHON_SITELIBDIR%%/rdiff_backup/longname.pyc
+%%PYTHON_SITELIBDIR%%/rdiff_backup/longname.pyo
 %%PYTHON_SITELIBDIR%%/rdiff_backup/manage.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/manage.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/manage.pyo
@@ -91,6 +101,9 @@ bin/rdiff-backup
 %%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.py
 %%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyc
 %%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyo
+%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.py
+%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyc
+%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyo
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html