--- /usr/ports/sysutils/rdiff-backup-devel/Makefile	2008-06-06 16:03:18.000000000 +0200
+++ /usr/ports/sysutils/rdiff-backup-devel/Makefile	2008-08-06 21:51:34.545564000 +0200
@@ -6,14 +6,13 @@ 
 #
 
 PORTNAME=	rdiff-backup
-PORTVERSION=	1.1.15
-PORTREVISION=	1
+PORTVERSION=	1.2.0
+PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	${PORTNAME}/:savannah \
 		vd/${PORTNAME}${PKGNAMESUFFIX}/:local
-PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:savannah,local
 
@@ -22,7 +21,8 @@ 
 
 LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
 
-CONFLICTS=	rdiff-backup-[0-9]*
+CONFLICTS=	rdiff-backup10-[0-9]*
+CONFLICTS=	rdiff-backup-devel-[0-9]*
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
--- /usr/ports/sysutils/rdiff-backup-devel/distinfo	2008-01-19 08:06:35.000000000 +0100
+++ /usr/ports/sysutils/rdiff-backup-devel/distinfo	2008-08-06 21:14:36.000000000 +0200
@@ -1,3 +1,3 @@ 
-MD5 (rdiff-backup-1.1.15.tar.gz) = 7c3dfae289d0f4dea3647ae2831c46c7
-SHA256 (rdiff-backup-1.1.15.tar.gz) = 07f9d39d833844a72ada964bbdbfcef88303c042cd7fb085701c2eb74633451f
-SIZE (rdiff-backup-1.1.15.tar.gz) = 182180
+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
--- /usr/ports/sysutils/rdiff-backup-devel/files/patch-setup.py	2006-01-04 10:27:54.000000000 +0100
+++ /usr/ports/sysutils/rdiff-backup-devel/files/patch-setup.py	2008-08-06 21:24:47.000000000 +0200
@@ -1,8 +1,8 @@ 
---- setup.py.orig	Wed Jan  4 09:00:26 2006
-+++ setup.py	Wed Jan  4 09:08:19 2006
-@@ -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,21 +11,21 @@ 
  setup(name="rdiff-backup",
  	  version=version_string,
  	  description="Local/remote mirroring+incremental backup",
-@@ -51,13 +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', 'rdiff-backup-statistics'],
++							   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'])
--- /usr/ports/sysutils/rdiff-backup-devel/pkg-plist	2006-01-04 10:27:54.000000000 +0100
+++ /usr/ports/sysutils/rdiff-backup-devel/pkg-plist	2008-08-06 21:29:24.000000000 +0200
@@ -101,6 +101,9 @@ 
 %%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