closing #31244 and other fixes

6 files changed, 42 insertions, 63 deletions

diff --git a/net-analyzer/nsat/ChangeLog b/net-analyzer/nsat/ChangeLog
index a106485dff31..b88e04408ab6 100644
--- a/net-analyzer/nsat/ChangeLog
+++ b/net-analyzer/nsat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nsat
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.3 2003/02/12 07:48:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.4 2003/10/28 13:36:37 aliz Exp $
+
+  28 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> nsat-1.5.ebuild :
+  DEPEND fixes, sed fixes and sparc keyword from #31244.
+  Remove 1.43 ebuild so that 1.5 is latest.
+  Fix CFLAGS.
 
 *nsat-1.5 (07 Jan 2003)
 
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index 213e2c130f03..e5c4b0525761 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -1,5 +1,4 @@
-MD5 4fc44bed922dd0a60bb28bb01ad7d722 files/digest-nsat-1.43 58
+MD5 8c7a3d341a784664a863ea10e43515e0 ChangeLog 707
+MD5 4b2bf75aa753be73122e85a4694e0872 nsat-1.5.ebuild 1300
 MD5 99fbec45790d1b3bcdc76807e592f1bf files/digest-nsat-1.5 57
-MD5 b8337d8546f36773a55c9030535c7d39 nsat-1.43.ebuild 1047
-MD5 5f20abb166ee2949aea9d04a87a7d287 nsat-1.5.ebuild 1046
-MD5 777388afb2c27a47751637d55bf868ac ChangeLog 527
+MD5 dd2688ef10995aad69fac0669f7413eb files/nsat-1.5-configure.patch 566
diff --git a/net-analyzer/nsat/files/digest-nsat-1.43 b/net-analyzer/nsat/files/digest-nsat-1.43
deleted file mode 100644
index 23cf18e46d57..000000000000
--- a/net-analyzer/nsat/files/digest-nsat-1.43
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9613f5bcc1a9bc7afd4016caeacb3739 nsat-1.43.tgz 422182
diff --git a/net-analyzer/nsat/files/nsat-1.5-configure.patch b/net-analyzer/nsat/files/nsat-1.5-configure.patch
new file mode 100644
index 000000000000..1f2c7e65bbf0
--- /dev/null
+++ b/net-analyzer/nsat/files/nsat-1.5-configure.patch
@@ -0,0 +1,14 @@
+--- configure.in	2003-10-28 13:27:28.000000000 +0000
++++ configure.in	2003-10-28 13:28:02.000000000 +0000
+@@ -47,9 +47,9 @@
+ else
+     CCOPTS='-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"
+     SMBLFLAGS="-lnsl -lcrypt"
++    CFLAGS="$CFLAGS -Wall -funroll-loops -ansi -fPIC -DLINUX"
+  ;;
+  *Darwin* | *Mac* | *MAC*)
+   AC_MSG_RESULT(found MAC OS X)
diff --git a/net-analyzer/nsat/nsat-1.43.ebuild b/net-analyzer/nsat/nsat-1.43.ebuild
deleted file mode 100644
index 1da13f91e61c..000000000000
--- a/net-analyzer/nsat/nsat-1.43.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.43.ebuild,v 1.3 2003/07/13 11:30:13 aliz Exp $
-
-IUSE="pcap X"
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
-SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
-HOMEPAGE="http://nsat.sourceforge.net/"
-
-DEPEND="pcap? ( >=net-libs/libpcap-0.7.1-r1 )
-	X? ( virtual/x11 )"
-RDEPEND=${DEPEND}
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	mv nsat.conf nsat.conf.orig
-	sed "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:" \
-		nsat.conf.orig > nsat.conf
-}
-
-src_compile() {
-	econf || die
-
-	# Parallel make doesn't work.
-	make || die "compile problem"
-}
-
-src_install () {
-	dobin nsat smb-ns
-	use X && dobin tools/xnsat
-
-	insinto /usr/share/nsat
-	doins nsat.cgi
-
-	insinto /etc/nsat
-	doins nsat.conf
-
-	dodoc README doc/LICENSE doc/CHANGES
-	doman doc/nsat.8
-}
diff --git a/net-analyzer/nsat/nsat-1.5.ebuild b/net-analyzer/nsat/nsat-1.5.ebuild
index a74963f06f00..d511ddfb3ca1 100644
--- a/net-analyzer/nsat/nsat-1.5.ebuild
+++ b/net-analyzer/nsat/nsat-1.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # 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.3 2003/07/13 11:30:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5.ebuild,v 1.4 2003/10/28 13:36:37 aliz Exp $
 
-IUSE="pcap X"
+IUSE="X"
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
 SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
 HOMEPAGE="http://nsat.sourceforge.net/"
 
-DEPEND="pcap? ( >=net-libs/libpcap-0.7.1-r1 )
-	X? ( virtual/x11 )"
+DEPEND="X? ( virtual/x11 dev-lang/tk )
+	>=net-libs/libpcap-0.7.1-r1 "
 RDEPEND=${DEPEND}
 
 SLOT="0"
@@ -20,16 +20,25 @@ KEYWORDS="x86"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	mv nsat.conf nsat.conf.orig
-	sed "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:" \
-		nsat.conf.orig > nsat.conf
+
+	epatch ${FILESDIR}/${P}-configure.patch
+
+	sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
+		nsat.conf
+	sed -i "s:/usr/local:/usr:g" Makefile.in
+	sed -i "s:/usr/local:/usr:g" tools/xnsat
+	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
 }
 
 src_compile() {
-	econf || die
+	WANT_AUTOCONF_2_5=1
+	autoconf
+
+	econf $( use_with X x ) || die
 
-	# Parallel make doesn't work.
-	make || die "compile problem"
+	make|| die "compile problem"
 }
 
 src_install () {