fix noradius patch to actually patch configure.in (makes it more portable), fixes bug #105459

(Portage version: 2.0.51.22-r2)

4 files changed, 53 insertions, 13 deletions

diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 095c402f6109..ba81072e7972 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nagios-plugins
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.37 2005/09/10 13:22:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.38 2005/09/10 18:24:13 ramereth Exp $
+
+  10 Sep 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/nagios-plugins-1.4.1-noradius.patch, nagios-plugins-1.4.1.ebuild:
+  * Fix noradius patch to actually patch configure.in instead of the configure
+  script (makes it more portable) This should fix bug #105459
 
   10 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   nagios-plugins-1.4.1.ebuild:
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index a08dfb1133de..dc13c47ce19f 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -1,11 +1,12 @@
 MD5 a152c2b6f4f339474ac2b589c675d99a ChangeLog 6199
-MD5 dc5c009c94eb85253dcefe800212ea3d nagios-plugins-1.4.ebuild 3279
-MD5 5db356dad10986a73f73a0335265ad92 metadata.xml 371
 MD5 8f37db1a5330acf9b68c8642375acd17 nagios-plugins-1.3.1-r1.ebuild 2947
-MD5 b94512e1b59c8d5e6462a32c9842f33d nagios-plugins-1.4.1.ebuild 3310
+MD5 5db356dad10986a73f73a0335265ad92 metadata.xml 371
+MD5 dc5c009c94eb85253dcefe800212ea3d nagios-plugins-1.4.ebuild 3279
+MD5 da9232879b2741bee08b6e24d9097b0e nagios-plugins-1.4.1.ebuild 3571
+MD5 39af7074b023625d9a75730bd6932437 files/digest-nagios-plugins-1.3.1-r1 72
 MD5 acb0b2b914b27b67b9a33807b1e6838e files/install-opts-fix.diff 3168
+MD5 ee71da291efd7427bd9786591a98df34 files/nagios-plugins-noradius.patch 2661
 MD5 c8c25561d4871462ea03dc0490ced91b files/check_swap.c.patch 2212
-MD5 da07ad1aeef96a19b0a44da14dac23ca files/digest-nagios-plugins-1.4.1 72
 MD5 639ea6f5791cdf3ad540489c66d1f356 files/digest-nagios-plugins-1.4 70
-MD5 ee71da291efd7427bd9786591a98df34 files/nagios-plugins-noradius.patch 2661
-MD5 39af7074b023625d9a75730bd6932437 files/digest-nagios-plugins-1.3.1-r1 72
+MD5 da07ad1aeef96a19b0a44da14dac23ca files/digest-nagios-plugins-1.4.1 72
+MD5 73ee36e67ff5948e0db8c99963a9e89f files/nagios-plugins-1.4.1-noradius.patch 666
diff --git a/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.1-noradius.patch b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.1-noradius.patch
new file mode 100644
index 000000000000..aac5637ecd50
--- /dev/null
+++ b/net-analyzer/nagios-plugins/files/nagios-plugins-1.4.1-noradius.patch
@@ -0,0 +1,22 @@
+--- configure.in.orig	2005-09-10 16:40:43.000000000 +0000
++++ configure.in	2005-09-10 16:43:18.000000000 +0000
+@@ -193,19 +193,6 @@
+ LIBS="$_SAVEDLIBS"
+ CPPFLAGS="$_SAVEDCPPFLAGS"
+ 
+-dnl Check for radius libraries
+-_SAVEDLIBS="$LIBS"
+-AC_CHECK_LIB(radiusclient,rc_read_config)
+-if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
+-  EXTRAS="$EXTRAS check_radius"
+-	RADIUSLIBS="-lradiusclient"
+-  AC_SUBST(RADIUSLIBS)
+-else
+-  AC_MSG_WARN([Skipping radius plugin])
+-  AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
+-fi
+-LIBS="$_SAVEDLIBS"
+-
+ dnl Check for LDAP libraries
+ _SAVEDLIBS="$LIBS"
+ AC_CHECK_LIB(ldap,main,,,-llber)
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
index 27e423c4d5a0..e35044422398 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild,v 1.3 2005/09/10 13:22:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild,v 1.4 2005/09/10 18:24:13 ramereth Exp $
 
 inherit eutils
 
@@ -44,12 +44,24 @@ pkg_setup() {
 	enewuser nagios -1 /bin/bash /dev/null nagios
 }
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	if ! use radius; then
+		EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/${P}-noradius.patch
+	fi
 	if ! use radius; then
-		epatch ${FILESDIR}/nagios-plugins-noradius.patch
+		export WANT_AUTOCONF=2.58
+		export WANT_AUTMAKE=1.8
+		cd ${S}
+		aclocal -I m4 || die "Failed to run aclocal"
+		autoconf || die "Failed to run autoconf"
+		automake || die "Failed to run automake"
 	fi
+}
+
+src_compile() {
 
-	./configure \
+	econf \
 		$(use_with mysql) \
 		$(use_with postgres) \
 		$(use_with ssl openssl) \
@@ -59,12 +71,12 @@ src_compile() {
 		--with-nagios-user=nagios \
 		--sysconfdir=/etc/nagios \
 		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+		--mandir=/usr/share/man || die "econf failed"
 
 	# fix problem with additional -
 	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
 
-	make || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {