*** empty log message ***

3 files changed, 67 insertions, 30 deletions

diff --git a/net-analyzer/ntop/ntop-1.3.1-r2.ebuild b/net-analyzer/ntop/ntop-1.3.1-r2.ebuild
index b62e62484bd7..ad1e4cb9464c 100644
--- a/net-analyzer/ntop/ntop-1.3.1-r2.ebuild
+++ b/net-analyzer/ntop/ntop-1.3.1-r2.ebuild
@@ -1,7 +1,7 @@
 # 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.2 2001/04/29 16:51:55 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-1.3.1-r2.ebuild,v 1.3 2001/06/01 14:00:14 achim Exp $
 
 P=ntop-1.3.1
 A="${P}.tar.gz"
@@ -10,33 +10,47 @@ 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=">=sys-apps/bash-2.04
+DEPEND="virtual/glibc sys-devel/gcc
 	>=sys-libs/gdbm-1.8.0
-	>=sys-libs/glibc-2.1.3
-	>=sys-libs/gpm-1.19.3
-	>=sys-libs/ncurses-5.1
-	>=dev-libs/openssl-0.9.6
+	ssl? ( >=dev-libs/openssl-0.9.6 )
 	>=net-libs/libpcap-0.5.2"
 
+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() {
-    cd ${S}
-    cp configure configure.orig
-    sed -e "s:/usr/local/ssl:/usr:" configure.orig > configure
-    CFLAGS="$CFLAGS -I/usr/include/openssl" try ./configure --prefix=/usr --sysconfdir=/usr/share --host=${CHOST} 
+
+    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
+     try ./configure --prefix=/usr --sysconfdir=/usr/share --mandir=/usr/share/man --host=${CHOST}  $myconf
     try make
 
 }
 
 src_install () {
 
-    cd ${S}
-    try make prefix=${D}/usr sysconfdir=/${D}/usr/share 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
-    prepman
+
     dodoc AUTHORS ChangeLog CONTENTS COPYING FAQ FILES HACKING
     dodoc KNOWN_BUGS MANIFESTO NEWS ntop.txt PORTING README*
     dodoc SUPPORT* THANKS THREADS-FAQ TODO
diff --git a/net-analyzer/tcpdump/tcpdump-3.6.1.ebuild b/net-analyzer/tcpdump/tcpdump-3.6.1.ebuild
index 4b9c86efe541..081b2bfbd6a1 100644
--- a/net-analyzer/tcpdump/tcpdump-3.6.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.6.1.ebuild
@@ -1,7 +1,7 @@
 # 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/tcpdump/tcpdump-3.6.1.ebuild,v 1.1 2001/04/29 17:19:04 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.6.1.ebuild,v 1.2 2001/06/01 14:00:14 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,14 +11,20 @@ SRC_URI="http://www.tcpdump.org/release/${A}
 HOMEPAGE="http://www.tcpdump.org/"
 
 DEPEND="virtual/glibc
-	>=sys-libs/zlib-1.1.3
-	>=dev-libs/openssl-0.6.9
+	ssl? ( >=dev-libs/openssl-0.6.9 )
 	>=net-libs/libpcap-0.6.1"
 
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/usr
+RDEPEND="virtual/glibc
+	ssl? ( >=dev-libs/openssl-0.6.9 )"
+
+src_compile() {
+  local myconf
+  if [ -z "`use ssl`" ] ; then
+    myconf="--without-crypto"
+  fi
+  try ./configure --host=${CHOST} --prefix=/usr --enable-ipv6 $myconf
 #--disable-ipv6
-  try make
+  try make CCOPT=\"$CFLAGS\"
 }
 
 src_install() {                               
diff --git a/net-analyzer/ucd-snmp/ucd-snmp-4.1.2.ebuild b/net-analyzer/ucd-snmp/ucd-snmp-4.1.2.ebuild
index 179abb869ff3..5d2b74d4d434 100644
--- a/net-analyzer/ucd-snmp/ucd-snmp-4.1.2.ebuild
+++ b/net-analyzer/ucd-snmp/ucd-snmp-4.1.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Jerry Alexandratos <jerry@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ucd-snmp/ucd-snmp-4.1.2.ebuild,v 1.2 2000/11/08 08:44:48 jerry Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ucd-snmp/ucd-snmp-4.1.2.ebuild,v 1.3 2001/06/01 14:00:14 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,25 +9,42 @@ DESCRIPTION="Software for generating and retrieving SNMP data"
 SRC_URI="http://download.sourceforge.net/net-snmp/${A}"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
 
-DEPEND=">=sys-libs/glibc-2.1.3
+DEPEND="virtual/glibc <sys-libs/db-2
         >=sys-libs/zlib-1.1.3
-        >=dev-libs/openssl-0.9.6
-        >=sys-apps/tcp-wrappers-7.6
-        >=sys-devel/perl-5.6.0"
+        ssl? ( >=dev-libs/openssl-0.9.6 )
+        tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+DEPEND="virtual/glibc <sys-libs/db-2
+        ssl? ( >=dev-libs/openssl-0.9.6 )
+        >=sys-libs/zlib-1.1.3"
 
 src_compile() {
-    cd ${S}
-    try ./configure --prefix=/usr --host=${CHOST} \
-        --with-openssl --with-libwrap --with-zlib
+    local myconf
+    if [ "`use ssl`" ] ; then
+      myconf="--with-openssl=/usr"
+    else
+      myconf="--enable-internal-md5 --with-openssl=no"
+    fi
+    if [ "`use tcpd`" ] ; then
+      myconf="--with-libwrap"
+    fi
+    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
+        $myconf --with-zlib --enable-shared --enable-ipv6 \
+        --with-sys-contact=\"root\@Unknown\" \
+        --with-sys-location="Unknown" \
+        --with-logfile=/var/log/snmpd.log \
+        --with-persistent-directory=/var/lib/ucd-snmp
+
     try make
 }
 
 src_install () {
     try make prefix=${D}/usr exec_prefix=${D}/usr \
-        persistentdir=${D}/var/ucd-snmp install
+        mandir=${D}/usr/share/man \
+        persistentdir=${D}/var/lib/ucd-snmp install
 
-    dodir /etc/rc.d/init.d/
-    cp ${O}/files/snmpd ${D}/etc/rc.d/init.d/snmpd
+    dodir /etc/rc.d/init.d
+    cp ${FILESDIR}/snmpd ${D}/etc/rc.d/init.d/snmpd
 }
 
 pkg_config() {