From pi@f10.opsec.eu  Sun Oct  6 17:49:41 2013
Return-Path: <pi@f10.opsec.eu>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 09A0C8E1;
	Sun,  6 Oct 2013 17:49:41 +0000 (UTC)
	(envelope-from pi@f10.opsec.eu)
Received: from f10.opsec.eu (fa8.opsec.eu [IPv6:2001:14f8:200:4::2])
	(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 BA39D26C9;
	Sun,  6 Oct 2013 17:49:40 +0000 (UTC)
Received: from pi by f10.opsec.eu with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <pi@f10.opsec.eu>)
	id 1VSsR7-000BOc-44; Sun, 06 Oct 2013 19:48:09 +0200
Message-Id: <E1VSsR7-000BOc-44@f10.opsec.eu>
Date: Sun, 06 Oct 2013 19:48:09 +0200
From: Kurt Jaeger <fbsd-ports@opsec.eu>
Reply-To: Kurt Jaeger <fbsd-ports@opsec.eu>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jase@FreeBSD.org
Subject: [patch update] sysutils/duplicity 0.6.22 small change in setup.py to properly run under py33
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         182765
>Category:       ports
>Synopsis:       [patch update] sysutils/duplicity 0.6.22 small change in setup.py to properly run under py33
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 06 17:50:00 UTC 2013
>Closed-Date:    Sat Nov 02 23:01:03 UTC 2013
>Last-Modified:  Sat Nov  2 23:10:02 UTC 2013
>Originator:     Kurt Jaeger
>Release:        FreeBSD 10.0-ALPHA4 amd64
>Organization:
-
>Environment:
System: FreeBSD f10.opsec.eu 10.0-ALPHA4 FreeBSD 10.0-ALPHA4 #0 r255933: Sun Sep 29 02:50:54 UTC 2013 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64

>Description:
	small fix for setup.py to run under py33

>How-To-Repeat:
	-

>Fix:

diff -r -u -N sysutils/duplicity/files/patch-setup.py /usr/home/pi/myp/sysutils/duplicity/files/patch-setup.py
--- sysutils/duplicity/files/patch-setup.py	2013-10-01 21:07:07.000000000 +0200
+++ /usr/home/pi/myp/sysutils/duplicity/files/patch-setup.py	2013-10-06 19:44:07.000000000 +0200
@@ -1,6 +1,12 @@
---- 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 @@
+--- 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)
  
  incdir_list = libdir_list = None
  
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jase 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Oct 6 17:50:15 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182765 
Responsible-Changed-From-To: jase->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Sat Nov 2 23:00:55 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182765 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Sat Nov 2 23:01:02 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=182765 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/182765: commit references a PR
Date: Sat,  2 Nov 2013 23:01:00 +0000 (UTC)

 Author: wg
 Date: Sat Nov  2 23:00:53 2013
 New Revision: 332550
 URL: http://svnweb.freebsd.org/changeset/ports/332550
 
 Log:
   sysutils/duplicity: fix for python 3.x
   
   PR:		ports/182765
   Submitted by:	Kurt Jaeger <fbsd-ports opsec.eu>
   Approved by:	maintainer (timeout)
 
 Modified:
   head/sysutils/duplicity/Makefile
   head/sysutils/duplicity/files/patch-setup.py
 
 Modified: head/sysutils/duplicity/Makefile
 ==============================================================================
 --- head/sysutils/duplicity/Makefile	Sat Nov  2 22:55:52 2013	(r332549)
 +++ head/sysutils/duplicity/Makefile	Sat Nov  2 23:00:53 2013	(r332550)
 @@ -9,14 +9,14 @@ MASTER_SITES=	http://launchpad.net/dupli
  MAINTAINER=	jase@FreeBSD.org
  COMMENT=	Backup tool that uses librsync and GnuPG
  
 -LIB_DEPENDS=	rsync:${PORTSDIR}/net/librsync
 +LIB_DEPENDS=	librsync.so:${PORTSDIR}/net/librsync
  RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
  
  FETCH_ARGS=	-pRr
  
  CONFLICTS=	duplicity-0.5.* duplicity-devel-[0-9]*
  
 -USE_PYTHON=	2.5+
 +USE_PYTHON=	yes
  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 "bsd.port.options.mk"
 +.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	Sat Nov  2 22:55:52 2013	(r332549)
 +++ head/sysutils/duplicity/files/patch-setup.py	Sat Nov  2 23:00:53 2013	(r332550)
 @@ -1,6 +1,12 @@
 ---- 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 @@
 +--- 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)
   
   incdir_list = libdir_list = None
   
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
