ports/187201: [patch] use OPTIONS helpers for sysutils/duplicity

[Adam Weinberger]

>Number:         187201
>Category:       ports
>Synopsis:       [patch] use OPTIONS helpers for sysutils/duplicity
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 02 17:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Adam Weinberger
>Release:        FreeBSD 10.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #0: Fri Feb 28 10:32:45 EST 2014 root at apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386


	
>Description:

The attached patch cleans up the Makefile a bit.
* Uses the OPTIONS helpers, which cuts the Makefile length in half
* Removes some .if's that are no longer necessary with STAGE
* Removes CONFLICTS which are no longer relevant

>How-To-Repeat:
>Fix:

--- duplicity.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 346782)
+++ Makefile	(working copy)
@@ -14,8 +14,6 @@
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
 		${PYTHON_PKGNAMEPREFIX}lockfile>=0:${PORTSDIR}/devel/py-lockfile
 
-CONFLICTS=	duplicity-0.5.* duplicity-devel-[0-9]*
-
 USE_PYTHON=	2
 USE_PYDISTUTILS=yes
 PYDISTUTILS_AUTOPLIST=	yes
@@ -35,73 +33,20 @@
 PORTDOCS=	COPYING README README-REPO README-LOG tarfile-LICENSE \
 		tarfile-CHANGES CHANGELOG
 
+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
+
 .include <bsd.port.options.mk>
 
-.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
-
-.if ${PORT_OPTIONS:MFTPS}
-RUN_DEPENDS+=	lftp>=3.7.15:${PORTSDIR}/ftp/lftp
-PLIST_SUB+=	FTPS=""
-.else
-PLIST_SUB+=	FTPS="@comment "
-.endif
-
-.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
-
 post-patch:
 .if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} -e '54,62d' \
@@ -140,14 +85,10 @@
 	@${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 <bsd.port.mk>
--- duplicity.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: