Index: head/sysutils/duplicity-devel/files/patch-setup.py =================================================================== --- head/sysutils/duplicity-devel/files/patch-setup.py (revision 527454) +++ head/sysutils/duplicity-devel/files/patch-setup.py (nonexistent) @@ -1,95 +0,0 @@ ---- setup.py.orig 2019-07-25 14:48:21 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 -@@ -50,12 +49,6 @@ if os.name == u'posix': - data_files = [(u'share/man/man1', - [u'bin/duplicity.1', - u'bin/rdiffdir.1']), -- (u'share/doc/duplicity-%s' % version_string, -- [u'COPYING', -- u'README', -- u'README-REPO', -- u'README-LOG', -- u'CHANGELOG']), - ] - - top_dir = os.path.dirname(os.path.abspath(__file__)) -@@ -79,47 +72,9 @@ else: - ext_modules = [] - - --class TestCommand(test): -- -- def run(self): -- # Make sure all modules are ready -- build_cmd = self.get_finalized_command(u"build_py") -- build_cmd.run() -- # And make sure our scripts are ready -- build_scripts_cmd = self.get_finalized_command(u"build_scripts") -- build_scripts_cmd.run() -- -- # make symlinks for test data -- if build_cmd.build_lib != top_dir: -- for path in [u'testfiles.tar.gz', u'gnupg']: -- src = os.path.join(top_dir, u'testing', path) -- target = os.path.join(build_cmd.build_lib, u'testing', path) -- try: -- os.symlink(src, target) -- except Exception: -- pass -- -- os.environ[u'PATH'] = u"%s:%s" % ( -- os.path.abspath(build_scripts_cmd.build_dir), -- os.environ.get(u'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(u'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, u'testing') -- os.system(u"rm -rf %s" % testing_dir) -- - install.run(self) - - -@@ -186,21 +141,14 @@ setup(name=u"duplicity", - url=u"http://duplicity.nongnu.org/index.html", - packages=[u'duplicity', - u'duplicity.backends', -- u'duplicity.backends.pyrax_identity', -- u'testing', -- u'testing.functional', -- u'testing.overrides', -- u'testing.unit'], -+ u'duplicity.backends.pyrax_identity'], - package_dir={u"duplicity": u"duplicity", - u"duplicity.backends": u"duplicity/backends", }, - ext_modules=ext_modules, - scripts=[u'bin/rdiffdir', u'bin/duplicity'], - data_files=data_files, - install_requires=[u'fasteners', u'future'], -- tests_require=[u'pytest', u'pytest-runner', u'fasteners', u'future', u'mock', u'pexpect'], -- test_suite=u'testing', -- cmdclass={u'test': TestCommand, -- u'install': InstallCommand, -+ cmdclass={u'install': InstallCommand, - u'sdist': SDistCommand, - u'build_scripts': BSCommand}, - classifiers=[u"Programming Language :: Python :: 2", Property changes on: head/sysutils/duplicity-devel/files/patch-setup.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/duplicity-devel/Makefile =================================================================== --- head/sysutils/duplicity-devel/Makefile (revision 527454) +++ head/sysutils/duplicity-devel/Makefile (revision 527455) @@ -1,94 +1,98 @@ # Created by: Gerhard Häring # $FreeBSD$ PORTNAME= duplicity -PORTVERSION= 0.8.10 -DISTVERSIONSUFFIX= fin1558 -PORTREVISION= 2 +PORTVERSION= 0.8.11 +DISTVERSIONSUFFIX= .1596 CATEGORIES= sysutils MASTER_SITES= https://code.launchpad.net/duplicity/0.8-series/${PORTVERSION}/+download/ PKGNAMESUFFIX= -devel 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}fasteners>=0:devel/py-fasteners@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} USES= localbase python shebangfix USE_PYTHON= autoplist distutils noflavors USE_LDCONFIG= yes CONFLICTS_INSTALL= duplicity SHEBANG_FILES= bin/duplicity bin/rdiffdir PORTDOCS= CHANGELOG COPYING README README-REPO README-LOG +POST_PLIST= trim-duplicity-testing + OPTIONS_DEFINE= B2 DOCS FTP FTPS GDOCS NLS S3 OPTIONS_GROUP= GPG OPTIONS_SINGLE= GPG OPTIONS_SINGLE_GPG= GNUPG GNUPG2 OPTIONS_DEFAULT= B2 FTP FTPS GNUPG2 S3 B2_DESC= Backblaze B2 backend FTP_DESC= FTP backend FTPS_DESC= FTPS backend GDOCS_DESC= Google Docs backend GPG_DESC= GnuPG support GNUPG_DESC= Use GnuPG 1 GNUPG2_DESC= Use GnuPG 2 S3_DESC= Amazon S3 backend B2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}b2sdk>=0.1.8:devel/py-b2sdk@${PY_FLAVOR} FTP_RUN_DEPENDS= ncftp>=3.2.2:ftp/ncftp3 FTPS_RUN_DEPENDS= lftp>=3.7.15:ftp/lftp GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pydrive>0:devel/py-pydrive@${PY_FLAVOR} GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:security/gnupg1 GNUPG2_RUN_DEPENDS= gpg2:security/gnupg NLS_USES= gettext S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:devel/py-boto@${PY_FLAVOR} post-patch: .for f in cfbackend _cf_cloudfiles _cf_pyrax giobackend @${RM} ${WRKSRC}/${PORTNAME}/backends/${f}.py .endfor post-patch-NLS-off: @${REINPLACE_CMD} -e '55,63d' \ ${WRKSRC}/setup.py 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-B2-off: @${RM} ${WRKSRC}/${PORTNAME}/backends/b2backend.py post-install: @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/duplicity/_librsync.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|g} ${STAGEDIR}${DOCSDIR} + +trim-duplicity-testing: + @${REINPLACE_CMD} '/\/testing\//d' ${TMPPLIST} .include Index: head/sysutils/duplicity-devel/distinfo =================================================================== --- head/sysutils/duplicity-devel/distinfo (revision 527454) +++ head/sysutils/duplicity-devel/distinfo (revision 527455) @@ -1,3 +1,3 @@ -TIMESTAMP = 1580137004 -SHA256 (duplicity-0.8.10fin1558.tar.gz) = b08295b7e8d321dd3459465d28fb190c9653d849be7ab13b1f9d09d6b6aa578d -SIZE (duplicity-0.8.10fin1558.tar.gz) = 1870098 +TIMESTAMP = 1582992837 +SHA256 (duplicity-0.8.11.1596.tar.gz) = 09826a6e5706db1fc9a2c5624fc7f13c0ec1289111676eb9b323b0c69757aae1 +SIZE (duplicity-0.8.11.1596.tar.gz) = 1872223