Version bump to 3.1.1. Cleanup.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

8 files changed, 31 insertions, 1040 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 242aa2500d2c..67b9bf64ca3a 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.117 2010/11/21 12:43:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.118 2010/11/24 16:56:35 idl0r Exp $
+
+*cfengine-3.1.1 (24 Nov 2010)
+
+  24 Nov 2010; Christian Ruppert <idl0r@gentoo.org>
+  -cfengine-3.0.5_p1-r3.ebuild, -files/cfengine-3.0.5_p1-Makefile.am.patch,
+  -files/cfengine-3.0.5_p1-configure.ac.patch,
+  -files/cfengine-3.0.5_p1-regex.c.patch, -cfengine-3.1.0-r1.ebuild,
+  -files/cfengine-3.1.0-configure.ac.patch, +cfengine-3.1.1.ebuild:
+  Version bump to 3.1.1. Cleanup.
 
   21 Nov 2010; Raúl Porcel <armin76@gentoo.org> cfengine-2.2.10-r3.ebuild:
   arm/sparc stable wrt #344841
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index abab1c7773ad..39c63b91e6dd 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,24 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 511666-segfault.patch 731 RMD160 5a1965029fcc27f95ef89aaf74ea7b5e93ff30eb SHA1 1c93030161d91bab21e46df355bbb7da77772f27 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d
 AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6abdb SHA1 39e8a42c9ecca02d51d340fd6dabe91626c494c8 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2
 AUX cf-execd.rc6 318 RMD160 462f1700ca412a2ffbdc7e9f96e9d7354906a770 SHA1 0c161245a34a7562cbe37e878545ad90d551f508 SHA256 1862d1d86752b96cf92810f324f5746f0d73730cfce75e9598bea5e0b391a2e9
 AUX cf-monitord.rc6 315 RMD160 a60f9a9e96336bb314f6a9082549174493658468 SHA1 58d74ee850ac7efcffdd55c4e0ab68206ed5374f SHA256 6484bc78ecbb94cba236171aa6566c3af0c4a88b6012d6e9d0d4ff9b6983e4a2
 AUX cf-serverd.rc6 310 RMD160 989192609a7ab579487da51392d727e008f01b4c SHA1 28043eec58a1798faba78f5baae5dde39cea6435 SHA256 17969ef741f2a0c327c8651a1a2cfb175da8c76fdb754a84b76b0eda14cc5c5a
 AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 RMD160 58c7369342d9042dd6c02ec37bbc1e05b8272c50 SHA1 4668f24858a8c48c8f60f3840de6277612955ed1 SHA256 25a37e3d23163459844789b3817814768a7126f564fd473ec0a6d1136897ebff
-AUX cfengine-3.0.5_p1-Makefile.am.patch 1010 RMD160 63be934e2e0529f320034882cfa7a477bf818d6b SHA1 5370668dc725135cf27252c4928c54e6560ca0e7 SHA256 17558b112bdd3991f4ca18a135e8c96cd10f5477dab5eed208d8f33222ca4dac
-AUX cfengine-3.0.5_p1-configure.ac.patch 13597 RMD160 645163b58d05124f03dc8aa4525954f7412ce038 SHA1 a716dc0af3f835a5327e0e9096ef53d7c0e6120b SHA256 82ff6baf5e8c0215ddda4824d233cd9ab7a144e6bc8c409112980c03cc804835
-AUX cfengine-3.0.5_p1-regex.c.patch 330 RMD160 d5cf6c473f11432b6d215666a0257f1ed980ff44 SHA1 cb4c994df51d91a45ca1d73fef6f9f8951d61a8a SHA256 bc50e35480ab2fb0837f5a68d3ce5d33e06f098ee7c219f4b5c7fe63326ecf4d
 AUX cfengine-3.1.0-cf-key.patch 1440 RMD160 e755aa329f75965f4f95f651627bb66b2bcee216 SHA1 b8a3380f38f893ab5d2cdf9ad7a8446361498335 SHA256 2b53155e33854f9009eac44d33bbf18235c2b3b9c391785cd7d3d14e63c9eae2
-AUX cfengine-3.1.0-configure.ac.patch 13859 RMD160 6c70d29f329d9f3afb14ff7fd64fb9dc45067863 SHA1 06d87c3b6c5903dc2b1a9645b0bb188b67a0d286 SHA256 8e5c076880b185489df8ba69fe5273296d7000fd08a3e62824aa32dad7a2ca04
 AUX cfenvd.rc6 254 RMD160 cbbb932dfee81318437f27b0e644b3201d6e4664 SHA1 d27f693a0744cbbd8f06ec85779935fc1a3181f2 SHA256 de0877e26bbb5cd8eb5da1827308b8fa00c9ce487e61263306c4b57e3ba9e150
 AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df7747bded2a2d9c5bdcfb1bebc3e3c9ef463 SHA256 98735d665038e372be29ac8b173861491dde1d71fad7d0cefddab0fbf99a157c
 AUX cfportage.README 2294 RMD160 05c285d3b79e266ac6229985b2fdbab1b7841752 SHA1 7f7598154775bf9f180383f69294a00624a69735 SHA256 c1a5a2af3b7e41a9b1c6d5e252e7a3673ec17d12ed3fa0aa34581b5893c8f833
 AUX cfservd.rc6 259 RMD160 8390afb5b3cf7ffbe0b74766ddf3f9d05c4d5b6c SHA1 c1fc1ccf15789c8acfc3857481ed69dc7f9b6d2b SHA256 892e9537c9b75861031a0755af886b2b931e1ca4dd2589847a2bacf00862de0f
 DIST cfengine-2.2.10.tar.gz 2690333 RMD160 67fd3dc80270dc000887e3dbf26f372338e2600f SHA1 032bec0bc59ffee7179422e96dfd902afbf94340 SHA256 f34697cc52e1342c5ec4b45a4adf9fbffdfa05a68bdc7c53382f72d03e106783
-DIST cfengine-3.0.5p1.tar.gz 1517992 RMD160 909ee306cdbd0e674fbdb54ddcbca66b0cc5213b SHA1 bc7cc5fbc6c9a973f2f74c45e6835934230b6d63 SHA256 38a389969ff095775e206df24b0fbc66ae30fa404d92dcb26b94a568e790610b
-DIST cfengine-3.1.0.tar.gz 2267458 RMD160 b92f76b3ac6c0e92d95c167a8dab1e74e31d21c4 SHA1 6927ab111d87b768c3d666d8169bc29c617517af SHA256 c5aacc7025a7a711bdf21695346b078c8fae8d205ed6f88628eafbf27d380fc4
+DIST cfengine-3.1.1.tar.gz 1582945 RMD160 d94f301334f5051efd5b2a0ed7f44d05fbe33e2c SHA1 b7ed3b9e47da0cbdb30bc59d256d56fb901b0f46 SHA256 6142e67c1a8c1265b41ddfc0f84292eb335ad0ab8f6c7b177df23182b5f1a06f
 EBUILD cfengine-2.2.10-r3.ebuild 3111 RMD160 c17d87023177a259803c8c3c5b29d3b59b863c91 SHA1 9181b7a32456ede9f78c6e08c21b7e291bb7d5cb SHA256 ebb9dc64c5e37c83c3dd34570840431a255646e5e695484aea2f68f6442e3e15
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.0.5_p1-r3.ebuild 4306 RMD160 b6ea2704be1f7d0101d6faea87f12091f61655ca SHA1 9c03dfa4830326ad45778b6b7ce86b49a6b1f0ae SHA256 bfe457e2146b25aea305c8d48fa886db31a4fe52e299b8cc62923d7689889a8e
-EBUILD cfengine-3.1.0-r1.ebuild 4414 RMD160 c5f5021a142a88c44c2d57fc75d482b4bdb0f92c SHA1 0f2c3da75d1149de14f5f4d44ca71ba5dcb1bf1e SHA256 f3dceb62967c29263e8ca750bbfe17f9eb8194ea08c33ca68b3d0b6887e41c48
-MISC ChangeLog 20179 RMD160 604a4bb6d253d59f6d70b8fcedaa6831b65434e3 SHA1 a71d0709faa11384066098784361ac7efd1d1dba SHA256 391eecd212e83eaf0e36568e6c8d8bd3ddd396d9e761f38f4ef7ee9f683ecfc5
+EBUILD cfengine-3.1.1.ebuild 4243 RMD160 4467a76b516fa8ab62123f8d7e765ffb3cdfe7c2 SHA1 4d2e8e1ae848057fa6a4067c672ef8955fd33da2 SHA256 c116beb29c43f9a5a36a7519cb4246a0c4db90d7291e01fb3641e9084cb0b432
+MISC ChangeLog 20555 RMD160 e39e211c294f0af4c50a82cff4609b3051fd7c28 SHA1 401446b0fe7db8594fcb2d41e6ade17fe7ba24b9 SHA256 92620de5edde8cd8d08be6502d03109ec53355bb52c10965f7e78afc85e07871
 MISC metadata.xml 2646 RMD160 2c51382fec40e084a1ef7372505399d079fcedfb SHA1 51acdf2de92d83b818d56a326511a03a5d8a1689 SHA256 f78868dec97c0018b6b59a05e85153a76e44526b65aa77820d8ce9c2cdcf857e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBCAAGBQJM7UPIAAoJEMOx0zmdw4Z11L0H/1t1miiuWbQ0PrWbIHjDw9sP
+BQ5t49CDfCXJX+K8bD5Ln2+UqlUTqzbt+e41bqfGaF32L1Yd5qVKNVEE6XXn269L
+s+e/nKrm4meZ1qflq391q3ETBaVEzDX8TiC4r2DCqWyc4ilJx7EKwnAz1EIXTIee
+k/q9zqAbs7V4dqS+Ss46464ideIBiDTSOwYVL1cMdLcL2xbDraAzH3DidDjmjkBz
+2gs5cYi7D6KF7QyjjwUKDOLFmrwNRZBSCRRO1S8LSp3Ug6pbk7X5rmDA8/hRGptA
+mJdqdvvNo6F13EdR3rQmE6PSH1xcPcLLEgx8AofL9QQV1LPqZogVWVAY/uanV9Y=
+=n3bF
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.1.0-r1.ebuild b/net-misc/cfengine/cfengine-3.1.0-r1.ebuild
deleted file mode 100644
index 58216232e030..000000000000
--- a/net-misc/cfengine/cfengine-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.0-r1.ebuild,v 1.1 2010/11/19 20:20:34 idl0r Exp $
-
-EAPI="3"
-
-inherit eutils autotools
-
-MY_PV="${PV//_beta/b}"
-MY_PV="${MY_PV/_p/p}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An automated suite of programs for configuring and maintaining
-Unix-like computers"
-HOMEPAGE="http://www.cfengine.org/"
-SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~s390 ~sparc ~x86"
-
-IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax"
-
-DEPEND=">=sys-libs/db-4
-	gd? ( media-libs/gd )
-	graphviz? ( media-gfx/graphviz )
-	ldap? ( net-nds/openldap )
-	libvirt? ( app-emulation/libvirt )
-	mysql? ( virtual/mysql )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql-base )
-	selinux? ( sys-libs/libselinux )
-	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
-	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
-	>=dev-libs/openssl-0.9.7"
-RDEPEND="${DEPEND}"
-PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# https://cfengine.com/bugtracker/view.php?id=243
-	epatch "${FILESDIR}/${P}-configure.ac.patch"
-	epatch "${FILESDIR}/${PN}-3.0.5_p1-Makefile.am.patch"
-	# https://cfengine.com/bugtracker/view.php?id=390
-	epatch "${FILESDIR}/${P}-cf-key.patch"
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use mysql || use postgres ; then
-		myconf="--with-sql"
-	else
-		myconf="--without-sql"
-	fi
-
-	if ! use qdbm && ! use tokyocabinet; then
-		myconf="${myconf} --with-berkeleydb=/usr"
-	fi
-
-	# Enforce /var/cfengine for historical compatibility
-	econf \
-		--docdir=/usr/share/doc/"${PF}" \
-		--with-workdir=/var/cfengine \
-		${myconf} \
-		$(use_with gd) \
-		$(use_with graphviz) \
-		$(use_with ldap) \
-		$(use_with libvirt) \
-		$(use_with pcre) \
-		$(use_with qdbm) \
-		$(use_enable selinux) \
-		$(use_with tokyocabinet)
-
-	# Fix Makefile to skip inputs, see below "examples"
-	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
-
-	# We install documentation through portage
-	sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile || die
-
-	if use tests; then
-		# Fix Makefiles to install tests in correct directory
-		for i in file_masters file_operands units ; do
-			sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${PF}\/tests\/${i}/" \
-				tests/${i}/Makefile || die
-		done
-	else
-		sed -i -e 's/\(SUBDIRS =\).*/\1/' tests/Makefile || die
-	fi
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die
-	newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die
-	newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die
-
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO INSTALL
-
-	if use examples; then
-		docinto examples
-		dodoc inputs/*.cf || die
-	fi
-
-	# Create cfengine working directory
-	dodir /var/cfengine/bin
-	fperms 700 /var/cfengine
-
-	# Copy cfagent into the cfengine tree otherwise cfexecd won't
-	# find it. Most hosts cache their copy of the cfengine
-	# binaries here. This is the default search location for the
-	# binaries.
-	for bin in know promises agent monitord serverd execd runagent key report; do
-		dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die
-	done
-
-	if use html; then
-		docinto html
-		dohtml -r docs/ || die
-	fi
-}
-
-pkg_postinst() {
-	echo
-	einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided."
-	einfo
-	einfo "To run cfengine out of cron every half hour modify your crontab:"
-	einfo "0,30 * * * *    /usr/sbin/cf-execd -F"
-	echo
-
-	elog "If you run cfengine the very first time, you MUST generate the keys for cfengine by running:"
-	elog "emerge --config ${CATEGORY}/${PN}"
-
-	# Fix old cf-servd, remove it after some releases.
-	local found=0
-	for fname in $(find /etc/runlevels/ -type f -or -type l -name 'cf-servd'); do
-		found=1
-		rm $fname
-		ln -s /etc/init.d/cf-serverd $(echo $fname | sed 's:cf-servd:cf-serverd:')
-	done
-
-	if [ "${found}" -eq 1 ]; then
-		echo
-		elog "/etc/init.d/cf-servd has been renamed to /etc/init.d/cf-serverd"
-	fi
-}
-
-pkg_config() {
-	if [ "${ROOT}" == "/" ]; then
-		if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then
-			einfo "Generating keys for localhost."
-			/usr/sbin/cf-key
-		fi
-	else
-		die "cfengine cfkey does not support any value of ROOT other than /."
-	fi
-}
diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild b/net-misc/cfengine/cfengine-3.1.1.ebuild
index e992f324db54..1de1f7734f27 100644
--- a/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild
+++ b/net-misc/cfengine/cfengine-3.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r3.ebuild,v 1.1 2010/11/03 18:40:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.1.ebuild,v 1.1 2010/11/24 16:56:35 idl0r Exp $
 
 EAPI="3"
 
-inherit eutils autotools
+inherit eutils
 
 MY_PV="${PV//_beta/b}"
 MY_PV="${MY_PV/_p/p}"
@@ -40,10 +40,8 @@ PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-configure.ac.patch"
-	epatch "${FILESDIR}/${P}-Makefile.am.patch"
-	epatch "${FILESDIR}/${P}-regex.c.patch"
-	eautoreconf
+	# https://cfengine.com/bugtracker/view.php?id=390
+	epatch "${FILESDIR}/${PN}-3.1.0-cf-key.patch"
 }
 
 src_configure() {
diff --git a/net-misc/cfengine/files/cfengine-3.0.5_p1-Makefile.am.patch b/net-misc/cfengine/files/cfengine-3.0.5_p1-Makefile.am.patch
deleted file mode 100644
index 999c9a92f3f0..000000000000
--- a/net-misc/cfengine/files/cfengine-3.0.5_p1-Makefile.am.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/pub/Makefile.am b/pub/Makefile.am
-index 14ad1a2..6ef675a 100644
---- a/pub/Makefile.am
-+++ b/pub/Makefile.am
-@@ -2,9 +2,9 @@
- AM_CFLAGS = @CFLAGS@ @GCC_CFLAG@
- INCLUDES = @BERKELEY_DB_CFLAGS@ @OPENSSL_LIB_CPPFLAGS@
- 
--noinst_LIBRARIES = libcfpub.a
-+noinst_LTLIBRARIES = libcfpub.la
- 
--libcfpub_a_SOURCES =							\
-+libcfpub_la_SOURCES =							\
- 	getopt.c							\
- 	getopt1.c							\
- 	full-write.c							\
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e48bb5b..c69ce0e 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -5,7 +5,7 @@ LDADD = libpromises.la # $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LI
- INCLUDES = $(BERKELEY_DB_CFLAGS) $(OPENSSL_LIB_CPPFLAGS)
- AM_LDFLAGS = $(BERKELEY_DB_LDFLAGS) $(OPENSSL_LIB_LDFLAGS) @LDFLAGS@
- 
--lib_LTLIBRARIES = libpromises.la
-+pkglib_LTLIBRARIES = libpromises.la
- 
- libpromises_la_LDFLAGS = -version-info 1:0:0 -no-undefined
- libpromises_la_LIBADD = $(BERKELEY_DB_LDFLAGSD) $(BERKELEY_DB_LIB) $(OPENSSL_LIB_LDFLAGS) $(OPENSSL_LIB_LIB)
diff --git a/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch b/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch
deleted file mode 100644
index 64bdab4891ed..000000000000
--- a/net-misc/cfengine/files/cfengine-3.0.5_p1-configure.ac.patch
+++ /dev/null
@@ -1,406 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 64b2a13..8202c6c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,8 +68,7 @@ AC_PROG_CC
- AM_PROG_LEX
- AC_PROG_YACC
- AC_PROG_RANLIB
--AC_DISABLE_SHARED
--dnl AC_DISABLE_STATIC - maybe use shared libs later
-+AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- AC_PROG_INSTALL
- AC_CONFIG_LIBOBJ_DIR(pub)
-@@ -84,13 +83,9 @@ AC_CHECK_LIB(m,main)
- 
- dnl Look for ldap
- 
--AC_ARG_WITH(ldap,
--	AS_HELP_STRING(--without-ldap, [support ldap functions]),with_ldap=no,
--	with_ldap=yes)
--
--if test "x$with_ldap" != xno; then
--   AC_CHECK_LIB(ldap,ldap_get_values_len)
--fi
-+AC_ARG_WITH([ldap],
-+    [AS_HELP_STRING([--without-ldap], [support ldap functions])])
-+AS_IF([test "x$with_ldap" = "xyes"], [AC_CHECK_LIB([ldap], [ldap_get_values_len])])
- 
- dnl Now check for database connectors
- 
-@@ -99,15 +94,9 @@ dnl ######################################################################
- dnl  Look for SQL connectors.
- dnl ######################################################################
- 
--AC_ARG_WITH(sql,
--	AS_HELP_STRING(--with-sql, [support database functions]), ,
--	with_sql=check)
--
--if test "x$with_sql" != xno; then
--   WITH_SQL=1
--else
--   WITH_SQL=0
--fi
-+AC_ARG_WITH([sql],
-+    [AS_HELP_STRING([--with-sql], [support database functions])])
-+AS_IF([test "x$with_sql" = "xyes"], [WITH_SQL=1], [WITH_SQL=0])
- 
- if test $WITH_SQL = 1; then
-   case "$target_os" in
-@@ -124,31 +113,17 @@ if test $WITH_SQL = 1; then
- fi
- 
- 
--AC_ARG_WITH(nova,
--	AS_HELP_STRING(--without-nova, [support some graphic functions]),with_nova=no,
--	with_nova=yes)
--
--if test "x$with_nova" != xno; then
--   AC_CHECK_LIB(cfnova,main)
--fi
-+AC_ARG_WITH([nova],
-+    [AS_HELP_STRING([--without-nova], [support some graphic functions])])
-+AS_IF([test "x$with_nova" = "xyes"], [AC_CHECK_LIB([cfnova], [main])])
- 
--AC_ARG_WITH(constellation,
--	AS_HELP_STRING(--without-constellation, [support some graphic functions]),with_constellation=no,
--	with_constellation=yes)
-+AC_ARG_WITH([constellation],
-+    [AS_HELP_STRING([--without-constellation], [support some graphic functions])])
-+AS_IF([test "x$with_constellation" == "xyes"], [AC_CHECK_LIB([cfconstellation], [main])])
- 
--if test "x$with_constellation" != xno; then
--   AC_CHECK_LIB(cfconstellation,main)
--
--fi
--
--AC_ARG_WITH(galaxy,
--	AS_HELP_STRING(--without-galaxy, [support some graphic functions]),with_galaxy=no,
--	with_galaxy=yes)
--
--if test "x$with_galaxy" != xno; then
--   AC_CHECK_LIB(cfgalaxy,main)
--
--fi
-+AC_ARG_WITH([galaxy],
-+    [AS_HELP_STRING([--without-galaxy], [support some graphic functions])])
-+AS_IF([test "x$with_galaxy" = "xyes"], [AC_CHECK_LIB([cfgalaxy], [main])])
- 
- AC_CHECK_FUNC(door_create,door)
- AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
-@@ -162,18 +137,12 @@ dnl
- dnl Choose a database
- dnl
- 
--AC_ARG_WITH(tokyocabinet,
--	AS_HELP_STRING(--with-tokyocabinet, [support database functions]),with_tokyo=yes,
--	with_tokyo=no)
--
--if test "x$with_tokyo" = xyes; then
--   AC_MSG_CHECKING(for TokyoCabinet)
--   WITH_TOKYO=1
--else
--   WITH_TOKYO=0
--fi
-+AC_ARG_WITH([tokyocabinet],
-+    [AS_HELP_STRING([--with-tokyocabinet], [support database functions])])
-+AS_IF([test "x$with_tokyocabinet" = "xyes"], [WITH_TOKYO=1], [WITH_TOKYO=0])
- 
- if test $WITH_TOKYO = 1; then
-+  AC_MSG_CHECKING(for TokyoCabinet)
-   AC_CHECK_LIB(tokyocabinet,main, [], [AC_MSG_ERROR(Cannot find Tokyo Cabinet)])
-   AC_CHECK_HEADERS(tcutil.h)
-   AC_CHECK_HEADERS(tchdb.h)
-@@ -182,18 +151,12 @@ fi
- 
- dnl else qdbm?
- 
--AC_ARG_WITH(qdbm,
--	AS_HELP_STRING(--with-qdbm, [support database functions qdbm]),with_qdbm=yes,
--	with_qdbm=no)
--
--if test "x$with_qdbm" = xyes; then
--   AC_MSG_CHECKING(for QDBM)
--   WITH_QDBM=1
--else
--   WITH_QDBM=0
--fi
-+AC_ARG_WITH([qdbm],
-+    [AS_HELP_STRING([--with-qdbm], [support database functions qdbm])])
-+AS_IF([test "x$with_qdbm" = "xyes"], [WITH_QDBM=1], [WITH_QDBM=0])
- 
- if test $WITH_QDBM = 1; then
-+  AC_MSG_CHECKING(for QDBM)
-   AC_CHECK_LIB(qdbm,main, [], [AC_MSG_ERROR(Cannot find Quick Database Manager)])
-   AC_CHECK_HEADERS(depot.h)
-   AC_DEFINE(QDB, 1, [Define if QDBM is available.])
-@@ -471,18 +434,12 @@ AC_SUBST(OPENSSL_LIB_LIB)
- # Others
- #
- 
--AC_ARG_WITH(libvirt,
--	AS_HELP_STRING(--with-libvirt, [support virtual machine management]),with_virt=yes,
--	with_virt=no)
--
--if test "x$with_virt" = xyes; then
--   AC_MSG_CHECKING(for libvirt)
--   WITH_VIRT=1
--else
--   WITH_VIRT=0
--fi
-+AC_ARG_WITH([libvirt],
-+    [AS_HELP_STRING([--with-libvirt], [support virtual machine management])])
-+AS_IF([test "x$with_libvirt" = "xyes"], [WITH_VIRT=1], [WITH_VIRT=0])
- 
- if test $WITH_VIRT = 1; then
-+  AC_MSG_CHECKING(for libvirt)
-   AC_CHECK_LIB(virt,main, [], [AC_MSG_ERROR(Cannot find libvirt)])
- fi
- 
-@@ -491,60 +448,52 @@ dnl ######################################################################
- dnl Checks for perl compatible regular expressions
- dnl ######################################################################
- 
--AC_ARG_WITH(pcre,
--    [  --with-pcre[[=PATH]] directory where Perl compatible regex exists (optionally in PATH)],
--    [
--        AC_MSG_CHECKING(pcre)
--
--        if test "x$withval" != "xno" ; then
--            if test "x$withval" != "xyes" ; then
--                if test "x$withval" = "xdefault" ; then
--                    for d in $prefix /usr/local /usr; do
--                        if test -f "$d/include/pcreposix.h" ; then
--                            CPPFLAGS="$CPPFLAGS -I$d/include"
--                            LDFLAGS="$LDFLAGS -L$d/lib"
--                            PCRE_LIB="-lpcreposix"
--                            AC_MSG_RESULT($d)
--                            break
--                        fi
--                    done
--                    if test x"$PCRE_LIB" = x ; then
--                        AC_MSG_ERROR(Cannot find PCRE - specify the path)
--                    fi
--                else
--                if test -f "${withval}/include/pcreposix.h" ; then
--                    CPPFLAGS="$CPPFLAGS -I${withval}/include"
--                    LDFLAGS="$LDFLAGS -L${withval}/lib"
--                    AC_MSG_RESULT("${withval}")
--                else
--                    AC_MSG_ERROR(Cannot find PCRE - specify the path)
--                fi
--                fi
--            else
--               AC_MSG_RESULT("yes")
--            fi
--            LIBS="$LIBS -lpcreposix"
--            AC_DEFINE(USE_PCRE, 1, [Define if PCRE is available.])
--        fi
--    ]
--)
-+AC_ARG_WITH([pcre],
-+			[AS_HELP_STRING([--without-pcre[[=PATH]]], [support for Perl compatible regex (optionally search in PATH)])])
-+AS_IF([test "x$with_pcre" != "xno"], [
-+    AC_MSG_CHECKING([pcre])
-+    if test "x$with_pcre" = "xyes" -o "x$with_pcre" = "x" ; then
-+		for d in $prefix /usr/local /usr; do
-+			if test -f "$d/include/pcre.h" ; then
-+				CPPFLAGS="$CPPFLAGS -I$d/include"
-+				LDFLAGS="$LDFLAGS -L$d/lib"
-+				AC_MSG_RESULT($d)
-+				FOUND_PCRE=1
-+				break
-+			fi
-+		done
-+		if test "x$FOUND_PCRE" = "x" ; then
-+			AC_MSG_NOTICE([Cannot find PCRE - specify the path])
-+		fi
-+	else
-+		if test -f "${withval}/include/pcre.h" ; then
-+			CPPFLAGS="$CPPFLAGS -I${withval}/include"
-+			LDFLAGS="$LDFLAGS -L${withval}/lib"
-+			AC_MSG_RESULT("${withval}")
-+		else
-+			AC_MSG_NOTICE([Cannot find PCRE in $withval])
-+		fi
-+	fi
- 
--AC_CHECK_LIB(pcre, main, [], [AC_MSG_ERROR(Cannot find PCRE)])
-+	AC_CHECK_HEADERS([pcre.h pcre/pcre.h])
-+	AC_CHECK_LIB(pcre, main, [], [AC_MSG_WARN([Cannot find PCRE])])
-+	AC_DEFINE(USE_PCRE, 1, [Define if PCRE is available.])
-+])
- 
--LIBS="$LIBS $BERKELEY_DB_LDFLAGS $BERKELEY_DB_LIB $OPENSSL_LIB_LDFLAGS $OPENSSL_LIB_LIB"
-+if test "x$ac_cv_lib_pcre_main" != "xyes"; then
-+	AC_CHECK_HEADERS([regex.h rxposix.h])
-+	AC_CHECK_FUNC([regcomp])
- 
--dnl ######################################################################
--dnl Checks for regular expressions
--dnl GNU regex lib if you have regcomp in libc you should NOT have this lib too
--dnl ######################################################################
-+	if test "x$ac_cv_header_regex_h" != "xyes" -a "x$ac_cv_header_rxposix_h" != "xyes" ; then
-+		AC_MSG_ERROR([Either PCRE, rxposix or GNU regex is required])
-+	fi
-+fi
- 
-+LIBS="$LIBS $BERKELEY_DB_LDFLAGS $BERKELEY_DB_LIB $OPENSSL_LIB_LDFLAGS $OPENSSL_LIB_LIB"
- 
- dnl AC_CHECK_LIB(rx, main) deprecated
- AC_CHECK_LIB(rt, main)
- 
--AC_CHECK_HEADERS(pcre.h)
--AC_CHECK_HEADERS(pcre/pcre.h)
--
- dnl ######################################################################
- dnl Checks for header files.
- dnl ######################################################################
-@@ -564,7 +513,6 @@ AC_CHECK_HEADERS(sys/param.h)
- AC_CHECK_HEADERS(fcntl.h)
- AC_CHECK_HEADERS(sys/filesys.h)
- AC_CHECK_HEADERS(dustat.h)
--AC_CHECK_HEADERS(regex.h rxposix.h)
- AC_CHECK_HEADERS(sys/systeminfo.h)
- AC_CHECK_HEADERS(sys/acl.h winsock2.h)
- 
-@@ -579,32 +527,23 @@ dnl ######################################################################
- dnl Checks for graph support
- dnl ######################################################################
- 
--AC_ARG_WITH(graphviz,
--	AS_HELP_STRING(--with-graphviz, [support some graphic functions]),with_graphviz=yes,
--	with_graphviz=no)
--
--if test "x$with_graphviz" = xyes; then
--   AC_MSG_CHECKING(for Graphviz)
--   WITH_GVC=1
--else
--   WITH_GVC=0
--fi
-+AC_ARG_WITH([graphviz],
-+    [AS_HELP_STRING([--with-graphviz], [support some graphic functions])])
-+AS_IF([test "x$with_graphviz" = "xyes"], [WITH_GVC=1], [WITH_GVC=0])
- 
- if test $WITH_GVC = 1; then
-+  AC_MSG_CHECKING(for Graphviz)
-   AC_CHECK_HEADERS(graphviz/gvc.h)
-   AC_CHECK_LIB(gvc,main)
- fi
- 
- 
--AC_ARG_WITH(gd,
--	AS_HELP_STRING(--without-gd, [support some graphic functions]),with_gd=no,
--	with_gd=yes)
--
--if test "x$with_gd" != xno; then
--   AC_CHECK_LIB(gd,main)
--   AC_CHECK_HEADERS(gd.h)
--fi
--
-+AC_ARG_WITH([gd],
-+    [AS_HELP_STRING([--without-gd], [support some graphic functions])])
-+AS_IF([test "x$with_gd" = "xyes"], [
-+    AC_CHECK_LIB(gd,main)
-+    AC_CHECK_HEADERS(gd.h)
-+])
- 
- dnl ######################################################################
- dnl Checks for data types
-@@ -627,7 +566,7 @@ dnl Check for special functions
- dnl ######################################################################
- 
- AC_CHECK_FUNCS(getcwd getnetgrent waitpid seteuid setegid setreuid setregid)
--AC_CHECK_FUNCS(uname gethostname realpath regcomp chflags)
-+AC_CHECK_FUNCS(uname gethostname realpath chflags)
- AC_CHECK_FUNCS(strstr strsep putenv drand48 srand48 getaddrinfo)
- AC_CHECK_FUNCS(bcopy mkfifo statfs statvfs door)
- AC_CHECK_FUNCS(sysinfo setsid strdup strrchr strerror snprintf sysconf)
-@@ -691,30 +630,27 @@ AC_CHECK_FUNC(lchown, AC_DEFINE(HAVE_LCHOWN))
- AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
- AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
- 
--AC_ARG_ENABLE(DCE,[  --enable-DCE            support for DCE and ACLs],[
--  case "$enableval" in
--    no) 
--        ;;
--    *)
--	AC_CHECK_LIB(thread, main) 
--	AC_CHECK_LIB(dce, main)            dnl DFS
--	AC_CHECK_HEADERS(dce/daclif.h)
--	AC_CHECK_HEADERS(pthread.h)
--	AC_CHECK_HEADERS(sched.h)
--	;;
--  esac
-- ])
-+AC_ARG_ENABLE([DCE], [AS_HELP_STRING([--enable-DCE], [support for DCE and ACLs])])
-+AS_IF([test "x$enable_DCE" = "xyes"], [
-+    AC_CHECK_LIB(thread, main)
-+    AC_CHECK_LIB(dce, main)            dnl DFS
-+    AC_CHECK_HEADERS(dce/daclif.h)
-+    AC_CHECK_HEADERS(pthread.h)
-+    AC_CHECK_HEADERS(sched.h)
-+])
- 
- dnl ######################################################################
- dnl Give the chance to enable SELINUX
- dnl ######################################################################
- dnl 
--AC_ARG_ENABLE(selinux, dnl 
--               [  --enable-selinux              Enable use of the SELINUX libraries],
--               [AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX])
--               LIB_SELINUX="-lselinux"
--               LIBS="$LIBS $LIB_SELINUX"
--               AC_SUBST(LIB_SELINUX)])
-+AC_ARG_ENABLE([selinux], dnl
-+    [AS_HELP_STRING([--enable-selinux], [Enable use of the SELINUX libraries])])
-+AS_IF([test "x$enable_selinux" = "xyes"], [
-+    AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX])
-+    LIB_SELINUX="-lselinux"
-+    LIBS="$LIBS $LIB_SELINUX"
-+    AC_SUBST(LIB_SELINUX)
-+])
- 
- 
- dnl ######################################################################
-@@ -995,7 +931,7 @@ AC_MSG_RESULT( )
- AC_MSG_RESULT(    Summary of options...)
- 
- 
--if test $ac_cv_lib_pcre_main = "yes"; then
-+if test "x$ac_cv_lib_pcre_main" = "xyes"; then
-   AC_MSG_RESULT( -> Configured with PCRE libraries)
- else
-   AC_MSG_RESULT( -> No PCRE library support - reverting to POSIX builtins)
-@@ -1003,11 +939,11 @@ fi
- 
- if test $WITH_SQL = 1; then
- 
--  if test $ac_cv_lib_mysqlclient_main = "yes"; then
-+  if test "x$ac_cv_lib_mysqlclient_main" = "xyes"; then
-     AC_MSG_RESULT( -> Configured with MYSQL libraries)
-   fi
- 
--  if test $ac_cv_lib_pq_main = "yes"; then
-+  if test "x$ac_cv_lib_pq_main" = "xyes"; then
-     AC_MSG_RESULT( -> Configured with Postgres libraries)
-   fi
- 
-@@ -1016,14 +952,14 @@ else
- fi
- 
- if test $WITH_GVC = 1; then
-- if test $ac_cv_lib_gvc_main = "yes"; then
-+ if test "x$ac_cv_lib_gvc_main" = "xyes"; then
-    AC_MSG_RESULT( -> Configured with Graphviz libraries)
-  fi
- else
-   AC_MSG_RESULT( -> No Graphviz libraries included)
- fi
- 
--if test $ac_cv_lib_ldap_ldap_get_values_len = "yes"; then
-+if test "x$ac_cv_lib_ldap_ldap_get_values_len" = "xyes"; then
-   AC_MSG_RESULT( -> Configured with LDAP libraries)
- else
-   AC_MSG_RESULT( -> No LDAP libraries included)
diff --git a/net-misc/cfengine/files/cfengine-3.0.5_p1-regex.c.patch b/net-misc/cfengine/files/cfengine-3.0.5_p1-regex.c.patch
deleted file mode 100644
index 2874a9439370..000000000000
--- a/net-misc/cfengine/files/cfengine-3.0.5_p1-regex.c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/pub/regex.c b/pub/regex.c
-index ba15918..dcaa9b4 100644
---- a/pub/regex.c
-+++ b/pub/regex.c
-@@ -40,6 +40,7 @@
- 
- /* We need this for `regex.h', and perhaps for the Emacs include files.  */
- #include <sys/types.h>
-+#include <string.h>
- #include "gnuregex.h"
- 
- /* The `emacs' switch turns on certain matching commands
diff --git a/net-misc/cfengine/files/cfengine-3.1.0-configure.ac.patch b/net-misc/cfengine/files/cfengine-3.1.0-configure.ac.patch
deleted file mode 100644
index 34dd32a81285..000000000000
--- a/net-misc/cfengine/files/cfengine-3.1.0-configure.ac.patch
+++ /dev/null
@@ -1,417 +0,0 @@
-From cfef822f6b86302f557e52af7190777f609e6d88 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Tue, 9 Nov 2010 18:14:10 +0100
-Subject: [PATCH] Fix configure.ac
-
-Enable shared libraries by default.
-Fix/Imporove several AC_ARG_WITH and AC_ARG_ENABLE.
-Some cleanup.
----
- configure.ac |  252 ++++++++++++++++++++++------------------------------------
- 1 files changed, 94 insertions(+), 158 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 57fb700..33ae4dd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -68,8 +68,7 @@ AC_PROG_CC
- AM_PROG_LEX
- AC_PROG_YACC
- AC_PROG_RANLIB
--AC_DISABLE_SHARED
--dnl AC_DISABLE_STATIC - maybe use shared libs later
-+AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
- AC_PROG_INSTALL
- AC_CONFIG_LIBOBJ_DIR(pub)
-@@ -93,13 +92,9 @@ fi
- 
- dnl Look for ldap
- 
--AC_ARG_WITH(ldap,
--	AS_HELP_STRING(--without-ldap, [support ldap functions]),with_ldap=no,
--	with_ldap=yes)
--
--if test "x$with_ldap" != xno; then
--   AC_CHECK_LIB(ldap,ldap_get_values_len)
--fi
-+AC_ARG_WITH([ldap],
-+    [AS_HELP_STRING([--without-ldap], [support ldap functions])])
-+AS_IF([test "x$with_ldap" = "xyes"], [AC_CHECK_LIB([ldap], [ldap_get_values_len])])
- 
- dnl Now check for database connectors
- 
-@@ -108,15 +103,9 @@ dnl ######################################################################
- dnl  Look for SQL connectors.
- dnl ######################################################################
- 
--AC_ARG_WITH(sql,
--	AS_HELP_STRING(--with-sql, [support database functions]), ,
--	with_sql=check)
--
--if test "x$with_sql" != xno; then
--   WITH_SQL=1
--else
--   WITH_SQL=0
--fi
-+AC_ARG_WITH([sql],
-+    [AS_HELP_STRING([--with-sql], [support database functions])])
-+AS_IF([test "x$with_sql" = "xyes"], [WITH_SQL=1], [WITH_SQL=0])
- 
- if test $WITH_SQL = 1; then
-   case "$target_os" in
-@@ -133,31 +122,17 @@ if test $WITH_SQL = 1; then
- fi
- 
- 
--AC_ARG_WITH(nova,
--	AS_HELP_STRING(--without-nova, [support some graphic functions]),with_nova=no,
--	with_nova=yes)
--
--if test "x$with_nova" != xno; then
--   AC_CHECK_LIB(cfnova,main)
--fi
--
--AC_ARG_WITH(constellation,
--	AS_HELP_STRING(--without-constellation, [support some graphic functions]),with_constellation=no,
--	with_constellation=yes)
--
--if test "x$with_constellation" != xno; then
--   AC_CHECK_LIB(cfconstellation,main)
--
--fi
--
--AC_ARG_WITH(galaxy,
--	AS_HELP_STRING(--without-galaxy, [support some graphic functions]),with_galaxy=no,
--	with_galaxy=yes)
-+AC_ARG_WITH([nova],
-+    [AS_HELP_STRING([--without-nova], [support some graphic functions])])
-+AS_IF([test "x$with_nova" = "xyes"], [AC_CHECK_LIB([cfnova], [main])])
- 
--if test "x$with_galaxy" != xno; then
--   AC_CHECK_LIB(cfgalaxy,main)
-+AC_ARG_WITH([constellation],
-+    [AS_HELP_STRING([--without-constellation], [support some graphic functions])])
-+AS_IF([test "x$with_constellation" == "xyes"], [AC_CHECK_LIB([cfconstellation], [main])])
- 
--fi
-+AC_ARG_WITH([galaxy],
-+    [AS_HELP_STRING([--without-galaxy], [support some graphic functions])])
-+AS_IF([test "x$with_galaxy" = "xyes"], [AC_CHECK_LIB([cfgalaxy], [main])])
- 
- AC_CHECK_FUNC(door_create,door)
- AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
-@@ -171,18 +146,12 @@ dnl
- dnl Choose a database
- dnl
- 
--AC_ARG_WITH(tokyocabinet,
--	AS_HELP_STRING(--with-tokyocabinet, [support database functions]),with_tokyo=yes,
--	with_tokyo=no)
--
--if test "x$with_tokyo" = xyes; then
--   AC_MSG_CHECKING(for TokyoCabinet)
--   WITH_TOKYO=1
--else
--   WITH_TOKYO=0
--fi
-+AC_ARG_WITH([tokyocabinet],
-+    [AS_HELP_STRING([--with-tokyocabinet], [support database functions])])
-+AS_IF([test "x$with_tokyocabinet" = "xyes"], [WITH_TOKYO=1], [WITH_TOKYO=0])
- 
- if test $WITH_TOKYO = 1; then
-+  AC_MSG_CHECKING(for TokyoCabinet)
-   AC_CHECK_LIB(tokyocabinet,main, [], [AC_MSG_ERROR(Cannot find Tokyo Cabinet)])
-   AC_CHECK_HEADERS(tcutil.h)
-   AC_CHECK_HEADERS(tchdb.h)
-@@ -191,18 +160,12 @@ fi
- 
- dnl else qdbm?
- 
--AC_ARG_WITH(qdbm,
--	AS_HELP_STRING(--with-qdbm, [support database functions qdbm]),with_qdbm=yes,
--	with_qdbm=no)
--
--if test "x$with_qdbm" = xyes; then
--   AC_MSG_CHECKING(for QDBM)
--   WITH_QDBM=1
--else
--   WITH_QDBM=0
--fi
-+AC_ARG_WITH([qdbm],
-+    [AS_HELP_STRING([--with-qdbm], [support database functions qdbm])])
-+AS_IF([test "x$with_qdbm" = "xyes"], [WITH_QDBM=1], [WITH_QDBM=0])
- 
- if test $WITH_QDBM = 1; then
-+  AC_MSG_CHECKING(for QDBM)
-   AC_CHECK_LIB(qdbm,main, [], [AC_MSG_ERROR(Cannot find Quick Database Manager)])
-   AC_CHECK_HEADERS(depot.h)
-   AC_DEFINE(QDB, 1, [Define if QDBM is available.])
-@@ -504,18 +467,12 @@ if test $WITH_MONGO = 1; then
- fi
- 
- 
--AC_ARG_WITH(libvirt,
--	AS_HELP_STRING(--with-libvirt, [support virtual machine management]),with_virt=yes,
--	with_virt=no)
--
--if test "x$with_virt" = xyes; then
--   AC_MSG_CHECKING(for libvirt)
--   WITH_VIRT=1
--else
--   WITH_VIRT=0
--fi
-+AC_ARG_WITH([libvirt],
-+    [AS_HELP_STRING([--with-libvirt], [support virtual machine management])])
-+AS_IF([test "x$with_libvirt" = "xyes"], [WITH_VIRT=1], [WITH_VIRT=0])
- 
- if test $WITH_VIRT = 1; then
-+  AC_MSG_CHECKING(for libvirt)
-   AC_CHECK_LIB(virt,main, [], [AC_MSG_ERROR(Cannot find libvirt)])
- fi
- 
-@@ -524,60 +481,52 @@ dnl ######################################################################
- dnl Checks for perl compatible regular expressions
- dnl ######################################################################
- 
--AC_ARG_WITH(pcre,
--    [  --with-pcre[[=PATH]] directory where Perl compatible regex exists (optionally in PATH)],
--    [
--        AC_MSG_CHECKING(pcre)
--
--        if test "x$withval" != "xno" ; then
--            if test "x$withval" != "xyes" ; then
--                if test "x$withval" = "xdefault" ; then
--                    for d in $prefix /usr/local /usr; do
--                        if test -f "$d/include/pcreposix.h" ; then
--                            CPPFLAGS="$CPPFLAGS -I$d/include"
--                            LDFLAGS="$LDFLAGS -L$d/lib"
--                            PCRE_LIB="-lpcreposix"
--                            AC_MSG_RESULT($d)
--                            break
--                        fi
--                    done
--                    if test x"$PCRE_LIB" = x ; then
--                        AC_MSG_ERROR(Cannot find PCRE - specify the path)
--                    fi
--                else
--                if test -f "${withval}/include/pcreposix.h" ; then
--                    CPPFLAGS="$CPPFLAGS -I${withval}/include"
--                    LDFLAGS="$LDFLAGS -L${withval}/lib"
--                    AC_MSG_RESULT("${withval}")
--                else
--                    AC_MSG_ERROR(Cannot find PCRE - specify the path)
--                fi
--                fi
--            else
--               AC_MSG_RESULT("yes")
--            fi
--            LIBS="$LIBS -lpcreposix"
--            AC_DEFINE(USE_PCRE, 1, [Define if PCRE is available.])
--        fi
--    ]
--)
-+AC_ARG_WITH([pcre],
-+			[AS_HELP_STRING([--without-pcre[[=PATH]]], [support for Perl compatible regex (optionally search in PATH)])])
-+AS_IF([test "x$with_pcre" != "xno"], [
-+    AC_MSG_CHECKING([pcre])
-+    if test "x$with_pcre" = "xyes" -o "x$with_pcre" = "x" ; then
-+		for d in $prefix /usr/local /usr; do
-+			if test -f "$d/include/pcre.h" ; then
-+				CPPFLAGS="$CPPFLAGS -I$d/include"
-+				LDFLAGS="$LDFLAGS -L$d/lib"
-+				AC_MSG_RESULT($d)
-+				FOUND_PCRE=1
-+				break
-+			fi
-+		done
-+		if test "x$FOUND_PCRE" = "x" ; then
-+			AC_MSG_NOTICE([Cannot find PCRE - specify the path])
-+		fi
-+	else
-+		if test -f "${withval}/include/pcre.h" ; then
-+			CPPFLAGS="$CPPFLAGS -I${withval}/include"
-+			LDFLAGS="$LDFLAGS -L${withval}/lib"
-+			AC_MSG_RESULT("${withval}")
-+		else
-+			AC_MSG_NOTICE([Cannot find PCRE in $withval])
-+		fi
-+	fi
- 
--AC_CHECK_LIB(pcre, main, [], [AC_MSG_ERROR(Cannot find PCRE)])
-+	AC_CHECK_HEADERS([pcre.h pcre/pcre.h])
-+	AC_CHECK_LIB(pcre, main, [], [AC_MSG_WARN([Cannot find PCRE])])
-+	AC_DEFINE(USE_PCRE, 1, [Define if PCRE is available.])
-+])
- 
--LIBS="$LIBS $BERKELEY_DB_LDFLAGS $BERKELEY_DB_LIB $OPENSSL_LIB_LDFLAGS $OPENSSL_LIB_LIB"
-+if test "x$ac_cv_lib_pcre_main" != "xyes"; then
-+	AC_CHECK_HEADERS([regex.h rxposix.h])
-+	AC_CHECK_FUNC([regcomp])
- 
--dnl ######################################################################
--dnl Checks for regular expressions
--dnl GNU regex lib if you have regcomp in libc you should NOT have this lib too
--dnl ######################################################################
-+	if test "x$ac_cv_header_regex_h" != "xyes" -a "x$ac_cv_header_rxposix_h" != "xyes" ; then
-+		AC_MSG_ERROR([Either PCRE, rxposix or GNU regex is required])
-+	fi
-+fi
- 
-+LIBS="$LIBS $BERKELEY_DB_LDFLAGS $BERKELEY_DB_LIB $OPENSSL_LIB_LDFLAGS $OPENSSL_LIB_LIB"
- 
- dnl AC_CHECK_LIB(rx, main) deprecated
- AC_CHECK_LIB(rt, main)
- 
--AC_CHECK_HEADERS(pcre.h)
--AC_CHECK_HEADERS(pcre/pcre.h)
--
- dnl ######################################################################
- dnl Checks for header files.
- dnl ######################################################################
-@@ -597,7 +546,6 @@ AC_CHECK_HEADERS(sys/param.h)
- AC_CHECK_HEADERS(fcntl.h)
- AC_CHECK_HEADERS(sys/filesys.h)
- AC_CHECK_HEADERS(dustat.h)
--AC_CHECK_HEADERS(regex.h rxposix.h)
- AC_CHECK_HEADERS(sys/systeminfo.h)
- AC_CHECK_HEADERS(sys/acl.h winsock2.h)
- 
-@@ -612,32 +560,23 @@ dnl ######################################################################
- dnl Checks for graph support
- dnl ######################################################################
- 
--AC_ARG_WITH(graphviz,
--	AS_HELP_STRING(--with-graphviz, [support some graphic functions]),with_graphviz=yes,
--	with_graphviz=no)
--
--if test "x$with_graphviz" = xyes; then
--   AC_MSG_CHECKING(for Graphviz)
--   WITH_GVC=1
--else
--   WITH_GVC=0
--fi
-+AC_ARG_WITH([graphviz],
-+    [AS_HELP_STRING([--with-graphviz], [support some graphic functions])])
-+AS_IF([test "x$with_graphviz" = "xyes"], [WITH_GVC=1], [WITH_GVC=0])
- 
- if test $WITH_GVC = 1; then
-+  AC_MSG_CHECKING(for Graphviz)
-   AC_CHECK_HEADERS(graphviz/gvc.h)
-   AC_CHECK_LIB(gvc,main)
- fi
- 
- 
--AC_ARG_WITH(gd,
--	AS_HELP_STRING(--without-gd, [support some graphic functions]),with_gd=no,
--	with_gd=yes)
--
--if test "x$with_gd" != xno; then
--   AC_CHECK_LIB(gd,main)
--   AC_CHECK_HEADERS(gd.h)
--fi
--
-+AC_ARG_WITH([gd],
-+    [AS_HELP_STRING([--without-gd], [support some graphic functions])])
-+AS_IF([test "x$with_gd" = "xyes"], [
-+    AC_CHECK_LIB(gd,main)
-+    AC_CHECK_HEADERS(gd.h)
-+])
- 
- dnl ######################################################################
- dnl Checks for data types
-@@ -660,7 +599,7 @@ dnl Check for special functions
- dnl ######################################################################
- 
- AC_CHECK_FUNCS(getcwd getnetgrent waitpid seteuid setegid setreuid setregid)
--AC_CHECK_FUNCS(uname gethostname realpath regcomp chflags)
-+AC_CHECK_FUNCS(uname gethostname realpath chflags)
- AC_CHECK_FUNCS(strstr strsep putenv drand48 srand48 getaddrinfo)
- AC_CHECK_FUNCS(bcopy mkfifo statfs statvfs door)
- AC_CHECK_FUNCS(sysinfo setsid strdup strrchr strerror snprintf sysconf)
-@@ -724,30 +663,27 @@ AC_CHECK_FUNC(lchown, AC_DEFINE(HAVE_LCHOWN))
- AC_CHECK_FUNC(pthread_attr_setstacksize, AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE), AC_CHECK_LIB(pthread, pthread_create))
- AC_CHECK_FUNC(pthread_sigmask, AC_DEFINE(HAVE_PTHREAD_SIGMASK), AC_CHECK_LIB(pthread, pthread_create))
- 
--AC_ARG_ENABLE(DCE,[  --enable-DCE            support for DCE and ACLs],[
--  case "$enableval" in
--    no) 
--        ;;
--    *)
--	AC_CHECK_LIB(thread, main) 
-+AC_ARG_ENABLE([DCE],[AS_HELP_STRING([--enable-DCE], [support for DCE and ACLs])])
-+AS_IF([test "x$enable_DCE" = "xyes"], [
-+	AC_CHECK_LIB(thread, main)
- 	AC_CHECK_LIB(dce, main)            dnl DFS
- 	AC_CHECK_HEADERS(dce/daclif.h)
- 	AC_CHECK_HEADERS(pthread.h)
- 	AC_CHECK_HEADERS(sched.h)
--	;;
--  esac
-- ])
-+])
- 
- dnl ######################################################################
- dnl Give the chance to enable SELINUX
- dnl ######################################################################
- 
--AC_ARG_ENABLE(selinux,
--               [  --enable-selinux              Enable use of the SELINUX libraries],
--               [AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX])
--               LIB_SELINUX="-lselinux"
--               LIBS="$LIBS $LIB_SELINUX"
--               AC_SUBST(LIB_SELINUX)])
-+AC_ARG_ENABLE([selinux],
-+	[AS_HELP_STRING([--enable-selinux], [Enable use of the SELINUX libraries])])
-+AS_IF([test "x$enable_selinux" = "xyes"], [
-+	AC_DEFINE(WITH_SELINUX, 1, [Define if you want to use SELINUX])
-+	LIB_SELINUX="-lselinux"
-+	LIBS="$LIBS $LIB_SELINUX"
-+	AC_SUBST(LIB_SELINUX)
-+])
- 
- dnl ######################################################################
- dnl OS specific stuff
-@@ -1027,7 +963,7 @@ AC_MSG_RESULT( )
- AC_MSG_RESULT(    Summary of options...)
- 
- 
--if test $ac_cv_lib_pcre_main = "yes"; then
-+if test "x$ac_cv_lib_pcre_main" = "xyes"; then
-   AC_MSG_RESULT( -> Configured with PCRE libraries)
- else
-   AC_MSG_RESULT( -> No PCRE library support - reverting to POSIX builtins)
-@@ -1035,11 +971,11 @@ fi
- 
- if test $WITH_SQL = 1; then
- 
--  if test $ac_cv_lib_mysqlclient_main = "yes"; then
-+  if test "x$ac_cv_lib_mysqlclient_main" = "xyes"; then
-     AC_MSG_RESULT( -> Configured with MYSQL libraries)
-   fi
- 
--  if test $ac_cv_lib_pq_main = "yes"; then
-+  if test "x$ac_cv_lib_pq_main" = "xyes"; then
-     AC_MSG_RESULT( -> Configured with Postgres libraries)
-   fi
- 
-@@ -1048,14 +984,14 @@ else
- fi
- 
- if test $WITH_GVC = 1; then
-- if test $ac_cv_lib_gvc_main = "yes"; then
-+ if test "x$ac_cv_lib_gvc_main" = "xyes"; then
-    AC_MSG_RESULT( -> Configured with Graphviz libraries)
-  fi
- else
-   AC_MSG_RESULT( -> No Graphviz libraries included)
- fi
- 
--if test $ac_cv_lib_ldap_ldap_get_values_len = "yes"; then
-+if test "x$ac_cv_lib_ldap_ldap_get_values_len" = "xyes"; then
-   AC_MSG_RESULT( -> Configured with LDAP libraries)
- else
-   AC_MSG_RESULT( -> No LDAP libraries included)
--- 
-1.7.2.2
-