From owner-svn-ports-head@FreeBSD.ORG  Thu May  2 15:16:15 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D0F0B92C;
 Thu,  2 May 2013 15:16:15 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id A90FE12A1;
 Thu,  2 May 2013 15:16:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r42FGFX8099411;
 Thu, 2 May 2013 15:16:15 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r42FGFYQ099410;
 Thu, 2 May 2013 15:16:15 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201305021516.r42FGFYQ099410@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 2 May 2013 15:16:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r317127 - head/net-mgmt/tork
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 May 2013 15:16:15 -0000

Author: bapt
Date: Thu May  2 15:16:15 2013
New Revision: 317127
URL: http://svnweb.freebsd.org/changeset/ports/317127

Log:
  Please bmake(1)
  While here convert to new options framework

Modified:
  head/net-mgmt/tork/Makefile

Modified: head/net-mgmt/tork/Makefile
==============================================================================
--- head/net-mgmt/tork/Makefile	Thu May  2 14:50:07 2013	(r317126)
+++ head/net-mgmt/tork/Makefile	Thu May  2 15:16:15 2013	(r317127)
@@ -26,42 +26,50 @@ MAN1=		tork.1 torkarkollon.1 torkify.1 t
 MAN5=		torksocks.conf.5
 MAN8=		torksocks.8
 
-HAVE_TOR!=	if pkg_info -I tor-\* >/dev/null 2>&1 ; then ${ECHO} YES; fi
+.include "${PORTSDIR}/Mk/bsd.commands.mk"
 
-.if (${HAVE_TOR} == "YES")
-HAVE_TOR_DEVEL!=	if pkg_info -I tor-devel\* >/dev/null 2>&1 ; then ${ECHO} YES; fi
+HAVE_TOR!=	${PKG_INFO} -I tor-\* >/dev/null 2>&1 && ${ECHO_CMD} YES || ${ECHO_CMD} NO
 
-.if (${HAVE_TOR_DEVEL} == "YES")
-OPTIONS=	TOR_DEVEL	"Depend on tor-devel (already installed)"   On
+.if ${HAVE_TOR} == "YES"
+HAVE_TOR_DEVEL!=	${PKG_INFO} -I tor-devel\* >/dev/null 2>&1 && ${ECHO_CMD} YES || ${ECHO_CMD} NO
+
+.if ${HAVE_TOR_DEVEL} == "YES"
+OPTIONS_DEFINE=	TOR_DEVEL
+OPTIONS_DEFAULT=	TOR_DEVEL
+TOR_DEVEL_DESC=		Depend on tor-devel (already installed)
 .else
-OPTIONS=	TOR	"Depend on tor (already installed)" On
+OPTIONS_DEFINE=	TOR
+OPTIONS_DEFAULT=	TOR
+TOR_DESC=		Depend on tor (already installed)
 .endif
 
 .else
-OPTIONS=	TOR_DEVEL	"Depend on tor-devel"   On \
-		TOR	"Depend on tor"     Off
+OPTIONS_SINGLE=	TOR_PORT
+OPTIONS_SINGLE_TOR_PORT=	TOR_DEVEL TOR
+OPTIONS_DEFAULT=	TOR_DEVEL
+TOR_DEVEL_DESC=	Depend on tor-devel
+TOR_DESC=	Depend on tor
 .endif
 
-OPTIONS+=	PRIVOXY	"Install privoxy"	On \
-		MIXMINION "Install mixminion"	Off
+OPTIONS_DEFINE+=	PRIVOXY MIXMINION
+OPTIONS_DEFAULT+=	PRIVOXY
+PRIVOXY_DESC=	Install privoxy
+MIXMINION_DESC=	Install mixminion
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_TOR_DEVEL)
-.if defined(WITH_TOR)
-IGNORE=			cannot depend on tor and tor-devel at the same time
-.endif
+.if ${PORT_OPTIONS:MTOR_DEVEL}
 RUN_DEPENDS+=	${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor-devel
-.elif defined(WITH_TOR)
+.if ${PORT_OPTIONS:MTOR}
 RUN_DEPENDS+=	${LOCALBASE}/bin/tor:${PORTSDIR}/security/tor
 .endif
 
-.if defined(WITH_PRIVOXY)
+.if ${PORT_OPTIONS:MPRIVOXY}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/privoxy:${PORTSDIR}/www/privoxy
 .endif
 
-.if defined(WITH_MIXMINION)
+.if ${PORT_OPTIONS:MMIXMINION}
 RUN_DEPENDS+=	${LOCALBASE}/bin/mixminion:${PORTSDIR}/mail/mixminion
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>