Better FLAVORS

net-mgmt/nrpe/Makefile

@@ -40,7 +40,7 @@ PLIST_SUB=	NAGIOSUSER=${NAGIOSUSER} \
 		NRPE_PIDDIR=${NRPE_PIDDIR}
 
 OPTIONS_DEFINE=	SSL ARGS
-OPTIONS_DEFAULT=NAGPLUGINS SSL
+OPTIONS_DEFAULT=SSL
 OPTIONS_RADIO=	PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 
@@ -49,13 +49,8 @@ MONPLUGINS_DESC=Use net-mgmt/monitoring-plugins
 NAGPLUGINS_DESC=Use net-mgmt/nagios-plugins
 
 ARGS_CONFIGURE_ENABLE=	command-args
-.if ${FLAVOR} == monpluging
-RUN_DEPENDS+=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
-.else
-# Fallback to OPTIONS
 MONPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
-.endif
 SSL_USES=		ssl
 SSL_CONFIGURE_ENABLE=	ssl
 SSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE} ssl-inc=${OPENSSLINC} ssl-lib=${OPENSSLLIB}
@@ -66,6 +61,14 @@ NAGIOSGROUP?=	nagios
 
 NRPE_PIDDIR?=	/var/run/nrpe
 
+.if ${FLAVOR} == monplugins
+OPTIONS_DEFAULT+=	MONPLUGINS
+.endif
+
+.if ${FLAVOR} == default
+OPTIONS_DEFAULT+=	NAGPLUGINS
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/run/nrpe.pid|${NRPE_PIDDIR}/nrpe.pid|g' \
 		-e 's|/usr/lib/nagios/plugins/|${LOCALBASE}/libexec/nagios/|g' \