5 files changed, 75 insertions, 9 deletions

diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index 747c786fa87f..1e8ffe454da1 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -5,17 +5,37 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	1.1.4
-PORTEPOCH=	0
+PORTNAME=	rdiff-backup
+PORTVERSION=	1.1.5
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_SAVANNAH}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	vd@datamax.bg
+COMMENT=	Local/remote mirroring+incremental backup
 
-MASTERDIR=	${.CURDIR}/../rdiff-backup
+LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync
 
 CONFLICTS=	rdiff-backup-[0-9]*
 
-MD5_FILE=	${.CURDIR}/distinfo
-PLIST=		${.CURDIR}/pkg-plist
+USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
 
-.include "${MASTERDIR}/Makefile"
+MAN1=		rdiff-backup.1 rdiff-backup-statistics.1
+
+DOCFILES=	CHANGELOG README COPYING FAQ.html
+
+post-install:
+.for man in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${man} ${PREFIX}/man/man1
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for doc in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/rdiff-backup-devel/distinfo b/sysutils/rdiff-backup-devel/distinfo
index e04b80c8741f..413d75ef0368 100644
--- a/sysutils/rdiff-backup-devel/distinfo
+++ b/sysutils/rdiff-backup-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (rdiff-backup-1.1.4.tar.gz) = 246769a61d547e2dd6797b883816d3be
-SHA256 (rdiff-backup-1.1.4.tar.gz) = e04b4954bbff27de83185731e7cb48f6b5ac9cd08e541923f0f75a9748c0d47f
-SIZE (rdiff-backup-1.1.4.tar.gz) = 163520
+MD5 (rdiff-backup-1.1.5.tar.gz) = 37478b1d3e76ea521aac22216582ec58
+SHA256 (rdiff-backup-1.1.5.tar.gz) = 0cbfb4b3940ecc9e351bbd72b5a9c53af050f2f5f63d500e8ff714ab6c91e447
+SIZE (rdiff-backup-1.1.5.tar.gz) = 170477
diff --git a/sysutils/rdiff-backup-devel/files/patch-setup.py b/sysutils/rdiff-backup-devel/files/patch-setup.py
new file mode 100644
index 000000000000..0ca0a338f392
--- /dev/null
+++ b/sysutils/rdiff-backup-devel/files/patch-setup.py
@@ -0,0 +1,31 @@
+--- 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 = []
+ 
++LOCALBASE = os.getenv("LOCALBASE", "/usr/local")
++include_dirs = ["%s/include" % LOCALBASE]
++library_dirs = ["%s/lib" % LOCALBASE]
++
+ setup(name="rdiff-backup",
+ 	  version=version_string,
+ 	  description="Local/remote mirroring+incremental backup",
+@@ -51,13 +55,9 @@
+ 	  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'],
+-	  data_files = [('share/man/man1', ['rdiff-backup.1',
+-										'rdiff-backup-statistics.1']),
+-					('share/doc/rdiff-backup-%s' % (version_string,),
+-					 ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])])
++)
+ 
diff --git a/sysutils/rdiff-backup-devel/pkg-descr b/sysutils/rdiff-backup-devel/pkg-descr
new file mode 100644
index 000000000000..42cc081a0cd1
--- /dev/null
+++ b/sysutils/rdiff-backup-devel/pkg-descr
@@ -0,0 +1,14 @@
+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 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 rsync. Thus you can use
+rdiff-backup and ssh to securely back a hard drive up to a remote location,
+and only the differences will be transmitted.
+
+This is the development version of rdiff-backup.
+
+WWW: http://www.nongnu.org/rdiff-backup/
diff --git a/sysutils/rdiff-backup-devel/pkg-plist b/sysutils/rdiff-backup-devel/pkg-plist
index 1183e1cfb950..ce90215e8768 100644
--- a/sysutils/rdiff-backup-devel/pkg-plist
+++ b/sysutils/rdiff-backup-devel/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