cleanup

5 files changed, 22 insertions, 175 deletions

diff --git a/net-analyzer/ntop/files/digest-ntop-1.3.1-r2 b/net-analyzer/ntop/files/digest-ntop-1.3.1-r2
deleted file mode 100644
index 84f56d6242cc..000000000000
--- a/net-analyzer/ntop/files/digest-ntop-1.3.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8afc33c65a176339916841e3a5177468 ntop-1.3.1.tar.gz 633849
diff --git a/net-analyzer/ntop/files/digest-ntop-2.0 b/net-analyzer/ntop/files/digest-ntop-2.0
deleted file mode 100644
index 8574724fd032..000000000000
--- a/net-analyzer/ntop/files/digest-ntop-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e528f29de05924852ff4222509e2f9a4 ntop-2.0-src.tgz 1950251
diff --git a/net-analyzer/ntop/ntop-1.3.1-r2.ebuild b/net-analyzer/ntop/ntop-1.3.1-r2.ebuild
deleted file mode 100644
index a8e27db992f5..000000000000
--- a/net-analyzer/ntop/ntop-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,64 +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/ntop/ntop-1.3.1-r2.ebuild,v 1.4 2001/06/09 07:10:17 achim Exp $
-
-P=ntop-1.3.1
-A="${P}.tar.gz"
-S=${WORKDIR}/${P}
-DESCRIPTION="Unix Tool that shows networkusage like top"
-SRC_URI="ftp://ftp.it.ntop.org/pub/local/ntop/snapshots/${A}"
-HOMEPAGE="http://www.ntop.org/ntop.html"
-
-DEPEND="virtual/glibc sys-devel/gcc
-	>=sys-libs/gdbm-1.8.0
-        >=sys-libs/readline-4.1
-        >=net-libs/libpcap-0.5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-RDEPEND="virtual/glibc sys-devel/gcc
-	>=sys-libs/gdbm-1.8.0
-        >=sys-libs/ncurses-5.1
-        >=sys-libs/readline-4.1
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-# tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) does not work atm
-
-src_unpack() {
-    unpack ${A}
-    cp ${FILESDIR}/main.c ${S}/main.c
-}
-src_compile() {
-
-    local myconf
-    if [ -z "`use ssl`" ] ; then
-        myconf="--disable-ssl"
-    else
-        cp configure configure.orig
-        sed -e "s:/usr/local/ssl:/usr:" configure.orig > configure
-        export CFLAGS="$CFLAGS -I/usr/include/openssl"
-    fi
-    #if [ "`use tcpd`" ] ; then
-    #    myconf="$myconf --enable-tcpwrap"
-    #fi
-    touch *
-    try ./configure --prefix=/usr --sysconfdir=/usr/share --mandir=/usr/share/man --host=${CHOST}  $myconf
-    try make
-
-}
-
-src_install () {
-
-
-    try make prefix=${D}/usr sysconfdir=/${D}/usr/share mandir=${D}/usr/share/man install
-    mv ${D}/usr/bin/plugins ${D}/usr/share/ntop
-
-    dodoc AUTHORS ChangeLog CONTENTS COPYING FAQ FILES HACKING
-    dodoc KNOWN_BUGS MANIFESTO NEWS ntop.txt PORTING README*
-    dodoc SUPPORT* THANKS THREADS-FAQ TODO
-    docinto html
-    dodoc ntop.html
-}
-
-
-
diff --git a/net-analyzer/ntop/ntop-2.0-r1.ebuild b/net-analyzer/ntop/ntop-2.0-r1.ebuild
index 4213260774bb..0cd1f6b1a050 100644
--- a/net-analyzer/ntop/ntop-2.0-r1.ebuild
+++ b/net-analyzer/ntop/ntop-2.0-r1.ebuild
@@ -1,21 +1,20 @@
-# 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>, Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-2.0-r1.ebuild,v 1.1 2002/04/25 22:26:49 tutor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-2.0-r1.ebuild,v 1.2 2002/04/27 12:53:03 seemant Exp $
 
-A="${P}-src.tgz"
-S=${WORKDIR}/ntop
+S=${WORKDIR}/${PN}
 DESCRIPTION="ntop is a unix tool that shows network usage like top"
-SRC_URI="http://luca.ntop.org/${A}"
+SRC_URI="http://luca.ntop.org/${P}-src.tgz"
 HOMEPAGE="http://www.ntop.org/ntop.html"
 
 DEPEND="virtual/glibc sys-devel/gcc
 	>=sys-libs/gdbm-1.8.0
-        >=net-libs/libpcap-0.5.2
+	>=net-libs/libpcap-0.5.2
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	mysql? ( dev-db/mysql )
-	readline? ( >=sys-libs/readline-4.1 )
-        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	readline? ( >=sys-libs/readline-4.1 )"
 
 RDEPEND="${DEPEND}"
 
@@ -23,16 +22,16 @@ src_compile() {
 
     local myconf
     if [ -z "`use ssl`" ] ; then
-        myconf="--disable-ssl"
+		myconf="--disable-ssl"
     else
-        cp configure configure.orig
-        sed -e "s:/usr/local/ssl:/usr:" configure.orig > configure
-        export CFLAGS="$CFLAGS -I/usr/include/openssl"
+		cp configure configure.orig
+		sed -e "s:/usr/local/ssl:/usr:" configure.orig > configure
+		export CFLAGS="$CFLAGS -I/usr/include/openssl"
     fi
 
-    use mysql		|| myconf="$myconf --disable-mysql"
-    use readline	|| myconf="$myconf --disable-readline"
-    use tcpd		|| myconf="$myconf --enable-tcpwrap"
+    use mysql		|| myconf="${myconf} --disable-mysql"
+    use readline	|| myconf="${myconf} --disable-readline"
+    use tcpd		|| myconf="${myconf} --enable-tcpwrap"
 
     # ntop 2.0 ships with its own version of gdchart... gdchart should
     # get its own package but ntop should be built with the version it
@@ -59,8 +58,8 @@ src_compile() {
     cd ../ntop
     # fix syslog() format strings vulnerability.
     patch -p1 < ${FILESDIR}/ntop-2.0_syslog_format.patch
-    try ./configure --prefix=/usr --sysconfdir=/usr/share --mandir=/usr/share/man --host=${CHOST}  $myconf
-    try make
+	econf ${myconf} || die
+    make || die
 
 }
 
@@ -70,7 +69,11 @@ src_install () {
     mv Makefile Makefile.orig
     sed 's/man_MANS = ntop.8 intop\/intop.1//g' Makefile.orig > Makefile
 
-    try make prefix=${D}/usr sysconfdir=/${D}/usr/share mandir=${D}/usr/share/man install
+    make \
+		prefix=${D}/usr \
+		sysconfdir=/${D}/usr/share \
+		mandir=${D}/usr/share/man \
+		install || die
 
     # fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
     # (don't know if there is a clean way to handle it)
@@ -80,9 +83,5 @@ src_install () {
     dodoc AUTHORS CONTENTS COPYING ChangeLog INSTALL MANIFESTO NEWS
     dodoc PORTING README SUPPORT_NTOP.txt THANKS
 
-    docinto html
-    dodoc ntop.html
+    dohtml ntop.html
 }
-
-
-
diff --git a/net-analyzer/ntop/ntop-2.0.ebuild b/net-analyzer/ntop/ntop-2.0.ebuild
deleted file mode 100644
index 32c23772dadf..000000000000
--- a/net-analyzer/ntop/ntop-2.0.ebuild
+++ /dev/null
@@ -1,86 +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>, Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-2.0.ebuild,v 1.1 2002/01/08 19:20:29 blocke Exp $
-
-A="${P}-src.tgz"
-S=${WORKDIR}/ntop
-DESCRIPTION="ntop is a unix tool that shows network usage like top"
-SRC_URI="http://luca.ntop.org/${A}"
-HOMEPAGE="http://www.ntop.org/ntop.html"
-
-DEPEND="virtual/glibc sys-devel/gcc
-	>=sys-libs/gdbm-1.8.0
-        >=net-libs/libpcap-0.5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	mysql? ( dev-db/mysql )
-	readline? ( >=sys-libs/readline-4.1 )
-        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-RDEPEND="${DEPEND}"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use ssl`" ] ; then
-        myconf="--disable-ssl"
-    else
-        cp configure configure.orig
-        sed -e "s:/usr/local/ssl:/usr:" configure.orig > configure
-        export CFLAGS="$CFLAGS -I/usr/include/openssl"
-    fi
-
-    use mysql		|| myconf="$myconf --disable-mysql"
-    use readline	|| myconf="$myconf --disable-readline"
-    use tcpd		|| myconf="$myconf --enable-tcpwrap"
-
-    # ntop 2.0 ships with its own version of gdchart... gdchart should
-    # get its own package but ntop should be built with the version it
-    # shipped with just in case future versions are incompatible -- blocke
-
-    # compile gdchart
-    cd ../gdchart0.94c
-    ./configure || die
-
-    # subtree #1
-    cd gd-1.8.3/libpng-1.0.8
-    make -f scripts/makefile.linux || die
-
-    # subtree #2
-    cd ../../zlib-1.1.3/
-    ./configure || die
-    make || die
-
-    # gdchart make
-    cd ../
-    make || die
-
-    # now ntop itself...
-    cd ../ntop
-    try ./configure --prefix=/usr --sysconfdir=/usr/share --mandir=/usr/share/man --host=${CHOST}  $myconf
-    try make
-
-}
-
-src_install () {
-
-    # slight issue with man file installation
-    mv Makefile Makefile.orig
-    sed 's/man_MANS = ntop.8 intop\/intop.1//g' Makefile.orig > Makefile
-
-    try make prefix=${D}/usr sysconfdir=/${D}/usr/share mandir=${D}/usr/share/man install
-
-    # fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
-    # (don't know if there is a clean way to handle it)
-
-    doman ntop-rules.8 ntop.8
-
-    dodoc AUTHORS CONTENTS COPYING ChangeLog INSTALL MANIFESTO NEWS
-    dodoc PORTING README SUPPORT_NTOP.txt THANKS
-
-    docinto html
-    dodoc ntop.html
-}
-
-
-