Clean up configure patch. Do not strip (bug #251981). Do not call autoconf directly (bug #226585).

(Portage version: 2.2_rc22/cvs/Linux 2.6.25-gentoo-r7-JeR i686)

4 files changed, 44 insertions, 15 deletions

diff --git a/net-analyzer/nsat/ChangeLog b/net-analyzer/nsat/ChangeLog
index 41d597876c62..0059e74dd4dc 100644
--- a/net-analyzer/nsat/ChangeLog
+++ b/net-analyzer/nsat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nsat
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.15 2007/07/22 07:59:37 pva Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.16 2009/01/15 07:04:29 jer Exp $
+
+  15 Jan 2009; Jeroen Roovers <jer@gentoo.org>
+  files/nsat-1.5-configure.patch, +files/nsat-1.5-strip.patch,
+  nsat-1.5.ebuild:
+  Clean up configure patch. Do not strip (bug #251981). Do not call autoconf
+  directly (bug #226585).
 
   22 Jul 2007; <pva@gentoo.org> nsat-1.5.ebuild:
   Removed virtual/x11 dependency.
diff --git a/net-analyzer/nsat/files/nsat-1.5-configure.patch b/net-analyzer/nsat/files/nsat-1.5-configure.patch
index 1f2c7e65bbf0..803a01f9e2bc 100644
--- a/net-analyzer/nsat/files/nsat-1.5-configure.patch
+++ b/net-analyzer/nsat/files/nsat-1.5-configure.patch
@@ -1,14 +1,25 @@
---- configure.in	2003-10-28 13:27:28.000000000 +0000
-+++ configure.in	2003-10-28 13:28:02.000000000 +0000
-@@ -47,9 +47,9 @@
+--- nsat/configure.in.orig	2003-01-05 22:47:13.000000000 +0100
++++ nsat/configure.in	2009-01-15 07:56:35.000000000 +0100
+@@ -15,7 +15,6 @@
  else
-     CCOPTS='-DLINUX'
+     AC_MSG_RESULT(crappy :P)
+ fi
+- LEETCC=$ac_cv_prog_gcc;
+ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+@@ -45,11 +44,11 @@
+ if test $LEETCC = yes; then
+     CCOPTS='-Wall -O6 -funroll-loops -ansi -fPIC -DLINUX'
+ else
+-    CCOPTS='-DLINUX'
++    CCOPTS="${CFLAGS} -DLINUX"
  fi
 -    CFLAGS="$CCOPTS"
 -    SMBCFLAGS="-Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
-+    SMBCFLAGS="$CFLAGS -Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
++    SMBCFLAGS="${CCOPTS} -Wall -DLINUX -DNETGROUP -DALLOW_CHANGE_PASSWORD -DFAST_SHARE_MODES -DNO_ASMSIGNALH -DGLIBC2"
      SMBLFLAGS="-lnsl -lcrypt"
-+    CFLAGS="$CFLAGS -Wall -funroll-loops -ansi -fPIC -DLINUX"
++    CFLAGS="${CCOPTS} -Wall -ansi -fPIC -DLINUX"
   ;;
   *Darwin* | *Mac* | *MAC*)
    AC_MSG_RESULT(found MAC OS X)
diff --git a/net-analyzer/nsat/files/nsat-1.5-strip.patch b/net-analyzer/nsat/files/nsat-1.5-strip.patch
new file mode 100644
index 000000000000..89b109802de1
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-strip.patch
@@ -0,0 +1,10 @@
+--- nsat/src/Makefile.in.orig	2002-04-26 08:45:38.000000000 +0200
++++ nsat/src/Makefile.in	2009-01-15 07:44:11.000000000 +0100
+@@ -37,7 +37,6 @@
+ 
+ ../nsat:
+ 	${GPP} ${CFLAGS} ${OBJ} ${MODOBJ} ${MIXOBJ} -o ../nsat ${CLIB}
+-	strip ../nsat
+ 
+ pidalloc.o:
+ 	${GPP} ${CFLAGS} -c pidalloc.cpp
diff --git a/net-analyzer/nsat/nsat-1.5.ebuild b/net-analyzer/nsat/nsat-1.5.ebuild
index 27935332d2a4..bbca1e5efaa7 100644
--- a/net-analyzer/nsat/nsat-1.5.ebuild
+++ b/net-analyzer/nsat/nsat-1.5.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5.ebuild,v 1.16 2007/07/22 07:59:37 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5.ebuild,v 1.17 2009/01/15 07:04:29 jer Exp $
 
-inherit eutils
+inherit eutils autotools
+
+WANT_AUTOCONF=2.5
 
 DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
 HOMEPAGE="http://nsat.sourceforge.net/"
@@ -24,10 +26,11 @@ S="${WORKDIR}/${PN}"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
+	cp -va configure.in{,.orig}
 	epatch "${FILESDIR}"/${P}-configure.patch
 	# bug 128204
 	epatch "${FILESDIR}"/${P}-lvalue-gcc4.patch
+	epatch "${FILESDIR}"/${P}-strip.patch
 
 	sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
 		nsat.conf
@@ -36,12 +39,11 @@ src_unpack() {
 	sed -i -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
 		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
 		src/lang.h
+
+	eautoconf
 }
 
 src_compile() {
-	WANT_AUTOCONF=2.5
-	autoconf
-
 	econf $( use_with X x ) || die
 
 	make|| die "compile problem"