Attachment 147920 Details for Bug 194068 – patch4

[patch] patch4

libtool.update.patch (text/plain), 86.15 KB, created by Tijl Coosemans on 2014-10-02 17:18:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2014-10-02 17:18:09 UTC

Size: 86.15 KB

patch

obsolete

>Index: Mk/Uses/libtool.mk
>===================================================================
>--- Mk/Uses/libtool.mk	(revision 369722)
>+++ Mk/Uses/libtool.mk	(working copy)
>@@ -19,6 +19,8 @@ _USES_POST+=	libtool
> 
> .if ${libtool_ARGS:Mbuild}
> BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
>+CONFIGURE_ENV+=	LTTRAP=no
>+MAKE_ENV+=	LTTRAP=no
> .endif
> .endif
> 
>Index: archivers/tardy/Makefile
>===================================================================
>--- archivers/tardy/Makefile	(revision 369722)
>+++ archivers/tardy/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	tardy
> PORTVERSION=	1.28
> DISTVERSIONSUFFIX=	.D001.orig
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	archivers
> MASTER_SITES=	SF/tardy/${PORTVERSION}/
> DISTNAME=	${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}
>Index: audio/libnoise/Makefile
>===================================================================
>--- audio/libnoise/Makefile	(revision 369722)
>+++ audio/libnoise/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libnoise
> DISTVERSION=	1.0.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	audio
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
> DISTNAME=	${PORTNAME}src-${DISTVERSION}
>@@ -26,7 +26,7 @@ post-patch:
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib
>-	(cd ${WRKSRC}/src && ${LOCALBASE}/bin/libtool --mode=install \
>+	(cd ${WRKSRC}/src && ${SETENV} LTTRAP=no ${LOCALBASE}/bin/libtool --mode=install \
> 		${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib)
> 	(cd ${WRKSRC}/include && \
> 		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise)
>Index: audio/libnoise/pkg-plist
>===================================================================
>--- audio/libnoise/pkg-plist	(revision 369722)
>+++ audio/libnoise/pkg-plist	(working copy)
>@@ -45,6 +45,7 @@ include/noise/vectortable.h
> lib/libnoise.a
> lib/libnoise.so
> lib/libnoise.so.0
>+lib/libnoise.so.0.0.0
> @dirrm include/noise/model
> @dirrm include/noise/module
> @dirrm include/noise
>Index: devel/bglibs/Makefile
>===================================================================
>--- devel/bglibs/Makefile	(revision 369722)
>+++ devel/bglibs/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	bglibs
> PORTVERSION=	1.106
>-PORTREVISION=	5
>+PORTREVISION=	6
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://untroubled.org/${PORTNAME}/archive/ \
>Index: devel/bglibs/pkg-plist
>===================================================================
>--- devel/bglibs/pkg-plist	(revision 369722)
>+++ devel/bglibs/pkg-plist	(working copy)
>@@ -100,11 +100,13 @@ lib/bglibs/libbg-path.a
> lib/bglibs/libbg-str.a
> lib/bglibs/libbg-sysdeps.a
> lib/bglibs/libbg-sysdeps.so
>-lib/bglibs/libbg-sysdeps.so.2
>+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.2
>+lib/bglibs/libbg.so.1
>+lib/bglibs/libbg.so.1.1.1
> lib/bglibs/libinstaller.a
> lib/bglibs/libinstcheck.a
> lib/bglibs/libinstshow.a
>Index: devel/boehm-gc/Makefile
>===================================================================
>--- devel/boehm-gc/Makefile	(revision 369722)
>+++ devel/boehm-gc/Makefile	(working copy)
>@@ -23,7 +23,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libatomi
> 
> 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
>@@ -36,11 +35,11 @@ OPTIONS_DEFINE=	DEBUG
> .ifdef GC_VARIANT
> INSTLIBS=	cord gc gccpp
> PLIST=		${NONEXISTENT}
>-PLIST_FILES=	${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so.${SOVER},g} \
>-		${INSTLIBS:S,^,lib/lib,g:S,$,-${GC_VARIANT}.so,g} \
>+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
>@@ -55,13 +54,9 @@ OPTIONS_DEFINE+=DOCS
> PORTDOCS=	*
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
> NOT_FOR_ARCHS=	ia64
> 
>-# no rule to get .lo from .S in subdirectory
>-pre-build:
>-	${LN} -sf ${WRKSRC}/src/sparc_mach_dep.S ${WRKSRC}
>+.include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDEBUG}
> CONFIGURE_ARGS+=--enable-gc-debug
>@@ -83,15 +78,12 @@ post-patch:
> 	@${REINPLACE_CMD} -e \
> 		's,-lgc,-lgc-${GC_VARIANT},' ${WRKSRC}/bdw-gc.pc.in
> 
>-do-install:
>-.for LIB in ${INSTLIBS}
>-	${INSTALL_DATA} ${WRKSRC}/.libs/lib${LIB}-${GC_VARIANT}.so.${SOVER} \
>-		${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so.${SOVER}
>-	${LN} -sf lib${LIB}-${GC_VARIANT}.so.${SOVER} \
>-		${STAGEDIR}${PREFIX}/lib/lib${LIB}-${GC_VARIANT}.so
>-.endfor
>-	${INSTALL_DATA} ${WRKSRC}/bdw-gc.pc \
>+post-install:
>+	${RM} -r ${STAGEDIR}${PREFIX}/include
>+	${RM} -r ${STAGEDIR}${PREFIX}/share
>+	${MV} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc.pc \
> 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/bdw-gc-${GC_VARIANT}.pc
>+
> .else # ! GC_VARIANT
> 
> post-patch:
>@@ -107,13 +99,7 @@ post-install:
> 
> .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} check
>+	(cd ${WRKSRC} && ${MAKE_CMD} check)
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>Index: devel/boehm-gc-redirect/Makefile
>===================================================================
>--- devel/boehm-gc-redirect/Makefile	(revision 369722)
>+++ devel/boehm-gc-redirect/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # Created by: stas
> # $FreeBSD$
> 
>-PORTREVISION=	0
>+PORTREVISION=	1
> 
> COMMENT=	Garbage collection and memory leak detection for C and C++ with malloc redirection
> 
>@@ -9,6 +9,7 @@ LICENSE=	MIT
> 
> MASTERDIR=	${.CURDIR}/../boehm-gc                                                                                                                                                        
> DESCR=		${.CURDIR}/pkg-descr
>+
> GC_VARIANT=	redirect
> 
> .include "${MASTERDIR}/Makefile"
>Index: devel/boehm-gc-threaded/Makefile
>===================================================================
>--- devel/boehm-gc-threaded/Makefile	(revision 369722)
>+++ devel/boehm-gc-threaded/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # Created by: stas
> # $FreeBSD$
> 
>-PORTREVISION=	0
>+PORTREVISION=	1
> 
> COMMENT=	Garbage collection and memory leak detection for C and C++ with threading support
> 
>@@ -11,6 +11,5 @@ MASTERDIR=	${.CURDIR}/../boehm-gc
> DESCR=		${.CURDIR}/pkg-descr
> 
> GC_VARIANT=	threaded
>-SOVER=	1
> 
> .include "${MASTERDIR}/Makefile"
>Index: devel/cdialog/Makefile
>===================================================================
>--- devel/cdialog/Makefile	(revision 369722)
>+++ devel/cdialog/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	cdialog
> PORTVERSION=	1.2.20140219
>+PORTREVISION=	1
> PORTEPOCH=	2
> CATEGORIES=	devel
> MASTER_SITES=	ftp://invisible-island.net/${PORTNAME:S|^c||}/
>Index: devel/cdialog/pkg-plist
>===================================================================
>--- devel/cdialog/pkg-plist	(revision 369722)
>+++ devel/cdialog/pkg-plist	(working copy)
>@@ -7,6 +7,7 @@ include/cdialog/dlg_keys.h
> lib/libcdialog.a
> lib/libcdialog.so
> lib/libcdialog.so.11
>+lib/libcdialog.so.11.1.0
> man/man1/cdialog.1.gz
> man/man3/cdialog.3.gz
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
>Index: devel/fhist/Makefile
>===================================================================
>--- devel/fhist/Makefile	(revision 369722)
>+++ devel/fhist/Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	fhist
> PORTVERSION=	1.21
> DISTVERSIONSUFFIX=	.D001
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
> 
>Index: devel/libdsp/Makefile
>===================================================================
>--- devel/libdsp/Makefile	(revision 369722)
>+++ devel/libdsp/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libdsp
> PORTVERSION=	5.0.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel audio
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable-src/${PORTVERSION} \
> 		http://mirror.mcx2.org/
>Index: devel/libdsp/pkg-plist
>===================================================================
>--- devel/libdsp/pkg-plist	(revision 369722)
>+++ devel/libdsp/pkg-plist	(working copy)
>@@ -27,5 +27,6 @@ include/dsp/dspop.h
> include/dsp/dsptypes.h
> lib/libdsp.a
> lib/libdsp.so
>-lib/libdsp.so.10
>+lib/libdsp.so.2
>+lib/libdsp.so.2.8.1
> @dirrm include/dsp
>Index: devel/libexplain/Makefile
>===================================================================
>--- devel/libexplain/Makefile	(revision 369722)
>+++ devel/libexplain/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libexplain
> PORTVERSION=	1.3.${PATCHLEVEL}
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}
> DISTNAME=	${PORTNAME}-${PORTVERSION:R}
>Index: devel/libexplain/pkg-plist
>===================================================================
>--- devel/libexplain/pkg-plist	(revision 369722)
>+++ devel/libexplain/pkg-plist	(working copy)
>@@ -240,7 +240,8 @@ include/libexplain/write.h
> include/libexplain/writev.h
> lib/libexplain.a
> lib/libexplain.so
>-lib/libexplain.so.55
>+lib/libexplain.so.51
>+lib/libexplain.so.51.4.0
> libdata/pkgconfig/libexplain.pc
> man/man1/explain.1.gz
> man/man1/explain_lca2010.1.gz
>Index: devel/libltdl/Makefile
>===================================================================
>--- devel/libltdl/Makefile	(revision 369722)
>+++ devel/libltdl/Makefile	(working copy)
>@@ -2,21 +2,20 @@
> # $FreeBSD$
> 
> PORTNAME=	libltdl
>-MASTERDIR=	${.CURDIR}/../../devel/libtool
>+PORTREVISION=	0
> 
> COMMENT=	System independent dlopen wrapper
> 
>+.include "${.CURDIR}/../libtool/Makefile.common"
>+
> LICENSE=	LGPL21
>-USE_LDCONFIG=	yes
>-USES=		libtool:keepla
>-CONFIGURE_ARGS=	--enable-ltdl-install
>+LICENSE_FILE=	${WRKSRC}/COPYING.LIB
> 
>-CONFIGURE_WRKSRC=${WRKSRC}/libltdl
>-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
>-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
>-DESCR=		${.CURDIR}/pkg-descr
>-PLIST=		${.CURDIR}/pkg-plist
>-INFO=		# empty
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ARGS=	--enable-ltdl-install
> INSTALL_TARGET=	install-strip
>+USES+=		libtool
>+USE_LDCONFIG=	yes
>+WRKSRC_SUBDIR=	libltdl
> 
>-.include "${MASTERDIR}/Makefile"
>+.include <bsd.port.mk>
>Index: devel/libltdl/pkg-plist
>===================================================================
>--- devel/libltdl/pkg-plist	(revision 369722)
>+++ devel/libltdl/pkg-plist	(working copy)
>@@ -3,8 +3,6 @@ include/libltdl/lt_error.h
> include/libltdl/lt_system.h
> include/ltdl.h
> lib/libltdl.a
>-lib/libltdl.la
> lib/libltdl.so
> lib/libltdl.so.7
>-lib/libltdl.so.7.3.0
>-@dirrm include/libltdl
>+lib/libltdl.so.7.3.1
>Index: devel/libmaa/Makefile
>===================================================================
>--- devel/libmaa/Makefile	(revision 369722)
>+++ devel/libmaa/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libmaa
> PORTVERSION=	1.3.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	devel
> MASTER_SITES=	SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>@@ -27,7 +27,8 @@ DOCS=		README doc/libmaa.600dpi.ps
> PLIST_FILES=	include/maa.h \
> 		lib/libmaa.a \
> 		lib/libmaa.so \
>-		lib/libmaa.so.3
>+		lib/libmaa.so.3 \
>+		lib/libmaa.so.3.0.0
> PORTDOCS=	${DOCS:T}
> 
> post-install:
>Index: devel/libtool/Makefile
>===================================================================
>--- devel/libtool/Makefile	(revision 369722)
>+++ devel/libtool/Makefile	(working copy)
>@@ -1,36 +1,35 @@
> # Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>
> # $FreeBSD$
> 
>-PORTNAME?=	libtool
>-PORTVERSION=	2.4.2
>-PORTREVISION=	3
>-CATEGORIES=	devel
>-MASTER_SITES=	${MASTER_SITE_GNU}
>-MASTER_SITE_SUBDIR=	libtool
>-DISTNAME=	libtool-${PORTVERSION}
>+PORTNAME=	libtool
>+PORTREVISION=	0
> 
>-MAINTAINER=	autotools@FreeBSD.org
>-COMMENT?=	Generic shared library support script
>+COMMENT=	Generic shared library support script
> 
>-LICENSE?=        GPLv2
>+.include "${.CURDIR}/../libtool/Makefile.common"
> 
>-CONFLICTS=	libtool-fixed-[0-9]*
>+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
>-CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
>-INFO?=		libtool
>+CONFIGURE_ARGS=	--disable-ltdl-install
>+MAKE_ARGS=	MAKEINFOFLAGS=--no-split
>+USES+=		makeinfo
> 
>-post-extract:
>-	@${RM} -f ${WRKSRC}/doc/*.info*
>+INFO=		libtool
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|sed gsed|sed|g' \
>-		-e 's|CC=cc|CC=${CC}|g' \
>-		${WRKSRC}/configure ${WRKSRC}/libltdl/configure
>+	@${RM} -f ${WRKSRC}/doc/*.info*
>+.for f in build-aux/ltmain.sh configure libtoolize.in m4/libtool.m4
>+	@${TOUCH} -mr ${WRKSRC}/${f}.orig ${WRKSRC}/${f}
>+.endfor
> 
>-post-configure:
>-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
>+post-install:
>+	${SED} -i '' \
>+		'2s/^/[ x$$LTTRAP = xno ] || { echo "Caught one!"; exit 1; }/' \
>+		${STAGEDIR}${PREFIX}/bin/libtool
> 
> .include <bsd.port.mk>
>Index: devel/libtool/Makefile.common
>===================================================================
>--- devel/libtool/Makefile.common	(revision 0)
>+++ devel/libtool/Makefile.common	(working copy)
>@@ -0,0 +1,12 @@
>+# $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
>
>Property changes on: devel/libtool/Makefile.common
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+FreeBSD=%H
>\ No newline at end of property
>Index: devel/libtool/distinfo
>===================================================================
>--- devel/libtool/distinfo	(revision 369722)
>+++ devel/libtool/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (libtool-2.4.2.tar.gz) = b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918
>-SIZE (libtool-2.4.2.tar.gz) = 2632347
>+SHA256 (libtool-2.4.2.418.tar.xz) = 6465c7e6ebb7c9083aa610d510498aadf7be0c6dc5f2f4e57008686879d27d8c
>+SIZE (libtool-2.4.2.418.tar.xz) = 941808
>Index: devel/libtool/files/patch-build-aux_ltmain.sh
>===================================================================
>--- devel/libtool/files/patch-build-aux_ltmain.sh	(revision 0)
>+++ devel/libtool/files/patch-build-aux_ltmain.sh	(working copy)
>@@ -0,0 +1,30 @@
>+--- 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)
>
>Property changes on: devel/libtool/files/patch-build-aux_ltmain.sh
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: devel/libtool/files/patch-configure
>===================================================================
>--- devel/libtool/files/patch-configure	(revision 0)
>+++ devel/libtool/files/patch-configure	(working copy)
>@@ -0,0 +1,42 @@
>+--- 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
>+       ;;
>
>Property changes on: devel/libtool/files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libtool/files/patch-libltdl-Makefile.in
>===================================================================
>--- devel/libtool/files/patch-libltdl-Makefile.in	(revision 369722)
>+++ devel/libtool/files/patch-libltdl-Makefile.in	(working copy)
>@@ -1,23 +0,0 @@
>---- 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 $@
>- 
>Index: devel/libtool/files/patch-libltdl_config_ltmain.sh
>===================================================================
>--- devel/libtool/files/patch-libltdl_config_ltmain.sh	(revision 369722)
>+++ devel/libtool/files/patch-libltdl_config_ltmain.sh	(working copy)
>@@ -1,83 +0,0 @@
>---- 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
>Index: devel/libtool/files/patch-libtoolize.in
>===================================================================
>--- devel/libtool/files/patch-libtoolize.in	(revision 0)
>+++ devel/libtool/files/patch-libtoolize.in	(working copy)
>@@ -0,0 +1,16 @@
>+--- libtoolize.in.orig
>++++ libtoolize.in
>+@@ -1894,9 +1894,10 @@ func_require_seen_libtool ()
>+   # Lists of all files libtoolize has ever installed.  These are removed
>+   # before installing the latest files when --force was passed to help
>+   # ensure a clean upgrade.
>+-  # Do not remove config.guess nor config.sub, we don't install them
>+-  # without --install, and the project may not be using Automake.
>+-  all_pkgaux_files="compile install-sh depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
>++  # Do not remove config.guess, config.sub or install-sh, we don't
>++  # install them without --install, and the project may not be using
>++  # Automake.
>++  all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
>+   all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
>+   all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
>+ 
>
>Property changes on: devel/libtool/files/patch-libtoolize.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/libtool/files/patch-m4_libtool.m4
>===================================================================
>--- devel/libtool/files/patch-m4_libtool.m4	(revision 0)
>+++ devel/libtool/files/patch-m4_libtool.m4	(working copy)
>@@ -0,0 +1,12 @@
>+--- 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
>+       ;;
>
>Property changes on: devel/libtool/files/patch-m4_libtool.m4
>___________________________________________________________________
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Index: devel/libtool/pkg-plist
>===================================================================
>--- devel/libtool/pkg-plist	(revision 369722)
>+++ devel/libtool/pkg-plist	(working copy)
>@@ -9,50 +9,45 @@ share/aclocal/ltoptions.m4
> share/aclocal/ltsugar.m4
> share/aclocal/ltversion.m4
> share/aclocal/lt~obsolete.m4
>-share/libtool/config/compile
>-share/libtool/config/config.guess
>-share/libtool/config/config.sub
>-share/libtool/config/depcomp
>-share/libtool/config/install-sh
>-share/libtool/config/ltmain.sh
>-share/libtool/config/missing
>-share/libtool/libltdl/COPYING.LIB
>-share/libtool/libltdl/Makefile.am
>-share/libtool/libltdl/Makefile.in
>-share/libtool/libltdl/Makefile.inc
>-share/libtool/libltdl/README
>-share/libtool/libltdl/aclocal.m4
>-share/libtool/libltdl/argz.c
>-share/libtool/libltdl/argz_.h
>-share/libtool/libltdl/config-h.in
>-share/libtool/libltdl/configure
>-share/libtool/libltdl/configure.ac
>-share/libtool/libltdl/libltdl/lt__alloc.h
>-share/libtool/libltdl/libltdl/lt__dirent.h
>-share/libtool/libltdl/libltdl/lt__glibc.h
>-share/libtool/libltdl/libltdl/lt__private.h
>-share/libtool/libltdl/libltdl/lt__strl.h
>-share/libtool/libltdl/libltdl/lt_dlloader.h
>-share/libtool/libltdl/libltdl/lt_error.h
>-share/libtool/libltdl/libltdl/lt_system.h
>-share/libtool/libltdl/libltdl/slist.h
>-share/libtool/libltdl/loaders/dld_link.c
>-share/libtool/libltdl/loaders/dlopen.c
>-share/libtool/libltdl/loaders/dyld.c
>-share/libtool/libltdl/loaders/load_add_on.c
>-share/libtool/libltdl/loaders/loadlibrary.c
>-share/libtool/libltdl/loaders/preopen.c
>-share/libtool/libltdl/loaders/shl_load.c
>-share/libtool/libltdl/lt__alloc.c
>-share/libtool/libltdl/lt__dirent.c
>-share/libtool/libltdl/lt__strl.c
>-share/libtool/libltdl/lt_dlloader.c
>-share/libtool/libltdl/lt_error.c
>-share/libtool/libltdl/ltdl.c
>-share/libtool/libltdl/ltdl.h
>-share/libtool/libltdl/slist.c
>-@dirrm share/libtool/libltdl/loaders
>-@dirrm share/libtool/libltdl/libltdl
>-@dirrm share/libtool/libltdl
>-@dirrm share/libtool/config
>-@dirrm share/libtool
>+%%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
>Index: devel/srecord/Makefile
>===================================================================
>--- devel/srecord/Makefile	(revision 369722)
>+++ devel/srecord/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	srecord
> PORTVERSION=	1.64
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	SF
> 
>Index: devel/srecord/pkg-plist
>===================================================================
>--- devel/srecord/pkg-plist	(revision 369722)
>+++ devel/srecord/pkg-plist	(working copy)
>@@ -143,6 +143,7 @@ include/srecord/string.h
> lib/libsrecord.a
> lib/libsrecord.so
> lib/libsrecord.so.0
>+lib/libsrecord.so.0.0.0
> libdata/pkgconfig/srecord.pc
> man/man1/srec_cat.1.gz
> man/man1/srec_cmp.1.gz
>Index: devel/xparam/Makefile
>===================================================================
>--- devel/xparam/Makefile	(revision 369722)
>+++ devel/xparam/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	xparam
> PORTVERSION=	1.22
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	SF
> 
>Index: devel/xparam/pkg-plist
>===================================================================
>--- devel/xparam/pkg-plist	(revision 369722)
>+++ devel/xparam/pkg-plist	(working copy)
>@@ -84,4 +84,4 @@ include/xparam_extend.h
> lib/libxparam.a
> lib/libxparam.so
> lib/libxparam.so.1
>-@dirrm include/xparam
>+lib/libxparam.so.1.0.0
>Index: dns/dnsutl/Makefile
>===================================================================
>--- dns/dnsutl/Makefile	(revision 369722)
>+++ dns/dnsutl/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	dnsutl
> PORTVERSION=	1.12
>+PORTREVISION=	1
> CATEGORIES=	dns
> MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
> 
>Index: ftp/twoftpd/Makefile
>===================================================================
>--- ftp/twoftpd/Makefile	(revision 369722)
>+++ ftp/twoftpd/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	twoftpd
> PORTVERSION=	1.42
>+PORTREVISION=	1
> CATEGORIES=	ftp
> MASTER_SITES=	http://untroubled.org/${PORTNAME}/
> 
>Index: graphics/gexiv2/Makefile
>===================================================================
>--- graphics/gexiv2/Makefile	(revision 369722)
>+++ graphics/gexiv2/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gexiv2
> PORTVERSION=	0.6.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	graphics
> MASTER_SITES=	http://yorba.org/download/${PORTNAME}/${PORTVERSION:R}/
> DISTNAME=	lib${PORTNAME}_${PORTVERSION}
>Index: graphics/gexiv2/pkg-plist
>===================================================================
>--- graphics/gexiv2/pkg-plist	(revision 369722)
>+++ graphics/gexiv2/pkg-plist	(working copy)
>@@ -5,11 +5,9 @@ include/gexiv2/gexiv2-managed-stream.h
> include/gexiv2/gexiv2-preview-properties.h
> include/gexiv2/gexiv2-preview-image.h
> include/gexiv2/gexiv2-startup.h
>-lib/libgexiv2.so.2
>-lib/libgexiv2.so
> lib/libgexiv2.a
>+lib/libgexiv2.so
>+lib/libgexiv2.so.2
>+lib/libgexiv2.so.2.0.0
> libdata/pkgconfig/gexiv2.pc
> share/vala/vapi/gexiv2.vapi
>-@dirrmtry include/gexiv2
>-@dirrmtry share/vala/vapi
>-@dirrmtry share/vala
>Index: lang/gforth/Makefile
>===================================================================
>--- lang/gforth/Makefile	(revision 369722)
>+++ lang/gforth/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	gforth
> PORTVERSION=	0.7.3
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	lang
> MASTER_SITES=	http://www.complang.tuwien.ac.at/forth/gforth/ \
> 		GNU
>Index: lang/gforth/pkg-plist
>===================================================================
>--- lang/gforth/pkg-plist	(revision 369722)
>+++ lang/gforth/pkg-plist	(working copy)
>@@ -12,18 +12,22 @@ include/gforth/%%PORTVERSION%%/config.h
> 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/socket.so.0
>-lib/gforth/%%PORTVERSION%%/libcc-named/socket.so
>+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/libffi.so.0
>-lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so
>+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/fflib.so.0
>-lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so
>+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
>Index: lang/oo2c/Makefile
>===================================================================
>--- lang/oo2c/Makefile	(revision 369722)
>+++ lang/oo2c/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	oo2c
> PORTVERSION=	2.1.11
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	lang
> MASTER_SITES=	SF/ooc/ooc2/${PORTVERSION}
> DISTNAME=	${PORTNAME}_${BITS}-${PORTVERSION}
>Index: lang/oo2c/pkg-plist
>===================================================================
>--- lang/oo2c/pkg-plist	(revision 369722)
>+++ lang/oo2c/pkg-plist	(working copy)
>@@ -10,6 +10,7 @@ man/man1/oowhereis.1.gz
> lib/liboo2c.a
> lib/liboo2c.so
> lib/liboo2c.so.3
>+lib/liboo2c.so.3.0.0
> lib/oo2c/emacs/o2-default.el
> lib/oo2c/emacs/o2-indent.el
> lib/oo2c/emacs/o2-insert.el
>Index: mail/mailfront/Makefile
>===================================================================
>--- mail/mailfront/Makefile	(revision 369722)
>+++ mail/mailfront/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	mailfront
> PORTVERSION=	2.01
>+PORTREVISION=	1
> CATEGORIES=	mail
> MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
> 		http://untroubled.org/${PORTNAME}/archive/
>Index: mail/qmail-autoresponder/Makefile
>===================================================================
>--- mail/qmail-autoresponder/Makefile	(revision 369722)
>+++ mail/qmail-autoresponder/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qmail-autoresponder
> PORTVERSION=	0.97
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail
> MASTER_SITES=	http://untroubled.org/${PORTNAME}/
> 
>Index: mail/qmail-qfilter/Makefile
>===================================================================
>--- mail/qmail-qfilter/Makefile	(revision 369722)
>+++ mail/qmail-qfilter/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	qmail-qfilter
> PORTVERSION=	2.1
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	mail
> MASTER_SITES=	http://untroubled.org/${PORTNAME}/
> 
>Index: math/libtommath/Makefile
>===================================================================
>--- math/libtommath/Makefile	(revision 369722)
>+++ math/libtommath/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	libtommath
> PORTVERSION=	0.42.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	math
> MASTER_SITES=	http://libtom.org/files/
> DISTNAME=	ltm-${PORTVERSION}
>@@ -31,7 +31,7 @@ post-patch:
> .if ${PORT_OPTIONS:MSHARED}
> USES+=		libtool:build
> USE_LDCONFIG=	yes
>-PLIST_FILES+=	lib/libtommath.so.0 lib/libtommath.so
>+PLIST_FILES+=	lib/libtommath.so lib/libtommath.so.0 lib/libtommath.so.0.0.41
> MAKEFILE=	makefile.shared
> .else
> MAKEFILE=	makefile
>Index: net-mgmt/monitoring-plugins/Makefile
>===================================================================
>--- net-mgmt/monitoring-plugins/Makefile	(revision 369722)
>+++ net-mgmt/monitoring-plugins/Makefile	(working copy)
>@@ -15,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> CONFLICTS_INSTALL=	nagios-plugins-*
> 
>-USES=		charsetfix gmake perl5 libtool autoreconf
>-CHARSETFIX_MAKEFILEIN=Makefile.am
>+USES=		charsetfix gmake perl5 libtool
> USE_SUBMAKE=	yes
> 
> OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS
>@@ -70,24 +69,26 @@ CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCG
> CONFIGURE_ARGS+=--with-qmail-qstat-command=/var/qmail/bin/qmail-qstat
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
> QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
>-QSTAT_CONFIGURE_ENABLE=	qstat
>+QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QUAKESTAT= \
>+			ac_cv_path_PATH_TO_QSTAT=
> 
> IPV6_CONFIGURE_WITH=	ipv6
> 
> FPING_BUILD_DEPENDS=	fping:${PORTSDIR}/net/fping
> FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
>-FPING_CONFIGURE_ENABLE=	fping
>+FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING= \
>+			ac_cv_path_PATH_TO_FPING6=
> 
> NETSNMP_BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
> 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
> NETSNMP_RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
> 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
>-NETSNMP_CONFIGURE_ENABLE=	snmp
>+NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
>+			ac_cv_path_PATH_TO_SNMPGETNEXT=
> 
> RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
> RADIUS_CONFIGURE_WITH=	radius
>@@ -147,10 +148,10 @@ post-patch:
> 	check_users.c
> 	@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
> .endfor
>-	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.am
>+	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.in
> .if ${PORT_OPTIONS:MJAIL}
>-	@${REINPLACE_CMD} -e 's# 127.0.0.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure.ac
>-	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure.ac
>+	@${REINPLACE_CMD} -e 's# 127\.0\.0\.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure
> .endif
> 
> .include <bsd.port.mk>
>Index: net-mgmt/monitoring-plugins/files/patch-configure
>===================================================================
>--- net-mgmt/monitoring-plugins/files/patch-configure	(revision 0)
>+++ net-mgmt/monitoring-plugins/files/patch-configure	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.orig	2014-06-26 16:17:37 UTC
>++++ configure
>+@@ -21787,7 +21787,7 @@ then
>+ $as_echo "$ac_cv_ps_command" >&6; }
>+ 
>+ elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
>+-	egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
>++	egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
>+ then
>+ 	ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
>+ 	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
>
>Property changes on: net-mgmt/monitoring-plugins/files/patch-configure
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: net-mgmt/monitoring-plugins/files/patch-configure.ac
>===================================================================
>--- net-mgmt/monitoring-plugins/files/patch-configure.ac	(revision 369722)
>+++ net-mgmt/monitoring-plugins/files/patch-configure.ac	(working copy)
>@@ -1,414 +0,0 @@
>---- 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
>Index: net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4
>===================================================================
>--- net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4	(revision 369722)
>+++ net-mgmt/monitoring-plugins/files/patch-gl__m4__extensions.m4	(working copy)
>@@ -1,18 +0,0 @@
>---- 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
>Index: net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am
>===================================================================
>--- net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am	(revision 369722)
>+++ net-mgmt/monitoring-plugins/files/patch-plugins__Makefile.am	(working copy)
>@@ -1,11 +0,0 @@
>---- plugins/Makefile.am.orig	2014-06-23 16:01:00 UTC
>-+++ plugins/Makefile.am
>-@@ -14,7 +14,7 @@
>- VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
>- 
>- AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \
>--	@LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
>-+	@LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@
>- 
>- localedir = $(datadir)/locale
>- # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this
>Index: net-mgmt/nagios-plugins/Makefile
>===================================================================
>--- net-mgmt/nagios-plugins/Makefile	(revision 369722)
>+++ net-mgmt/nagios-plugins/Makefile	(working copy)
>@@ -17,8 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
> 
> CONFLICTS_INSTALL=	monitoring-plugins-*
> 
>-USES=		charsetfix gmake perl5 libtool autoreconf
>-CHARSETFIX_MAKEFILEIN=Makefile.am
>+USES=		charsetfix gmake perl5 libtool
> USE_SUBMAKE=	yes
> 
> OPTIONS_DEFINE=	QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS
>@@ -76,24 +75,26 @@ CONFIGURE_ARGS+=--with-qmail-qstat-comma
> 
> CONFIGURE_ENV=	PERL=${PERL}
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-CFLAGS+=	-I${LOCALBASE}/include
>+LIBS+=		-L${LOCALBASE}/lib
> 
> QSTAT_BUILD_DEPENDS=	qstat:${PORTSDIR}/games/qstat
> QSTAT_RUN_DEPENDS=	qstat:${PORTSDIR}/games/qstat
>-QSTAT_CONFIGURE_ENABLE=	qstat
>+QSTAT_CONFIGURE_OFF=	ac_cv_path_PATH_TO_QUAKESTAT= \
>+			ac_cv_path_PATH_TO_QSTAT=
> 
> IPV6_CONFIGURE_WITH=	ipv6
> 
> FPING_BUILD_DEPENDS=	fping:${PORTSDIR}/net/fping
> FPING_RUN_DEPENDS=	fping:${PORTSDIR}/net/fping
>-FPING_CONFIGURE_ENABLE=	fping
>+FPING_CONFIGURE_OFF=	ac_cv_path_PATH_TO_FPING= \
>+			ac_cv_path_PATH_TO_FPING6=
> 
> NETSNMP_BUILD_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
> 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
> NETSNMP_RUN_DEPENDS=	snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
> 		p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP
>-NETSNMP_CONFIGURE_ENABLE=	snmp
>+NETSNMP_CONFIGURE_OFF=	ac_cv_path_PATH_TO_SNMPGET= \
>+			ac_cv_path_PATH_TO_SNMPGETNEXT=
> 
> RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:${PORTSDIR}/net/radiusclient
> RADIUS_CONFIGURE_WITH=	radius
>@@ -153,12 +154,12 @@ post-patch:
> 	check_users.c
> 	@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
> .endfor
>-	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.am
>+	@${REINPLACE_CMD} -e 's|chown root|${TRUE}|g' ${WRKSRC}/plugins-root/Makefile.in
> 	# add a fake PATH so that it gets set to a correct value during build.
> 	@${REINPLACE_CMD} -e "s|$$ENV{'PATH'}=''|$$ENV{'PATH'}='foo'|" ${WRKSRC}/plugins-scripts/*.pl
> .if ${PORT_OPTIONS:MJAIL}
>-	@${REINPLACE_CMD} -e 's# 127.0.0.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure.ac
>-	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure.ac
>+	@${REINPLACE_CMD} -e 's# 127\.0\.0\.1 # ${NAGIOSPOLLIP} #g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's# ::1 # ${NAGIOSPOLLIP6} #g' ${WRKSRC}/configure
> .endif
> 
> .include <bsd.port.mk>
>Index: net-mgmt/nagios-plugins/files/patch-configure
>===================================================================
>--- net-mgmt/nagios-plugins/files/patch-configure	(revision 0)
>+++ net-mgmt/nagios-plugins/files/patch-configure	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.orig	2014-06-26 16:17:37 UTC
>++++ configure
>+@@ -21787,7 +21787,7 @@ then
>+ $as_echo "$ac_cv_ps_command" >&6; }
>+ 
>+ elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
>+-	egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
>++	egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
>+ then
>+ 	ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
>+ 	ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
>
>Property changes on: net-mgmt/nagios-plugins/files/patch-configure
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: net-mgmt/nagios-plugins/files/patch-configure.ac
>===================================================================
>--- net-mgmt/nagios-plugins/files/patch-configure.ac	(revision 369722)
>+++ net-mgmt/nagios-plugins/files/patch-configure.ac	(working copy)
>@@ -1,423 +0,0 @@
>---- 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
>Index: net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4
>===================================================================
>--- net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4	(revision 369722)
>+++ net-mgmt/nagios-plugins/files/patch-gl__m4__extensions.m4	(working copy)
>@@ -1,18 +0,0 @@
>---- 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
>Index: net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am
>===================================================================
>--- net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am	(revision 369722)
>+++ net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am	(working copy)
>@@ -1,11 +0,0 @@
>---- plugins/Makefile.am.orig	2014-05-20 19:15:34 UTC
>-+++ plugins/Makefile.am
>-@@ -14,7 +14,7 @@
>- VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
>- 
>- AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \
>--	@LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
>-+	@LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@
>- 
>- localedir = $(datadir)/locale
>- # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this
>Index: security/cvm/Makefile
>===================================================================
>--- security/cvm/Makefile	(revision 369722)
>+++ security/cvm/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	cvm
> PORTVERSION=	0.96
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	security
> MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
> 		http://untroubled.org/${PORTNAME}/archive/
>Index: security/cvm/pkg-plist
>===================================================================
>--- security/cvm/pkg-plist	(revision 369722)
>+++ security/cvm/pkg-plist	(working copy)
>@@ -26,31 +26,40 @@ lib/libcvm-client.a
> lib/libcvm-client.so
> lib/libcvm-command.a
> lib/libcvm-command.so
>-lib/libcvm-command.so.2
>+lib/libcvm-command.so.1
>+lib/libcvm-command.so.1.1.0
> lib/libcvm-local.a
> lib/libcvm-local.so
>-lib/libcvm-local.so.2
>+lib/libcvm-local.so.1
>+lib/libcvm-local.so.1.1.0
> lib/libcvm-module.a
> lib/libcvm-module.so
>-lib/libcvm-module.so.2
>+lib/libcvm-module.so.1
>+lib/libcvm-module.so.1.1.0
> lib/libcvm-qmail.a
> lib/libcvm-qmail.so
>-lib/libcvm-qmail.so.2
>+lib/libcvm-qmail.so.1
>+lib/libcvm-qmail.so.1.1.0
> lib/libcvm-sasl.a
> lib/libcvm-sasl.so
>-lib/libcvm-sasl.so.2
>+lib/libcvm-sasl.so.1
>+lib/libcvm-sasl.so.1.1.0
> lib/libcvm-sql.a
> lib/libcvm-sql.so
>-lib/libcvm-sql.so.2
>+lib/libcvm-sql.so.1
>+lib/libcvm-sql.so.1.1.0
> lib/libcvm-udp.a
> lib/libcvm-udp.so
>-lib/libcvm-udp.so.2
>+lib/libcvm-udp.so.1
>+lib/libcvm-udp.so.1.1.0
> lib/libcvm-v1client.a
> lib/libcvm-v1client.so
>-lib/libcvm-v1client.so.2
>+lib/libcvm-v1client.so.1
>+lib/libcvm-v1client.so.1.1.0
> lib/libcvm-v2client.a
> lib/libcvm-v2client.so
>-lib/libcvm-v2client.so.2
>+lib/libcvm-v2client.so.1
>+lib/libcvm-v2client.so.1.1.0
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
> %%PORTDOCS%%%%DOCSDIR%%/README
> %%PORTDOCS%%%%DOCSDIR%%/TODO
>@@ -77,5 +86,3 @@ lib/libcvm-v2client.so.2
> %%PORTDOCS%%%%DOCSDIR%%/sql.html
> %%PORTDOCS%%%%DOCSDIR%%/v1client.html
> %%PORTDOCS%%%%DOCSDIR%%/v2client.html
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm include/cvm
>Index: security/libtomcrypt/Makefile
>===================================================================
>--- security/libtomcrypt/Makefile	(revision 369722)
>+++ security/libtomcrypt/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	libtomcrypt
> PORTVERSION=	1.17
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	security
> MASTER_SITES=	http://libtom.org/files/
> DISTNAME=	crypt-${PORTVERSION}
>Index: security/libtomcrypt/pkg-plist
>===================================================================
>--- security/libtomcrypt/pkg-plist	(revision 369722)
>+++ security/libtomcrypt/pkg-plist	(working copy)
>@@ -15,9 +15,11 @@ include/tomcrypt_test.h
> lib/libtomcrypt.a
> lib/libtomcrypt.so
> lib/libtomcrypt.so.0
>+lib/libtomcrypt.so.0.0.117
> lib/libtomcrypt_prof.a
> lib/libtomcrypt_prof.so
> lib/libtomcrypt_prof.so.0
>+lib/libtomcrypt_prof.so.0.0.117
> %%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf
> %%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>Index: sysutils/ucspi-proxy/Makefile
>===================================================================
>--- sysutils/ucspi-proxy/Makefile	(revision 369722)
>+++ sysutils/ucspi-proxy/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ucspi-proxy
> PORTVERSION=	0.98
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils
> MASTER_SITES=	http://untroubled.org/ucspi-proxy/
> 
>Index: sysutils/vii/Makefile
>===================================================================
>--- sysutils/vii/Makefile	(revision 369722)
>+++ sysutils/vii/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	vii
> PORTVERSION=	4.2
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	sysutils
> MASTER_SITES=	http://vii.sourceforge.net/ \
> 		CRITICAL
>Index: x11-toolkits/xmhtml/Makefile
>===================================================================
>--- x11-toolkits/xmhtml/Makefile	(revision 369722)
>+++ x11-toolkits/xmhtml/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	XmHTML
> PORTVERSION=	1.1.9
>+PORTREVISION=	1
> CATEGORIES=	x11-toolkits www
> MASTER_SITES=	SF/${PORTNAME:tl}
> 
>@@ -24,7 +25,7 @@ MAKE_ENV=	LIBTOOL=${LIBTOOL}
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
> do-install:
>-	(cd ${WRKSRC}/lib && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
>+	(cd ${WRKSRC}/lib && ${SETENV} LTTRAP=no ${LIBTOOL} --mode=install ${INSTALL_DATA} \
> 		libXmHTML.la ${STAGEDIR}${PREFIX}/lib)
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML
> 	(cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \
>Index: x11-toolkits/xmhtml/pkg-plist
>===================================================================
>--- x11-toolkits/xmhtml/pkg-plist	(revision 369722)
>+++ x11-toolkits/xmhtml/pkg-plist	(working copy)
>@@ -14,6 +14,7 @@ include/XmHTML/toolkit.h
> lib/libXmHTML.a
> lib/libXmHTML.so
> lib/libXmHTML.so.1
>+lib/libXmHTML.so.1.0.2
> %%PORTDOCS%%%%DOCSDIR%%/GPL.html
> %%PORTDOCS%%%%DOCSDIR%%/LGPL.html
> %%PORTDOCS%%%%DOCSDIR%%/XmHTML.html

Actions: View | Diff

Attachments on bug 194068: 147884 | 147902 | 147916 | 147920 | 147948 | 147959 | 147991