sed -i

3 files changed, 15 insertions, 18 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index ea4cf22fef7a..d83a28bb9d40 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.16 2004/01/12 02:37:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.17 2004/01/12 06:04:07 seemant Exp $
+
+  11 Jan 2004; Seemant Kulleen <seemant@gentoo.org> ntop-2.0.99_rc2-r2.ebuild:
+  sed -i
 
   11 Jan 2004; Seemant Kulleen <seemant@gentoo.org> ntop-2.2.ebuild,
   ntop-2.2c.ebuild:
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index af8d11da39e8..2d03a4bb7a9d 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -1,6 +1,6 @@
-MD5 2621f553b7a2f6208843e605463b97e0 ntop-2.0.99_rc2-r2.ebuild 2686
+MD5 65de78a42cd109cc0decb1d74653273d ntop-2.0.99_rc2-r2.ebuild 2493
 MD5 c4f912362ce17bfdda7b36b6d5811f59 ntop-2.2.ebuild 2115
-MD5 d71f7e115536968de68d294f8c15a068 ChangeLog 1901
+MD5 81a8ac03bb85c51ab906865cc2125984 ChangeLog 1990
 MD5 c4d97b72dd30233a40fd63a2c03210d9 ntop-2.2c.ebuild 2281
 MD5 e8f42646f3226a9ad43cac51773512f0 files/digest-ntop-2.0.99_rc2-r2 65
 MD5 b7642cd2d05562431a2af66604275657 files/digest-ntop-2.2 58
diff --git a/net-analyzer/ntop/ntop-2.0.99_rc2-r2.ebuild b/net-analyzer/ntop/ntop-2.0.99_rc2-r2.ebuild
index 7611986858f8..fffe025185aa 100644
--- a/net-analyzer/ntop/ntop-2.0.99_rc2-r2.ebuild
+++ b/net-analyzer/ntop/ntop-2.0.99_rc2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-2.0.99_rc2-r2.ebuild,v 1.9 2003/02/13 13:49:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-2.0.99_rc2-r2.ebuild,v 1.10 2004/01/12 06:04:07 seemant Exp $
 
 IUSE="ssl readline mysql"
 
@@ -16,6 +16,7 @@ KEYWORDS="x86 ppc sparc "
 DEPEND=">=sys-libs/gdbm-1.8.0
 	>=net-libs/libpcap-0.5.2
 	>=sys-apps/tcp-wrappers-7.6
+	>=sys-apps/sed-4
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	mysql? ( dev-db/mysql )
 	readline? ( >=sys-libs/readline-4.1 )"
@@ -29,8 +30,7 @@ src_compile() {
 	if [ -z "`use ssl`" ] ; then
 		myconf="--disable-ssl"
 	else
-		cp configure configure.orig
-		sed -e "s:/usr/local/ssl:/usr:" configure.orig > configure
+		sed -i "s:/usr/local/ssl:/usr:" configure
 		export CFLAGS="$CFLAGS -I/usr/include/openssl"
 	fi
 
@@ -70,17 +70,11 @@ src_compile() {
 
 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
-
-	make \
-		prefix=${D}/usr \
-		sysconfdir=/${D}/etc \
-		mandir=${D}/usr/share/man \
-		datadir=${D}/usr/share \
+	sed -i 's/man_MANS = ntop.8 intop\/intop.1//g' Makefile
+
+	einstall \
 		DATAFILE_DIR=${D}/usr/share/ntop \
-		CONFIGFILE_DIR=${D}/etc/ntop \
-		install || die "install problem"
+		CONFIGFILE_DIR=${D}/etc/ntop || die
 
 	# fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
 	# (don't know if there is a clean way to handle it)
@@ -92,5 +86,5 @@ src_install () {
 
 	dohtml ntop.html
 
-	dodir /var/lib/ntop
+	keepdir /var/lib/ntop
 }