Hi,
This is an update, enhancement and build fix for sysutils/duplicity. Notes are:
- Version bump from 0.6.23 to 0.6.24
- Added archivers/par2cmdline for par2+ wrapper support
- Remove ${MODPY_LIB_DEPENDS} due to make package reporting that it
wasn't required
- Added MODPY_SETUPTOOLS = Yes as the fake structure wasn't setup,
causing setup.py to error and halt the make build process
Please review and any feedback welcome. Tested on amd64 only.
Thanks.
Index: sysutils/duplicity/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- sysutils/duplicity/Makefile 14 Apr 2014 15:14:28 -0000 1.29
+++ sysutils/duplicity/Makefile 19 Aug 2014 02:30:20 -0000
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.29 2014/04/14 15:14:28 jca Exp $
+# $OpenBSD: Makefile,v 1.30 2014/08/19 12:05:27 jca Exp $
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
@@ -20,13 +20,15 @@ MODULES = lang/python
WANTLIB += pthread rsync ${MODPY_WANTLIB}
-LIB_DEPENDS += net/librsync \
- ${MODPY_LIB_DEPENDS}
+LIB_DEPENDS += net/librsync
RUN_DEPENDS += net/py-boto \
net/ncftp \
+ archivers/par2cmdline \
security/py-gnupg \
sysutils/py-lockfile
+
+MODPY_SETUPTOOLS = Yes
MAKE_ENV += LIBRSYNC_DIR=${LOCALBASE}
Index: sysutils/duplicity/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- sysutils/duplicity/distinfo 3 Apr 2014 07:59:35 -0000 1.15
+++ sysutils/duplicity/distinfo 19 Aug 2014 02:31:24 -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: sysutils/duplicity/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 PLIST
--- sysutils/duplicity/pkg/PLIST 3 Apr 2014 07:59:35 -0000 1.13
+++ sysutils/duplicity/pkg/PLIST 19 Aug 2014 02:32:08 -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
@@ -160,3 +164,4 @@ share/locale/ug/
share/locale/ug/LC_MESSAGES/
share/locale/ug/LC_MESSAGES/duplicity.mo
share/locale/zh_CN/LC_MESSAGES/duplicity.mo
+share/pkgconfig/