Attachment #147916 for bug #194068

Lines 19-24 _USES_POST+= libtool Link Here

(-)Mk/Uses/libtool.mk (+2 lines)
19		19
20	.if ${libtool_ARGS:Mbuild}	20	.if ${libtool_ARGS:Mbuild}
21	BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool	21	BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool
		22	CONFIGURE_ENV+= LTTRAP=no
		23	MAKE_ENV+= LTTRAP=no
22	.endif	24	.endif
23	.endif	25	.endif
24		26

Lines 4-10 Link Here

(-)archivers/tardy/Makefile (-1 / +1 lines)
4	PORTNAME= tardy	4	PORTNAME= tardy
5	PORTVERSION= 1.28	5	PORTVERSION= 1.28
6	DISTVERSIONSUFFIX= .D001.orig	6	DISTVERSIONSUFFIX= .D001.orig
7	PORTREVISION= 1	7	PORTREVISION= 2
8	CATEGORIES= archivers	8	CATEGORIES= archivers
9	MASTER_SITES= SF/tardy/${PORTVERSION}/	9	MASTER_SITES= SF/tardy/${PORTVERSION}/
10	DISTNAME= ${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}	10	DISTNAME= ${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}

Lines 3-9 Link Here

(-)audio/libnoise/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= libnoise	4	PORTNAME= libnoise
5	DISTVERSION= 1.0.0	5	DISTVERSION= 1.0.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
9	DISTNAME= ${PORTNAME}src-${DISTVERSION}	9	DISTNAME= ${PORTNAME}src-${DISTVERSION}
Lines 26-32 post-patch: Link Here
26		26
27	do-install:	27	do-install:
28	${MKDIR} ${STAGEDIR}${PREFIX}/lib	28	${MKDIR} ${STAGEDIR}${PREFIX}/lib
29	(cd ${WRKSRC}/src && ${LOCALBASE}/bin/libtool --mode=install \	29	(cd ${WRKSRC}/src && ${SETENV} LTTRAP=no ${LOCALBASE}/bin/libtool --mode=install \
30	${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib)	30	${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib)
31	(cd ${WRKSRC}/include && \	31	(cd ${WRKSRC}/include && \
32	${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise)	32	${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise)

Lines 45-50 include/noise/vectortable.h Link Here

(-)audio/libnoise/pkg-plist (+1 lines)
45	lib/libnoise.a	45	lib/libnoise.a
46	lib/libnoise.so	46	lib/libnoise.so
47	lib/libnoise.so.0	47	lib/libnoise.so.0
		48	lib/libnoise.so.0.0.0
48	@dirrm include/noise/model	49	@dirrm include/noise/model
49	@dirrm include/noise/module	50	@dirrm include/noise/module
50	@dirrm include/noise	51	@dirrm include/noise

Lines 3-9 Link Here

(-)devel/bglibs/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= bglibs	4	PORTNAME= bglibs
5	PORTVERSION= 1.106	5	PORTVERSION= 1.106
6	PORTREVISION= 5	6	PORTREVISION= 6
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= devel	8	CATEGORIES= devel
9	MASTER_SITES= http://untroubled.org/${PORTNAME}/archive/ \	9	MASTER_SITES= http://untroubled.org/${PORTNAME}/archive/ \




lib/bglibs/libbg-str.a
lib/bglibs/libbg-sysdeps.a
lib/bglibs/libbg-sysdeps.so
lib/bglibs/libbg-sysdeps.so.1
lib/bglibs/libbg-sysdeps.so.1.1.1
lib/bglibs/libbg-unix.a
lib/bglibs/libbg.a
lib/bglibs/libbg.so
lib/bglibs/libbg.so.1
lib/bglibs/libbg.so.1.1.1
lib/bglibs/libinstaller.a
lib/bglibs/libinstcheck.a
lib/bglibs/libinstshow.a





GNU_CONFIGURE=	yes
USES=		libtool pathfix pkgconfig
USE_AUTOTOOLS=	aclocal autoconf libtoolize
USE_LDCONFIG=	yes
INSTALL_TARGET=	install-strip
CONFIGURE_ARGS=	--enable-cplusplus --disable-static

.ifdef GC_VARIANT
INSTLIBS=	cord gc gccpp
PLIST=		${NONEXISTENT}
PLIST_FILES=	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
		${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.0.3,} \
		libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
RUN_DEPENDS+=	${LOCALBASE}/include/gc/gc.h:${PORTSDIR}/devel/boehm-gc
SOVER=		1
. if ${GC_VARIANT} == "redirect"
CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc
. endif

PORTDOCS=	*
.endif

.include <bsd.port.pre.mk>

NOT_FOR_ARCHS=	ia64

.include <bsd.port.options.mk>
pre-build:
	${LN} -sf ${WRKSRC}/src/sparc_mach_dep.S ${WRKSRC}

.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-gc-debug

	@${REINPLACE_CMD} -e \
		's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in

post-install:
	${RM} -r ${STAGEDIR}${PREFIX}/include
	${RM} -r ${STAGEDIR}${PREFIX}/share
	${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc.pc \
	${LN} -sf lib${LIB}-${GC_VARIANT}.so.${SOVER} \
		${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so
.endfor
	${INSTALL_DATA} ${WRKSRC}/bdw-gc.pc \
		${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc

.else # ! GC_VARIANT

post-patch:


.endif

# Get rid of .la and static library files
#
post-configure:
	@${REINPLACE_CMD} -E -e \
	'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool

regression-test: build
	(cd ${WRKSRC} && ${MAKE_CMD} check)

.include <bsd.port.mk>

Lines 1-7 Link Here

(-)devel/boehm-gc-redirect/Makefile (-1 / +2 lines)
1	# Created by: stas	1	# Created by: stas
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 0	4	PORTREVISION= 1
5		5
6	COMMENT= Garbage collection and memory leak detection for C and C++ with malloc redirection	6	COMMENT= Garbage collection and memory leak detection for C and C++ with malloc redirection
7		7
Lines 9-14 LICENSE= MIT Link Here
9		9
10	MASTERDIR= ${.CURDIR}/../boehm-gc	10	MASTERDIR= ${.CURDIR}/../boehm-gc
11	DESCR= ${.CURDIR}/pkg-descr	11	DESCR= ${.CURDIR}/pkg-descr
		12
12	GC_VARIANT= redirect	13	GC_VARIANT= redirect
13		14
14	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Lines 1-7 Link Here

(-)devel/boehm-gc-threaded/Makefile (-2 / +1 lines)
1	# Created by: stas	1	# Created by: stas
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 0	4	PORTREVISION= 1
5		5
6	COMMENT= Garbage collection and memory leak detection for C and C++ with threading support	6	COMMENT= Garbage collection and memory leak detection for C and C++ with threading support
7		7
Lines 11-16 MASTERDIR= ${.CURDIR}/../boehm-gc Link Here
11	DESCR= ${.CURDIR}/pkg-descr	11	DESCR= ${.CURDIR}/pkg-descr
12		12
13	GC_VARIANT= threaded	13	GC_VARIANT= threaded
14	SOVER= 1
15		14
16	.include "${MASTERDIR}/Makefile"	15	.include "${MASTERDIR}/Makefile"

Lines 2-7 Link Here

(-)devel/cdialog/Makefile (+1 lines)
2		2
3	PORTNAME= cdialog	3	PORTNAME= cdialog
4	PORTVERSION= 1.2.20140219	4	PORTVERSION= 1.2.20140219
		5	PORTREVISION= 1
5	PORTEPOCH= 2	6	PORTEPOCH= 2
6	CATEGORIES= devel	7	CATEGORIES= devel
7	MASTER_SITES= ftp://invisible-island.net/${PORTNAME:S\|^c\|\|}/	8	MASTER_SITES= ftp://invisible-island.net/${PORTNAME:S\|^c\|\|}/

Lines 7-12 include/cdialog/dlg_keys.h Link Here

(-)devel/cdialog/pkg-plist (+1 lines)
7	lib/libcdialog.a	7	lib/libcdialog.a
8	lib/libcdialog.so	8	lib/libcdialog.so
9	lib/libcdialog.so.11	9	lib/libcdialog.so.11
		10	lib/libcdialog.so.11.1.0
10	man/man1/cdialog.1.gz	11	man/man1/cdialog.1.gz
11	man/man3/cdialog.3.gz	12	man/man3/cdialog.3.gz
12	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README	13	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README

Lines 4-10 Link Here

(-)devel/fhist/Makefile (-1 / +1 lines)
4	PORTNAME= fhist	4	PORTNAME= fhist
5	PORTVERSION= 1.21	5	PORTVERSION= 1.21
6	DISTVERSIONSUFFIX= .D001	6	DISTVERSIONSUFFIX= .D001
7	PORTREVISION= 3	7	PORTREVISION= 4
8	CATEGORIES= devel	8	CATEGORIES= devel
9	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}	9	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
10		10

Lines 3-9 Link Here

(-)devel/libdsp/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libdsp	4	PORTNAME= libdsp
5	PORTVERSION= 5.0.2	5	PORTVERSION= 5.0.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= devel audio	7	CATEGORIES= devel audio
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable-src/${PORTVERSION} \	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable-src/${PORTVERSION} \
9	http://mirror.mcx2.org/	9	http://mirror.mcx2.org/

Lines 27-31 include/dsp/dspop.h Link Here

(-)devel/libdsp/pkg-plist (-1 / +2 lines)
27	include/dsp/dsptypes.h	27	include/dsp/dsptypes.h
28	lib/libdsp.a	28	lib/libdsp.a
29	lib/libdsp.so	29	lib/libdsp.so
30	lib/libdsp.so.10	30	lib/libdsp.so.2
		31	lib/libdsp.so.2.8.1
31	@dirrm include/dsp	32	@dirrm include/dsp

Lines 3-9 Link Here

(-)devel/libexplain/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libexplain	4	PORTNAME= libexplain
5	PORTVERSION= 1.3.${PATCHLEVEL}	5	PORTVERSION= 1.3.${PATCHLEVEL}
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R}	8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R}
9	DISTNAME= ${PORTNAME}-${PORTVERSION:R}	9	DISTNAME= ${PORTNAME}-${PORTVERSION:R}

Lines 240-246 include/libexplain/write.h Link Here

(-)devel/libexplain/pkg-plist (-1 / +2 lines)
240	include/libexplain/writev.h	240	include/libexplain/writev.h
241	lib/libexplain.a	241	lib/libexplain.a
242	lib/libexplain.so	242	lib/libexplain.so
243	lib/libexplain.so.55	243	lib/libexplain.so.51
		244	lib/libexplain.so.51.4.0
244	libdata/pkgconfig/libexplain.pc	245	libdata/pkgconfig/libexplain.pc
245	man/man1/explain.1.gz	246	man/man1/explain.1.gz
246	man/man1/explain_lca2010.1.gz	247	man/man1/explain_lca2010.1.gz

Lines 2-22 Link Here

(-)devel/libltdl/Makefile (-11 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libltdl	4	PORTNAME= libltdl
5	MASTERDIR= ${.CURDIR}/../../devel/libtool	5	PORTREVISION= 0
6		6
7	COMMENT= System independent dlopen wrapper	7	COMMENT= System independent dlopen wrapper
8		8
		9	.include "${.CURDIR}/../libtool/Makefile.common"
		10
9	LICENSE= LGPL21	11	LICENSE= LGPL21
10	USE_LDCONFIG= yes	12	LICENSE_FILE= ${WRKSRC}/COPYING.LIB
11	USES= libtool:keepla
12	CONFIGURE_ARGS= --enable-ltdl-install
13		13
14	CONFIGURE_WRKSRC=${WRKSRC}/libltdl	14	GNU_CONFIGURE= yes
15	BUILD_WRKSRC= ${CONFIGURE_WRKSRC}	15	CONFIGURE_ARGS= --enable-ltdl-install
16	INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
17	DESCR= ${.CURDIR}/pkg-descr
18	PLIST= ${.CURDIR}/pkg-plist
19	INFO= # empty
20	INSTALL_TARGET= install-strip	16	INSTALL_TARGET= install-strip
		17	USES+= libtool
		18	USE_LDCONFIG= yes
		19	WRKSRC_SUBDIR= libltdl
21		20
22	.include "${MASTERDIR}/Makefile"	21	.include <bsd.port.mk>

Lines 3-10 include/libltdl/lt_error.h Link Here

(-)devel/libltdl/pkg-plist (-3 / +1 lines)
3	include/libltdl/lt_system.h	3	include/libltdl/lt_system.h
4	include/ltdl.h	4	include/ltdl.h
5	lib/libltdl.a	5	lib/libltdl.a
6	lib/libltdl.la
7	lib/libltdl.so	6	lib/libltdl.so
8	lib/libltdl.so.7	7	lib/libltdl.so.7
9	lib/libltdl.so.7.3.0	8	lib/libltdl.so.7.3.1
10	@dirrm include/libltdl

Lines 3-9 Link Here

(-)devel/libmaa/Makefile (-2 / +3 lines)
3		3
4	PORTNAME= libmaa	4	PORTNAME= libmaa
5	PORTVERSION= 1.3.2	5	PORTVERSION= 1.3.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= devel	8	CATEGORIES= devel
9	MASTER_SITES= SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}	9	MASTER_SITES= SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
Lines 27-33 DOCS= README doc/libmaa.600dpi.ps Link Here
27	PLIST_FILES= include/maa.h \	27	PLIST_FILES= include/maa.h \
28	lib/libmaa.a \	28	lib/libmaa.a \
29	lib/libmaa.so \	29	lib/libmaa.so \
30	lib/libmaa.so.3	30	lib/libmaa.so.3 \
		31	lib/libmaa.so.3.0.0
31	PORTDOCS= ${DOCS:T}	32	PORTDOCS= ${DOCS:T}
32		33
33	post-install:	34	post-install:




# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>
# $FreeBSD$

PORTNAME=	libtool
PORTREVISION=	0
PORTREVISION=	3
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	libtool
DISTNAME=	libtool-${PORTVERSION}

COMMENT=	Generic shared library support script
COMMENT?=	Generic shared library support script

.include "${.CURDIR}/../libtool/Makefile.common"

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4

USES+=		makeinfo
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-ltdl-install
MAKE_ARGS=	MAKEINFOFLAGS=--no-split
USES+=		makeinfo

INFO=		libtool
	@${RM} -f ${WRKSRC}/doc/*.info*

post-patch:
	@${RM} -f ${WRKSRC}/doc/*.info*
	@${TOUCH} -mr ${WRKSRC}/build-aux/ltmain.sh.orig \
		${WRKSRC}/build-aux/ltmain.sh
	@${TOUCH} -mr ${WRKSRC}/configure.orig ${WRKSRC}/configure
	@${TOUCH} -mr ${WRKSRC}/m4/libtool.m4.orig ${WRKSRC}/m4/libtool.m4

post-install:
	${SED} -i '' \
		'2s/^/[ x$$LTTRAP = xno ] || { echo "Caught one!"; exit 1; }/' \
		${STAGEDIR}${PREFIX}/bin/libtool

.include <bsd.port.mk>




# $FreeBSD$

PORTVERSION=	2.4.2.418
PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
CATEGORIES=	devel
MASTER_SITES=	GNU_ALPHA
DISTNAME=	libtool-${PORTVERSION}

MAINTAINER=	autotools@FreeBSD.org

DISTINFO_FILE=	${.CURDIR}/../libtool/distinfo
USES=		tar:xz

Lines 1-2 Link Here

(-)devel/libtool/distinfo (-2 / +2 lines)
1	SHA256 (libtool-2.4.2.tar.gz) = b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918	1	SHA256 (libtool-2.4.2.418.tar.xz) = 6465c7e6ebb7c9083aa610d510498aadf7be0c6dc5f2f4e57008686879d27d8c
2	SIZE (libtool-2.4.2.tar.gz) = 2632347	2	SIZE (libtool-2.4.2.418.tar.xz) = 941808




--- build-aux/ltmain.sh.orig	2013-10-26 22:53:58 UTC
+++ build-aux/ltmain.sh
@@ -8598,13 +8598,13 @@ func_mode_link ()
 	  #
 	  case $version_type in
 	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
+	  darwin|freebsd-elf|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age=$number_minor
 	    revision=$number_revision
 	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
+	  freebsd-aout|qnx|sunos)
 	    current=$number_major
 	    revision=$number_minor
 	    age=0
@@ -8690,8 +8690,9 @@ func_mode_link ()
 	  ;;
 
 	freebsd-elf)
-	  major=.$current
-	  versuffix=.$current
+	  func_arith $current - $age
+	  major=.$func_arith_result
+	  versuffix=$major.$age.$revision
 	  ;;
 
 	irix | nonstopux)




--- configure.orig	2013-10-26 22:53:35 UTC
+++ configure
@@ -11582,7 +11582,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -16739,7 +16740,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -19695,7 +19697,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
@@ -22786,7 +22789,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;




--- libltdl/Makefile.in.orig	2009-11-19 14:55:46.000000000 +0100
+++ libltdl/Makefile.in	2009-11-19 14:56:35.000000000 +0100
@@ -402,12 +402,6 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
@@ -418,7 +412,6 @@
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config-h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 




--- libltdl/config/ltmain.sh.orig	2010-09-22 09:45:43.000000000 -0500
+++ libltdl/config/ltmain.sh	2011-01-18 12:59:46.000000000 -0600
@@ -1376,2 +1376,17 @@
     $opt_debug
+
+    # FreeBSD-specific: where we install compilers with non-standard names
+    tag_compilers_CC="*cc cc* *gcc gcc* clang*"
+    tag_compilers_CXX="*c++ c++* *g++ g++* clang++*"
+    base_compiler=`set -- "$@"; echo $1`
+
+    # If $tagname isn't set, then try to infer if the default "CC" tag applies
+    if test -z "$tagname"; then
+      for zp in $tag_compilers_CC; do
+        case $base_compiler in
+	 $zp) tagname="CC"; break;;
+	esac
+      done
+    fi
+
     if test -n "$available_tags" && test -z "$tagname"; then
@@ -1412,3 +1427,18 @@
 	    esac
-	  fi
+
+	    # FreeBSD-specific: try compilers based on inferred tag
+	    if test -z "$tagname"; then
+	      eval "tag_compilers=\$tag_compilers_${z}"
+	      if test -n "$tag_compilers"; then
+		for zp in $tag_compilers; do
+		  case $base_compiler in   
+		    $zp) tagname=$z; break;;
+		  esac
+		done
+		if test -n "$tagname"; then
+		  break
+		fi
+	      fi
+            fi
+          fi
 	done
@@ -3516,2 +3546,5 @@
 	;;
+      *-*-freebsd*)
+	# FreeBSD doesn't need this...
+	;;
       *)
@@ -5585,2 +5618,3 @@
 	esac
+	deplibs="$deplibs $arg"
 	continue
@@ -6155,9 +6189,26 @@
 	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
 	  fi
+
+	  case $linkmode in
+	  lib)
+	    deplibs="$deplib $deplibs"
+	    test "$pass" = conv && continue
+	    newdependency_libs="$deplib $newdependency_libs"
+	    ;;
+	  prog)
+	    if test "$pass" = conv; then
+	      deplibs="$deplib $deplibs"
+	      continue
+	    fi
+	    if test "$pass" = scan; then
+	      deplibs="$deplib $deplibs"
+	    else
+	      compile_deplibs="$deplib $compile_deplibs"
+	      finalize_deplibs="$deplib $finalize_deplibs"
+	    fi
+	    ;;
+	  *)
+	    ;;
+	  esac # linkmode
+
 	  continue




--- m4/libtool.m4.orig	2013-10-25 23:37:46 UTC
+++ m4/libtool.m4
@@ -2547,7 +2547,8 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;




share/aclocal/ltsugar.m4
share/aclocal/ltversion.m4
share/aclocal/lt~obsolete.m4
%%DATADIR%%/COPYING.LIB
%%DATADIR%%/Makefile.am
%%DATADIR%%/Makefile.in
%%DATADIR%%/README
%%DATADIR%%/aclocal.m4
%%DATADIR%%/argz.c
%%DATADIR%%/argz_.h
%%DATADIR%%/build-aux/compile
%%DATADIR%%/build-aux/config.guess
%%DATADIR%%/build-aux/config.sub
%%DATADIR%%/build-aux/depcomp
%%DATADIR%%/build-aux/install-sh
%%DATADIR%%/build-aux/ltmain.sh
%%DATADIR%%/build-aux/missing
%%DATADIR%%/config-h.in
%%DATADIR%%/configure
%%DATADIR%%/configure.ac
%%DATADIR%%/libltdl/lt__alloc.h
%%DATADIR%%/libltdl/lt__dirent.h
%%DATADIR%%/libltdl/lt__glibc.h
%%DATADIR%%/libltdl/lt__private.h
%%DATADIR%%/libltdl/lt__strl.h
%%DATADIR%%/libltdl/lt_dlloader.h
%%DATADIR%%/libltdl/lt_error.h
%%DATADIR%%/libltdl/lt_system.h
%%DATADIR%%/libltdl/slist.h
%%DATADIR%%/loaders/dld_link.c
%%DATADIR%%/loaders/dlopen.c
%%DATADIR%%/loaders/dyld.c
%%DATADIR%%/loaders/load_add_on.c
%%DATADIR%%/loaders/loadlibrary.c
%%DATADIR%%/loaders/preopen.c
%%DATADIR%%/loaders/shl_load.c
%%DATADIR%%/lt__alloc.c
%%DATADIR%%/lt__dirent.c
%%DATADIR%%/lt__strl.c
%%DATADIR%%/lt_dlloader.c
%%DATADIR%%/lt_error.c
%%DATADIR%%/ltdl.c
%%DATADIR%%/ltdl.h
%%DATADIR%%/ltdl.mk
%%DATADIR%%/slist.c
@dirrm share/libtool/libltdl/loaders
@dirrm share/libtool/libltdl/libltdl
@dirrm share/libtool/libltdl
@dirrm share/libtool/config
@dirrm share/libtool

Lines 3-9 Link Here

(-)devel/srecord/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= srecord	4	PORTNAME= srecord
5	PORTVERSION= 1.64	5	PORTVERSION= 1.64
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9

Lines 143-148 include/srecord/string.h Link Here

(-)devel/srecord/pkg-plist (+1 lines)
143	lib/libsrecord.a	143	lib/libsrecord.a
144	lib/libsrecord.so	144	lib/libsrecord.so
145	lib/libsrecord.so.0	145	lib/libsrecord.so.0
		146	lib/libsrecord.so.0.0.0
146	libdata/pkgconfig/srecord.pc	147	libdata/pkgconfig/srecord.pc
147	man/man1/srec_cat.1.gz	148	man/man1/srec_cat.1.gz
148	man/man1/srec_cmp.1.gz	149	man/man1/srec_cmp.1.gz

Lines 3-9 Link Here

(-)devel/xparam/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= xparam	4	PORTNAME= xparam
5	PORTVERSION= 1.22	5	PORTVERSION= 1.22
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= SF	8	MASTER_SITES= SF
9		9

Lines 84-87 include/xparam_extend.h Link Here

(-)devel/xparam/pkg-plist (-1 / +1 lines)
84	lib/libxparam.a	84	lib/libxparam.a
85	lib/libxparam.so	85	lib/libxparam.so
86	lib/libxparam.so.1	86	lib/libxparam.so.1
87	@dirrm include/xparam	87	lib/libxparam.so.1.0.0

Lines 3-8 Link Here

(-)dns/dnsutl/Makefile (+1 lines)
3		3
4	PORTNAME= dnsutl	4	PORTNAME= dnsutl
5	PORTVERSION= 1.12	5	PORTVERSION= 1.12
		6	PORTREVISION= 1
6	CATEGORIES= dns	7	CATEGORIES= dns
7	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
8		9

Lines 3-8 Link Here

(-)ftp/twoftpd/Makefile (+1 lines)
3		3
4	PORTNAME= twoftpd	4	PORTNAME= twoftpd
5	PORTVERSION= 1.42	5	PORTVERSION= 1.42
		6	PORTREVISION= 1
6	CATEGORIES= ftp	7	CATEGORIES= ftp
7	MASTER_SITES= http://untroubled.org/${PORTNAME}/	8	MASTER_SITES= http://untroubled.org/${PORTNAME}/
8		9

Lines 3-9 Link Here

(-)graphics/gexiv2/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gexiv2	4	PORTNAME= gexiv2
5	PORTVERSION= 0.6.1	5	PORTVERSION= 0.6.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= http://yorba.org/download/${PORTNAME}/${PORTVERSION:R}/	8	MASTER_SITES= http://yorba.org/download/${PORTNAME}/${PORTVERSION:R}/
9	DISTNAME= lib${PORTNAME}_${PORTVERSION}	9	DISTNAME= lib${PORTNAME}_${PORTVERSION}

Lines 5-15 include/gexiv2/gexiv2-managed-stream.h Link Here

(-)graphics/gexiv2/pkg-plist (-5 / +3 lines)
5	include/gexiv2/gexiv2-preview-properties.h	5	include/gexiv2/gexiv2-preview-properties.h
6	include/gexiv2/gexiv2-preview-image.h	6	include/gexiv2/gexiv2-preview-image.h
7	include/gexiv2/gexiv2-startup.h	7	include/gexiv2/gexiv2-startup.h
8	lib/libgexiv2.so.2
9	lib/libgexiv2.so
10	lib/libgexiv2.a	8	lib/libgexiv2.a
		9	lib/libgexiv2.so
		10	lib/libgexiv2.so.2
		11	lib/libgexiv2.so.2.0.0
11	libdata/pkgconfig/gexiv2.pc	12	libdata/pkgconfig/gexiv2.pc
12	share/vala/vapi/gexiv2.vapi	13	share/vala/vapi/gexiv2.vapi
13	@dirrmtry include/gexiv2
14	@dirrmtry share/vala/vapi
15	@dirrmtry share/vala

Lines 3-9 Link Here

(-)lang/gforth/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= gforth	4	PORTNAME= gforth
5	PORTVERSION= 0.7.3	5	PORTVERSION= 0.7.3
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= http://www.complang.tuwien.ac.at/forth/gforth/ \	8	MASTER_SITES= http://www.complang.tuwien.ac.at/forth/gforth/ \
9	GNU	9	GNU




include/gforth/%%PORTVERSION%%/libcc.h
lib/gforth/%%PORTVERSION%%/gforth-ditc
lib/gforth/%%PORTVERSION%%/gforth.fi
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.a
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0.0.0
lib/gforth/%%PORTVERSION%%/libcc-named/socket.a
lib/gforth/%%PORTVERSION%%/libcc-named/socket.so
lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0
lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0.0.0
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.a
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0.0.0
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.a
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0.0.0
man/man1/gforth.1.gz
%%DATADIR%%/%%PORTVERSION%%/TAGS
%%DATADIR%%/%%PORTVERSION%%/add.fs

Lines 3-9 Link Here

(-)lang/oo2c/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= oo2c	4	PORTNAME= oo2c
5	PORTVERSION= 2.1.11	5	PORTVERSION= 2.1.11
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= SF/ooc/ooc2/${PORTVERSION}	8	MASTER_SITES= SF/ooc/ooc2/${PORTVERSION}
9	DISTNAME= ${PORTNAME}_${BITS}-${PORTVERSION}	9	DISTNAME= ${PORTNAME}_${BITS}-${PORTVERSION}

Lines 10-15 man/man1/oowhereis.1.gz Link Here

(-)lang/oo2c/pkg-plist (+1 lines)
10	lib/liboo2c.a	10	lib/liboo2c.a
11	lib/liboo2c.so	11	lib/liboo2c.so
12	lib/liboo2c.so.3	12	lib/liboo2c.so.3
		13	lib/liboo2c.so.3.0.0
13	lib/oo2c/emacs/o2-default.el	14	lib/oo2c/emacs/o2-default.el
14	lib/oo2c/emacs/o2-indent.el	15	lib/oo2c/emacs/o2-indent.el
15	lib/oo2c/emacs/o2-insert.el	16	lib/oo2c/emacs/o2-insert.el

Lines 3-8 Link Here

(-)mail/mailfront/Makefile (+1 lines)
3		3
4	PORTNAME= mailfront	4	PORTNAME= mailfront
5	PORTVERSION= 2.01	5	PORTVERSION= 2.01
		6	PORTREVISION= 1
6	CATEGORIES= mail	7	CATEGORIES= mail
7	MASTER_SITES= http://untroubled.org/${PORTNAME}/ \	8	MASTER_SITES= http://untroubled.org/${PORTNAME}/ \
8	http://untroubled.org/${PORTNAME}/archive/	9	http://untroubled.org/${PORTNAME}/archive/

Lines 3-9 Link Here

(-)mail/qmail-autoresponder/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= qmail-autoresponder	4	PORTNAME= qmail-autoresponder
5	PORTVERSION= 0.97	5	PORTVERSION= 0.97
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://untroubled.org/${PORTNAME}/	8	MASTER_SITES= http://untroubled.org/${PORTNAME}/
9		9

Lines 3-9 Link Here

(-)mail/qmail-qfilter/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= qmail-qfilter	4	PORTNAME= qmail-qfilter
5	PORTVERSION= 2.1	5	PORTVERSION= 2.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= mail	7	CATEGORIES= mail
8	MASTER_SITES= http://untroubled.org/${PORTNAME}/	8	MASTER_SITES= http://untroubled.org/${PORTNAME}/
9		9

Lines 2-8 Link Here

(-)math/libtommath/Makefile (-2 / +2 lines)
2		2
3	PORTNAME= libtommath	3	PORTNAME= libtommath
4	PORTVERSION= 0.42.0	4	PORTVERSION= 0.42.0
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= math	6	CATEGORIES= math
7	MASTER_SITES= http://libtom.org/files/	7	MASTER_SITES= http://libtom.org/files/
8	DISTNAME= ltm-${PORTVERSION}	8	DISTNAME= ltm-${PORTVERSION}
Lines 31-37 post-patch: Link Here
31	.if ${PORT_OPTIONS:MSHARED}	31	.if ${PORT_OPTIONS:MSHARED}
32	USES+= libtool:build	32	USES+= libtool:build
33	USE_LDCONFIG= yes	33	USE_LDCONFIG= yes
34	PLIST_FILES+= lib/libtommath.so.0 lib/libtommath.so	34	PLIST_FILES+= lib/libtommath.so lib/libtommath.so.0 lib/libtommath.so.0.0.41
35	MAKEFILE= makefile.shared	35	MAKEFILE= makefile.shared
36	.else	36	.else
37	MAKEFILE= makefile	37	MAKEFILE= makefile





CONFLICTS_INSTALL=	nagios-plugins-*

USES=		charsetfix gmake perl5 libtool
CHARSETFIX_MAKEFILEIN=Makefile.am
USE_SUBMAKE=	yes

OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS

CONFIGURE_ARGS+=--with-qmail-qstat-command=/var/qmail/bin/qmail-qstat

CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib
CFLAGS+=	-I${LOCALBASE}/include

QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/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_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_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

	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.in
.if ${PORT_OPTIONS:MJAIL}
	@${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>

Line 0 Link Here

(-)net-mgmt/monitoring-plugins/files/patch-configure (+11 lines)
	1	--- configure.orig 2014-06-26 16:17:37 UTC
	2	+++ configure
	3	@@ -21787,7 +21787,7 @@ then
	4	$as_echo "$ac_cv_ps_command" >&6; }
	5
	6	elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null \| \
	7	- egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
	8	+ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
	9	then
	10	ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
	11	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"




--- configure.ac.orig	2014-07-11 09:15:18 UTC
+++ configure.ac
@@ -44,6 +44,7 @@
 gl_EARLY
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_LIBTOOL
+AC_PROG_RANLIB
 
 AM_PROG_CC_C_O
 
@@ -212,8 +213,8 @@
 AC_CHECK_LIB(crypt,main)
 if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
   if test -n "$PGSQL"; then
-    LDFLAGS="$LDFLAGS -L$PGSQL/lib"
-    CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
+    LDFLAGS="${LDFLAGS} -L$PGSQL/lib"
+    CPPFLAGS="${CPPFLAGS} -I$PGSQL/include"
   fi
   AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
   if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
@@ -257,10 +258,10 @@
 dnl Check for DBI libraries
 AS_IF([test "x$with_dbi" != "xno"], [
   _SAVEDLIBS="$LIBS"
-  AC_CHECK_LIB(dbi,dbi_initialize)
+  AC_CHECK_LIB(dbi,dbi_initialize,,,-L${LOCALBASE}/lib)
   if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then
     EXTRAS="$EXTRAS check_dbi\$(EXEEXT)"
-  	DBILIBS="-ldbi"
+  	DBILIBS="-L${LOCALBASE}/lib -ldbi"
     AC_SUBST(DBILIBS)
   else
     AC_MSG_WARN([Skipping dbi plugin])
@@ -275,15 +276,12 @@
 AS_IF([test "x$with_radius" != "xno"], [
   _SAVEDLIBS="$LIBS"
   AC_CHECK_LIB(freeradius-client,rc_read_config)
-  if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then
-    EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
-    RADIUSLIBS="-lfreeradius-client"
-    AC_SUBST(RADIUSLIBS)
-  else
-    AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+    AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib)
     if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
       EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
       RADIUSLIBS="-lradiusclient-ng"
+      RADIUSINCLUDE="-I${LOCALBSE}/include"
+      AC_SUBST(RADIUSINCLUDE)
       AC_SUBST(RADIUSLIBS)
     else
       AC_CHECK_LIB(radiusclient,rc_read_config)
@@ -296,7 +294,6 @@
         AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
       fi
     fi
-  fi
   LIBS="$_SAVEDLIBS"
 ])
 
@@ -305,12 +302,13 @@
 dnl Check for LDAP libraries
 AS_IF([test "x$with_ldap" != "xno"], [
   _SAVEDLIBS="$LIBS"
-  AC_CHECK_LIB(ldap,main,,,-llber)
-  if test "$ac_cv_lib_ldap_main" = "yes"; then
-    LDAPLIBS="-lldap -llber"\
-    LDAPINCLUDE="-I/usr/include/ldap"
+  AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber)
+  if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then
+    LDAPLIBS="-L${LOCALBSE}/lib -lldap -llber"
+    LDAPINCLUDE="-I${LOCALBASE}/include"
     AC_SUBST(LDAPLIBS)
     AC_SUBST(LDAPINCLUDE)
+    LIBS="-L${LOCALBASE}/lib $LIBS"
     AC_CHECK_FUNCS(ldap_set_option)
     EXTRAS="$EXTRAS check_ldap\$(EXEEXT)"
   	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
@@ -740,22 +738,10 @@
 dnl 	ac_cv_ps_cols=8
 dnl 	AC_MSG_RESULT([$ac_cv_ps_command])
 
-dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
-dnl so test for this first...
-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
-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'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
-dnl Should also work for FreeBSD 5.2.1 and 5.3
-dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
+dnl FreeBSD 5.x and above
+dnl  STAT COMMAND               VSZ   RSS USER       UID   PID  PPID COMMAND
 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'"
@@ -763,9 +749,8 @@
 	ac_cv_ps_cols=9
 	AC_MSG_RESULT([$ac_cv_ps_command])
 
-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
-dnl Limitation: Only first 16 chars returned for ucomm field
-dnl Must come before ps -weo
+dnl FreeBSD 4.x
+dnl  STAT   UID   PID  PPID   VSZ  RSS %CPU UCOMM            COMMAND
 elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
 	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
 then
@@ -775,209 +760,6 @@
 	ac_cv_ps_cols=9
 	AC_MSG_RESULT([$ac_cv_ps_command])
 
-dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
-elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \
-	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n"
-	ac_cv_ps_cols=10
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl FreeBSD
-elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \
-	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl BSD-like mode in RH 6.1
-elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl SunOS 4.1.3:
-dnl  F  UID  PID  PPID  CP  PRI  NI  SZ  RSS  WCHAN  STAT  TT  TIME  COMMAND
-dnl Need the head -1 otherwise test will work because arguments are found
-elif ps -laxnwww 2>/dev/null | head -1 | \
-	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
-then
-	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -laxnwww"
-	ac_cv_ps_format="%*s %d %d %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl Debian Linux / procps v1.2.9:
-dnl  FLAGS   UID   PID  PPID PRI  NI   SIZE   RSS WCHAN       STA TTY TIME COMMAND
-dnl    100     0     1     0   0   0    776    76  c0131c8c   S  ffff  0:11 init [2]
-dnl
-elif ps laxnwww 2>/dev/null | \
-	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
-then
-	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS laxnwww"
-	ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
-elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
-dnl Has /usr/bin/ps and /sbin/ps - force sbin version
-dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
-dnl of 1500). Will need big changes to check_procs to support
-elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \
-	egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]"
-	ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'"
-	ac_cv_ps_format=["%s%*[ +<>] %d %d %d %f %s %s %n"]
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl AIX 4.3.3 and 5.1 do not have an rss field
-elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \
-	egrep -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command - with no RSS])
-
-dnl Solaris 2.6
-elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
-	# There must be no space between the %s and %n due to a wierd problem in sscanf where
-	# it will return %n as longer than the line length
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl wonder who takes state instead of stat
-elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl IRIX 53
-elif ps -el 2>/dev/null | \
-	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl IRIX 63
-elif ps -el 2>/dev/null | \
-	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-	ac_cv_ps_cols=6
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl AIX 4.1:
-dnl     F S      UID   PID  PPID   C PRI NI ADDR  SZ  RSS   WCHAN    TTY  TIME CMD
-dnl    303 A        0     0     0 120  16 -- 1c07  20   24              -  0:45 swapper
-elif ps -el 2>/dev/null | \
-	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-	ac_cv_ps_cols=6
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl AIX?
-elif ps glaxen 2>/dev/null | \
-	egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
-then
-	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS glaxen"
-	ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl MacOSX / Darwin
-dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT
-dnl Some truncation will happen in UCOMM column
-dnl STAT      VSZ    RSS   UID  PPID %CPU UCOMM            COMMAND
-dnl Ss      52756  22496   501     1   6.9 Window Manager   /System/Library/CoreServices/WindowServer -daemon
-elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \
-	egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
-then
-	ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'"
-	ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl UnixWare
-elif ps -Al 2>/dev/null | \
-	egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -Al"
-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
 else
 	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
 fi
@@ -1376,6 +1158,8 @@
 	AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares])
 fi
 
+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
+if test x$enable_snmp = xyes; then
 AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
 AC_ARG_WITH(snmpget_command,
             ACX_HELP_STRING([--with-snmpget-command=PATH],
@@ -1406,7 +1190,10 @@
 else
 	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
 fi
+fi
 
+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
+if test x$enable_qstat = xyes; then
 AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
 AC_PATH_PROG(PATH_TO_QSTAT,qstat)
 AC_ARG_WITH(qstat_command,
@@ -1431,7 +1218,10 @@
 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
 		[path to qstat/quakestat])
 fi
+fi
 
+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
+if test x$enable_fping = xyes; then
 AC_PATH_PROG(PATH_TO_FPING,fping)
 AC_PATH_PROG(PATH_TO_FPING6,fping6)
 
@@ -1452,6 +1242,7 @@
 else
 	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
 fi
+fi
 
 AC_PATH_PROG(PATH_TO_SSH,ssh)
 AC_ARG_WITH(ssh_command,
@@ -1519,32 +1310,12 @@
 dnl end if for PATH_TO_SWAP
 fi
 
-AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
-if (test -n "$PATH_TO_SWAPINFO")
-then
-AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format])
-if [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null]
-then
-	ac_cv_have_swap=yes
-	ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
-
-	if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
-	then
-		ac_cv_swap_format=["%*s %f %*d %f"]
-		ac_cv_swap_conv=1024
-		AC_MSG_RESULT([using FreeBSD format swapinfo])
-	fi
-
-elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
-then
-	ac_cv_have_swap=yes
-	ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
-	ac_cv_swap_format=["%*s %f %*d %f"]
-	ac_cv_swap_conv=1024
-	AC_MSG_RESULT([using HP-UX format swapinfo])
-fi
-dnl end if for PATH_TO_SWAPINFO
-fi
+PATH_TO_SWAPINFO="/usr/sbin/swapinfo"
+ac_cv_have_swap=yes
+ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
+ac_cv_swap_format=["%*s %f %*d %f"]
+ac_cv_swap_conv=1024
+AC_MSG_RESULT([using FreeBSD format swapinfo])
 
 AC_PATH_PROG(PATH_TO_LSPS,lsps)
 if (test -n "$PATH_TO_LSPS")
@@ -1737,7 +1508,7 @@
 AC_SUBST(DEPLIBS)
 
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.15)
+AM_GNU_GETTEXT_VERSION(0.18)
 
 dnl Check for Redhat spopen problem
 dnl Wierd problem where ECHILD is returned from a wait call in error




--- gl/m4/extensions.m4.orig	2014-06-18 19:37:06 UTC
+++ gl/m4/extensions.m4
@@ -16,6 +16,7 @@
 #     warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
 # or  warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
 # the fix is
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
 #   1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
 #      but always AC_REQUIREd,
 #   2) to ensure that for each occurrence of
@@ -49,6 +50,7 @@
        except with this defined.])
     AC_DEFINE([_MINIX], [1],
       [Define to 1 if on MINIX.])
+])
     AC_DEFINE([_NETBSD_SOURCE], [1],
       [Define to 1 to make NetBSD features available.  MINIX 3 needs this.])
   fi

Lines 1-11 Link Here

(-)net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am (-11 lines)
1	--- plugins/Makefile.am.orig 2014-06-23 16:01:00 UTC
2	+++ plugins/Makefile.am
3	@@ -14,7 +14,7 @@
4	VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
5
6	AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \
7	- @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
8	+ @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@
9
10	localedir = $(datadir)/locale
11	# gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this





CONFLICTS_INSTALL=	monitoring-plugins-*

USES=		charsetfix gmake perl5 libtool
CHARSETFIX_MAKEFILEIN=Makefile.am
USE_SUBMAKE=	yes

OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS


CONFIGURE_ENV=	PERL=${PERL}
CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib
CFLAGS+=	-I${LOCALBASE}/include

QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/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_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_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

	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.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
	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure
.endif

.include <bsd.port.mk>

Line 0 Link Here

(-)net-mgmt/nagios-plugins/files/patch-configure (+11 lines)
	1	--- configure.orig 2014-06-26 16:17:37 UTC
	2	+++ configure
	3	@@ -21787,7 +21787,7 @@ then
	4	$as_echo "$ac_cv_ps_command" >&6; }
	5
	6	elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null \| \
	7	- egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
	8	+ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
	9	then
	10	ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
	11	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"




--- configure.ac.orig	2014-06-26 16:17:12 UTC
+++ configure.ac
@@ -13,8 +13,6 @@
 RELEASE=1
 AC_SUBST(RELEASE)
 
-AC_PREFIX_DEFAULT(/usr/local/nagios)
-
 dnl Deprecated configure options
 
 
@@ -45,6 +43,7 @@
 gl_EARLY
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_LIBTOOL
+AC_PROG_RANLIB
 
 AM_PROG_CC_C_O
 
@@ -216,8 +215,8 @@
 AC_CHECK_LIB(crypt,main)
 if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
   if test -n "$PGSQL"; then
-    LDFLAGS="$LDFLAGS -L$PGSQL/lib"
-    CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
+    LDFLAGS="${LDFLAGS} -L$PGSQL/lib"
+    CPPFLAGS="${CPPFLAGS} -I$PGSQL/include"
   fi
   AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
   if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
@@ -261,10 +260,10 @@
 dnl Check for DBI libraries
 AS_IF([test "x$with_dbi" != "xno"], [
   _SAVEDLIBS="$LIBS"
-  AC_CHECK_LIB(dbi,dbi_initialize)
+  AC_CHECK_LIB(dbi,dbi_initialize,,,-L${LOCALBASE}/lib)
   if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then
     EXTRAS="$EXTRAS check_dbi\$(EXEEXT)"
-  	DBILIBS="-ldbi"
+  	DBILIBS="-L${LOCALBASE}/lib -ldbi"
     AC_SUBST(DBILIBS)
   else
     AC_MSG_WARN([Skipping dbi plugin])
@@ -278,22 +277,17 @@
 dnl Check for radius libraries
 AS_IF([test "x$with_radius" != "xno"], [
   _SAVEDLIBS="$LIBS"
-  AC_CHECK_LIB(radiusclient,rc_read_config)
-  if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
-    EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
-  	RADIUSLIBS="-lradiusclient"
-    AC_SUBST(RADIUSLIBS)
-  else
-    AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+    AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib)
     if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
       EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
-    	  RADIUSLIBS="-lradiusclient-ng"
+      RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng"
+      RADIUSINCLUDE="-I${LOCALBSE}/include"
       AC_SUBST(RADIUSLIBS)
+      AC_SUBST(RADIUSINCLUDE)
     else
       AC_MSG_WARN([Skipping radius plugin])
       AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
     fi
-  fi
   LIBS="$_SAVEDLIBS"
 ])
 
@@ -302,12 +296,13 @@
 dnl Check for LDAP libraries
 AS_IF([test "x$with_ldap" != "xno"], [
   _SAVEDLIBS="$LIBS"
-  AC_CHECK_LIB(ldap,main,,,-llber)
-  if test "$ac_cv_lib_ldap_main" = "yes"; then
-    LDAPLIBS="-lldap -llber"\
-    LDAPINCLUDE="-I/usr/include/ldap"
+  AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber)
+  if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then
+    LDAPLIBS="-L${LOCALBSE}/lib -lldap -llber"
+    LDAPINCLUDE="-I${LOCALBASE}/include"
     AC_SUBST(LDAPLIBS)
     AC_SUBST(LDAPINCLUDE)
+    LIBS="-L${LOCALBASE}/lib $LIBS"
     AC_CHECK_FUNCS(ldap_set_option)
     EXTRAS="$EXTRAS check_ldap\$(EXEEXT)"
   	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
@@ -755,22 +750,10 @@
 dnl 	ac_cv_ps_cols=8
 dnl 	AC_MSG_RESULT([$ac_cv_ps_command])
 
-dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
-dnl so test for this first...
-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
-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'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
-dnl Should also work for FreeBSD 5.2.1 and 5.3
-dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
+dnl FreeBSD 5.x and above
+dnl  STAT COMMAND               VSZ   RSS USER       UID   PID  PPID COMMAND
 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'"
@@ -778,9 +761,8 @@
 	ac_cv_ps_cols=9
 	AC_MSG_RESULT([$ac_cv_ps_command])
 
-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
-dnl Limitation: Only first 16 chars returned for ucomm field
-dnl Must come before ps -weo
+dnl FreeBSD 4.x
+dnl  STAT   UID   PID  PPID   VSZ  RSS %CPU UCOMM            COMMAND
 elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
 	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
 then
@@ -790,209 +772,6 @@
 	ac_cv_ps_cols=9
 	AC_MSG_RESULT([$ac_cv_ps_command])
 
-dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
-elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \
-	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n"
-	ac_cv_ps_cols=10
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl FreeBSD
-elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \
-	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl BSD-like mode in RH 6.1
-elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl SunOS 4.1.3:
-dnl  F  UID  PID  PPID  CP  PRI  NI  SZ  RSS  WCHAN  STAT  TT  TIME  COMMAND
-dnl Need the head -1 otherwise test will work because arguments are found
-elif ps -laxnwww 2>/dev/null | head -1 | \
-	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
-then
-	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -laxnwww"
-	ac_cv_ps_format="%*s %d %d %d %*s %*s %*s %d %d %*s %s %*s %*s %n%s"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl Debian Linux / procps v1.2.9:
-dnl  FLAGS   UID   PID  PPID PRI  NI   SIZE   RSS WCHAN       STA TTY TIME COMMAND
-dnl    100     0     1     0   0   0    776    76  c0131c8c   S  ffff  0:11 init [2]
-dnl
-elif ps laxnwww 2>/dev/null | \
-	egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
-then
-	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS laxnwww"
-	ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
-elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-	egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
-dnl Has /usr/bin/ps and /sbin/ps - force sbin version
-dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
-dnl of 1500). Will need big changes to check_procs to support
-elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \
-	egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]"
-	ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'"
-	ac_cv_ps_format=["%s%*[ +<>] %d %d %d %f %s %s %n"]
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl AIX 4.3.3 and 5.1 do not have an rss field
-elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \
-	egrep -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command - with no RSS])
-
-dnl Solaris 2.6
-elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
-	# There must be no space between the %s and %n due to a wierd problem in sscanf where
-	# it will return %n as longer than the line length
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=9
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl wonder who takes state instead of stat
-elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \
-	egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl IRIX 53
-elif ps -el 2>/dev/null | \
-	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl IRIX 63
-elif ps -el 2>/dev/null | \
-	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-	ac_cv_ps_cols=6
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl AIX 4.1:
-dnl     F S      UID   PID  PPID   C PRI NI ADDR  SZ  RSS   WCHAN    TTY  TIME CMD
-dnl    303 A        0     0     0 120  16 -- 1c07  20   24              -  0:45 swapper
-elif ps -el 2>/dev/null | \
-	egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-	ac_cv_ps_cols=6
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl AIX?
-elif ps glaxen 2>/dev/null | \
-	egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
-then
-	ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS glaxen"
-	ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl MacOSX / Darwin
-dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT
-dnl Some truncation will happen in UCOMM column
-dnl STAT      VSZ    RSS   UID  PPID %CPU UCOMM            COMMAND
-dnl Ss      52756  22496   501     1   6.9 Window Manager   /System/Library/CoreServices/WindowServer -daemon
-elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \
-	egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
-then
-	ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'"
-	ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]"
-	ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
-dnl UnixWare
-elif ps -Al 2>/dev/null | \
-	egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
-then
-	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
-	ac_cv_ps_command="$PATH_TO_PS -Al"
-	ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
-	ac_cv_ps_cols=8
-	AC_MSG_RESULT([$ac_cv_ps_command])
-
 else
 	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
 fi
@@ -1391,6 +1170,8 @@
 	AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares])
 fi
 
+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
+if test x$enable_snmp = xyes; then
 AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
 AC_ARG_WITH(snmpget_command,
             ACX_HELP_STRING([--with-snmpget-command=PATH],
@@ -1421,7 +1202,10 @@
 else
 	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
 fi
+fi
 
+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
+if test x$enable_qstat = xyes; then
 AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
 AC_PATH_PROG(PATH_TO_QSTAT,qstat)
 AC_ARG_WITH(qstat_command,
@@ -1446,7 +1230,10 @@
 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
 		[path to qstat/quakestat])
 fi
+fi
 
+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
+if test x$enable_fping = xyes; then
 AC_PATH_PROG(PATH_TO_FPING,fping)
 AC_PATH_PROG(PATH_TO_FPING6,fping6)
 
@@ -1467,6 +1254,7 @@
 else
 	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
 fi
+fi
 
 AC_PATH_PROG(PATH_TO_SSH,ssh)
 AC_ARG_WITH(ssh_command,
@@ -1537,32 +1325,12 @@
 dnl end if for PATH_TO_SWAP
 fi
 
-AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
-if (test -n "$PATH_TO_SWAPINFO")
-then
-AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format])
-if [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null]
-then
-	ac_cv_have_swap=yes
-	ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
-
-	if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
-	then
-		ac_cv_swap_format=["%*s %f %*d %f"]
-		ac_cv_swap_conv=1024
-		AC_MSG_RESULT([using FreeBSD format swapinfo])
-	fi
-
-elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
-then
-	ac_cv_have_swap=yes
-	ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
-	ac_cv_swap_format=["%*s %f %*d %f"]
-	ac_cv_swap_conv=1024
-	AC_MSG_RESULT([using HP-UX format swapinfo])
-fi
-dnl end if for PATH_TO_SWAPINFO
-fi
+PATH_TO_SWAPINFO="/usr/sbin/swapinfo"
+ac_cv_have_swap=yes
+ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
+ac_cv_swap_format=["%*s %f %*d %f"]
+ac_cv_swap_conv=1024
+AC_MSG_RESULT([using FreeBSD format swapinfo])
 
 AC_PATH_PROG(PATH_TO_LSPS,lsps)
 if (test -n "$PATH_TO_LSPS")
@@ -1755,7 +1523,7 @@
 AC_SUBST(DEPLIBS)
 
 AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.15)
+AM_GNU_GETTEXT_VERSION(0.18)
 
 dnl Check for Redhat spopen problem
 dnl Wierd problem where ECHILD is returned from a wait call in error




--- gl/m4/extensions.m4.orig	2014-03-04 21:41:56 UTC
+++ gl/m4/extensions.m4
@@ -16,6 +16,7 @@
 #     warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
 # or  warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
 # the fix is
+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
 #   1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
 #      but always AC_REQUIREd,
 #   2) to ensure that for each occurrence of
@@ -49,6 +50,7 @@
        except with this defined.])
     AC_DEFINE([_MINIX], [1],
       [Define to 1 if on MINIX.])
+])
     AC_DEFINE([_NETBSD_SOURCE], [1],
       [Define to 1 to make NetBSD features available.  MINIX 3 needs this.])
   fi

Lines 1-11 Link Here

(-)net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am (-11 lines)
1	--- plugins/Makefile.am.orig 2014-05-20 19:15:34 UTC
2	+++ plugins/Makefile.am
3	@@ -14,7 +14,7 @@
4	VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
5
6	AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \
7	- @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
8	+ @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@
9
10	localedir = $(datadir)/locale
11	# gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this

Lines 3-9 Link Here

(-)security/cvm/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= cvm	4	PORTNAME= cvm
5	PORTVERSION= 0.96	5	PORTVERSION= 0.96
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://untroubled.org/${PORTNAME}/ \	8	MASTER_SITES= http://untroubled.org/${PORTNAME}/ \
9	http://untroubled.org/${PORTNAME}/archive/	9	http://untroubled.org/${PORTNAME}/archive/




lib/libcvm-client.so
lib/libcvm-command.a
lib/libcvm-command.so
lib/libcvm-command.so.1
lib/libcvm-command.so.1.1.0
lib/libcvm-local.a
lib/libcvm-local.so
lib/libcvm-local.so.1
lib/libcvm-local.so.1.1.0
lib/libcvm-module.a
lib/libcvm-module.so
lib/libcvm-module.so.1
lib/libcvm-module.so.1.1.0
lib/libcvm-qmail.a
lib/libcvm-qmail.so
lib/libcvm-qmail.so.1
lib/libcvm-qmail.so.1.1.0
lib/libcvm-sasl.a
lib/libcvm-sasl.so
lib/libcvm-sasl.so.1
lib/libcvm-sasl.so.1.1.0
lib/libcvm-sql.a
lib/libcvm-sql.so
lib/libcvm-sql.so.1
lib/libcvm-sql.so.1.1.0
lib/libcvm-udp.a
lib/libcvm-udp.so
lib/libcvm-udp.so.1
lib/libcvm-udp.so.1.1.0
lib/libcvm-v1client.a
lib/libcvm-v1client.so
lib/libcvm-v1client.so.1
lib/libcvm-v1client.so.1.1.0
lib/libcvm-v2client.a
lib/libcvm-v2client.so
lib/libcvm-v2client.so.1
lib/libcvm-v2client.so.1.1.0
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO

%%PORTDOCS%%%%DOCSDIR%%/sql.html
%%PORTDOCS%%%%DOCSDIR%%/v1client.html
%%PORTDOCS%%%%DOCSDIR%%/v2client.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/cvm

Lines 3-9 Link Here

(-)security/libtomcrypt/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= libtomcrypt	4	PORTNAME= libtomcrypt
5	PORTVERSION= 1.17	5	PORTVERSION= 1.17
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= security	7	CATEGORIES= security
8	MASTER_SITES= http://libtom.org/files/	8	MASTER_SITES= http://libtom.org/files/
9	DISTNAME= crypt-${PORTVERSION}	9	DISTNAME= crypt-${PORTVERSION}

Lines 15-23 include/tomcrypt_test.h Link Here

(-)security/libtomcrypt/pkg-plist (+2 lines)
15	lib/libtomcrypt.a	15	lib/libtomcrypt.a
16	lib/libtomcrypt.so	16	lib/libtomcrypt.so
17	lib/libtomcrypt.so.0	17	lib/libtomcrypt.so.0
		18	lib/libtomcrypt.so.0.0.117
18	lib/libtomcrypt_prof.a	19	lib/libtomcrypt_prof.a
19	lib/libtomcrypt_prof.so	20	lib/libtomcrypt_prof.so
20	lib/libtomcrypt_prof.so.0	21	lib/libtomcrypt_prof.so.0
		22	lib/libtomcrypt_prof.so.0.0.117
21	%%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf	23	%%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf
22	%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf	24	%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
23	%%PORTDOCS%%@dirrm %%DOCSDIR%%	25	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Lines 3-9 Link Here

(-)sysutils/ucspi-proxy/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= ucspi-proxy	4	PORTNAME= ucspi-proxy
5	PORTVERSION= 0.98	5	PORTVERSION= 0.98
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= http://untroubled.org/ucspi-proxy/	8	MASTER_SITES= http://untroubled.org/ucspi-proxy/
9		9

Lines 3-9 Link Here

(-)sysutils/vii/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= vii	4	PORTNAME= vii
5	PORTVERSION= 4.2	5	PORTVERSION= 4.2
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= http://vii.sourceforge.net/ \	8	MASTER_SITES= http://vii.sourceforge.net/ \
9	CRITICAL	9	CRITICAL

Lines 3-8 Link Here

(-)x11-toolkits/xmhtml/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= XmHTML	4	PORTNAME= XmHTML
5	PORTVERSION= 1.1.9	5	PORTVERSION= 1.1.9
		6	PORTREVISION= 1
6	CATEGORIES= x11-toolkits www	7	CATEGORIES= x11-toolkits www
7	MASTER_SITES= SF/${PORTNAME:tl}	8	MASTER_SITES= SF/${PORTNAME:tl}
8		9
Lines 24-30 MAKE_ENV= LIBTOOL=${LIBTOOL} Link Here
24	OPTIONS_DEFINE= DOCS EXAMPLES	25	OPTIONS_DEFINE= DOCS EXAMPLES
25		26
26	do-install:	27	do-install:
27	(cd ${WRKSRC}/lib && ${LIBTOOL} --mode=install ${INSTALL_DATA} \	28	(cd ${WRKSRC}/lib && ${SETENV} LTTRAP=no ${LIBTOOL} --mode=install ${INSTALL_DATA} \
28	libXmHTML.la ${STAGEDIR}${PREFIX}/lib)	29	libXmHTML.la ${STAGEDIR}${PREFIX}/lib)
29	@${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML	30	@${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML
30	(cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \	31	(cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \

Lines 14-19 include/XmHTML/toolkit.h Link Here

(-)x11-toolkits/xmhtml/pkg-plist (+1 lines)
14	lib/libXmHTML.a	14	lib/libXmHTML.a
15	lib/libXmHTML.so	15	lib/libXmHTML.so
16	lib/libXmHTML.so.1	16	lib/libXmHTML.so.1
		17	lib/libXmHTML.so.1.0.2
17	%%PORTDOCS%%%%DOCSDIR%%/GPL.html	18	%%PORTDOCS%%%%DOCSDIR%%/GPL.html
18	%%PORTDOCS%%%%DOCSDIR%%/LGPL.html	19	%%PORTDOCS%%%%DOCSDIR%%/LGPL.html
19	%%PORTDOCS%%%%DOCSDIR%%/XmHTML.html	20	%%PORTDOCS%%%%DOCSDIR%%/XmHTML.html

Return to bug 194068

Lines 100-110 lib/bglibs/libbg-path.a Link Here

(-)devel/bglibs/pkg-plist (-2 / +4 lines)
100	lib/bglibs/libbg-str.a	100	lib/bglibs/libbg-str.a
101	lib/bglibs/libbg-sysdeps.a	101	lib/bglibs/libbg-sysdeps.a
102	lib/bglibs/libbg-sysdeps.so	102	lib/bglibs/libbg-sysdeps.so
103	lib/bglibs/libbg-sysdeps.so.2	103	lib/bglibs/libbg-sysdeps.so.1
		104	lib/bglibs/libbg-sysdeps.so.1.1.1
104	lib/bglibs/libbg-unix.a	105	lib/bglibs/libbg-unix.a
105	lib/bglibs/libbg.a	106	lib/bglibs/libbg.a
106	lib/bglibs/libbg.so	107	lib/bglibs/libbg.so
107	lib/bglibs/libbg.so.2	108	lib/bglibs/libbg.so.1
		109	lib/bglibs/libbg.so.1.1.1
108	lib/bglibs/libinstaller.a	110	lib/bglibs/libinstaller.a
109	lib/bglibs/libinstcheck.a	111	lib/bglibs/libinstcheck.a
110	lib/bglibs/libinstshow.a	112	lib/bglibs/libinstshow.a

Lines 23-29 BUILD_DEPENDS= ${LOCALBASE}/lib/libatomi Link Here

(-)devel/boehm-gc/Makefile (-25 / +11 lines)
23		23
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	USES= libtool pathfix pkgconfig	25	USES= libtool pathfix pkgconfig
26	USE_AUTOTOOLS= aclocal autoconf libtoolize
27	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
28	INSTALL_TARGET= install-strip	27	INSTALL_TARGET= install-strip
29	CONFIGURE_ARGS= --enable-cplusplus --disable-static	28	CONFIGURE_ARGS= --enable-cplusplus --disable-static
Lines 36-46 OPTIONS_DEFINE= DEBUG Link Here
36	.ifdef GC_VARIANT	35	.ifdef GC_VARIANT
37	INSTLIBS= cord gc gccpp	36	INSTLIBS= cord gc gccpp
38	PLIST= ${NONEXISTENT}	37	PLIST= ${NONEXISTENT}
39	PLIST_FILES= ${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so.${SOVER},g} \	38	PLIST_FILES= ${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so,} \
40	${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so,g} \	39	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1,} \
		40	${INSTLIBS:S,^,lib/lib,:S,$,-${GC_VARIANT}.so.1.0.3,} \
41	libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc	41	libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
42	RUN_DEPENDS+= ${LOCALBASE}/include/gc/gc.h:${PORTSDIR}/devel/boehm-gc	42	RUN_DEPENDS+= ${LOCALBASE}/include/gc/gc.h:${PORTSDIR}/devel/boehm-gc
43	SOVER= 1
44	. if ${GC_VARIANT} == "redirect"	43	. if ${GC_VARIANT} == "redirect"
45	CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc	44	CONFIGURE_ARGS+=--disable-threads --enable-redirect-malloc
46	. endif	45	. endif
Lines 55-67 OPTIONS_DEFINE+=DOCS Link Here
55	PORTDOCS= *	54	PORTDOCS= *
56	.endif	55	.endif
57		56
58	.include <bsd.port.pre.mk>
59
60	NOT_FOR_ARCHS= ia64	57	NOT_FOR_ARCHS= ia64
61		58
62	# no rule to get .lo from .S in subdirectory	59	.include <bsd.port.options.mk>
63	pre-build:
64	${LN} -sf ${WRKSRC}/src/sparc_mach_dep.S ${WRKSRC}
65		60
66	.if ${PORT_OPTIONS:MDEBUG}	61	.if ${PORT_OPTIONS:MDEBUG}
67	CONFIGURE_ARGS+=--enable-gc-debug	62	CONFIGURE_ARGS+=--enable-gc-debug
Lines 83-97 post-patch: Link Here
83	@${REINPLACE_CMD} -e \	78	@${REINPLACE_CMD} -e \
84	's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in	79	's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in
85		80
86	do-install:	81	post-install:
87	.for LIB in ${INSTLIBS}	82	${RM} -r ${STAGEDIR}${PREFIX}/include
88	${INSTALL_DATA} ${WRKSRC}/.libs/lib${LIB}-${GC_VARIANT}.so.${SOVER} \	83	${RM} -r ${STAGEDIR}${PREFIX}/share
89	${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so.${SOVER}	84	${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc.pc \
90	${LN} -sf lib${LIB}-${GC_VARIANT}.so.${SOVER} \
91	${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so
92	.endfor
93	${INSTALL_DATA} ${WRKSRC}/bdw-gc.pc \
94	${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc	85	${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
		86
95	.else # ! GC_VARIANT	87	.else # ! GC_VARIANT
96		88
97	post-patch:	89	post-patch:
Lines 107-119 post-install: Link Here
107		99
108	.endif	100	.endif
109		101
110	# Get rid of .la and static library files
111	#
112	post-configure:
113	@${REINPLACE_CMD} -E -e \
114	'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
115
116	regression-test: build	102	regression-test: build
117	cd ${WRKSRC} && ${MAKE} check	103	(cd ${WRKSRC} && ${MAKE_CMD} check)
118		104
119	.include <bsd.port.post.mk>	105	.include <bsd.port.mk>

Lines 1-36 Link Here

(-)devel/libtool/Makefile (-22 / +22 lines)
1	# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>	1	# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= libtool	4	PORTNAME= libtool
5	PORTVERSION= 2.4.2	5	PORTREVISION= 0
6	PORTREVISION= 3
7	CATEGORIES= devel
8	MASTER_SITES= ${MASTER_SITE_GNU}
9	MASTER_SITE_SUBDIR= libtool
10	DISTNAME= libtool-${PORTVERSION}
11		6
12	MAINTAINER= autotools@FreeBSD.org	7	COMMENT= Generic shared library support script
13	COMMENT?= Generic shared library support script
14		8
15	LICENSE?= GPLv2	9	.include "${.CURDIR}/../libtool/Makefile.common"
16		10
17	CONFLICTS= libtool-fixed-[0-9]*	11	LICENSE= GPLv2
		12	LICENSE_FILE= ${WRKSRC}/COPYING
		13
		14	BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
		15	RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
18		16
19	USES+= makeinfo
20	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
21	CONFIGURE_ARGS?= --disable-ltdl-install	18	CONFIGURE_ARGS= --disable-ltdl-install
22	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"	19	MAKE_ARGS= MAKEINFOFLAGS=--no-split
23	INFO?= libtool	20	USES+= makeinfo
24		21
25	post-extract:	22	INFO= libtool
26	@${RM} -f ${WRKSRC}/doc/.info
27		23
28	post-patch:	24	post-patch:
29	@${REINPLACE_CMD} -e 's\|sed gsed\|sed\|g' \	25	@${RM} -f ${WRKSRC}/doc/.info
30	-e 's\|CC=cc\|CC=${CC}\|g' \	26	@${TOUCH} -mr ${WRKSRC}/build-aux/ltmain.sh.orig \
31	${WRKSRC}/configure ${WRKSRC}/libltdl/configure	27	${WRKSRC}/build-aux/ltmain.sh
		28	@${TOUCH} -mr ${WRKSRC}/configure.orig ${WRKSRC}/configure
		29	@${TOUCH} -mr ${WRKSRC}/m4/libtool.m4.orig ${WRKSRC}/m4/libtool.m4
32		30
33	post-configure:	31	post-install:
34	@${FIND} ${WRKSRC} -type f \| ${XARGS} ${TOUCH} -f	32	${SED} -i '' \
		33	'2s/^/[ x$$LTTRAP = xno ] \|\| { echo "Caught one!"; exit 1; }/' \
		34	${STAGEDIR}${PREFIX}/bin/libtool
35		35
36	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Line 0 Link Here

(-)devel/libtool/Makefile.common (+12 lines)
	1	# $FreeBSD$
	2
	3	PORTVERSION= 2.4.2.418
	4	PORTREVISION?= 0 # Leave this zero. Set in Makefile instead.
	5	CATEGORIES= devel
	6	MASTER_SITES= GNU_ALPHA
	7	DISTNAME= libtool-${PORTVERSION}
	8
	9	MAINTAINER= autotools@FreeBSD.org
	10
	11	DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo
	12	USES= tar:xz

Line 0 Link Here

(-)devel/libtool/files/patch-build-aux_ltmain.sh (+30 lines)
	1	--- build-aux/ltmain.sh.orig 2013-10-26 22:53:58 UTC
	2	+++ build-aux/ltmain.sh
	3	@@ -8598,13 +8598,13 @@ func_mode_link ()
	4	#
	5	case $version_type in
	6	# correct linux to gnu/linux during the next big refactor
	7	- darwin\|linux\|osf\|windows\|none)
	8	+ darwin\|freebsd-elf\|linux\|osf\|windows\|none)
	9	func_arith $number_major + $number_minor
	10	current=$func_arith_result
	11	age=$number_minor
	12	revision=$number_revision
	13	;;
	14	- freebsd-aout\|freebsd-elf\|qnx\|sunos)
	15	+ freebsd-aout\|qnx\|sunos)
	16	current=$number_major
	17	revision=$number_minor
	18	age=0
	19	@@ -8690,8 +8690,9 @@ func_mode_link ()
	20	;;
	21
	22	freebsd-elf)
	23	- major=.$current
	24	- versuffix=.$current
	25	+ func_arith $current - $age
	26	+ major=.$func_arith_result
	27	+ versuffix=$major.$age.$revision
	28	;;
	29
	30	irix \| nonstopux)

Line 0 Link Here

(-)devel/libtool/files/patch-configure (+42 lines)
	1	--- configure.orig 2013-10-26 22:53:35 UTC
	2	+++ configure
	3	@@ -11582,7 +11582,8 @@ freebsd* \| dragonfly*)
	4	version_type=freebsd-$objformat
	5	case $version_type in
	6	freebsd-elf*)
	7	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
	8	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
	9	+ soname_spec='$libname$release$shared_ext$major'
	10	need_version=no
	11	need_lib_prefix=no
	12	;;
	13	@@ -16739,7 +16740,8 @@ freebsd* \| dragonfly*)
	14	version_type=freebsd-$objformat
	15	case $version_type in
	16	freebsd-elf*)
	17	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
	18	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
	19	+ soname_spec='$libname$release$shared_ext$major'
	20	need_version=no
	21	need_lib_prefix=no
	22	;;
	23	@@ -19695,7 +19697,8 @@ freebsd* \| dragonfly*)
	24	version_type=freebsd-$objformat
	25	case $version_type in
	26	freebsd-elf*)
	27	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
	28	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
	29	+ soname_spec='$libname$release$shared_ext$major'
	30	need_version=no
	31	need_lib_prefix=no
	32	;;
	33	@@ -22786,7 +22789,8 @@ freebsd* \| dragonfly*)
	34	version_type=freebsd-$objformat
	35	case $version_type in
	36	freebsd-elf*)
	37	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
	38	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
	39	+ soname_spec='$libname$release$shared_ext$major'
	40	need_version=no
	41	need_lib_prefix=no
	42	;;

Lines 1-23 Link Here

(-)devel/libtool/files/patch-libltdl-Makefile.in (-23 lines)
1	--- libltdl/Makefile.in.orig 2009-11-19 14:55:46.000000000 +0100
2	+++ libltdl/Makefile.in 2009-11-19 14:56:35.000000000 +0100
3	@@ -402,12 +402,6 @@
4	$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
5	$(SHELL) ./config.status --recheck
6
7	-$(top_srcdir)/configure: $(am__configure_deps)
8	- $(am__cd) $(srcdir) && $(AUTOCONF)
9	-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
10	- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
11	-$(am__aclocal_m4_deps):
12	-
13	config.h: stamp-h1
14	@if test ! -f $@; then \
15	rm -f stamp-h1; \
16	@@ -418,7 +412,6 @@
17	@rm -f stamp-h1
18	cd $(top_builddir) && $(SHELL) ./config.status config.h
19	$(srcdir)/config-h.in: $(am__configure_deps)
20	- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
21	rm -f stamp-h1
22	touch $@
23

Lines 1-83 Link Here

(-)devel/libtool/files/patch-libltdl_config_ltmain.sh (-83 lines)
1	--- libltdl/config/ltmain.sh.orig 2010-09-22 09:45:43.000000000 -0500
2	+++ libltdl/config/ltmain.sh 2011-01-18 12:59:46.000000000 -0600
3	@@ -1376,2 +1376,17 @@
4	$opt_debug
5	+
6	+ # FreeBSD-specific: where we install compilers with non-standard names
7	+ tag_compilers_CC="cc cc gcc gcc clang*"
8	+ tag_compilers_CXX="c++ c++ g++ g++ clang++*"
9	+ base_compiler=`set -- "$@"; echo $1`
10	+
11	+ # If $tagname isn't set, then try to infer if the default "CC" tag applies
12	+ if test -z "$tagname"; then
13	+ for zp in $tag_compilers_CC; do
14	+ case $base_compiler in
15	+ $zp) tagname="CC"; break;;
16	+ esac
17	+ done
18	+ fi
19	+
20	if test -n "$available_tags" && test -z "$tagname"; then
21	@@ -1412,3 +1427,18 @@
22	esac
23	- fi
24	+
25	+ # FreeBSD-specific: try compilers based on inferred tag
26	+ if test -z "$tagname"; then
27	+ eval "tag_compilers=\$tag_compilers_${z}"
28	+ if test -n "$tag_compilers"; then
29	+ for zp in $tag_compilers; do
30	+ case $base_compiler in
31	+ $zp) tagname=$z; break;;
32	+ esac
33	+ done
34	+ if test -n "$tagname"; then
35	+ break
36	+ fi
37	+ fi
38	+ fi
39	+ fi
40	done
41	@@ -3516,2 +3546,5 @@
42	;;
43	+ --freebsd*)
44	+ # FreeBSD doesn't need this...
45	+ ;;
46	*)
47	@@ -5585,2 +5618,3 @@
48	esac
49	+ deplibs="$deplibs $arg"
50	continue
51	@@ -6155,9 +6189,26 @@
52	func_append compiler_flags " $deplib"
53	- if test "$linkmode" = lib ; then
54	- case "$new_inherited_linker_flags " in
55	- " $deplib ") ;;
56	- * ) func_append new_inherited_linker_flags " $deplib" ;;
57	- esac
58	- fi
59	fi
60	+
61	+ case $linkmode in
62	+ lib)
63	+ deplibs="$deplib $deplibs"
64	+ test "$pass" = conv && continue
65	+ newdependency_libs="$deplib $newdependency_libs"
66	+ ;;
67	+ prog)
68	+ if test "$pass" = conv; then
69	+ deplibs="$deplib $deplibs"
70	+ continue
71	+ fi
72	+ if test "$pass" = scan; then
73	+ deplibs="$deplib $deplibs"
74	+ else
75	+ compile_deplibs="$deplib $compile_deplibs"
76	+ finalize_deplibs="$deplib $finalize_deplibs"
77	+ fi
78	+ ;;
79	+ *)
80	+ ;;
81	+ esac # linkmode
82	+
83	continue

Line 0 Link Here

(-)devel/libtool/files/patch-m4_libtool.m4 (+12 lines)
	1	--- m4/libtool.m4.orig 2013-10-25 23:37:46 UTC
	2	+++ m4/libtool.m4
	3	@@ -2547,7 +2547,8 @@ freebsd* \| dragonfly*)
	4	version_type=freebsd-$objformat
	5	case $version_type in
	6	freebsd-elf*)
	7	- library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
	8	+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
	9	+ soname_spec='$libname$release$shared_ext$major'
	10	need_version=no
	11	need_lib_prefix=no
	12	;;

Lines 9-58 share/aclocal/ltoptions.m4 Link Here

(-)devel/libtool/pkg-plist (-47 / +42 lines)
9	share/aclocal/ltsugar.m4	9	share/aclocal/ltsugar.m4
10	share/aclocal/ltversion.m4	10	share/aclocal/ltversion.m4
11	share/aclocal/lt~obsolete.m4	11	share/aclocal/lt~obsolete.m4
12	share/libtool/config/compile	12	%%DATADIR%%/COPYING.LIB
13	share/libtool/config/config.guess	13	%%DATADIR%%/Makefile.am
14	share/libtool/config/config.sub	14	%%DATADIR%%/Makefile.in
15	share/libtool/config/depcomp	15	%%DATADIR%%/README
16	share/libtool/config/install-sh	16	%%DATADIR%%/aclocal.m4
17	share/libtool/config/ltmain.sh	17	%%DATADIR%%/argz.c
18	share/libtool/config/missing	18	%%DATADIR%%/argz_.h
19	share/libtool/libltdl/COPYING.LIB	19	%%DATADIR%%/build-aux/compile
20	share/libtool/libltdl/Makefile.am	20	%%DATADIR%%/build-aux/config.guess
21	share/libtool/libltdl/Makefile.in	21	%%DATADIR%%/build-aux/config.sub
22	share/libtool/libltdl/Makefile.inc	22	%%DATADIR%%/build-aux/depcomp
23	share/libtool/libltdl/README	23	%%DATADIR%%/build-aux/install-sh
24	share/libtool/libltdl/aclocal.m4	24	%%DATADIR%%/build-aux/ltmain.sh
25	share/libtool/libltdl/argz.c	25	%%DATADIR%%/build-aux/missing
26	share/libtool/libltdl/argz_.h	26	%%DATADIR%%/config-h.in
27	share/libtool/libltdl/config-h.in	27	%%DATADIR%%/configure
28	share/libtool/libltdl/configure	28	%%DATADIR%%/configure.ac
29	share/libtool/libltdl/configure.ac	29	%%DATADIR%%/libltdl/lt__alloc.h
30	share/libtool/libltdl/libltdl/lt__alloc.h	30	%%DATADIR%%/libltdl/lt__dirent.h
31	share/libtool/libltdl/libltdl/lt__dirent.h	31	%%DATADIR%%/libltdl/lt__glibc.h
32	share/libtool/libltdl/libltdl/lt__glibc.h	32	%%DATADIR%%/libltdl/lt__private.h
33	share/libtool/libltdl/libltdl/lt__private.h	33	%%DATADIR%%/libltdl/lt__strl.h
34	share/libtool/libltdl/libltdl/lt__strl.h	34	%%DATADIR%%/libltdl/lt_dlloader.h
35	share/libtool/libltdl/libltdl/lt_dlloader.h	35	%%DATADIR%%/libltdl/lt_error.h
36	share/libtool/libltdl/libltdl/lt_error.h	36	%%DATADIR%%/libltdl/lt_system.h
37	share/libtool/libltdl/libltdl/lt_system.h	37	%%DATADIR%%/libltdl/slist.h
38	share/libtool/libltdl/libltdl/slist.h	38	%%DATADIR%%/loaders/dld_link.c
39	share/libtool/libltdl/loaders/dld_link.c	39	%%DATADIR%%/loaders/dlopen.c
40	share/libtool/libltdl/loaders/dlopen.c	40	%%DATADIR%%/loaders/dyld.c
41	share/libtool/libltdl/loaders/dyld.c	41	%%DATADIR%%/loaders/load_add_on.c
42	share/libtool/libltdl/loaders/load_add_on.c	42	%%DATADIR%%/loaders/loadlibrary.c
43	share/libtool/libltdl/loaders/loadlibrary.c	43	%%DATADIR%%/loaders/preopen.c
44	share/libtool/libltdl/loaders/preopen.c	44	%%DATADIR%%/loaders/shl_load.c
45	share/libtool/libltdl/loaders/shl_load.c	45	%%DATADIR%%/lt__alloc.c
46	share/libtool/libltdl/lt__alloc.c	46	%%DATADIR%%/lt__dirent.c
47	share/libtool/libltdl/lt__dirent.c	47	%%DATADIR%%/lt__strl.c
48	share/libtool/libltdl/lt__strl.c	48	%%DATADIR%%/lt_dlloader.c
49	share/libtool/libltdl/lt_dlloader.c	49	%%DATADIR%%/lt_error.c
50	share/libtool/libltdl/lt_error.c	50	%%DATADIR%%/ltdl.c
51	share/libtool/libltdl/ltdl.c	51	%%DATADIR%%/ltdl.h
52	share/libtool/libltdl/ltdl.h	52	%%DATADIR%%/ltdl.mk
53	share/libtool/libltdl/slist.c	53	%%DATADIR%%/slist.c
54	@dirrm share/libtool/libltdl/loaders
55	@dirrm share/libtool/libltdl/libltdl
56	@dirrm share/libtool/libltdl
57	@dirrm share/libtool/config
58	@dirrm share/libtool

Lines 12-29 include/gforth/%%PORTVERSION%%/config.h Link Here

(-)lang/gforth/pkg-plist (-8 / +12 lines)
12	include/gforth/%%PORTVERSION%%/libcc.h	12	include/gforth/%%PORTVERSION%%/libcc.h
13	lib/gforth/%%PORTVERSION%%/gforth-ditc	13	lib/gforth/%%PORTVERSION%%/gforth-ditc
14	lib/gforth/%%PORTVERSION%%/gforth.fi	14	lib/gforth/%%PORTVERSION%%/gforth.fi
15	lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0
16	lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so
17	lib/gforth/%%PORTVERSION%%/libcc-named/cstr.a	15	lib/gforth/%%PORTVERSION%%/libcc-named/cstr.a
18	lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0	16	lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so
19	lib/gforth/%%PORTVERSION%%/libcc-named/socket.so	17	lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0
		18	lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0.0.0
20	lib/gforth/%%PORTVERSION%%/libcc-named/socket.a	19	lib/gforth/%%PORTVERSION%%/libcc-named/socket.a
21	lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0	20	lib/gforth/%%PORTVERSION%%/libcc-named/socket.so
22	lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so	21	lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0
		22	lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0.0.0
23	lib/gforth/%%PORTVERSION%%/libcc-named/libffi.a	23	lib/gforth/%%PORTVERSION%%/libcc-named/libffi.a
24	lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0	24	lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so
25	lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so	25	lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0
		26	lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0.0.0
26	lib/gforth/%%PORTVERSION%%/libcc-named/fflib.a	27	lib/gforth/%%PORTVERSION%%/libcc-named/fflib.a
		28	lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so
		29	lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0
		30	lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0.0.0
27	man/man1/gforth.1.gz	31	man/man1/gforth.1.gz
28	%%DATADIR%%/%%PORTVERSION%%/TAGS	32	%%DATADIR%%/%%PORTVERSION%%/TAGS
29	%%DATADIR%%/%%PORTVERSION%%/add.fs	33	%%DATADIR%%/%%PORTVERSION%%/add.fs

Lines 15-22 LICENSE_FILE= ${WRKSRC}/COPYING Link Here

(-)net-mgmt/monitoring-plugins/Makefile (-10 / +11 lines)
15		15
16	CONFLICTS_INSTALL= nagios-plugins-*	16	CONFLICTS_INSTALL= nagios-plugins-*
17		17
18	USES= charsetfix gmake perl5 libtool autoreconf	18	USES= charsetfix gmake perl5 libtool
19	CHARSETFIX_MAKEFILEIN=Makefile.am
20	USE_SUBMAKE= yes	19	USE_SUBMAKE= yes
21		20
22	OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS	21	OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS
Lines 70-93 CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCG Link Here
70	CONFIGURE_ARGS+=--with-qmail-qstat-command=/var/qmail/bin/qmail-qstat	69	CONFIGURE_ARGS+=--with-qmail-qstat-command=/var/qmail/bin/qmail-qstat
71		70
72	CPPFLAGS+= -I${LOCALBASE}/include	71	CPPFLAGS+= -I${LOCALBASE}/include
73	LDFLAGS+= -L${LOCALBASE}/lib	72	LIBS+= -L${LOCALBASE}/lib
74	CFLAGS+= -I${LOCALBASE}/include
75		73
76	QSTAT_BUILD_DEPENDS= qstat:${PORTSDIR}/games/qstat	74	QSTAT_BUILD_DEPENDS= qstat:${PORTSDIR}/games/qstat
77	QSTAT_RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat	75	QSTAT_RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat
78	QSTAT_CONFIGURE_ENABLE= qstat	76	QSTAT_CONFIGURE_OFF= ac_cv_path_PATH_TO_QUAKESTAT= \
		77	ac_cv_path_PATH_TO_QSTAT=
79		78
80	IPV6_CONFIGURE_WITH= ipv6	79	IPV6_CONFIGURE_WITH= ipv6
81		80
82	FPING_BUILD_DEPENDS= fping:${PORTSDIR}/net/fping	81	FPING_BUILD_DEPENDS= fping:${PORTSDIR}/net/fping
83	FPING_RUN_DEPENDS= fping:${PORTSDIR}/net/fping	82	FPING_RUN_DEPENDS= fping:${PORTSDIR}/net/fping
84	FPING_CONFIGURE_ENABLE= fping	83	FPING_CONFIGURE_OFF= ac_cv_path_PATH_TO_FPING= \
		84	ac_cv_path_PATH_TO_FPING6=
85		85
86	NETSNMP_BUILD_DEPENDS= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \	86	NETSNMP_BUILD_DEPENDS= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
87	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP	87	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
88	NETSNMP_RUN_DEPENDS= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \	88	NETSNMP_RUN_DEPENDS= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
89	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP	89	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
90	NETSNMP_CONFIGURE_ENABLE= snmp	90	NETSNMP_CONFIGURE_OFF= ac_cv_path_PATH_TO_SNMPGET= \
		91	ac_cv_path_PATH_TO_SNMPGETNEXT=
91		92
92	RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient	93	RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
93	RADIUS_CONFIGURE_WITH= radius	94	RADIUS_CONFIGURE_WITH= radius
Lines 147-156 post-patch: Link Here
147	check_users.c	148	check_users.c
148	@${REINPLACE_CMD} -e 's\|setlocale (LC_ALL, "");\|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");\|g' ${WRKSRC}/plugins/${file}	149	@${REINPLACE_CMD} -e 's\|setlocale (LC_ALL, "");\|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");\|g' ${WRKSRC}/plugins/${file}
149	.endfor	150	.endfor
150	@${REINPLACE_CMD} -e 's\|chown root\|${TRUE}\|g' ${WRKSRC}/plugins-root/Makefile.am	151	@${REINPLACE_CMD} -e 's\|chown root\|${TRUE}\|g' ${WRKSRC}/plugins-root/Makefile.in
151	.if ${PORT_OPTIONS:MJAIL}	152	.if ${PORT_OPTIONS:MJAIL}
152	@${REINPLACE_CMD} -e 's# 127.0.0.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure.ac	153	@${REINPLACE_CMD} -e 's# 127\.0\.0\.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure
153	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure.ac	154	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure
154	.endif	155	.endif
155		156
156	.include <bsd.port.mk>	157	.include <bsd.port.mk>

Lines 1-414 Link Here

(-)net-mgmt/monitoring-plugins/files/patch-configure.ac (-414 lines)
1	--- configure.ac.orig 2014-07-11 09:15:18 UTC
2	+++ configure.ac
3	@@ -44,6 +44,7 @@
4	gl_EARLY
5	AC_PROG_GCC_TRADITIONAL
6	AC_PROG_LIBTOOL
7	+AC_PROG_RANLIB
8
9	AM_PROG_CC_C_O
10
11	@@ -212,8 +213,8 @@
12	AC_CHECK_LIB(crypt,main)
13	if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
14	if test -n "$PGSQL"; then
15	- LDFLAGS="$LDFLAGS -L$PGSQL/lib"
16	- CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
17	+ LDFLAGS="${LDFLAGS} -L$PGSQL/lib"
18	+ CPPFLAGS="${CPPFLAGS} -I$PGSQL/include"
19	fi
20	AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
21	if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
22	@@ -257,10 +258,10 @@
23	dnl Check for DBI libraries
24	AS_IF([test "x$with_dbi" != "xno"], [
25	_SAVEDLIBS="$LIBS"
26	- AC_CHECK_LIB(dbi,dbi_initialize)
27	+ AC_CHECK_LIB(dbi,dbi_initialize,,,-L${LOCALBASE}/lib)
28	if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then
29	EXTRAS="$EXTRAS check_dbi\$(EXEEXT)"
30	- DBILIBS="-ldbi"
31	+ DBILIBS="-L${LOCALBASE}/lib -ldbi"
32	AC_SUBST(DBILIBS)
33	else
34	AC_MSG_WARN([Skipping dbi plugin])
35	@@ -275,15 +276,12 @@
36	AS_IF([test "x$with_radius" != "xno"], [
37	_SAVEDLIBS="$LIBS"
38	AC_CHECK_LIB(freeradius-client,rc_read_config)
39	- if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then
40	- EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
41	- RADIUSLIBS="-lfreeradius-client"
42	- AC_SUBST(RADIUSLIBS)
43	- else
44	- AC_CHECK_LIB(radiusclient-ng,rc_read_config)
45	+ AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib)
46	if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
47	EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
48	RADIUSLIBS="-lradiusclient-ng"
49	+ RADIUSINCLUDE="-I${LOCALBSE}/include"
50	+ AC_SUBST(RADIUSINCLUDE)
51	AC_SUBST(RADIUSLIBS)
52	else
53	AC_CHECK_LIB(radiusclient,rc_read_config)
54	@@ -296,7 +294,6 @@
55	AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
56	fi
57	fi
58	- fi
59	LIBS="$_SAVEDLIBS"
60	])
61
62	@@ -305,12 +302,13 @@
63	dnl Check for LDAP libraries
64	AS_IF([test "x$with_ldap" != "xno"], [
65	_SAVEDLIBS="$LIBS"
66	- AC_CHECK_LIB(ldap,main,,,-llber)
67	- if test "$ac_cv_lib_ldap_main" = "yes"; then
68	- LDAPLIBS="-lldap -llber"\
69	- LDAPINCLUDE="-I/usr/include/ldap"
70	+ AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber)
71	+ if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then
72	+ LDAPLIBS="-L${LOCALBSE}/lib -lldap -llber"
73	+ LDAPINCLUDE="-I${LOCALBASE}/include"
74	AC_SUBST(LDAPLIBS)
75	AC_SUBST(LDAPINCLUDE)
76	+ LIBS="-L${LOCALBASE}/lib $LIBS"
77	AC_CHECK_FUNCS(ldap_set_option)
78	EXTRAS="$EXTRAS check_ldap\$(EXEEXT)"
79	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
80	@@ -740,22 +738,10 @@
81	dnl ac_cv_ps_cols=8
82	dnl AC_MSG_RESULT([$ac_cv_ps_command])
83
84	-dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
85	-dnl so test for this first...
86	-elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null \| \
87	- egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
88	-then
89	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
90	- ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'"
91	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
92	- ac_cv_ps_cols=9
93	- AC_MSG_RESULT([$ac_cv_ps_command])
94	-
95	-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
96	-dnl Should also work for FreeBSD 5.2.1 and 5.3
97	-dnl STAT UCOMM VSZ RSS USER PPID COMMAND
98	+dnl FreeBSD 5.x and above
99	+dnl STAT COMMAND VSZ RSS USER UID PID PPID COMMAND
100	elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null \| \
101	- egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
102	+ egrep -i ["^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
103	then
104	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
105	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
106	@@ -763,9 +749,8 @@
107	ac_cv_ps_cols=9
108	AC_MSG_RESULT([$ac_cv_ps_command])
109
110	-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
111	-dnl Limitation: Only first 16 chars returned for ucomm field
112	-dnl Must come before ps -weo
113	+dnl FreeBSD 4.x
114	+dnl STAT UID PID PPID VSZ RSS %CPU UCOMM COMMAND
115	elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null \| \
116	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
117	then
118	@@ -775,209 +760,6 @@
119	ac_cv_ps_cols=9
120	AC_MSG_RESULT([$ac_cv_ps_command])
121
122	-dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
123	-elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null \| \
124	- egrep -i ["^ S[TAUES] +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
125	-then
126	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
127	- ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'"
128	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n"
129	- ac_cv_ps_cols=10
130	- AC_MSG_RESULT([$ac_cv_ps_command])
131	-
132	-dnl FreeBSD
133	-elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null \| \
134	- egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null
135	-then
136	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
137	- ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'"
138	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
139	- ac_cv_ps_cols=9
140	- AC_MSG_RESULT([$ac_cv_ps_command])
141	-
142	-dnl BSD-like mode in RH 6.1
143	-elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null \| \
144	- egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
145	-then
146	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
147	- ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'"
148	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
149	- ac_cv_ps_cols=9
150	- AC_MSG_RESULT([$ac_cv_ps_command])
151	-
152	-dnl SunOS 4.1.3:
153	-dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND
154	-dnl Need the head -1 otherwise test will work because arguments are found
155	-elif ps -laxnwww 2>/dev/null \| head -1 \| \
156	- egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)\|(VSZ)\|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
157	-then
158	- ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
159	- ac_cv_ps_command="$PATH_TO_PS -laxnwww"
160	- ac_cv_ps_format="%s %d %d %d %s %s %s %d %d %s %s %s %*s %n%s"
161	- ac_cv_ps_cols=9
162	- AC_MSG_RESULT([$ac_cv_ps_command])
163	-
164	-dnl Debian Linux / procps v1.2.9:
165	-dnl FLAGS UID PID PPID PRI NI SIZE RSS WCHAN STA TTY TIME COMMAND
166	-dnl 100 0 1 0 0 0 776 76 c0131c8c S ffff 0:11 init [2]
167	-dnl
168	-elif ps laxnwww 2>/dev/null \| \
169	- egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)\|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
170	-then
171	- ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
172	- ac_cv_ps_command="$PATH_TO_PS laxnwww"
173	- ac_cv_ps_format="%s %d %d %d %s %s %d %d %s %s %s %s %n%s"
174	- ac_cv_ps_cols=9
175	- AC_MSG_RESULT([$ac_cv_ps_command])
176	-
177	-dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
178	-elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null \| \
179	- egrep -i ["^ S[TAUES] +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
180	-then
181	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
182	- ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'"
183	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
184	- ac_cv_ps_cols=9
185	- AC_MSG_RESULT([$ac_cv_ps_command])
186	-
187	-dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
188	-dnl Has /usr/bin/ps and /sbin/ps - force sbin version
189	-dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
190	-dnl of 1500). Will need big changes to check_procs to support
191	-elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null \| \
192	- egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
193	-then
194	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]"
195	- ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'"
196	- ac_cv_ps_format=["%s%*[ +<>] %d %d %d %f %s %s %n"]
197	- ac_cv_ps_cols=8
198	- AC_MSG_RESULT([$ac_cv_ps_command])
199	-
200	-elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null \| \
201	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
202	-then
203	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
204	- ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'"
205	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
206	- ac_cv_ps_cols=9
207	- AC_MSG_RESULT([$ac_cv_ps_command])
208	-
209	-dnl AIX 4.3.3 and 5.1 do not have an rss field
210	-elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null \| \
211	- egrep -i ["^ S[TAUES] +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
212	-then
213	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
214	- ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'"
215	- ac_cv_ps_format="%s %d %d %d %d %f %s %n"
216	- ac_cv_ps_cols=8
217	- AC_MSG_RESULT([$ac_cv_ps_command - with no RSS])
218	-
219	-dnl Solaris 2.6
220	-elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null \| \
221	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
222	-then
223	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
224	- ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
225	- # There must be no space between the %s and %n due to a wierd problem in sscanf where
226	- # it will return %n as longer than the line length
227	- ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
228	- ac_cv_ps_cols=9
229	- AC_MSG_RESULT([$ac_cv_ps_command])
230	-
231	-elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null \| \
232	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
233	-then
234	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
235	- ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'"
236	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
237	- ac_cv_ps_cols=9
238	- AC_MSG_RESULT([$ac_cv_ps_command])
239	-
240	-elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null \| \
241	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
242	-then
243	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
244	- ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'"
245	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
246	- ac_cv_ps_cols=9
247	- AC_MSG_RESULT([$ac_cv_ps_command])
248	-
249	-dnl wonder who takes state instead of stat
250	-elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null \| \
251	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
252	-then
253	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
254	- ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'"
255	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
256	- ac_cv_ps_cols=8
257	- AC_MSG_RESULT([$ac_cv_ps_command])
258	-
259	-dnl IRIX 53
260	-elif ps -el 2>/dev/null \| \
261	- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
262	-then
263	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]"
264	- ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
265	- ac_cv_ps_format="%s %s %d %d %d %s %s %s %s %d %d %s %s %s %n%s"
266	- ac_cv_ps_cols=8
267	- AC_MSG_RESULT([$ac_cv_ps_command])
268	-
269	-dnl IRIX 63
270	-elif ps -el 2>/dev/null \| \
271	- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
272	-then
273	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
274	- ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
275	- ac_cv_ps_format="%s %s %d %d %d %s %s %s %s %s %s %s %s %s %*s %n%s"
276	- ac_cv_ps_cols=6
277	- AC_MSG_RESULT([$ac_cv_ps_command])
278	-
279	-dnl AIX 4.1:
280	-dnl F S UID PID PPID C PRI NI ADDR SZ RSS WCHAN TTY TIME CMD
281	-dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45 swapper
282	-elif ps -el 2>/dev/null \| \
283	- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
284	-then
285	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
286	- ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
287	- ac_cv_ps_format="%s %s %d %d %d %s %s %s %s %s %s %s %*s %n%s"
288	- ac_cv_ps_cols=6
289	- AC_MSG_RESULT([$ac_cv_ps_command])
290	-
291	-dnl AIX?
292	-elif ps glaxen 2>/dev/null \| \
293	- egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
294	-then
295	- ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
296	- ac_cv_ps_command="$PATH_TO_PS glaxen"
297	- ac_cv_ps_format="%s %d %d %d %s %s %d %d %s %s %s %s %n%s"
298	- ac_cv_ps_cols=8
299	- AC_MSG_RESULT([$ac_cv_ps_command])
300	-
301	-dnl MacOSX / Darwin
302	-dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT
303	-dnl Some truncation will happen in UCOMM column
304	-dnl STAT VSZ RSS UID PPID %CPU UCOMM COMMAND
305	-dnl Ss 52756 22496 501 1 6.9 Window Manager /System/Library/CoreServices/WindowServer -daemon
306	-elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null \| \
307	- egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
308	-then
309	- ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'"
310	- ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]"
311	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
312	- ac_cv_ps_cols=8
313	- AC_MSG_RESULT([$ac_cv_ps_command])
314	-
315	-dnl UnixWare
316	-elif ps -Al 2>/dev/null \| \
317	- egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
318	-then
319	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
320	- ac_cv_ps_command="$PATH_TO_PS -Al"
321	- ac_cv_ps_format="%s %s %d %d %d %s %s %s %s %s %s %s %s %s %n%s"
322	- ac_cv_ps_cols=8
323	- AC_MSG_RESULT([$ac_cv_ps_command])
324	-
325	else
326	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
327	fi
328	@@ -1376,6 +1158,8 @@
329	AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares])
330	fi
331
332	+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
333	+if test x$enable_snmp = xyes; then
334	AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
335	AC_ARG_WITH(snmpget_command,
336	ACX_HELP_STRING([--with-snmpget-command=PATH],
337	@@ -1406,7 +1190,10 @@
338	else
339	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
340	fi
341	+fi
342
343	+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
344	+if test x$enable_qstat = xyes; then
345	AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
346	AC_PATH_PROG(PATH_TO_QSTAT,qstat)
347	AC_ARG_WITH(qstat_command,
348	@@ -1431,7 +1218,10 @@
349	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
350	[path to qstat/quakestat])
351	fi
352	+fi
353
354	+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
355	+if test x$enable_fping = xyes; then
356	AC_PATH_PROG(PATH_TO_FPING,fping)
357	AC_PATH_PROG(PATH_TO_FPING6,fping6)
358
359	@@ -1452,6 +1242,7 @@
360	else
361	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
362	fi
363	+fi
364
365	AC_PATH_PROG(PATH_TO_SSH,ssh)
366	AC_ARG_WITH(ssh_command,
367	@@ -1519,32 +1310,12 @@
368	dnl end if for PATH_TO_SWAP
369	fi
370
371	-AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
372	-if (test -n "$PATH_TO_SWAPINFO")
373	-then
374	-AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format])
375	-if [$PATH_TO_SWAPINFO -k 2>&1 \| egrep -i "^Device" >/dev/null]
376	-then
377	- ac_cv_have_swap=yes
378	- ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
379	-
380	- if [$PATH_TO_SWAPINFO -k 2>/dev/null \| egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
381	- then
382	- ac_cv_swap_format=["%s %f %d %f"]
383	- ac_cv_swap_conv=1024
384	- AC_MSG_RESULT([using FreeBSD format swapinfo])
385	- fi
386	-
387	-elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null \| egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
388	-then
389	- ac_cv_have_swap=yes
390	- ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
391	- ac_cv_swap_format=["%s %f %d %f"]
392	- ac_cv_swap_conv=1024
393	- AC_MSG_RESULT([using HP-UX format swapinfo])
394	-fi
395	-dnl end if for PATH_TO_SWAPINFO
396	-fi
397	+PATH_TO_SWAPINFO="/usr/sbin/swapinfo"
398	+ac_cv_have_swap=yes
399	+ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
400	+ac_cv_swap_format=["%s %f %d %f"]
401	+ac_cv_swap_conv=1024
402	+AC_MSG_RESULT([using FreeBSD format swapinfo])
403
404	AC_PATH_PROG(PATH_TO_LSPS,lsps)
405	if (test -n "$PATH_TO_LSPS")
406	@@ -1737,7 +1508,7 @@
407	AC_SUBST(DEPLIBS)
408
409	AM_GNU_GETTEXT([external], [need-ngettext])
410	-AM_GNU_GETTEXT_VERSION(0.15)
411	+AM_GNU_GETTEXT_VERSION(0.18)
412
413	dnl Check for Redhat spopen problem
414	dnl Wierd problem where ECHILD is returned from a wait call in error

Lines 1-18 Link Here

(-)net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4 (-18 lines)
1	--- gl/m4/extensions.m4.orig 2014-06-18 19:37:06 UTC
2	+++ gl/m4/extensions.m4
3	@@ -16,6 +16,7 @@
4	# warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
5	# or warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
6	# the fix is
7	+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
8	# 1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
9	# but always AC_REQUIREd,
10	# 2) to ensure that for each occurrence of
11	@@ -49,6 +50,7 @@
12	except with this defined.])
13	AC_DEFINE([_MINIX], [1],
14	[Define to 1 if on MINIX.])
15	+])
16	AC_DEFINE([_NETBSD_SOURCE], [1],
17	[Define to 1 to make NetBSD features available. MINIX 3 needs this.])
18	fi

Lines 17-24 LICENSE_FILE= ${WRKSRC}/COPYING Link Here

(-)net-mgmt/nagios-plugins/Makefile (-10 / +11 lines)
17		17
18	CONFLICTS_INSTALL= monitoring-plugins-*	18	CONFLICTS_INSTALL= monitoring-plugins-*
19		19
20	USES= charsetfix gmake perl5 libtool autoreconf	20	USES= charsetfix gmake perl5 libtool
21	CHARSETFIX_MAKEFILEIN=Makefile.am
22	USE_SUBMAKE= yes	21	USE_SUBMAKE= yes
23		22
24	OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS	23	OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS
Lines 76-99 CONFIGURE_ARGS+=--with-qmail-qstat-comma Link Here
76		75
77	CONFIGURE_ENV= PERL=${PERL}	76	CONFIGURE_ENV= PERL=${PERL}
78	CPPFLAGS+= -I${LOCALBASE}/include	77	CPPFLAGS+= -I${LOCALBASE}/include
79	LDFLAGS+= -L${LOCALBASE}/lib	78	LIBS+= -L${LOCALBASE}/lib
80	CFLAGS+= -I${LOCALBASE}/include
81		79
82	QSTAT_BUILD_DEPENDS= qstat:${PORTSDIR}/games/qstat	80	QSTAT_BUILD_DEPENDS= qstat:${PORTSDIR}/games/qstat
83	QSTAT_RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat	81	QSTAT_RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat
84	QSTAT_CONFIGURE_ENABLE= qstat	82	QSTAT_CONFIGURE_OFF= ac_cv_path_PATH_TO_QUAKESTAT= \
		83	ac_cv_path_PATH_TO_QSTAT=
85		84
86	IPV6_CONFIGURE_WITH= ipv6	85	IPV6_CONFIGURE_WITH= ipv6
87		86
88	FPING_BUILD_DEPENDS= fping:${PORTSDIR}/net/fping	87	FPING_BUILD_DEPENDS= fping:${PORTSDIR}/net/fping
89	FPING_RUN_DEPENDS= fping:${PORTSDIR}/net/fping	88	FPING_RUN_DEPENDS= fping:${PORTSDIR}/net/fping
90	FPING_CONFIGURE_ENABLE= fping	89	FPING_CONFIGURE_OFF= ac_cv_path_PATH_TO_FPING= \
		90	ac_cv_path_PATH_TO_FPING6=
91		91
92	NETSNMP_BUILD_DEPENDS= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \	92	NETSNMP_BUILD_DEPENDS= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
93	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP	93	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
94	NETSNMP_RUN_DEPENDS= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \	94	NETSNMP_RUN_DEPENDS= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
95	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP	95	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
96	NETSNMP_CONFIGURE_ENABLE= snmp	96	NETSNMP_CONFIGURE_OFF= ac_cv_path_PATH_TO_SNMPGET= \
		97	ac_cv_path_PATH_TO_SNMPGETNEXT=
97		98
98	RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient	99	RADIUS_LIB_DEPENDS= libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
99	RADIUS_CONFIGURE_WITH= radius	100	RADIUS_CONFIGURE_WITH= radius
Lines 153-164 post-patch: Link Here
153	check_users.c	154	check_users.c
154	@${REINPLACE_CMD} -e 's\|setlocale (LC_ALL, "");\|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");\|g' ${WRKSRC}/plugins/${file}	155	@${REINPLACE_CMD} -e 's\|setlocale (LC_ALL, "");\|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");\|g' ${WRKSRC}/plugins/${file}
155	.endfor	156	.endfor
156	@${REINPLACE_CMD} -e 's\|chown root\|${TRUE}\|g' ${WRKSRC}/plugins-root/Makefile.am	157	@${REINPLACE_CMD} -e 's\|chown root\|${TRUE}\|g' ${WRKSRC}/plugins-root/Makefile.in
157	# add a fake PATH so that it gets set to a correct value during build.	158	# add a fake PATH so that it gets set to a correct value during build.
158	@${REINPLACE_CMD} -e "s\|$$ENV{'PATH'}=''\|$$ENV{'PATH'}='foo'\|" ${WRKSRC}/plugins-scripts/*.pl	159	@${REINPLACE_CMD} -e "s\|$$ENV{'PATH'}=''\|$$ENV{'PATH'}='foo'\|" ${WRKSRC}/plugins-scripts/*.pl
159	.if ${PORT_OPTIONS:MJAIL}	160	.if ${PORT_OPTIONS:MJAIL}
160	@${REINPLACE_CMD} -e 's# 127.0.0.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure.ac	161	@${REINPLACE_CMD} -e 's# 127\.0\.0\.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure
161	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure.ac	162	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure
162	.endif	163	.endif
163		164
164	.include <bsd.port.mk>	165	.include <bsd.port.mk>

Lines 1-423 Link Here

(-)net-mgmt/nagios-plugins/files/patch-configure.ac (-423 lines)
1	--- configure.ac.orig 2014-06-26 16:17:12 UTC
2	+++ configure.ac
3	@@ -13,8 +13,6 @@
4	RELEASE=1
5	AC_SUBST(RELEASE)
6
7	-AC_PREFIX_DEFAULT(/usr/local/nagios)
8	-
9	dnl Deprecated configure options
10
11
12	@@ -45,6 +43,7 @@
13	gl_EARLY
14	AC_PROG_GCC_TRADITIONAL
15	AC_PROG_LIBTOOL
16	+AC_PROG_RANLIB
17
18	AM_PROG_CC_C_O
19
20	@@ -216,8 +215,8 @@
21	AC_CHECK_LIB(crypt,main)
22	if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
23	if test -n "$PGSQL"; then
24	- LDFLAGS="$LDFLAGS -L$PGSQL/lib"
25	- CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
26	+ LDFLAGS="${LDFLAGS} -L$PGSQL/lib"
27	+ CPPFLAGS="${CPPFLAGS} -I$PGSQL/include"
28	fi
29	AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
30	if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
31	@@ -261,10 +260,10 @@
32	dnl Check for DBI libraries
33	AS_IF([test "x$with_dbi" != "xno"], [
34	_SAVEDLIBS="$LIBS"
35	- AC_CHECK_LIB(dbi,dbi_initialize)
36	+ AC_CHECK_LIB(dbi,dbi_initialize,,,-L${LOCALBASE}/lib)
37	if test "$ac_cv_lib_dbi_dbi_initialize" = "yes"; then
38	EXTRAS="$EXTRAS check_dbi\$(EXEEXT)"
39	- DBILIBS="-ldbi"
40	+ DBILIBS="-L${LOCALBASE}/lib -ldbi"
41	AC_SUBST(DBILIBS)
42	else
43	AC_MSG_WARN([Skipping dbi plugin])
44	@@ -278,22 +277,17 @@
45	dnl Check for radius libraries
46	AS_IF([test "x$with_radius" != "xno"], [
47	_SAVEDLIBS="$LIBS"
48	- AC_CHECK_LIB(radiusclient,rc_read_config)
49	- if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
50	- EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
51	- RADIUSLIBS="-lradiusclient"
52	- AC_SUBST(RADIUSLIBS)
53	- else
54	- AC_CHECK_LIB(radiusclient-ng,rc_read_config)
55	+ AC_CHECK_LIB(radiusclient-ng,rc_read_config,,,-L${LOCALBASE}/lib)
56	if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
57	EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
58	- RADIUSLIBS="-lradiusclient-ng"
59	+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient-ng"
60	+ RADIUSINCLUDE="-I${LOCALBSE}/include"
61	AC_SUBST(RADIUSLIBS)
62	+ AC_SUBST(RADIUSINCLUDE)
63	else
64	AC_MSG_WARN([Skipping radius plugin])
65	AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
66	fi
67	- fi
68	LIBS="$_SAVEDLIBS"
69	])
70
71	@@ -302,12 +296,13 @@
72	dnl Check for LDAP libraries
73	AS_IF([test "x$with_ldap" != "xno"], [
74	_SAVEDLIBS="$LIBS"
75	- AC_CHECK_LIB(ldap,main,,,-llber)
76	- if test "$ac_cv_lib_ldap_main" = "yes"; then
77	- LDAPLIBS="-lldap -llber"\
78	- LDAPINCLUDE="-I/usr/include/ldap"
79	+ AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber)
80	+ if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then
81	+ LDAPLIBS="-L${LOCALBSE}/lib -lldap -llber"
82	+ LDAPINCLUDE="-I${LOCALBASE}/include"
83	AC_SUBST(LDAPLIBS)
84	AC_SUBST(LDAPINCLUDE)
85	+ LIBS="-L${LOCALBASE}/lib $LIBS"
86	AC_CHECK_FUNCS(ldap_set_option)
87	EXTRAS="$EXTRAS check_ldap\$(EXEEXT)"
88	AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
89	@@ -755,22 +750,10 @@
90	dnl ac_cv_ps_cols=8
91	dnl AC_MSG_RESULT([$ac_cv_ps_command])
92
93	-dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
94	-dnl so test for this first...
95	-elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null \| \
96	- egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
97	-then
98	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
99	- ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'"
100	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
101	- ac_cv_ps_cols=9
102	- AC_MSG_RESULT([$ac_cv_ps_command])
103	-
104	-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
105	-dnl Should also work for FreeBSD 5.2.1 and 5.3
106	-dnl STAT UCOMM VSZ RSS USER PPID COMMAND
107	+dnl FreeBSD 5.x and above
108	+dnl STAT COMMAND VSZ RSS USER UID PID PPID COMMAND
109	elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null \| \
110	- egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
111	+ egrep -i ["^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
112	then
113	ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
114	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
115	@@ -778,9 +761,8 @@
116	ac_cv_ps_cols=9
117	AC_MSG_RESULT([$ac_cv_ps_command])
118
119	-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
120	-dnl Limitation: Only first 16 chars returned for ucomm field
121	-dnl Must come before ps -weo
122	+dnl FreeBSD 4.x
123	+dnl STAT UID PID PPID VSZ RSS %CPU UCOMM COMMAND
124	elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null \| \
125	egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
126	then
127	@@ -790,209 +772,6 @@
128	ac_cv_ps_cols=9
129	AC_MSG_RESULT([$ac_cv_ps_command])
130
131	-dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
132	-elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null \| \
133	- egrep -i ["^ S[TAUES] +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
134	-then
135	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
136	- ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'"
137	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n"
138	- ac_cv_ps_cols=10
139	- AC_MSG_RESULT([$ac_cv_ps_command])
140	-
141	-dnl FreeBSD
142	-elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null \| \
143	- egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null
144	-then
145	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
146	- ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'"
147	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
148	- ac_cv_ps_cols=9
149	- AC_MSG_RESULT([$ac_cv_ps_command])
150	-
151	-dnl BSD-like mode in RH 6.1
152	-elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null \| \
153	- egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
154	-then
155	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
156	- ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'"
157	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
158	- ac_cv_ps_cols=9
159	- AC_MSG_RESULT([$ac_cv_ps_command])
160	-
161	-dnl SunOS 4.1.3:
162	-dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND
163	-dnl Need the head -1 otherwise test will work because arguments are found
164	-elif ps -laxnwww 2>/dev/null \| head -1 \| \
165	- egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)\|(VSZ)\|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
166	-then
167	- ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
168	- ac_cv_ps_command="$PATH_TO_PS -laxnwww"
169	- ac_cv_ps_format="%s %d %d %d %s %s %s %d %d %s %s %s %*s %n%s"
170	- ac_cv_ps_cols=9
171	- AC_MSG_RESULT([$ac_cv_ps_command])
172	-
173	-dnl Debian Linux / procps v1.2.9:
174	-dnl FLAGS UID PID PPID PRI NI SIZE RSS WCHAN STA TTY TIME COMMAND
175	-dnl 100 0 1 0 0 0 776 76 c0131c8c S ffff 0:11 init [2]
176	-dnl
177	-elif ps laxnwww 2>/dev/null \| \
178	- egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)\|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
179	-then
180	- ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
181	- ac_cv_ps_command="$PATH_TO_PS laxnwww"
182	- ac_cv_ps_format="%s %d %d %d %s %s %d %d %s %s %s %s %n%s"
183	- ac_cv_ps_cols=9
184	- AC_MSG_RESULT([$ac_cv_ps_command])
185	-
186	-dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
187	-elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null \| \
188	- egrep -i ["^ S[TAUES] +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
189	-then
190	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
191	- ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'"
192	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
193	- ac_cv_ps_cols=9
194	- AC_MSG_RESULT([$ac_cv_ps_command])
195	-
196	-dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
197	-dnl Has /usr/bin/ps and /sbin/ps - force sbin version
198	-dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
199	-dnl of 1500). Will need big changes to check_procs to support
200	-elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null \| \
201	- egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
202	-then
203	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]"
204	- ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'"
205	- ac_cv_ps_format=["%s%*[ +<>] %d %d %d %f %s %s %n"]
206	- ac_cv_ps_cols=8
207	- AC_MSG_RESULT([$ac_cv_ps_command])
208	-
209	-elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null \| \
210	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
211	-then
212	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
213	- ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'"
214	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
215	- ac_cv_ps_cols=9
216	- AC_MSG_RESULT([$ac_cv_ps_command])
217	-
218	-dnl AIX 4.3.3 and 5.1 do not have an rss field
219	-elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null \| \
220	- egrep -i ["^ S[TAUES] +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
221	-then
222	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
223	- ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'"
224	- ac_cv_ps_format="%s %d %d %d %d %f %s %n"
225	- ac_cv_ps_cols=8
226	- AC_MSG_RESULT([$ac_cv_ps_command - with no RSS])
227	-
228	-dnl Solaris 2.6
229	-elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null \| \
230	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
231	-then
232	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
233	- ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
234	- # There must be no space between the %s and %n due to a wierd problem in sscanf where
235	- # it will return %n as longer than the line length
236	- ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
237	- ac_cv_ps_cols=9
238	- AC_MSG_RESULT([$ac_cv_ps_command])
239	-
240	-elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null \| \
241	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
242	-then
243	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
244	- ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'"
245	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
246	- ac_cv_ps_cols=9
247	- AC_MSG_RESULT([$ac_cv_ps_command])
248	-
249	-elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null \| \
250	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
251	-then
252	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
253	- ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'"
254	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
255	- ac_cv_ps_cols=9
256	- AC_MSG_RESULT([$ac_cv_ps_command])
257	-
258	-dnl wonder who takes state instead of stat
259	-elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null \| \
260	- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
261	-then
262	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
263	- ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'"
264	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
265	- ac_cv_ps_cols=8
266	- AC_MSG_RESULT([$ac_cv_ps_command])
267	-
268	-dnl IRIX 53
269	-elif ps -el 2>/dev/null \| \
270	- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
271	-then
272	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]"
273	- ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
274	- ac_cv_ps_format="%s %s %d %d %d %s %s %s %s %d %d %s %s %s %n%s"
275	- ac_cv_ps_cols=8
276	- AC_MSG_RESULT([$ac_cv_ps_command])
277	-
278	-dnl IRIX 63
279	-elif ps -el 2>/dev/null \| \
280	- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
281	-then
282	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
283	- ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
284	- ac_cv_ps_format="%s %s %d %d %d %s %s %s %s %s %s %s %s %s %*s %n%s"
285	- ac_cv_ps_cols=6
286	- AC_MSG_RESULT([$ac_cv_ps_command])
287	-
288	-dnl AIX 4.1:
289	-dnl F S UID PID PPID C PRI NI ADDR SZ RSS WCHAN TTY TIME CMD
290	-dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45 swapper
291	-elif ps -el 2>/dev/null \| \
292	- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
293	-then
294	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
295	- ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
296	- ac_cv_ps_format="%s %s %d %d %d %s %s %s %s %s %s %s %*s %n%s"
297	- ac_cv_ps_cols=6
298	- AC_MSG_RESULT([$ac_cv_ps_command])
299	-
300	-dnl AIX?
301	-elif ps glaxen 2>/dev/null \| \
302	- egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
303	-then
304	- ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
305	- ac_cv_ps_command="$PATH_TO_PS glaxen"
306	- ac_cv_ps_format="%s %d %d %d %s %s %d %d %s %s %s %s %n%s"
307	- ac_cv_ps_cols=8
308	- AC_MSG_RESULT([$ac_cv_ps_command])
309	-
310	-dnl MacOSX / Darwin
311	-dnl TODO: MacOSX has commands with spaces which will cause problems to PS_FORMAT
312	-dnl Some truncation will happen in UCOMM column
313	-dnl STAT VSZ RSS UID PPID %CPU UCOMM COMMAND
314	-dnl Ss 52756 22496 501 1 6.9 Window Manager /System/Library/CoreServices/WindowServer -daemon
315	-elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null \| \
316	- egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
317	-then
318	- ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'"
319	- ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]"
320	- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
321	- ac_cv_ps_cols=8
322	- AC_MSG_RESULT([$ac_cv_ps_command])
323	-
324	-dnl UnixWare
325	-elif ps -Al 2>/dev/null \| \
326	- egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
327	-then
328	- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
329	- ac_cv_ps_command="$PATH_TO_PS -Al"
330	- ac_cv_ps_format="%s %s %d %d %d %s %s %s %s %s %s %s %s %s %n%s"
331	- ac_cv_ps_cols=8
332	- AC_MSG_RESULT([$ac_cv_ps_command])
333	-
334	else
335	AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
336	fi
337	@@ -1391,6 +1170,8 @@
338	AC_MSG_WARN([Get smbclient from Samba.org to monitor SMB shares])
339	fi
340
341	+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
342	+if test x$enable_snmp = xyes; then
343	AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
344	AC_ARG_WITH(snmpget_command,
345	ACX_HELP_STRING([--with-snmpget-command=PATH],
346	@@ -1421,7 +1202,10 @@
347	else
348	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
349	fi
350	+fi
351
352	+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game)
353	+if test x$enable_qstat = xyes; then
354	AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
355	AC_PATH_PROG(PATH_TO_QSTAT,qstat)
356	AC_ARG_WITH(qstat_command,
357	@@ -1446,7 +1230,10 @@
358	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
359	[path to qstat/quakestat])
360	fi
361	+fi
362
363	+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
364	+if test x$enable_fping = xyes; then
365	AC_PATH_PROG(PATH_TO_FPING,fping)
366	AC_PATH_PROG(PATH_TO_FPING6,fping6)
367
368	@@ -1467,6 +1254,7 @@
369	else
370	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
371	fi
372	+fi
373
374	AC_PATH_PROG(PATH_TO_SSH,ssh)
375	AC_ARG_WITH(ssh_command,
376	@@ -1537,32 +1325,12 @@
377	dnl end if for PATH_TO_SWAP
378	fi
379
380	-AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
381	-if (test -n "$PATH_TO_SWAPINFO")
382	-then
383	-AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format])
384	-if [$PATH_TO_SWAPINFO -k 2>&1 \| egrep -i "^Device" >/dev/null]
385	-then
386	- ac_cv_have_swap=yes
387	- ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
388	-
389	- if [$PATH_TO_SWAPINFO -k 2>/dev/null \| egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
390	- then
391	- ac_cv_swap_format=["%s %f %d %f"]
392	- ac_cv_swap_conv=1024
393	- AC_MSG_RESULT([using FreeBSD format swapinfo])
394	- fi
395	-
396	-elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null \| egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
397	-then
398	- ac_cv_have_swap=yes
399	- ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
400	- ac_cv_swap_format=["%s %f %d %f"]
401	- ac_cv_swap_conv=1024
402	- AC_MSG_RESULT([using HP-UX format swapinfo])
403	-fi
404	-dnl end if for PATH_TO_SWAPINFO
405	-fi
406	+PATH_TO_SWAPINFO="/usr/sbin/swapinfo"
407	+ac_cv_have_swap=yes
408	+ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
409	+ac_cv_swap_format=["%s %f %d %f"]
410	+ac_cv_swap_conv=1024
411	+AC_MSG_RESULT([using FreeBSD format swapinfo])
412
413	AC_PATH_PROG(PATH_TO_LSPS,lsps)
414	if (test -n "$PATH_TO_LSPS")
415	@@ -1755,7 +1523,7 @@
416	AC_SUBST(DEPLIBS)
417
418	AM_GNU_GETTEXT([external], [need-ngettext])
419	-AM_GNU_GETTEXT_VERSION(0.15)
420	+AM_GNU_GETTEXT_VERSION(0.18)
421
422	dnl Check for Redhat spopen problem
423	dnl Wierd problem where ECHILD is returned from a wait call in error

Lines 1-18 Link Here

(-)net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4 (-18 lines)
1	--- gl/m4/extensions.m4.orig 2014-03-04 21:41:56 UTC
2	+++ gl/m4/extensions.m4
3	@@ -16,6 +16,7 @@
4	# warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
5	# or warning: AC_RUN_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS
6	# the fix is
7	+m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],[
8	# 1) to ensure that AC_USE_SYSTEM_EXTENSIONS is never directly invoked
9	# but always AC_REQUIREd,
10	# 2) to ensure that for each occurrence of
11	@@ -49,6 +50,7 @@
12	except with this defined.])
13	AC_DEFINE([_MINIX], [1],
14	[Define to 1 if on MINIX.])
15	+])
16	AC_DEFINE([_NETBSD_SOURCE], [1],
17	[Define to 1 to make NetBSD features available. MINIX 3 needs this.])
18	fi

Lines 26-56 lib/libcvm-client.a Link Here

(-)security/cvm/pkg-plist (-11 / +18 lines)
26	lib/libcvm-client.so	26	lib/libcvm-client.so
27	lib/libcvm-command.a	27	lib/libcvm-command.a
28	lib/libcvm-command.so	28	lib/libcvm-command.so
29	lib/libcvm-command.so.2	29	lib/libcvm-command.so.1
		30	lib/libcvm-command.so.1.1.0
30	lib/libcvm-local.a	31	lib/libcvm-local.a
31	lib/libcvm-local.so	32	lib/libcvm-local.so
32	lib/libcvm-local.so.2	33	lib/libcvm-local.so.1
		34	lib/libcvm-local.so.1.1.0
33	lib/libcvm-module.a	35	lib/libcvm-module.a
34	lib/libcvm-module.so	36	lib/libcvm-module.so
35	lib/libcvm-module.so.2	37	lib/libcvm-module.so.1
		38	lib/libcvm-module.so.1.1.0
36	lib/libcvm-qmail.a	39	lib/libcvm-qmail.a
37	lib/libcvm-qmail.so	40	lib/libcvm-qmail.so
38	lib/libcvm-qmail.so.2	41	lib/libcvm-qmail.so.1
		42	lib/libcvm-qmail.so.1.1.0
39	lib/libcvm-sasl.a	43	lib/libcvm-sasl.a
40	lib/libcvm-sasl.so	44	lib/libcvm-sasl.so
41	lib/libcvm-sasl.so.2	45	lib/libcvm-sasl.so.1
		46	lib/libcvm-sasl.so.1.1.0
42	lib/libcvm-sql.a	47	lib/libcvm-sql.a
43	lib/libcvm-sql.so	48	lib/libcvm-sql.so
44	lib/libcvm-sql.so.2	49	lib/libcvm-sql.so.1
		50	lib/libcvm-sql.so.1.1.0
45	lib/libcvm-udp.a	51	lib/libcvm-udp.a
46	lib/libcvm-udp.so	52	lib/libcvm-udp.so
47	lib/libcvm-udp.so.2	53	lib/libcvm-udp.so.1
		54	lib/libcvm-udp.so.1.1.0
48	lib/libcvm-v1client.a	55	lib/libcvm-v1client.a
49	lib/libcvm-v1client.so	56	lib/libcvm-v1client.so
50	lib/libcvm-v1client.so.2	57	lib/libcvm-v1client.so.1
		58	lib/libcvm-v1client.so.1.1.0
51	lib/libcvm-v2client.a	59	lib/libcvm-v2client.a
52	lib/libcvm-v2client.so	60	lib/libcvm-v2client.so
53	lib/libcvm-v2client.so.2	61	lib/libcvm-v2client.so.1
		62	lib/libcvm-v2client.so.1.1.0
54	%%PORTDOCS%%%%DOCSDIR%%/NEWS	63	%%PORTDOCS%%%%DOCSDIR%%/NEWS
55	%%PORTDOCS%%%%DOCSDIR%%/README	64	%%PORTDOCS%%%%DOCSDIR%%/README
56	%%PORTDOCS%%%%DOCSDIR%%/TODO	65	%%PORTDOCS%%%%DOCSDIR%%/TODO
Lines 77-81 lib/libcvm-v2client.so.2 Link Here
77	%%PORTDOCS%%%%DOCSDIR%%/sql.html	86	%%PORTDOCS%%%%DOCSDIR%%/sql.html
78	%%PORTDOCS%%%%DOCSDIR%%/v1client.html	87	%%PORTDOCS%%%%DOCSDIR%%/v1client.html
79	%%PORTDOCS%%%%DOCSDIR%%/v2client.html	88	%%PORTDOCS%%%%DOCSDIR%%/v2client.html
80	%%PORTDOCS%%@dirrm %%DOCSDIR%%
81	@dirrm include/cvm