Attachment #179291 for bug #216366




# $FreeBSD$

PORTNAME=	duplicity
PORTVERSION=	0.7.11
CATEGORIES=	sysutils
MASTER_SITES=	http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/

MAINTAINER=	dbaio@bsd.com.br
COMMENT=	Backup tool that uses librsync and GnuPG

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	librsync.so:net/librsync2
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1475352375	1	TIMESTAMP = 1485014296
2	SHA256 (duplicity-0.7.10.tar.gz) = 485fef15526d163c061e00ec08de216cf7d652e67d41de5dc3bed9fb42214842	2	SHA256 (duplicity-0.7.11.tar.gz) = b047a1590a1f5bb3974643ad2cc9dfdd32f61adbf2c1989191fb12cb59c2ec07
3	SIZE (duplicity-0.7.10.tar.gz) = 1543523	3	SIZE (duplicity-0.7.11.tar.gz) = 1550197




--- setup.py.orig	2016-12-31 16:33:12 UTC
+++ setup.py
@@ -23,7 +23,6 @@
 import sys

 
 if os.name == 'posix':
     LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
@@ -47,16 +49,10 @@ if os.name == 'posix':
         incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]
         libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
 

-                'README-REPO',
-                'README-LOG',
-                'CHANGELOG']),
-              ]
+                 ]
 
 top_dir = os.path.dirname(os.path.abspath(__file__))
 assert os.path.exists(os.path.join(top_dir, "po")), "Missing 'po' directory."
@@ -70,46 +66,9 @@ for root, dirs, files in os.walk(os.path
                  ["po/%s/duplicity.mo" % lang]))
 
 
-class TestCommand(test):
-
-    def run(self):

-        if self.build_lib != top_dir:
-            testing_dir = os.path.join(self.build_lib, 'testing')
-            os.system("rm -rf %s" % testing_dir)
-
         install.run(self)
 
         install.run(self)
 
@@ -177,11 +136,7 @@ setup(name="duplicity",
       url="http://duplicity.nongnu.org/index.html",
       packages=['duplicity',
                 'duplicity.backends',

       package_dir={"duplicity": "duplicity",
                    "duplicity.backends": "duplicity/backends", },
       ext_modules=[Extension("duplicity._librsync",
@@ -192,10 +147,7 @@ setup(name="duplicity",
       scripts=['bin/rdiffdir', 'bin/duplicity'],
       data_files=data_files,
       install_requires=['lockfile'],

Return to bug 216366

Lines 2-14 Link Here

(-)Makefile (-2 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= duplicity	4	PORTNAME= duplicity
5	PORTVERSION= 0.7.10	5	PORTVERSION= 0.7.11
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/	7	MASTER_SITES= http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/
8		8
9	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= dbaio@bsd.com.br
10	COMMENT= Backup tool that uses librsync and GnuPG	10	COMMENT= Backup tool that uses librsync and GnuPG
11		11
		12	LICENSE= GPLv2+
		13	LICENSE_FILE= ${WRKSRC}/COPYING
		14
12	LIB_DEPENDS= librsync.so:net/librsync2	15	LIB_DEPENDS= librsync.so:net/librsync2
13	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile	16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lockfile>=0:devel/py-lockfile
14		17

Lines 1-4 Link Here

(-)files/patch-setup.py (-10 / +10 lines)
1	--- setup.py.orig 2016-08-20 19:13:49 UTC	1	--- setup.py.orig 2016-12-31 16:33:12 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -23,7 +23,6 @@	3	@@ -23,7 +23,6 @@
4	import sys	4	import sys
Lines 18-24 Link Here
18		18
19	if os.name == 'posix':	19	if os.name == 'posix':
20	LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')	20	LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
21	@@ -47,15 +49,9 @@ if os.name == 'posix':	21	@@ -47,16 +49,10 @@ if os.name == 'posix':
22	incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]	22	incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]
23	libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]	23	libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
24		24
Lines 32-45 Link Here
32	- 'README-REPO',	32	- 'README-REPO',
33	- 'README-LOG',	33	- 'README-LOG',
34	- 'CHANGELOG']),	34	- 'CHANGELOG']),
35	]	35	- ]
		36	+ ]
36		37
37	top_dir = os.path.dirname(os.path.abspath(__file__))	38	top_dir = os.path.dirname(os.path.abspath(__file__))
38	@@ -69,48 +65,9 @@ for root, dirs, files in os.walk(os.path	39	assert os.path.exists(os.path.join(top_dir, "po")), "Missing 'po' directory."
39	('share/locale/%s/LC_MESSAGES' % lang,	40	@@ -70,46 +66,9 @@ for root, dirs, files in os.walk(os.path
40	["po/%s/duplicity.mo" % lang]))	41	["po/%s/duplicity.mo" % lang]))
41		42
42	-	43
43	-class TestCommand(test):	44	-class TestCommand(test):
44	-	45	-
45	- def run(self):	46	- def run(self):
Lines 80-90 Link Here
80	- if self.build_lib != top_dir:	81	- if self.build_lib != top_dir:
81	- testing_dir = os.path.join(self.build_lib, 'testing')	82	- testing_dir = os.path.join(self.build_lib, 'testing')
82	- os.system("rm -rf %s" % testing_dir)	83	- os.system("rm -rf %s" % testing_dir)
83	-
84	install.run(self)
85		84
		85	install.run(self)
86		86
87	@@ -177,11 +134,7 @@ setup(name="duplicity",	87	@@ -177,11 +136,7 @@ setup(name="duplicity",
88	url="http://duplicity.nongnu.org/index.html",	88	url="http://duplicity.nongnu.org/index.html",
89	packages=['duplicity',	89	packages=['duplicity',
90	'duplicity.backends',	90	'duplicity.backends',
Lines 97-103 Link Here
97	package_dir={"duplicity": "duplicity",	97	package_dir={"duplicity": "duplicity",
98	"duplicity.backends": "duplicity/backends", },	98	"duplicity.backends": "duplicity/backends", },
99	ext_modules=[Extension("duplicity._librsync",	99	ext_modules=[Extension("duplicity._librsync",
100	@@ -192,10 +145,7 @@ setup(name="duplicity",	100	@@ -192,10 +147,7 @@ setup(name="duplicity",
101	scripts=['bin/rdiffdir', 'bin/duplicity'],	101	scripts=['bin/rdiffdir', 'bin/duplicity'],
102	data_files=data_files,	102	data_files=data_files,
103	install_requires=['lockfile'],	103	install_requires=['lockfile'],