From owner-svn-ports-head@FreeBSD.ORG Sun Nov 3 16:54:56 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6087AC44; Sun, 3 Nov 2013 16:54:56 +0000 (UTC) (envelope-from jase@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 33ED8273D; Sun, 3 Nov 2013 16:54:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3GsuGu052634; Sun, 3 Nov 2013 16:54:56 GMT (envelope-from jase@svn.freebsd.org) Received: (from jase@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3Gst7G052632; Sun, 3 Nov 2013 16:54:55 GMT (envelope-from jase@svn.freebsd.org) Message-Id: <201311031654.rA3Gst7G052632@svn.freebsd.org> From: Jase Thew Date: Sun, 3 Nov 2013 16:54:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332627 - in head/sysutils/duplicity: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2013 16:54:56 -0000 Author: jase Date: Sun Nov 3 16:54:55 2013 New Revision: 332627 URL: http://svnweb.freebsd.org/changeset/ports/332627 Log: - Revert r332550 - does not work as intended/is not applicable. Duplicity itself is not fully Python 3 compatible - there's multiple instances of "print" as command and all the unicode vs bytes string handling needs fixing to allow working unicode filename support. Python 3 support is currently planned for the 0.7 branch. Modified: head/sysutils/duplicity/Makefile head/sysutils/duplicity/files/patch-setup.py Modified: head/sysutils/duplicity/Makefile ============================================================================== --- head/sysutils/duplicity/Makefile Sun Nov 3 16:46:21 2013 (r332626) +++ head/sysutils/duplicity/Makefile Sun Nov 3 16:54:55 2013 (r332627) @@ -9,14 +9,14 @@ MASTER_SITES= http://launchpad.net/dupli MAINTAINER= jase@FreeBSD.org COMMENT= Backup tool that uses librsync and GnuPG -LIB_DEPENDS= librsync.so:${PORTSDIR}/net/librsync +LIB_DEPENDS= rsync:${PORTSDIR}/net/librsync RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg FETCH_ARGS= -pRr CONFLICTS= duplicity-0.5.* duplicity-devel-[0-9]* -USE_PYTHON= yes +USE_PYTHON= 2.5+ USE_PYDISTUTILS=yes USE_LDCONFIG= yes @@ -32,7 +32,7 @@ SSH_DESC= Install SSH/SCP/SFTP backend U1_DESC= Install Ubuntu One backend NO_STAGE= yes -.include +.include "bsd.port.options.mk" .if ${PORT_OPTIONS:MNLS} USES+= gettext Modified: head/sysutils/duplicity/files/patch-setup.py ============================================================================== --- head/sysutils/duplicity/files/patch-setup.py Sun Nov 3 16:46:21 2013 (r332626) +++ head/sysutils/duplicity/files/patch-setup.py Sun Nov 3 16:54:55 2013 (r332627) @@ -1,12 +1,6 @@ ---- setup.py.orig 2013-08-22 15:30:09.000000000 +0200 -+++ setup.py 2013-10-06 19:43:39.000000000 +0200 -@@ -26,11 +26,15 @@ - version_string = "0.6.22" - - if sys.version_info[:2] < (2,4): -- print "Sorry, duplicity requires version 2.4 or later of python" -+ print("Sorry, duplicity requires version 2.4 or later of python") - sys.exit(1) +--- setup.py.orig 2011-11-25 23:58:57.147597966 +0000 ++++ setup.py 2011-11-26 00:00:43.169721395 +0000 +@@ -31,6 +31,10 @@ incdir_list = libdir_list = None