From owner-svn-ports-all@FreeBSD.ORG Sat Mar 15 17:15:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org 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 ESMTPS id A6A4FE51; Sat, 15 Mar 2014 17:15:45 +0000 (UTC) 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 932FEEE0; Sat, 15 Mar 2014 17:15:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2FHFjrW087325; Sat, 15 Mar 2014 17:15:45 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2FHFjxt087324; Sat, 15 Mar 2014 17:15:45 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201403151715.s2FHFjxt087324@svn.freebsd.org> From: Adam Weinberger Date: Sat, 15 Mar 2014 17:15:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348357 - head/sysutils/duplicity X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Mar 2014 17:15:45 -0000 Author: adamw Date: Sat Mar 15 17:15:45 2014 New Revision: 348357 URL: http://svnweb.freebsd.org/changeset/ports/348357 QAT: https://qat.redports.org/buildarchive/r348357/ Log: - Use OPTIONS helpers - Remove some .if's obsoleted by STAGE - Remove CONFLICTS against ports that don't exist PR: ports/187201 Approved by: maintainer timeout Modified: head/sysutils/duplicity/Makefile Modified: head/sysutils/duplicity/Makefile ============================================================================== --- head/sysutils/duplicity/Makefile Sat Mar 15 17:05:50 2014 (r348356) +++ head/sysutils/duplicity/Makefile Sat Mar 15 17:15:45 2014 (r348357) @@ -12,9 +12,7 @@ COMMENT= Backup tool that uses librsync LIB_DEPENDS= librsync.so:${PORTSDIR}/net/librsync RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg \ - ${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile - -CONFLICTS= duplicity-0.5.* duplicity-devel-[0-9]* + ${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile USE_PYTHON= 2 USE_PYDISTUTILS=yes @@ -33,74 +31,21 @@ SSH_DESC= Install SSH/SCP/SFTP backend U1_DESC= Install Ubuntu One backend PORTDOCS= COPYING README README-REPO README-LOG tarfile-LICENSE \ - tarfile-CHANGES CHANGELOG - -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MSSH} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:${PORTSDIR}/security/py-paramiko -PLIST_SUB+= SSH="" -.else -PLIST_SUB+= SSH="@comment " -.endif - -.if ${PORT_OPTIONS:MFTP} -RUN_DEPENDS+= ncftp>=3.2.2:${PORTSDIR}/ftp/ncftp3 -PLIST_SUB+= FTP="" -.else -PLIST_SUB+= FTP="@comment " -.endif + tarfile-CHANGES CHANGELOG -.if ${PORT_OPTIONS:MFTPS} -RUN_DEPENDS+= lftp>=3.7.15:${PORTSDIR}/ftp/lftp -PLIST_SUB+= FTPS="" -.else -PLIST_SUB+= FTPS="@comment " -.endif +NLS_USES= gettext +SSH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paramiko>=1.7.7.1:${PORTSDIR}/security/py-paramiko +FTP_RUN_DEPENDS= ncftp>=3.2.2:${PORTSDIR}/ftp/ncftp3 +FTPS_RUN_DEPENDS= lftp>=3.7.15:${PORTSDIR}/ftp/lftp +S3_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:${PORTSDIR}/devel/py-boto +GDOCS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata +CLOUDFILES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cloudfiles>0:${PORTSDIR}/net/py-cloudfiles +GIO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject>0:${PORTSDIR}/devel/py-gobject \ + dbus>0:${PORTSDIR}/devel/dbus +U1_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 \ + ${PYTHON_PKGNAMEPREFIX}oauthlib>0:${PORTSDIR}/security/py-oauthlib -.if ${PORT_OPTIONS:MS3} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}boto>=1.6b:${PORTSDIR}/devel/py-boto -PLIST_SUB+= S3="" -.else -PLIST_SUB+= S3="@comment " -.endif - -.if ${PORT_OPTIONS:MGDOCS} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gdata>0:${PORTSDIR}/devel/py-gdata -PLIST_SUB+= GDOCS="" -.else -PLIST_SUB+= GDOCS="@comment " -.endif - -.if ${PORT_OPTIONS:MCLOUDFILES} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cloudfiles>0:${PORTSDIR}/net/py-cloudfiles -PLIST_SUB+= CLOUDFILES="" -.else -PLIST_SUB+= CLOUDFILES="@comment " -.endif - -.if ${PORT_OPTIONS:MGIO} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gobject>0:${PORTSDIR}/devel/py-gobject \ - dbus>0:${PORTSDIR}/devel/dbus -PLIST_SUB+= GIO="" -.else -PLIST_SUB+= GIO="@comment " -.endif - -.if ${PORT_OPTIONS:MU1} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 \ - ${PYTHON_PKGNAMEPREFIX}oauthlib>0:${PORTSDIR}/security/py-oauthlib -PLIST_SUB+= U1="" -.else -PLIST_SUB+= U1="@comment " -.endif +.include post-patch: .if empty(PORT_OPTIONS:MNLS) @@ -140,14 +85,10 @@ post-patch: @${RM} -f ${WRKSRC}/${PORTNAME}/backends/u1backend.py .endif -MAN1= duplicity.1 rdiffdir.1 - post-install: -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include