Attachment #89383 for bug #126314

View | Details | Raw Unified | Return to bug 126314
Collapse All | Expand All




#

PORTNAME=	rdiff-backup
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



LIB_DEPENDS=	rsync.1:${PORTSDIR}/net/librsync

CONFLICTS=	rdiff-backup10-[0-9]*
CONFLICTS=	rdiff-backup-devel-[0-9]*

USE_PYTHON=	yes
USE_PYDISTUTILS=yes

Lines 1-3 Link Here

(-)/usr/ports/sysutils/rdiff-backup-devel/distinfo (-3 / +3 lines)
1	MD5 (rdiff-backup-1.1.15.tar.gz) = 7c3dfae289d0f4dea3647ae2831c46c7	1	MD5 (rdiff-backup-1.2.0.tar.gz) = 65597d2d1ce12efe9ab2fa20cd029e0c
2	SHA256 (rdiff-backup-1.1.15.tar.gz) = 07f9d39d833844a72ada964bbdbfcef88303c042cd7fb085701c2eb74633451f	2	SHA256 (rdiff-backup-1.2.0.tar.gz) = 2e9f8485f7dd662ec043e29101db4c80b83a56ef80a349d1f0bc7d73fc4e60fa
3	SIZE (rdiff-backup-1.1.15.tar.gz) = 182180	3	SIZE (rdiff-backup-1.2.0.tar.gz) = 187974




--- 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]

 setup(name="rdiff-backup",
 	  version=version_string,
 	  description="Local/remote mirroring+incremental backup",
@@ -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,
 							   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'])],
-					**extra_options)
-
+	  scripts = ['rdiff-backup', 'rdiff-backup-statistics'])

Lines 101-106 Link Here

(-)/usr/ports/sysutils/rdiff-backup-devel/pkg-plist (+3 lines)
101	%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.py	101	%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.py
102	%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyc	102	%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyc
103	%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyo	103	%%PYTHON_SITELIBDIR%%/rdiff_backup/user_group.pyo
		104	%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.py
		105	%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyc
		106	%%PYTHON_SITELIBDIR%%/rdiff_backup/win_acls.pyo
104	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG	107	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
105	%%PORTDOCS%%%%DOCSDIR%%/COPYING	108	%%PORTDOCS%%%%DOCSDIR%%/COPYING
106	%%PORTDOCS%%%%DOCSDIR%%/FAQ.html	109	%%PORTDOCS%%%%DOCSDIR%%/FAQ.html

Return to bug 126314

Lines 6-19 Link Here

(-)/usr/ports/sysutils/rdiff-backup-devel/Makefile (-4 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= rdiff-backup	8	PORTNAME= rdiff-backup
9	PORTVERSION= 1.1.15	9	PORTVERSION= 1.2.0
10	PORTREVISION= 1	10	PORTEPOCH= 1
11	CATEGORIES= sysutils	11	CATEGORIES= sysutils
12	MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:savannah/} \	12	MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:savannah/} \
13	${MASTER_SITE_LOCAL:S/$/:local/}	13	${MASTER_SITE_LOCAL:S/$/:local/}
14	MASTER_SITE_SUBDIR= ${PORTNAME}/:savannah \	14	MASTER_SITE_SUBDIR= ${PORTNAME}/:savannah \
15	vd/${PORTNAME}${PKGNAMESUFFIX}/:local	15	vd/${PORTNAME}${PKGNAMESUFFIX}/:local
16	PKGNAMESUFFIX= -devel
17	DISTNAME= ${PORTNAME}-${PORTVERSION}	16	DISTNAME= ${PORTNAME}-${PORTVERSION}
18	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:savannah,local	17	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:savannah,local
19		18
Lines 22-28 Link Here
22		21
23	LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync	22	LIB_DEPENDS= rsync.1:${PORTSDIR}/net/librsync
24		23
25	CONFLICTS= rdiff-backup-[0-9]*	24	CONFLICTS= rdiff-backup10-[0-9]*
		25	CONFLICTS= rdiff-backup-devel-[0-9]*
26		26
27	USE_PYTHON= yes	27	USE_PYTHON= yes
28	USE_PYDISTUTILS=yes	28	USE_PYDISTUTILS=yes

Lines 1-8 Link Here

(-)/usr/ports/sysutils/rdiff-backup-devel/files/patch-setup.py (-14 / +14 lines)
1	--- setup.py.orig Wed Jan 4 09:00:26 2006	1	--- setup.py.orig 2008-08-06 21:24:28.756047734 +0200
2	+++ setup.py Wed Jan 4 09:08:19 2006	2	+++ setup.py 2008-08-06 21:24:18.122056264 +0200
3	@@ -41,6 +41,10 @@	3	@@ -58,6 +58,10 @@
4	if '-lrsync' in LIBS:	4	'zipfile': None
5	libname = []	5	})
6		6
7	+LOCALBASE = os.getenv("LOCALBASE", "/usr/local")	7	+LOCALBASE = os.getenv("LOCALBASE", "/usr/local")
8	+include_dirs = ["%s/include" % LOCALBASE]	8	+include_dirs = ["%s/include" % LOCALBASE]
Lines 11-31 Link Here
11	setup(name="rdiff-backup",	11	setup(name="rdiff-backup",
12	version=version_string,	12	version=version_string,
13	description="Local/remote mirroring+incremental backup",	13	description="Local/remote mirroring+incremental backup",
14	@@ -51,13 +55,9 @@	14	@@ -68,14 +72,8 @@
15	ext_modules = [Extension("rdiff_backup.C", ["cmodule.c"]),	15	ext_modules = [Extension("rdiff_backup.C", ["cmodule.c"]),
16	Extension("rdiff_backup._librsync",	16	Extension("rdiff_backup._librsync",
17	["_librsyncmodule.c"],	17	["_librsyncmodule.c"],
18	- include_dirs=incdir_list,	18	- include_dirs=incdir_list,
19	- library_dirs=libdir_list,	19	- library_dirs=libdir_list,
20	- libraries=libname,
21	- extra_link_args=lflags_arg)],
22	+ libraries=["rsync"],
23	+ include_dirs=include_dirs,	20	+ include_dirs=include_dirs,
24	+ library_dirs=library_dirs)],	21	+ library_dirs=library_dirs,
25	scripts = ['rdiff-backup', 'rdiff-backup-statistics'],	22	libraries=libname,
		23	extra_link_args=lflags_arg)],
		24	- scripts = ['rdiff-backup', 'rdiff-backup-statistics'],
26	- data_files = [('share/man/man1', ['rdiff-backup.1',	25	- data_files = [('share/man/man1', ['rdiff-backup.1',
27	- 'rdiff-backup-statistics.1']),	26	- 'rdiff-backup-statistics.1']),
28	- ('share/doc/rdiff-backup-%s' % (version_string,),	27	- ('share/doc/rdiff-backup-%s' % (version_string,),
29	- ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])])	28	- ['CHANGELOG', 'COPYING', 'README', 'FAQ.html'])],
30	+)	29	- **extra_options)
31		30	-
		31	+ scripts = ['rdiff-backup', 'rdiff-backup-statistics'])