From 3007775a5a8230d35da59df3c9f6776b589ceaf3 Mon Sep 17 00:00:00 2001 From: Jason Helfman Date: Mon, 29 Apr 2013 18:47:57 +0000 Subject: - adoption of optionsNG Approved by: portmgr (bapt) --- devel/bzr/Makefile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'devel/bzr') diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile index cdc7a005d66f..af5ca14f569d 100644 --- a/devel/bzr/Makefile +++ b/devel/bzr/Makefile @@ -1,9 +1,5 @@ -# Ports collection makefile for: bzr -# Date created: 10 October 2005 -# Whom: Ulf Lilleengen -# +# Created by: Ulf Lilleengen # $FreeBSD$ -# PORTNAME= bzr PORTVERSION= 2.5.1 @@ -17,8 +13,10 @@ COMMENT= Distributed version control system by Canonical # Often not needed, but it's cheap insurance BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython -OPTIONS= SFTP "Enable Paramiko for SFTP support" on \ - CA_BUNDLE "Include CA bundle for SSL cert validation" on +OPTIONS_DEFINE= SFTP CA_BUNDLE +SFTP_DESC= Paramiko for SFTP support +CA_BUNDLE_DESC= Include CA bundle for SSL cert validation +OPTIONS_DEFAULT= SFTP CA_BUNDLE USE_PYTHON= 2.6+ USE_PYDISTUTILS= yes @@ -27,13 +25,13 @@ USES= gettext MAN1= bzr.1 -.include +.include -.if !defined(WITHOUT_SFTP) -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/paramiko/__init__.py:${PORTSDIR}/security/py-paramiko +.if ${PORT_OPTIONS:MSFTP} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}>=0:${PORTSDIR}/security/py-paramiko .endif -.if !defined(WITHOUT_CA_BUNDLE) +.if ${PORT_OPTIONS:MCA_BUNDLE} RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss .endif @@ -43,4 +41,4 @@ post-install: test: build cd ${WRKSRC} && ./bzr selftest -.include +.include -- cgit v1.2.3