svn commit: r332550 - in head/sysutils/duplicity: . files

[William Grzybowski]

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 at 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