On 08/26/14 12:43, Jason Tubnor wrote:
> On 26 August 2014 16:33, Giovanni Bechis <giova...@paclan.it> wrote:
>
>> I will commit it in a couple of days, do you want to take maintainership
>> or do you prefer to set ports@ as maintainer ?
>
> Thanks Giovanni. I'll take the maintainership on. Jason Tubnor
> <ja...@tubnor.net>
>
> Cheers,
>
> Jason
>
Diff attached, regression tests seems to hang for me, I have not tried yet if
this is a regression in 0.6.24 or if it is present in previous versions as well.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 14 Apr 2014 15:14:28 -0000 1.29
+++ Makefile 26 Aug 2014 12:12:57 -0000
@@ -2,16 +2,15 @@
COMMENT = encrypted backup using rsync algorithm
-MODPY_EGG_VERSION = 0.6.23
+MODPY_EGG_VERSION = 0.6.24
DISTNAME = duplicity-${MODPY_EGG_VERSION}
-REVISION = 1
CATEGORIES = sysutils
HOMEPAGE = http://www.nongnu.org/duplicity/
MASTER_SITES = ${MASTER_SITE_SAVANNAH:=duplicity/}
-MAINTAINER = Jim Razmus II <j...@openbsd.org>
+MAINTAINER = Jason Tubnor <ja...@tubnor.net>
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
@@ -20,18 +19,21 @@ MODULES = lang/python
WANTLIB += pthread rsync ${MODPY_WANTLIB}
-LIB_DEPENDS += net/librsync \
- ${MODPY_LIB_DEPENDS}
+LIB_DEPENDS += net/librsync
-RUN_DEPENDS += net/py-boto \
+RUN_DEPENDS += archivers/par2cmdline \
+ net/py-boto \
net/ncftp \
security/py-gnupg \
sysutils/py-lockfile
+MODPY_SETUPTOOLS = Yes
+
MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
# Tests in ${WRKSRC}/testing directory require bash to run and they all fail
-NO_TEST = Yes
+#NO_TEST = Yes
+TEST_DEPENDS = devel/py-mock
# XXX 600 mode prevents from reading the man page;
# check if still required at next update
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo 3 Apr 2014 07:59:35 -0000 1.15
+++ distinfo 21 Aug 2014 10:20:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (duplicity-0.6.23.tar.gz) = ehfx4QOV3tzzIEvFOSW7ncu/KnVSybCW6+cn7OucDGA=
-SIZE (duplicity-0.6.23.tar.gz) = 1260261
+SHA256 (duplicity-0.6.24.tar.gz) = HUHXVmOPVRBvlQHD25TMvGVoqoVrpTHgftLPt2C2JFA=
+SIZE (duplicity-0.6.24.tar.gz) = 1268175
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 3 Apr 2014 07:59:35 -0000 1.13
+++ pkg/PLIST 21 Aug 2014 10:27:13 -0000
@@ -1,8 +1,14 @@
@comment $OpenBSD: PLIST,v 1.13 2014/04/03 07:59:35 ajacoutot Exp $
bin/duplicity
bin/rdiffdir
+@comment lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.py
+@comment lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/
-lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/duplicity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.py
lib/python${MODPY_VERSION}/site-packages/duplicity/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/_librsync.so
@@ -29,8 +35,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/botobackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/cfbackend.py
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/cfbackend.pyc
-@comment lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.py
-@comment lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.pyc
+lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.py
+lib/python${MODPY_VERSION}/site-packages/duplicity/backends/dpbxbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpbackend.py
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/ftpsbackend.py
@@ -55,10 +61,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/swiftbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/tahoebackend.py
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/tahoebackend.pyc
-lib/python${MODPY_VERSION}/site-packages/duplicity/backends/u1backend.py
-lib/python${MODPY_VERSION}/site-packages/duplicity/backends/u1backend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/webdavbackend.py
lib/python${MODPY_VERSION}/site-packages/duplicity/backends/webdavbackend.pyc
+lib/python${MODPY_VERSION}/site-packages/duplicity/backends/~par2wrapperbackend.py
+lib/python${MODPY_VERSION}/site-packages/duplicity/backends/~par2wrapperbackend.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/cached_ops.py
lib/python${MODPY_VERSION}/site-packages/duplicity/cached_ops.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/collections.py
@@ -95,8 +101,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/duplicity/log.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/manifest.py
lib/python${MODPY_VERSION}/site-packages/duplicity/manifest.pyc
-lib/python${MODPY_VERSION}/site-packages/duplicity/misc.py
-lib/python${MODPY_VERSION}/site-packages/duplicity/misc.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/patchdir.py
lib/python${MODPY_VERSION}/site-packages/duplicity/patchdir.pyc
lib/python${MODPY_VERSION}/site-packages/duplicity/path.py
