Index: head/sysutils/duplicity/Makefile =================================================================== --- head/sysutils/duplicity/Makefile (revision 445558) +++ head/sysutils/duplicity/Makefile (revision 445559) @@ -1,103 +1,102 @@ # Created by: Gerhard Häring # $FreeBSD$ PORTNAME= duplicity -PORTVERSION= 0.7.12 -PORTREVISION= 1 +PORTVERSION= 0.7.13.1 CATEGORIES= sysutils MASTER_SITES= http://launchpad.net/duplicity/0.7-series/${PORTVERSION}/+download/ MAINTAINER= dbaio@FreeBSD.org 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 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fasteners>=0:devel/py-fasteners USES= python:2 USE_PYTHON= autoplist distutils USE_LDCONFIG= yes PORTDOCS= CHANGELOG COPYING README README-REPO README-LOG OPTIONS_DEFINE= CLOUDFILES DOCS FTP FTPS GDOCS GIO NLS S3 OPTIONS_GROUP= GPG SSH OPTIONS_SINGLE= GPG OPTIONS_SINGLE_GPG= GNUPG GNUPG2 OPTIONS_GROUP_SSH= PARAMIKO PEXPECT OPTIONS_DEFAULT= FTP FTPS GNUPG PARAMIKO S3 CLOUDFILES_DESC= CloudFiles backend FTP_DESC= FTP backend FTPS_DESC= FTPS backend GDOCS_DESC= Google Docs backend GIO_DESC= GIO backend GPG_DESC= GnuPG support GNUPG_DESC= Use GnuPG 1 GNUPG2_DESC= Use GnuPG 2 S3_DESC= Amazon S3 backend SSH_DESC= SSH/SCP/SFTP backend PARAMIKO_DESC= python ssh implementation PEXPECT_DESC= pexpect and use ssh binaries CLOUDFILES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-cloudfiles>0:net/py-python-cloudfiles FTP_RUN_DEPENDS= ncftp>=3.2.2:ftp/ncftp3 FTPS_RUN_DEPENDS= lftp>=3.7.15:ftp/lftp GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:devel/py-gobject \ dbus>0:devel/dbus GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1 GNUPG2_RUN_DEPENDS= gpg2:security/gnupg NLS_USES= gettext PARAMIKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:security/py-paramiko PEXPECT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto post-patch-NLS-off: @${REINPLACE_CMD} -e '56,67d' \ ${WRKSRC}/setup.py post-patch-PARAMIKO-off: @${FIND} ${WRKSRC}/${PORTNAME}/backends -type f -depth 1 \ -name '*ssh_paramiko*' -delete post-patch-PEXPECT-off: @${FIND} ${WRKSRC}/${PORTNAME}/backends -type f -depth 1 \ -name '*ssh_pexpect*' -delete post-patch-FTP-off: @${RM} ${WRKSRC}/${PORTNAME}/backends/ftpbackend.py post-patch-FTPS-off: @${RM} ${WRKSRC}/${PORTNAME}/backends/ftpsbackend.py post-patch-S3-off: .for f in botobackend _boto_multi _boto_single @${RM} ${WRKSRC}/${PORTNAME}/backends/${f}.py .endfor post-patch-GDOCS-off: @${RM} ${WRKSRC}/${PORTNAME}/backends/gdocsbackend.py post-patch-CLOUDFILES-off: .for f in cfbackend _cf_cloudfiles _cf_pyrax @${RM} ${WRKSRC}/${PORTNAME}/backends/${f}.py .endfor post-patch-CLOUDFILES-on: # Make pycloudfiles the default backend for cloudfiles, as pyrax isn't in the Ports Collection yet # Use --cf-backend=pyrax arg when running duplicity to manually select pyrax as the backend @${REINPLACE_CMD} 's|"pyrax"|"cloudfiles"|' ${WRKSRC}/${PORTNAME}/globals.py post-patch-GIO-off: @${RM} ${WRKSRC}/${PORTNAME}/backends/giobackend.py post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/python2.7/site-packages/duplicity/_librsync.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|g} ${STAGEDIR}${DOCSDIR} .include Index: head/sysutils/duplicity/distinfo =================================================================== --- head/sysutils/duplicity/distinfo (revision 445558) +++ head/sysutils/duplicity/distinfo (revision 445559) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491052275 -SHA256 (duplicity-0.7.12.tar.gz) = 11cbad44a90891af1bf9e294260ba7c21a1660ccd3ab2c6e736ba74ac5cf0fe6 -SIZE (duplicity-0.7.12.tar.gz) = 1552442 +TIMESTAMP = 1499458687 +SHA256 (duplicity-0.7.13.1.tar.gz) = adb8668fb10e0b0f91cb77f758d02c02bf5c02e6c4835904a82cbdab6db4bef2 +SIZE (duplicity-0.7.13.1.tar.gz) = 1553736 Index: head/sysutils/duplicity/files/patch-setup.py =================================================================== --- head/sysutils/duplicity/files/patch-setup.py (revision 445558) +++ head/sysutils/duplicity/files/patch-setup.py (revision 445559) @@ -1,111 +1,109 @@ ---- setup.py.orig 2016-12-31 16:33:12 UTC +--- setup.py.orig 2017-06-15 18:48:07 UTC +++ setup.py @@ -23,7 +23,6 @@ import sys import os from setuptools import setup, Extension -from setuptools.command.test import test from setuptools.command.install import install from setuptools.command.sdist import sdist from distutils.command.build_scripts import build_scripts @@ -35,6 +34,9 @@ if sys.version_info[:2] < (2, 6) or sys. sys.exit(1) incdir_list = libdir_list = None +LOCALBASE = os.environ.get("LOCALBASE", "/usr/local") +incdir_list = ['%s/include' % LOCALBASE] +libdir_list = ['%s/lib/' % LOCALBASE] if os.name == 'posix': LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '') -@@ -47,16 +49,10 @@ if os.name == 'posix': +@@ -47,15 +49,9 @@ if os.name == 'posix': incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')] libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')] -data_files = [('share/man/man1', +data_files = [('man/man1', ['bin/duplicity.1', 'bin/rdiffdir.1']), - ('share/doc/duplicity-%s' % version_string, - ['COPYING', - 'README', - '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): - # Make sure all modules are ready - build_cmd = self.get_finalized_command("build_py") - build_cmd.run() - # And make sure our scripts are ready - build_scripts_cmd = self.get_finalized_command("build_scripts") - build_scripts_cmd.run() - - # make symlinks for test data - if build_cmd.build_lib != top_dir: - for path in ['testfiles.tar.gz', 'gnupg']: - src = os.path.join(top_dir, 'testing', path) - target = os.path.join(build_cmd.build_lib, 'testing', path) - try: - os.symlink(src, target) - except Exception: - pass - - os.environ['PATH'] = "%s:%s" % ( - os.path.abspath(build_scripts_cmd.build_dir), - os.environ.get('PATH')) - - test.run(self) - - class InstallCommand(install): def run(self): - # Normally, install will call build(). But we want to delete the - # testing dir between building and installing. So we manually build - # and mark ourselves to skip building when we run() for real. - self.run_command('build') - self.skip_build = True - - # This should always be true, but just to make sure! - 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) @@ -177,11 +136,7 @@ setup(name="duplicity", url="http://duplicity.nongnu.org/index.html", packages=['duplicity', 'duplicity.backends', - 'duplicity.backends.pyrax_identity', - 'testing', - 'testing.functional', - 'testing.overrides', - 'testing.unit'], + 'duplicity.backends.pyrax_identity'], 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'], -- tests_require=['lockfile', 'mock', 'pexpect'], + install_requires=['fasteners'], +- tests_require=['fasteners', 'mock', 'pexpect'], - test_suite='testing', - cmdclass={'test': TestCommand, - 'install': InstallCommand, + cmdclass={'install': InstallCommand, 'sdist': SDistCommand, 'build_scripts': BSCommand}, )