ports/170176: [PATCH] net-mgmt/smokeping: optionsng, fping6

[Mark Felder]

>Number:         170176
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/smokeping: optionsng, fping6
>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:   Wed Jul 25 20:20:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Mark Felder
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD mwi1.coffeenet.org 9.0-STABLE FreeBSD 9.0-STABLE #3 r234963: Thu May  3 13:12:01
>Description:

-OptionsNG
-Added fping6 (conflicts with fping)

https://redports.org/buildarchive/20120725200543-14976/

Port maintainer (rodrigo at bebik.net) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- smokeping-2.6.7_3.patch begins here ---
diff -ruN --exclude=CVS ../smokeping.orig/Makefile ./Makefile
--- ../smokeping.orig/Makefile	2012-07-10 07:12:44.000000000 -0500
+++ ./Makefile	2012-07-25 15:16:00.588309527 -0500
@@ -109,45 +109,56 @@
 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
+FPING_DESC=	Support for fping probes
+FPING6_DESC=	Support for IPv6-only 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
+
+OPTIONS_DEFINE=	ECHOPING CURL RADIUS TELNET DNS SG1 SG2
+OPTIONS_SINGLE=	SG1 SG2
+OPTIONS_SINGLE_SG1=	FPING FPING6
+OPTIONS_SINGLE_SG2=	LDAP LDAPSSL
+OPTIONS_DEFAULT=	FPING SG1
 
 .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:MFPING6}
+RUN_DEPENDS+=   ${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping+ipv6
+.endif
+
+.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}
 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
 
--- smokeping-2.6.7_3.patch ends here ---

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