Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 4 Jan 2006 10:23:56 +0200
From:      Vasil Dimov <vd@datamax.bg>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/91301: Update port: sysutils/rdiff-backup-devel to 1.1.5
Message-ID:  <20060104082356.GA39263@qlovarnika.bg.datamax>
Resent-Message-ID: <200601040830.k048U9MJ000869@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         91301
>Category:       ports
>Synopsis:       Update port: sysutils/rdiff-backup-devel to 1.1.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 04 08:30:09 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 6.0-STABLE amd64
>Organization:
DataMax
>Environment:

>Description:

Update sysutils/rdiff-backup-devel from 1.1.4 to 1.1.5:

* escape from rdiff-backup's mastering - being a slave to rdiff-backup
  becomes too hard to maintain with respect to changes in 1.1.5

* Makefile: mandatory variables imported from ../rdiff-backup/Makefile
* Makefile: add new entry to MAN1
* Makefile: slightly alter post-install target to make it install all
  man pages listed in MAN1
* add files/patch-setup.py which is now different from the one located
  in ../rdiff-backup/files/
* add own pkg-descr
* sync pkg-plist

>How-To-Repeat:

>Fix:

--- rdiff-backup-devel_1.1.4-1.1.5.diff begins here ---
diff -urN --exclude=CVS rdiff-backup-devel-1.1.4/Makefile rdiff-backup-devel/Makefile
--- rdiff-backup-devel-1.1.4/Makefile	Tue Dec 20 02:20:57 2005
+++ rdiff-backup-devel/Makefile	Wed Jan  4 10:06:14 2006
@@ -5,17 +5,37 @@
 # $FreeBSD: ports/sysutils/rdiff-backup-devel/Makefile,v 1.5 2005/12/19 11:33:39 lawrance Exp $
 #
 
-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 -urN --exclude=CVS rdiff-backup-devel-1.1.4/distinfo rdiff-backup-devel/distinfo
--- rdiff-backup-devel-1.1.4/distinfo	Tue Dec 20 02:20:57 2005
+++ rdiff-backup-devel/distinfo	Wed Jan  4 08:51:41 2006
@@ -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 -urN --exclude=CVS rdiff-backup-devel-1.1.4/files/patch-setup.py rdiff-backup-devel/files/patch-setup.py
--- rdiff-backup-devel-1.1.4/files/patch-setup.py	Thu Jan  1 02:00:00 1970
+++ rdiff-backup-devel/files/patch-setup.py	Wed Jan  4 09:10:07 2006
@@ -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 -urN --exclude=CVS rdiff-backup-devel-1.1.4/pkg-descr rdiff-backup-devel/pkg-descr
--- rdiff-backup-devel-1.1.4/pkg-descr	Thu Jan  1 02:00:00 1970
+++ rdiff-backup-devel/pkg-descr	Wed Jan  4 10:02:44 2006
@@ -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 -urN --exclude=CVS rdiff-backup-devel-1.1.4/pkg-plist rdiff-backup-devel/pkg-plist
--- rdiff-backup-devel-1.1.4/pkg-plist	Mon Nov 28 02:20:48 2005
+++ rdiff-backup-devel/pkg-plist	Wed Jan  4 09:43:49 2006
@@ -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
--- rdiff-backup-devel_1.1.4-1.1.5.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060104082356.GA39263>