From owner-svn-ports-head@FreeBSD.ORG Sun Nov 3 17:00:07 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 46A3110B; Sun, 3 Nov 2013 17:00:07 +0000 (UTC) (envelope-from william88@gmail.com) Received: from mail-la0-x234.google.com (mail-la0-x234.google.com [IPv6:2a00:1450:4010:c03::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 44CDA2790; Sun, 3 Nov 2013 17:00:06 +0000 (UTC) Received: by mail-la0-f52.google.com with SMTP id ev20so2965292lab.39 for ; Sun, 03 Nov 2013 09:00:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=bM3VLWz5nJ1zL7uJCuTJKPBlvUqF9IkuZQTWtqepzIw=; b=Fd97wmBqoruJg30BlJUpumIguXzoCKVU2g/jSPv0LH7p+mewR5vXucjItlrW0tO0Xz 0uVLhJjBUJ9qrJyQcQwKYrI99KJWavin48K8XPEIC45z7jhJ6GIHjgM1MvlrJxqD5PKh Xqgry3fz9Z3poMVT0YcRzmQEiOmK0HlMCVuQYtf2XjbyuTB81ybSL5lbbVX2eYh6WZzG VJALAkFm5N0HaLf7O2dA06cdDS2XNI9a5udXXQsmPTOcjOIaNdvoa6yLLxApyjswp58o LiBTACCX8Ik9hSDPj9s28Fd9YMh6TNokVBqp095SIQRF4nPywUNTz0Xb/ZHVMwkBavlg T5hQ== MIME-Version: 1.0 X-Received: by 10.152.27.129 with SMTP id t1mr331599lag.37.1383498004329; Sun, 03 Nov 2013 09:00:04 -0800 (PST) Received: by 10.114.176.34 with HTTP; Sun, 3 Nov 2013 09:00:04 -0800 (PST) In-Reply-To: <201311031654.rA3Gst7G052632@svn.freebsd.org> References: <201311031654.rA3Gst7G052632@svn.freebsd.org> Date: Sun, 3 Nov 2013 15:00:04 -0200 Message-ID: Subject: Re: svn commit: r332627 - in head/sysutils/duplicity: . files From: William Grzybowski To: Jase Thew Content-Type: text/plain; charset=ISO-8859-1 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , ports-committers 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 17:00:07 -0000 Hi, You could at least revert just the offending part, see inline. On Sun, Nov 3, 2013 at 2:54 PM, Jase Thew wrote: > 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 The previous version is indeed the new format. > > FETCH_ARGS= -pRr > > CONFLICTS= duplicity-0.5.* duplicity-devel-[0-9]* > > -USE_PYTHON= yes > +USE_PYTHON= 2.5+ > USE_PYDISTUTILS=yes > USE_LDCONFIG= yes 2.5 is not even supported anymore, you should have used USE_PYTHON=2 as 3.x is not supported. > @@ -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" The correct usafe is <>. > > .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 > -- William Grzybowski ------------------------------------------ Curitiba/PR - Brasil