cleanup

9 files changed, 32 insertions, 157 deletions

diff --git a/net-analyzer/nbaudit/nbaudit-1.0.ebuild b/net-analyzer/nbaudit/nbaudit-1.0.ebuild
index 2eec12507227..fc7c83f94b9b 100644
--- a/net-analyzer/nbaudit/nbaudit-1.0.ebuild
+++ b/net-analyzer/nbaudit/nbaudit-1.0.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/nbaudit-1.0.ebuild,v 1.5 2002/02/14 05:09:36 blocke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/nbaudit-1.0.ebuild,v 1.6 2002/04/27 12:41:09 seemant Exp $
 
 
 # Its officially called nat10 but the name conflicts with other projects
 # so I'm following the *BSDs suggestion of calling it nbaudit
 
-A=nat10.tgz
-P=nat10
-S=${WORKDIR}/${P}
+MY_P=nat10
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="NetBIOS file sharing services scanner (nat10)"
-SRC_URI="http://www.tux.org/pub/security/secnet/tools/nat10/${A}"
+SRC_URI="http://www.tux.org/pub/security/secnet/tools/nat10/${MY_P}.tgz"
 HOMEPAGE="http://www.tux.org/pub/security/secnet/tools/nat10"
 
 DEPEND=""
@@ -22,17 +21,17 @@ src_compile() {
    sed -e "s/# FLAGSM = -DLINUX -DSHADOW_PWD/FLAGSM = -DLINUX -DSHADOW_PWD -DNO_ASMSIGNALH/" -e "s/# LIBSM = -lshadow/LIBSM = -lshadow/" Makefile.old > Makefile
 
    # NOTE: DO NOT SET CFLAGS OR THE PROGRAM WILL SEGFAULT
-   try make all
+   make all || die
 
 }
 
 src_install () {
 
-    mv nat nbaudit
-    dobin nbaudit
+	mv nat nbaudit
+	dobin nbaudit
 
-    mv nat.1 nbaudit.1
-    doman nbaudit.1
+	mv nat.1 nbaudit.1
+	doman nbaudit.1
 
-    dodoc README COPYING
+	dodoc README COPYING
 }
diff --git a/net-analyzer/ngrep/files/digest-ngrep-1.38-r2 b/net-analyzer/ngrep/files/digest-ngrep-1.38-r2
deleted file mode 100644
index 6be02508fa5f..000000000000
--- a/net-analyzer/ngrep/files/digest-ngrep-1.38-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 adff63845df54eb40ef48f16664e4344 ngrep-1.38.tar.gz 93669
diff --git a/net-analyzer/ngrep/ngrep-1.38-r2.ebuild b/net-analyzer/ngrep/ngrep-1.38-r2.ebuild
deleted file mode 100644
index aa7722d2c893..000000000000
--- a/net-analyzer/ngrep/ngrep-1.38-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.38-r2.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $
-
-P=ngrep-1.38
-A=${P}.tar.gz
-S=${WORKDIR}/ngrep
-DESCRIPTION="A grep for network layers"
-SRC_URI="http://ngrep.datasurge.net/"${A}
-HOMEPAGE="http://ngrep.datasurge.net"
-
-DEPEND="virtual/glibc
-	>=net-libs/libpcap-0.5.2"
-
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-  unpack ${A}
-  patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-  
-  try ./configure --host=${CHOST} --prefix=/usr
-  try make
-}
-
-src_install() {
-
-  into /usr
-  dobin ngrep
-  doman ngrep.8
-  dodoc BUGS CHANGES COPYRIGHT CREDITS README TODO USAGE
-}
-
-
-
diff --git a/net-analyzer/ngrep/ngrep-1.40.ebuild b/net-analyzer/ngrep/ngrep-1.40.ebuild
index 4114e3c997c0..3eca6ca9ef4f 100644
--- a/net-analyzer/ngrep/ngrep-1.40.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.40.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.40.ebuild,v 1.1 2001/06/21 20:42:02 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.40.ebuild,v 1.2 2002/04/27 12:43:08 seemant Exp $
 
-A=${P}.tar.gz
 S=${WORKDIR}/ngrep
 DESCRIPTION="A grep for network layers"
-SRC_URI="http://prdownloads.sourceforge.net/ngrep/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/ngrep/${P}.tar.gz"
 HOMEPAGE="http://ngrep.sourceforge.net"
 
 DEPEND="virtual/glibc
@@ -14,23 +13,18 @@ DEPEND="virtual/glibc
 
 RDEPEND="virtual/glibc"
 
-#src_unpack() {
-#  unpack ${A}
-#  patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-#}
-
 src_compile() {
-  
-  try ./configure --host=${CHOST} --prefix=/usr
-  try make
+	
+	econf || die
+	make || die
 }
 
 src_install() {
 
-  into /usr
-  dobin ngrep
-  doman ngrep.8
-  dodoc BUGS CHANGES COPYRIGHT CREDITS README TODO USAGE
+	into /usr
+	dobin ngrep
+	doman ngrep.8
+	dodoc BUGS CHANGES COPYRIGHT CREDITS README TODO USAGE
 }
 
 
diff --git a/net-analyzer/nmap/files/digest-nmap-2.54_beta24-r1 b/net-analyzer/nmap/files/digest-nmap-2.54_beta24-r1
deleted file mode 100644
index 7794cccbc04b..000000000000
--- a/net-analyzer/nmap/files/digest-nmap-2.54_beta24-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 55fbb29468cb02270b5c15785f018f13 nmap-2.54BETA24.tgz 804051
diff --git a/net-analyzer/nmap/files/digest-nmap-2.54_beta30 b/net-analyzer/nmap/files/digest-nmap-2.54_beta30
deleted file mode 100644
index 219761f972bf..000000000000
--- a/net-analyzer/nmap/files/digest-nmap-2.54_beta30
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c43117c4a8d9f8e636398b1efe6dd00f nmap-2.54BETA30.tgz 854153
diff --git a/net-analyzer/nmap/nmap-2.54_beta24-r1.ebuild b/net-analyzer/nmap/nmap-2.54_beta24-r1.ebuild
deleted file mode 100644
index 920a6cc514c7..000000000000
--- a/net-analyzer/nmap/nmap-2.54_beta24-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta24-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
-
-
-P=nmap-2.54BETA24
-A=${P}.tgz
-S=${WORKDIR}/${P}
-DESCRIPTION="Portscanner"
-SRC_URI="http://www.insecure.org/nmap/dist/"${A}
-HOMEPAGE="http://www.insecure.org/nmap/"
-
-DEPEND="virtual/glibc
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
-
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --enable-ipv6
-  if [ "`use gtk`" ] ; then
-    try make
-  else
-    try make nmap
-  fi
-}
-
-src_install() {                               
-
-  try make prefix=${D}/usr mandir=${D}/usr/share/man install
-
-  dodoc CHANGELOG COPYING HACKING README*
-  cd docs
-  dodoc *.txt
-  docinto html
-  dodoc *.html
-}
-
-
-
diff --git a/net-analyzer/nmap/nmap-2.54_beta30.ebuild b/net-analyzer/nmap/nmap-2.54_beta30.ebuild
deleted file mode 100644
index 259e95ee3c0b..000000000000
--- a/net-analyzer/nmap/nmap-2.54_beta30.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta30.ebuild,v 1.1 2002/01/26 09:28:46 blocke Exp $
-
-
-P=nmap-2.54BETA30
-A=${P}.tgz
-S=${WORKDIR}/${P}
-DESCRIPTION="Portscanner"
-SRC_URI="http://www.insecure.org/nmap/dist/"${A}
-HOMEPAGE="http://www.insecure.org/nmap/"
-
-DEPEND="virtual/glibc
-	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
-
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man --enable-ipv6
-  if [ "`use gtk`" ] ; then
-    try make
-  else
-    try make nmap
-  fi
-}
-
-src_install() {                               
-
-  try make prefix=${D}/usr mandir=${D}/usr/share/man install
-
-  dodoc CHANGELOG COPYING HACKING README*
-  cd docs
-  dodoc *.txt
-  docinto html
-  dodoc *.html
-}
-
-
-
diff --git a/net-analyzer/nmap/nmap-2.54_beta31.ebuild b/net-analyzer/nmap/nmap-2.54_beta31.ebuild
index 817ee7aa09ab..710a2c1aacb1 100644
--- a/net-analyzer/nmap/nmap-2.54_beta31.ebuild
+++ b/net-analyzer/nmap/nmap-2.54_beta31.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta31.ebuild,v 1.1 2002/03/21 16:45:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-2.54_beta31.ebuild,v 1.2 2002/04/27 12:46:06 seemant Exp $
 
-#MY_P="nmap-2.54BETA31"
 MY_P="${P/_beta/BETA}"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Portscanner"
@@ -12,7 +11,7 @@ HOMEPAGE="http://www.insecure.org/nmap/"
 DEPEND="virtual/glibc
 	gtk? ( >=x11-libs/gtk+-1.2.10-r4 )"
 
-src_compile() {                           
+src_compile() {													 
 	./configure	\
 		--host=${CHOST}	\
 		--prefix=/usr	\
@@ -20,22 +19,22 @@ src_compile() {
 		--enable-ipv6	\
 		|| die
 
-	if [ "`use gtk`" ] ; then
+	use gtk && ( \
 		make || die
-	else
+	) || (
 		make nmap || die
-	fi
+	)
 }
 
-src_install() {                               
+src_install() {															 
 
-  make	\
-  	prefix=${D}/usr 	\
+	make	\
+		prefix=${D}/usr 	\
 	mandir=${D}/usr/share/man	\
 	install
 
-  dodoc CHANGELOG COPYING HACKING README*
-  cd docs
-  dodoc *.txt
-  dohtml *.html
+	dodoc CHANGELOG COPYING HACKING README*
+	cd docs
+	dodoc *.txt
+	dohtml *.html
 }