Added an xinetd example, changed to epatch, and added xinetd RDEPEND.

3 files changed, 23 insertions, 20 deletions

diff --git a/net-ftp/ftpd/ChangeLog b/net-ftp/ftpd/ChangeLog
index de6697fb785f..4e5b3ef3c93a 100644
--- a/net-ftp/ftpd/ChangeLog
+++ b/net-ftp/ftpd/ChangeLog
@@ -1,11 +1,12 @@
 # ChangeLog for net-ftp/ftpd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.3 2003/01/16 02:02:27 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.4 2003/01/16 02:25:11 raker Exp $
 
 *ftpd-0.17 (25 Nov 2002)
 
   15 Jan 2003; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild :
-  Fixed a typo in postinst
+  Fixed a typo in postinst and added xinetd as an RDEPEND and now
+  installing an /etc/xinetd.d/ftp.  Also changed to epatch.
 
   05 Dec 2002; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild :
   Marked stable.
diff --git a/net-ftp/ftpd/files/ftp.xinetd b/net-ftp/ftpd/files/ftp.xinetd
new file mode 100644
index 000000000000..858c718d80e2
--- /dev/null
+++ b/net-ftp/ftpd/files/ftp.xinetd
@@ -0,0 +1,13 @@
+# default: off
+# $Header: 
+# description: The netkit ftp daemon with optional SSL support.
+
+service ftp
+{
+	socket_type		= stream
+	protocol		= tcp
+	wait			= no
+	user			= root
+	server			= /usr/bin/ftpd
+	disable			= yes
+}
diff --git a/net-ftp/ftpd/ftpd-0.17.ebuild b/net-ftp/ftpd/ftpd-0.17.ebuild
index 5438bcc1281a..b3a7eca9db12 100644
--- a/net-ftp/ftpd/ftpd-0.17.ebuild
+++ b/net-ftp/ftpd/ftpd-0.17.ebuild
@@ -1,55 +1,45 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17.ebuild,v 1.3 2003/01/16 02:02:27 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17.ebuild,v 1.4 2003/01/16 02:25:11 raker Exp $
 
 DESCRIPTION="The netkit FTP server with optional SSL support"
 HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz"
-
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86"
-
 IUSE="ssl"
-
 DEPEND="virtual/glibc
 	ssl? ( dev-libs/openssl )"
-
+RDEPEND="${DEPEND}
+	sys-apps/xinetd"
 S=${WORKDIR}/linux-${P}
+inherit eutils
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-
 	if [ "`use ssl`" ]; then
-		zcat ${FILESDIR}/ssl.diff.gz | patch -p1 \
-			|| die "ssl patch failed"
+		epatch ${FILESDIR}/ssl.diff.gz || die
 	fi
-
 }
 
 src_compile() {
-
 	./configure --prefix=/usr || die "configure failed"
-
 	cp MCONFIG MCONFIG.orig                                                 
         sed -e "s/-pipe -O2/${CFLAGS}/" MCONFIG.orig > MCONFIG
-
 	emake || die "parallel make failed"
-
 }
 
 src_install() {
-
 	dobin ftpd/ftpd
 	doman ftpd/ftpd.8
 	dodoc README ChangeLog
-
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/ftp.xinetd ftp
 }
 
 pkg_postinst() {
-
 	einfo "In order to start the server with SSL support"
 	einfo "You need to create a certificate and place it"
 	einfo "in SSLCERTDIR..."
@@ -59,5 +49,4 @@ pkg_postinst() {
 	einfo "cd SSLCERTDIR"
 	einfo "openssl req -new -x509 -nodes -out ftpd.pem -keyout ftpd.pem"
 	einfo ""
-
 }