Index: Makefile
===================================================================
--- Makefile	(revision 308968)
+++ Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	SmokePing
-# Date created:				Tue Feb 12 22:17:40 CET 2002
-# Whom:                                 Lars Thegler <lars@thegler.dk>
-#
+# Created by: Lars Thegler <lars@thegler.dk>
 # $FreeBSD$
-#
 
 PORTNAME=	smokeping
 PORTVERSION=	2.6.7
@@ -109,50 +105,52 @@
 SUB_LIST=	USERS=${USERS} \
 		GROUPS=${GROUPS}
 
-OPTIONS=	FPING "Support for fping probes" on
-OPTIONS+=	ECHOPING "Support for EchoPing probes" off
-OPTIONS+=	CURL "Support for Curl probes" off
-OPTIONS+=	LDAP "Support for LDAP probes" off
-OPTIONS+=	LDAPSSL "Support for SSL-enabled LDAP probes" off
-OPTIONS+=	RADIUS "Support for Radius probes" off
-OPTIONS+=	TELNET "Support for TelnetIOSPing probes" off
-OPTIONS+=	DNS "Support for AnotherDNS probes" off
+OPTIONS_DEFINE=	FPING ECHOPING CURL LDAP LDAPSSL RADIUS TELNET DNS
+OPTIONS_DEFAULT=	FPING
 
+FPING_DESC=	Support for fping probes
+ECHOPING_DESC=	Support for EchoPing probes
+CURL_DESC=	Support for Curl probes
+LDAP_DESC=	Support for LDAP probes
+LDAPSSL_DESC=	Support for SSL-enabled LDAP probes
+RADIUS_DESC=	Support for Radius probes
+TELNET_DESC=	Support for TelnetIOSPing probes
+DNS_DESC=	Support for AnotherDNS probes
+
 .include <bsd.port.options.mk>
-.ifdef(WITH_FPING)
+
+.if ${PORT_OPTIONS:MFPING}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
 .endif
 
-.ifdef(WITH_ECHOPING)
+.if ${PORT_OPTIONS:MECHOPING}
 RUN_DEPENDS+=	${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping
 .endif
 
-.ifdef(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
 RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
 .endif
 
-.if defined(WITH_LDAP) || defined(WITH_LDAPSSL)
+.if ${PORT_OPTIONS:MLDAP} || ${PORT_OPTIONS:MLDAPSSL}
 RUN_DEPENDS+=	p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
-.ifdef(WITH_RADIUS)
+.if ${PORT_OPTIONS:MRADIUS}
 RUN_DEPENDS+=	p5-Authen-Radius>=0:${PORTSDIR}/security/p5-Authen-Radius
 .endif
 
-.ifdef(WITH_LDAPSSL)
+.if ${PORT_OPTIONS:MLDAPSSL}
 RUN_DEPENDS+=	p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
 .endif
 
-.ifdef(WITH_TELNET)
+.if ${PORT_OPTIONS:MTELNET}
 RUN_DEPENDS+=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet
 .endif
 
-.ifdef(WITH_DNS)
+.if ${PORT_OPTIONS:MDNS}
 RUN_DEPENDS+=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 .endif
 
-.include <bsd.port.pre.mk>
-
 # We will take these from CPAN instead
 post-extract:
 	cd ${WRKSRC}/lib ; ${RM} BER.pm SNMP_util.pm SNMP_Session.pm
@@ -175,4 +173,4 @@
 	${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>