svn commit: r369893 - in head/net-mgmt/monitoring-plugins: . files

[Tijl Coosemans]

Author: tijl
Date: Fri Oct  3 12:42:42 2014
New Revision: 369893
URL: https://svnweb.freebsd.org/changeset/ports/369893
QAT: https://qat.redports.org/buildarchive/r369893/

Log:
  Remove some unneeded patches, patch configure and Makefile.in instead of
  configure.ac and Makefile.am so USES=autoreconf can be removed (avoids a
  problem with upcoming devel/libtool update)
  
  PR:		194068

Added:
  head/net-mgmt/monitoring-plugins/files/patch-configure   (contents, props changed)
Deleted:
  head/net-mgmt/monitoring-plugins/files/patch-configure.ac
  head/net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4
  head/net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am
Modified:
  head/net-mgmt/monitoring-plugins/Makefile

Modified: head/net-mgmt/monitoring-plugins/Makefile
==============================================================================
--- head/net-mgmt/monitoring-plugins/Makefile	Fri Oct  3 12:42:29 2014	(r369892)
+++ head/net-mgmt/monitoring-plugins/Makefile	Fri Oct  3 12:42:42 2014	(r369893)
@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL=	nagios-plugins-*
 
-USES=		charsetfix gmake perl5 libtool autoreconf
-CHARSETFIX_MAKEFILEIN=Makefile.am
+USES=		charsetfix gmake perl5 libtool
 USE_SUBMAKE=	yes
 
 OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS
@@ -70,24 +69,26 @@ CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCG
 CONFIGURE_ARGS+=--with-qmail-qstat-command=/var/qmail/bin/qmail-qstat
 
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 
 QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
 QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
-QSTAT_CONFIGURE_ENABLE=	qstat
+QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QUAKESTAT= \
+			ac_cv_path_PATH_TO_QSTAT=
 
 IPV6_CONFIGURE_WITH=	ipv6
 
 FPING_BUILD_DEPENDS=	fping:${PORTSDIR}/net/fping
 FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
-FPING_CONFIGURE_ENABLE=	fping
+FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING= \
+			ac_cv_path_PATH_TO_FPING6=
 
 NETSNMP_BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
 NETSNMP_RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-NETSNMP_CONFIGURE_ENABLE=	snmp
+NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
+			ac_cv_path_PATH_TO_SNMPGETNEXT=
 
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
 RADIUS_CONFIGURE_WITH=	radius
@@ -147,10 +148,10 @@ post-patch:
 	check_users.c
 	@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
 .endfor
-	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.am
+	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.in
 .if ${PORT_OPTIONS:MJAIL}
-	@${REINPLACE_CMD} -e 's# 127.0.0.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's# 127\.0\.0\.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure
 .endif
 
 .include <bsd.port.mk>

Added: head/net-mgmt/monitoring-plugins/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/monitoring-plugins/files/patch-configure	Fri Oct  3 12:42:42 2014	(r369893)
@@ -0,0 +1,11 @@
+--- configure.orig	2014-06-26 16:17:37 UTC
++++ configure
+@@ -21787,7 +21787,7 @@ then
+ $as_echo "$ac_cv_ps_command" >&6; }
+ 
+ elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
+-	egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
++	egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
+ then
+ 	ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
+ 	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"