Version bump.

Fix QA warnings (#237812).
Add corefonts run-time dependency (#231705).
(Portage version: 2.1.4.4)

5 files changed, 69 insertions, 36 deletions

diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index 91affb699ce3..a9e8738b49c4 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/ntop
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.65 2008/07/05 15:03:09 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.66 2008/10/05 13:08:44 mrness Exp $
+
+*ntop-3.3.8 (05 Oct 2008)
+
+  05 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  +files/ntop-3.3.8-gentoo.patch, -files/ntop-3.3-build.patch,
+  files/ntop-initd, -ntop-3.3.ebuild, +ntop-3.3.8.ebuild:
+  Version bump. Fix QA warnings (#237812). Add corefonts run-time dependency
+  (#231705).
 
   05 Jul 2008; Peter Alfredsen <loki_val@gentoo.org> ntop-3.3.6.ebuild:
   Fix for libtool-2.2, bug #230853.
diff --git a/net-analyzer/ntop/files/ntop-3.3-build.patch b/net-analyzer/ntop/files/ntop-3.3-build.patch
deleted file mode 100644
index 578ebf36eb3f..000000000000
--- a/net-analyzer/ntop/files/ntop-3.3-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru ntop-3.3~/configure.in ntop-3.3/configure.in
---- ntop-3.3~/configure.in	2007-08-19 14:36:35.000000000 +0200
-+++ ntop-3.3/configure.in	2007-08-19 14:43:37.000000000 +0200
-@@ -508,11 +508,6 @@
-     LOCALEDIR="/usr/lib/locale"
- fi
- 
--dnl> Add /usr/local/
--CFLAGS="${CFLAGS} -I/usr/local/include"
--CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
--LDFLAGS="${LDFLAGS} -L/usr/local/lib"
--
- 
- 
- echo
diff --git a/net-analyzer/ntop/files/ntop-3.3.8-gentoo.patch b/net-analyzer/ntop/files/ntop-3.3.8-gentoo.patch
new file mode 100644
index 000000000000..5614ac31a648
--- /dev/null
+++ b/net-analyzer/ntop/files/ntop-3.3.8-gentoo.patch
@@ -0,0 +1,41 @@
+diff -ur ntop-3.3.8.orig/configure.in ntop-3.3.8/configure.in
+--- ntop-3.3.8.orig/configure.in	2008-10-02 10:54:15.000000000 +0000
++++ ntop-3.3.8/configure.in	2008-10-05 10:39:47.000000000 +0000
+@@ -504,13 +504,6 @@
+     LOCALEDIR="/usr/lib/locale"
+ fi
+ 
+-dnl> Add /usr/local/
+-CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
+-CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
+-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
+-
+-
+-
+ echo
+ echo "Test the compiler and setup CFLAGS..."
+ echo
+diff -ur ntop-3.3.8.orig/globals-core.c ntop-3.3.8/globals-core.c
+--- ntop-3.3.8.orig/globals-core.c	2008-10-01 21:03:36.000000000 +0000
++++ ntop-3.3.8/globals-core.c	2008-10-05 10:39:47.000000000 +0000
+@@ -424,7 +424,7 @@
+   _mtuSize[DLT_ATM_RFC1483] = 9180                             /* LLC/SNAP encapsulated atm */;
+   _headerSize[DLT_ATM_RFC1483] = 0;
+ 
+-  /* _mtuSize[DLT_RAW] = ?                                        raw IP */
++  _mtuSize[DLT_RAW] = 1500                                     /*   raw IP */;
+   _headerSize[DLT_RAW] = 0;
+ 
+   /* Others defined in bpf.h at tcpdump.org as of the resync - it would be NICE
+diff -ur ntop-3.3.8.orig/report.c ntop-3.3.8/report.c
+--- ntop-3.3.8.orig/report.c	2008-08-17 21:06:33.000000000 +0000
++++ ntop-3.3.8/report.c	2008-10-05 10:39:47.000000000 +0000
+@@ -2301,7 +2301,7 @@
+   if(fetchPrefsValue("dot.path", buf, sizeof(buf)) != -1) {
+     snprintf(dotPath, sizeof(dotPath), "%s", buf);
+   } else {
+-    snprintf(dotPath, sizeof(dotPath), "/usr/local/bin/dot");
++    snprintf(dotPath, sizeof(dotPath), "/usr/bin/dot");
+     storePrefsValue("dot.path", dotPath); /* Set the default */
+   }
+ 
diff --git a/net-analyzer/ntop/files/ntop-initd b/net-analyzer/ntop/files/ntop-initd
index d0e2b0183454..ffc2923790df 100644
--- a/net-analyzer/ntop/files/ntop-initd
+++ b/net-analyzer/ntop/files/ntop-initd
@@ -17,7 +17,8 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting ntop"
-	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
+	export LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
+	export GDFONTPATH=/usr/share/fonts/corefonts # apparently the only font that works (#231705)
 	start-stop-daemon --start --exec /usr/bin/ntop -- -d -L ${NTOP_OPTS}
 	eend $?
 }
diff --git a/net-analyzer/ntop/ntop-3.3.ebuild b/net-analyzer/ntop/ntop-3.3.8.ebuild
index 0cf545ce6b3b..e16c8d9d2f09 100644
--- a/net-analyzer/ntop/ntop-3.3.ebuild
+++ b/net-analyzer/ntop/ntop-3.3.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.ebuild,v 1.7 2008/07/04 23:44:20 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.3.8.ebuild,v 1.1 2008/10/05 13:08:44 mrness Exp $
 
 inherit eutils autotools
 
@@ -11,27 +11,28 @@ SRC_URI="mirror://sourceforge/ntop/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 nls ssl tcpd zlib"
-#IUSE="ipv6 nls snmp ssl tcpd zlib"
+IUSE="ipv6 nls ssl tcpd"
+#snmp support is disabled
 
 #snmp? ( net-analyzer/net-snmp )
 COMMON_DEPEND="sys-apps/gawk
-	>=sys-libs/gdbm-1.8.0
+	dev-lang/perl
+	sys-libs/gdbm
 	net-libs/libpcap
-	>=media-libs/gd-2.0.22
-	>=media-libs/libpng-1.2.5
+	media-libs/gd
+	media-libs/libpng
 	net-analyzer/rrdtool
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
-	zlib? ( sys-libs/zlib )"
+	ssl? ( dev-libs/openssl )
+	tcpd? ( sys-apps/tcp-wrappers )
+	sys-libs/zlib"
 DEPEND="${COMMON_DEPEND}
 	>=sys-devel/libtool-1.4"
 
 # Needed by xmldumpPlugin - couldn't get it to work
 #	dev-libs/gdome2
 #	>=dev-libs/glib-2"
-
 RDEPEND="${COMMON_DEPEND}
+	media-fonts/corefonts
 	media-gfx/graphviz"
 
 pkg_setup() {
@@ -62,15 +63,12 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+
 	cd "${S}"
-	epatch "${FILESDIR}"/globals-core.c.diff
-	epatch "${FILESDIR}"/${P}-build.patch
-	# remove local libtool garbage injected by upstream #220819
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	cat acinclude.m4.in acinclude.m4.ntop > acinclude.m4
 	eautoreconf
-
-	sed -i \
-		-e "s@/usr/local/bin/dot@/usr/bin/dot@" report.c || die "sed failed"
+	touch libtool.m4.in
 }
 
 src_compile() {
@@ -86,9 +84,8 @@ src_compile() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable nls i18n) \
-		$(use_with ssl) $(use_enable ssl sslv3) $(use_enable ssl sslwatchdog) \
-		$(use_with tcpd) \
-		$(use_with zlib) \
+		$(use_with ssl) $(use_enable ssl sslwatchdog) \
+		$(use_with tcpd tcpwrapper) \
 		--with-rrd-home=/usr/lib \
 		--disable-snmp \
 		|| die "configure problem"
@@ -97,6 +94,7 @@ src_compile() {
 }
 
 src_install() {
+	LC_ALL=C # apparently doesn't work with some locales (#191576 and #205382)
 	emake DESTDIR="${D}" install || die "install problem"
 
 	keepdir /var/lib/ntop