From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Nov 29 19:20:02 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 899B816A46E for ; Thu, 29 Nov 2007 19:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6FDC613C447 for ; Thu, 29 Nov 2007 19:20:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id lATJK29T097010 for ; Thu, 29 Nov 2007 19:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id lATJK24Q097009; Thu, 29 Nov 2007 19:20:02 GMT (envelope-from gnats) Resent-Date: Thu, 29 Nov 2007 19:20:02 GMT Resent-Message-Id: <200711291920.lATJK24Q097009@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, peter.schuller@infidyne.com Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9ED0616A418; Thu, 29 Nov 2007 19:12:08 +0000 (UTC) (envelope-from scode@hyperion.scode.org) Received: from hyperion.scode.org (cl-1361.ams-04.nl.sixxs.net [IPv6:2001:960:2:550::2]) by mx1.freebsd.org (Postfix) with ESMTP id 4FBE913C447; Thu, 29 Nov 2007 19:12:08 +0000 (UTC) (envelope-from scode@hyperion.scode.org) Received: by hyperion.scode.org (Postfix, from userid 1001) id 2209423C48F; Thu, 29 Nov 2007 20:12:06 +0100 (CET) Message-Id: <20071129191206.2209423C48F@hyperion.scode.org> Date: Thu, 29 Nov 2007 20:12:05 +0100 (CET) From: peter.schuller@infidyne.com To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: vd@FreeBSD.org Subject: ports/118333: [patch] update sysutils/duplicity to 0.4.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: peter.schuller@infidyne.com List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2007 19:20:02 -0000 >Number: 118333 >Category: ports >Synopsis: [patch] update sysutils/duplicity to 0.4.6 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Nov 29 19:20:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: peter.schuller@infidyne.com >Release: FreeBSD 6.2-RELEASE-p8 i386 >Organization: >Environment: System: FreeBSD hyperion.scode.org 6.2-RELEASE-p8 FreeBSD 6.2-RELEASE-p8 #0: Fri Oct 19 05:50:09 CEST 2007 scode@hyperion.scode.org:/usr/obj/usr/src/sys/GENERIC i386 >Description: Duplicity has been updated a few times upstream. This patch updates 0.4.3 to 0.4.6 in the ports tree. Note that command line processing has changed. Suggest a /usr/ports/UPDATING message along the lines of: "Command line processing has changed as of 0.4.4.RC4. See http://www.nongnu.org/duplicity/CHANGELOG for details. The new command line processing is not backwards compatible with the old format." >How-To-Repeat: >Fix: Patch: --- Makefile.orig Thu Nov 29 19:49:47 2007 +++ Makefile Thu Nov 29 19:50:17 2007 @@ -6,7 +6,7 @@ # PORTNAME= duplicity -PORTVERSION= 0.4.3 +PORTVERSION= 0.4.6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} --- distinfo.orig Thu Nov 29 19:49:56 2007 +++ distinfo Thu Nov 29 19:50:34 2007 @@ -1,3 +1,3 @@ -MD5 (duplicity-0.4.3.tar.gz) = fc615a1bf173fb55c36c502d252583f8 -SHA256 (duplicity-0.4.3.tar.gz) = 67b03ccc51fcc3bc339835149466e609ddb05a9f54963515b163fe44da0e690c -SIZE (duplicity-0.4.3.tar.gz) = 104581 +MD5 (duplicity-0.4.6.tar.gz) = e11275500f79df9cba5c94eb2ea53c26 +SHA256 (duplicity-0.4.6.tar.gz) = b8a9ee5d6dcb03b2140998cfc9d219ca4bc1c07bba14ac83bde7f35796240ab8 +SIZE (duplicity-0.4.6.tar.gz) = 116047 --- patch-setup.py.orig Thu Nov 29 20:03:12 2007 +++ patch-setup.py Thu Nov 29 20:00:20 2007 @@ -1,38 +1,22 @@ -*** /tmp/duplicity-0.4.0/setup.py Sat Nov 30 23:41:29 2002 ---- setup.py Wed Jun 11 20:31:32 2003 -*************** -*** 9,14 **** ---- 9,18 ---- - print "Sorry, duplicity requires version 2.2 or later of python" - sys.exit(1) - -+ LOCALBASE = os.environ.get("LOCALBASE", "/usr/local") -+ include_dirs = ['%s/include' % LOCALBASE] -+ library_dirs = ['%s/lib/' % LOCALBASE] -+ - setup(name="duplicity", - version=version_string, - description="Untrusted backup using rsync algorithm", -*************** -*** 19,28 **** - package_dir = {"duplicity": "src"}, - ext_modules = [Extension("duplicity._librsync", - ["_librsyncmodule.c"], -! libraries=["rsync"])], -! scripts = ['rdiffdir', 'duplicity'], -! data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']), -! ('share/doc/duplicity-%s' % version_string, -! ['COPYING', 'README', 'CHANGELOG'])]) - - ---- 23,32 ---- - package_dir = {"duplicity": "src"}, - ext_modules = [Extension("duplicity._librsync", - ["_librsyncmodule.c"], -! libraries=["rsync"], -! include_dirs=include_dirs, -! library_dirs=library_dirs)], -! scripts = ['rdiffdir', 'duplicity'] -! ) - - +--- setup.py.orig Wed Nov 28 19:09:07 2007 ++++ setup.py Thu Nov 29 20:00:05 2007 +@@ -21,6 +21,10 @@ + + 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', '') + args = sys.argv[:] +@@ -49,7 +53,7 @@ + libraries=["rsync"])], + scripts = ['rdiffdir', 'duplicity'], + data_files = [('share/man/man1', ['duplicity.1', 'rdiffdir.1']), +- ('share/doc/duplicity-%s' % version_string, ++ ('share/doc/duplicity', + ['COPYING', 'README', 'CHANGELOG'])]) + + >Release-Note: >Audit-Trail: >Unformatted: