fix config file

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 12 insertions, 42 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index 73ae3855a8be..f803df9de235 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/oftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.28 2010/09/01 10:00:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.29 2010/11/06 01:37:10 xmw Exp $
+
+*oftpd-0.3.7-r6 (06 Nov 2010)
+
+  06 Nov 2010; Michael Weber <xmw@gentoo.org> -oftpd-0.3.7-r4.ebuild,
+  -oftpd-0.3.7-r5.ebuild, +oftpd-0.3.7-r6.ebuild, -files/conf.d.oftpd-r1,
+  +files/conf.d.oftpd-r6:
+  Rev bump to fix default port and description in config file (bug #344169,
+  thanks to Christohper Harrington <ironiridis@gmail.com>).
 
 *oftpd-0.3.7-r5 (01 Sep 2010)
 
diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r1 b/net-ftp/oftpd/files/conf.d.oftpd-r6
index 67c40c897b6f..dee1cba00863 100644
--- a/net-ftp/oftpd/files/conf.d.oftpd-r1
+++ b/net-ftp/oftpd/files/conf.d.oftpd-r6
@@ -1,4 +1,4 @@
-# Please read the oftd(8) man page for a more detailed explaination of these
+# Please read the oftpd(8) man page for a more detailed explaination of these
 # variables.
 #
 # FTPUSER (user-name in the man page):
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild
deleted file mode 100644
index 0e90fea40bd1..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild,v 1.1 2009/05/29 14:00:05 rbu Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Secure, small, anonymous only ftpd"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="net-ftp/ftpbase"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Don't crash when using an unsupported address family, #159178.
-	epatch "${FILESDIR}"/oftpd-0.3.7-family.patch
-}
-
-src_configure() {
-	# local myconf
-	# ipv6 support busted according to lamer
-	# use ipv6 && myconf="${myconf} --enable-ipv6"
-	econf --bindir=/usr/sbin || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS FAQ NEWS README TODO
-	keepdir /home/ftp
-	newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd
-	newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd
-}
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild
index e3be0fe5f834..e9dd22d4c758 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild,v 1.1 2010/09/01 10:00:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild,v 1.1 2010/11/06 01:37:10 xmw Exp $
 
 EAPI=2
 
@@ -42,5 +42,5 @@ src_install() {
 	dodoc AUTHORS BUGS FAQ NEWS README TODO || die
 	keepdir /home/ftp
 	newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd || die
-	newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd || die
+	newconfd "${FILESDIR}"/conf.d.oftpd-r6 oftpd || die
 }