ebuild cleanups

4 files changed, 17 insertions, 63 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 2885fef3ec0f..5e0fa82f75c2 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.11 2003/08/25 13:30:38 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.12 2003/08/28 13:41:24 liquidx Exp $
+
+  28 Aug 2003; Alastair Tse <liquidx@gentoo.org> ulogd-1.01.ebuild,
+  files/ulogd-1.01:
+  add various cleanups (#27245). thanks to Nicolas Kaiser <nikai@nikai.net>.
 
 *ulogd-1.01 (25 Aug 2003)
 
diff --git a/app-admin/ulogd/Manifest b/app-admin/ulogd/Manifest
index bd15fd8c2b78..e666c2214a8e 100644
--- a/app-admin/ulogd/Manifest
+++ b/app-admin/ulogd/Manifest
@@ -1,10 +1,9 @@
-MD5 8add03eb80ba4c6d1036ceb3d0ec8f82 ChangeLog 1288
+MD5 c128c2f8b82e6dd17411076eb35e8b05 ChangeLog 1457
 MD5 bd228d1fdeaeede8124704657a640ae5 ulogd-0.97-r1.ebuild 1124
 MD5 fc2800896076761f3afef7ae798380b4 ulogd-0.98.ebuild 1178
-MD5 86c0769764451942e9195b36a60ce9e0 ulogd-1.01.ebuild 1087
+MD5 400207b928da108f82ff0f438eb62655 ulogd-1.01.ebuild 1080
 MD5 04005ad49c96b691ff84b1305379d3c8 files/digest-ulogd-0.97-r1 61
-MD5 d21cc9239b60422b448ef743edaf9560 files/ulogd 755
 MD5 7d8c6f58accc97b0ce3beb6fc172d5df files/digest-ulogd-0.98 62
-MD5 86019df8b3674b4649f91134561f6c59 files/ulogd-0.98 763
 MD5 e346a1112f49dea95c9302f251dd3102 files/digest-ulogd-1.01 63
-MD5 86019df8b3674b4649f91134561f6c59 files/ulogd-1.01 763
+MD5 d21cc9239b60422b448ef743edaf9560 files/ulogd 755
+MD5 86019df8b3674b4649f91134561f6c59 files/ulogd-0.98 763
diff --git a/app-admin/ulogd/files/ulogd-1.01 b/app-admin/ulogd/files/ulogd-1.01
deleted file mode 100644
index 3360a75fa3ee..000000000000
--- a/app-admin/ulogd/files/ulogd-1.01
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/runscript
-#
-# chkconfig: - 91 35
-# description: Starts and stops the ulogd daemon
-#
-# pidfile: /var/lock/samba/ulogd.pid
-# config:  /usr/local/etc/ulogd.conf
-
-
-opts="${opts} reload"
-
-depend() {
-	need net
-    use mysql
-}
-
-initService() {
-# Avoid using root's TMPDIR
-unset TMPDIR
-
-# Check that ulogd.conf exists.
-[ -f /etc/ulogd.conf ] || exit 0
-
-RETVAL=0
-}
-
-start() {
-	initService
-	ebegin "Starting ulogd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ulogd -- -d >/dev/null 2>&1
-	eend $?
-}	
-
-stop() {
-	initService
-	ebegin "Stopping ulogd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/ulogd >/dev/null 2>&1
-	eend $?
-}	
-
-reload() {
-	initService
-        ebegin "Reloading ulogd.conf file"
-	killproc ulogd -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}	
diff --git a/app-admin/ulogd/ulogd-1.01.ebuild b/app-admin/ulogd/ulogd-1.01.ebuild
index ce7f610a11da..136e373158b5 100644
--- a/app-admin/ulogd/ulogd-1.01.ebuild
+++ b/app-admin/ulogd/ulogd-1.01.ebuild
@@ -1,24 +1,23 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.01.ebuild,v 1.2 2003/08/25 13:32:28 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ulogd-1.01.ebuild,v 1.3 2003/08/28 13:41:24 liquidx Exp $
 
 DESCRIPTION="iptables daemon for ULOG target for userspace iptables filter logging"
-SRC_URI="ftp://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2"
+SRC_URI="http://ftp.netfilter.org/pub/ulogd/${P}.tar.bz2"
 HOMEPAGE="http://www.gnumonks.org/gnumonks/projects/project_details?p_id=1"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc"
 IUSE="mysql"
+
 DEPEND="net-firewall/iptables"
-RDEPEND=${DEPEND}
 
-src_compile() {
-	local myconf
-	use mysql && myconf="--with-mysql"
+MAKEOPTS="${MAKEOPTS} -j1"
 
-	econf ${myconf}
-	make all || die "make failed"
+src_compile() {
+	econf `use_with mysql` || die "configure failed"
+	emake || die "make failed"
 }
 
 src_install() {
@@ -28,7 +27,7 @@ src_install() {
 
 	make DESTDIR=${D} install || die "install failed"
 	
-	cp ${FILESDIR}/ulogd-${PV} ${D}/etc/init.d/ulogd
+	cp ${FILESDIR}/ulogd-0.98 ${D}/etc/init.d/ulogd
 
 	dodoc README AUTHORS Changes 
 	cd doc/