added LICENSE, SLOT, $Headers.

7 files changed, 30 insertions, 90 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index acd440bd6bbf..cc969c75a0ea 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/oftpd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.2 2002/05/04 03:42:50 woodchip Exp $
+
+*oftpd-0.3.6-r7 (3 May 2002)
+  
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  
+  Added LICENSE, SLOT.
 
 *oftpd-0.3.6-r6 (1 Feb 2002)
 
diff --git a/net-ftp/oftpd/files/digest-oftpd-0.3.6-r6 b/net-ftp/oftpd/files/digest-oftpd-0.3.6-r6
deleted file mode 100644
index 22821daa64be..000000000000
--- a/net-ftp/oftpd/files/digest-oftpd-0.3.6-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78b4139bb0108297b9814564db986852 oftpd-0.3.6.tar.gz 77201
diff --git a/net-ftp/oftpd/files/digest-oftpd-0.3.6 b/net-ftp/oftpd/files/digest-oftpd-0.3.6-r7
index 22821daa64be..22821daa64be 100644
--- a/net-ftp/oftpd/files/digest-oftpd-0.3.6
+++ b/net-ftp/oftpd/files/digest-oftpd-0.3.6-r7
diff --git a/net-ftp/oftpd/files/oftpd.rc5 b/net-ftp/oftpd/files/oftpd.rc5
deleted file mode 100644
index 1612f482fff9..000000000000
--- a/net-ftp/oftpd/files/oftpd.rc5
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:75:This line is required for script management
-
-. /etc/rc.d/config/functions
-. /etc/rc.d/config/basic
-
-SERVICE="oftpd"
-opts="start stop restart"
-PIDFILE=/var/run/oftpd.pid
-EXE=/usr/sbin/oftpd
-
-start() {
-
-		ebegin "Starting $SERVICE"
-     		start-stop-daemon --start --quiet --exec $EXE -- $FTPUSER $FTPROOT
-		eend $? "Started $SERVICE." "Error starting $SERVICE."
-}
-
-stop() {
-
-		ebegin "Stopping $SERVICE"
-		start-stop-daemon --stop --quiet -n $SERVICE --exec $EXE
-		eend $? "Stopped $SERVICE." "Error stopping $SERVICE."
-}
-
-restart() {
-		stop
-		start
-}
-
-doservice ${@}
diff --git a/net-ftp/oftpd/files/oftpd.rc6 b/net-ftp/oftpd/files/oftpd.rc6
index bc019797034e..71f939e5cc91 100644
--- a/net-ftp/oftpd/files/oftpd.rc6
+++ b/net-ftp/oftpd/files/oftpd.rc6
@@ -1,28 +1,29 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/oftpd.rc6,v 1.2 2001/12/06 20:17:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/oftpd.rc6,v 1.3 2002/05/04 03:42:50 woodchip Exp $
 
 depend() {
-    need net
+	need net
 }
 
 checkconfig() {
-    if [ -z "$FTPUSER" ] || [ -z "$FTPROOT" ] ; then
-	eerror "You need to setup FTPUSER and FTPROOT in /etc/rc.conf"
-	return 1
-    fi
+	if [ -z "$FTPUSER" ] || [ -z "$FTPROOT" ] ; then
+		eerror "You need to setup FTPUSER and FTPROOT in /etc/rc.conf"
+		return 1
+	fi
 }
 
 start() {
-    checkconfig || return 1
-    ebegin "Starting oftpd"
-    start-stop-daemon --start --quiet --exec /usr/sbin/oftpd -- $FTPUSER $FTPROOT
-    eend $?
+	checkconfig || return 1
+	ebegin "Starting oftpd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/oftpd \
+		-- ${FTPUSER} ${FTPROOT}
+	eend $?
 }
 
 stop() {
-    ebegin "Stopping oftpd"
-    start-stop-daemon --stop --quiet --exec /usr/sbin/oftpd
-    eend $?
+	ebegin "Stopping oftpd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/oftpd
+	eend $?
 }
diff --git a/net-ftp/oftpd/oftpd-0.3.6-r6.ebuild b/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild
index b1de2a987415..c1e7d30ef77a 100644
--- a/net-ftp/oftpd/oftpd-0.3.6-r6.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild
@@ -1,7 +1,6 @@
-# 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 Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6-r6.ebuild,v 1.1 2001/09/06 11:35:24 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild,v 1.1 2002/05/04 03:42:50 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Secure, small, anonymous only ftpd"
@@ -9,12 +8,17 @@ SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
 HOMEPAGE="http://www.time-travellers.org/oftpd"
 
 DEPEND="virtual/glibc"
+LICENSE="as-is"
+SLOT="0"
 
 src_compile() {
-	local myconf
+	# local myconf
 	# ipv6 support busted according to lamer
 	# use ipv6 && myconf="${myconf} --enable-ipv6"
-	./configure --prefix=/usr --bindir=/usr/sbin --mandir=/usr/share/man \
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/sbin \
+		--mandir=/usr/share/man \
 		--host=${CHOST} ${myconf} || die
 	emake || die
 }
diff --git a/net-ftp/oftpd/oftpd-0.3.6.ebuild b/net-ftp/oftpd/oftpd-0.3.6.ebuild
deleted file mode 100644
index 4ea4f475bae7..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <lamer@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6.ebuild,v 1.3 2001/09/06 11:35:24 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Secure, small, anonymous only ftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
-
-DEPEND="virtual/glibc"
-
-src_compile() {
-
-# Broken upstream source. Won't compile with this enabled.
-#local myconf
-# if [ "`use ipv6`" ]; then
-#	myconf="--enable-ipv6"
-#fi
-
-    try ./configure --prefix=/usr --bindir=/usr/sbin \
-	${myconf} --mandir=/usr/share/man --host=${CHOST}
-    try make
-
-}
-
-src_install () {
-
-	try make DESTDIR=${D} install
-	dodoc AUTHORS BUGS COPYING INSTALL FAQ NEWS README TODO
-	exeinto /etc/rc.d/init.d
-	newexe ${FILESDIR}/oftpd.rc5 oftpd
-	dodir /home/ftp
-}
-
-pkg_postinst() {
-	einfo "Run \"rc-update add svc-oftpd\" to make the daemon start at boot"
-	einfo "Add FTPUSER=\"ftp\" and FTPROOT=\"/home/ftp\" to /etc/rc.d/config/basic"
-}