Cleanup, no functionnal change.

svn path=/head/; revision=547175

net-mgmt/monitoring-plugins/Makefile

@@ -5,7 +5,8 @@ PORTNAME=	monitoring-plugins
 PORTVERSION=	2.2
 PORTREVISION=	9
 CATEGORIES=	net-mgmt
-MASTER_SITES=	https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
+MASTER_SITES=	https://www.monitoring-plugins.org/download/ \
+		LOCAL/mat/${PORTNAME}
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Monitoring Plugins for Nagios
@@ -13,103 +14,59 @@ COMMENT=	Monitoring Plugins for Nagios
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS_INSTALL=	nagios-plugins-*
+USES=		charsetfix gmake libtool perl5 ssl
-
-USES=		charsetfix gmake perl5 libtool ssl
 USE_SUBMAKE=	yes
 
-OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 NLS DBI EXTRAOPTS SSH_PORTABLE
-OPTIONS_SINGLE=	DNS
-OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS
-OPTIONS_DEFAULT=EXTRAOPTS DNS_BASE
-OPTIONS_SUB=	yes
-
-QSTAT_DESC=	Game server query support (check_game)
-FPING_DESC=	Support for non-flooding fast ping (check_fping)
-NETSNMP_DESC=	SNMP support (check_snmp)
-RADIUS_DESC=	Radius support (check_radius)
-MYSQL_DESC=	MySQL support (check_mysql)
-PGSQL_DESC=	PostgreSQL support (check_pgsql)
-LDAP_DESC=	OpenLDAP support (check_ldap)
-DBI_DESC=	Check database using DBI
-EXTRAOPTS_DESC=	Parsing of plugins ini config files for extra options
-SSH_PORTABLE_DESC=	Build check_ssh with ports openssh (instead of base)
-
-DNS_DESC=	Configuration of check_dig and check_dns (see help)
-
-DNS_BASE_DESC=	Use drill for check_dig and no check_dns
-DNS_BINDTOOLS_DESC=	Use dig and nslookup from dns/bind-tools
-
-EXTRAOPTS_CONFIGURE_ENABLE=	extra-opts
-
 GNU_CONFIGURE=	yes
 
-NAGIOSDIR?=	/var/spool/nagios
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
-
-NAGIOSWWWDIR?=	www/nagios
-NAGIOSHTMURL?=	/nagios
-NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
-
-CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCGIURL} \
-		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
 		--libexecdir=${PREFIX}/libexec/nagios \
-		--datadir=${PREFIX}/share \
-		--sysconfdir=${PREFIX}/etc/nagios \
 		--localstatedir=${NAGIOSDIR} \
-		--with-perl=${PERL} \
+		--prefix=${PREFIX} \
-		--prefix=${PREFIX}
+		--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
+		--sysconfdir=${PREFIX}/etc/nagios \
+		--with-cgiurl=${NAGIOSCGIURL} \
+		--with-perl=${PERL}
 
 # Also, force some commands with their expected paths so that they don't get
 # disabled.
-CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \
+CONFIGURE_ARGS+=	--with-ping-command="/sbin/ping -n -t %d -c %d %s" \
-		ac_cv_path_PATH_TO_PING=/sbin/ping \
+			--with-ping6-command="${_PING6_CMD}" \
-		ac_cv_path_PATH_TO_PING6=/sbin/ping6 \
+			ac_cv_path_PATH_TO_PING6=/sbin/ping6 \
-		--with-ping-command="/sbin/ping -n -t %d -c %d %s" \
+			ac_cv_path_PATH_TO_PING=/sbin/ping \
-		--with-ping6-command="${_PING6_CMD}" \
+			ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \
-		ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo \
+			ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient \
-		ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient
+			ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
-QSTAT_BUILD_DEPENDS=	qstat:games/qstat
+CONFLICTS_INSTALL=	nagios-plugins-*
-QSTAT_RUN_DEPENDS=	qstat:games/qstat
-QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QUAKESTAT= \
-			ac_cv_path_PATH_TO_QSTAT=
 
-IPV6_CONFIGURE_WITH=	ipv6
+OPTIONS_DEFINE=		DBI EXTRAOPTS FPING IPV6 LDAP MYSQL NETSNMP NLS PGSQL \
+			QSTAT RADIUS SSH_PORTABLE
+OPTIONS_DEFAULT=	DNS_BASE EXTRAOPTS
+OPTIONS_SINGLE=		DNS
+OPTIONS_SINGLE_DNS=	DNS_BASE DNS_BINDTOOLS
+OPTIONS_SUB=		yes
 
-FPING_BUILD_DEPENDS=	fping:net/fping
+DBI_DESC=		Check database using DBI
-FPING_RUN_DEPENDS=	fping:net/fping
+DNS_BASE_DESC=		Use drill for check_dig and no check_dns
-FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING= \
+DNS_BINDTOOLS_DESC=	Use dig and nslookup from dns/bind-tools
-			ac_cv_path_PATH_TO_FPING6=
+DNS_DESC=		Configuration of check_dig and check_dns (see help)
-
+EXTRAOPTS_DESC=		Parsing of plugins ini config files for extra options
-NETSNMP_BUILD_DEPENDS=	snmpcheck:net-mgmt/net-snmp \
+FPING_DESC=		Support for non-flooding fast ping (check_fping)
-		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
+LDAP_DESC=		OpenLDAP support (check_ldap)
-NETSNMP_RUN_DEPENDS=	snmpcheck:net-mgmt/net-snmp \
+MYSQL_DESC=		MySQL support (check_mysql)
-		p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP
+NETSNMP_DESC=		SNMP support (check_snmp)
-NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
+PGSQL_DESC=		PostgreSQL support (check_pgsql)
-			ac_cv_path_PATH_TO_SNMPGETNEXT=
+QSTAT_DESC=		Game server query support (check_game)
-
+RADIUS_DESC=		Radius support (check_radius)
-RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
+SSH_PORTABLE_DESC=	Build check_ssh with ports openssh (instead of base)
-RADIUS_CONFIGURE_WITH=	radius
-
-MYSQL_USES=	mysql
-MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}
-
-PGSQL_USES=	pgsql
-PGSQL_CONFIGURE_WITH=	pgsql=${LOCALBASE}
-
-LDAP_USE=	openldap=yes
-LDAP_CONFIGURE_WITH=	ldap
-
-NLS_USES=	gettext
-NLS_CONFIGURE_ENABLE=	nls
 
 DBI_LIB_DEPENDS=	libdbi.so:databases/libdbi
 DBI_CONFIGURE_WITH=	dbi
 
-
 DNS_BASE_CONFIGURE_ON=	--with-dig-command=/usr/bin/drill \
 			ac_cv_path_PATH_TO_NSLOOKUP=
 DNS_BASE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-dig-to-drill.diff
@@ -119,10 +76,52 @@ DNS_BINDTOOLS_RUN_DEPENDS=	${DNS_BINDTOOLS_BUILD_DEPENDS}
 DNS_BINDTOOLS_CONFIGURE_ON=	--with-dig-command=${LOCALBASE}/bin/dig \
 				--with-nslookup-command=${LOCALBASE}/bin/nslookup
 
+EXTRAOPTS_CONFIGURE_ENABLE=	extra-opts
+
+FPING_BUILD_DEPENDS=	fping:net/fping
+FPING_RUN_DEPENDS=	fping:net/fping
+FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING6= \
+			ac_cv_path_PATH_TO_FPING=
+
+IPV6_CONFIGURE_WITH=	ipv6
+
+LDAP_USE=		OPENLDAP=yes
+LDAP_CONFIGURE_WITH=	ldap
+
+MYSQL_USES=		mysql
+MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}
+
+NETSNMP_BUILD_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+			snmpcheck:net-mgmt/net-snmp
+NETSNMP_RUN_DEPENDS=	p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \
+			snmpcheck:net-mgmt/net-snmp
+NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
+			ac_cv_path_PATH_TO_SNMPGETNEXT=
+
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	pgsql=${LOCALBASE}
+
+QSTAT_BUILD_DEPENDS=	qstat:games/qstat
+QSTAT_RUN_DEPENDS=	qstat:games/qstat
+QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QSTAT= \
+			ac_cv_path_PATH_TO_QUAKESTAT=
+
+RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
+RADIUS_CONFIGURE_WITH=	radius
+
 SSH_PORTABLE_BUILD_DEPENDS=	${LOCALBASE}/bin/ssh:security/openssh-portable
 SSH_PORTABLE_RUN_DEPENDS:=	${SSH_PORTABLE_BUILD_DEPENDS}
 SSH_PORTABLE_CONFIGURE_ON=	--with-ssh-command=${LOCALBASE}/bin/ssh
 
+NAGIOSDIR?=	/var/spool/nagios
+
+NAGIOSWWWDIR?=	www/nagios
+NAGIOSHTMURL?=	/nagios
+NAGIOSCGIURL?=	${NAGIOSHTMURL}/cgi-bin
+
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} < 1300041

net-mgmt/nagios-plugins/Makefile

@@ -142,7 +142,7 @@ PLIST_SUB+=	SSH=""
 .endif
 
 post-patch:
-	# add a fake PATH so that it gets set to a correct value during build.
+# add a fake PATH so that it gets set to a correct value during build.
 	@${REINPLACE_CMD} -e "s|$$ENV{'PATH'}=''|$$ENV{'PATH'}='foo'|; \
 		s|/usr/bin/|${LOCALBASE}/bin/|g" \
 		${WRKSRC}/plugins-scripts/*.pl