Date: Fri, 3 Oct 2014 12:41:33 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369891 - in head/net-mgmt/nagios-plugins: . files Message-ID: <201410031241.s93CfXDA049721@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Oct 3 12:41:32 2014 New Revision: 369891 URL: https://svnweb.freebsd.org/changeset/ports/369891 QAT: https://qat.redports.org/buildarchive/r369891/ 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/nagios-plugins/files/patch-configure (contents, props changed) Deleted: head/net-mgmt/nagios-plugins/files/patch-configure.ac head/net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4 head/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am Modified: head/net-mgmt/nagios-plugins/Makefile Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Fri Oct 3 12:37:55 2014 (r369890) +++ head/net-mgmt/nagios-plugins/Makefile Fri Oct 3 12:41:32 2014 (r369891) @@ -17,8 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING CONFLICTS_INSTALL= monitoring-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 @@ -76,24 +75,26 @@ CONFIGURE_ARGS+=--with-qmail-qstat-comma CONFIGURE_ENV= PERL=${PERL} 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 @@ -153,12 +154,12 @@ 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 # add a fake PATH so that it gets set to a correct value during build. @${REINPLACE_CMD} -e "s|$$ENV{'PATH'}=''|$$ENV{'PATH'}='foo'|" ${WRKSRC}/plugins-scripts/*.pl .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/nagios-plugins/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios-plugins/files/patch-configure Fri Oct 3 12:41:32 2014 (r369891) @@ -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'"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410031241.s93CfXDA049721>