Version bump.

(Portage version: 2.2_rc60/cvs/Linux x86_64)

5 files changed, 100 insertions, 4 deletions

diff --git a/net-ftp/tnftp/ChangeLog b/net-ftp/tnftp/ChangeLog
index 866a05a9585c..bac6ca91a24f 100644
--- a/net-ftp/tnftp/ChangeLog
+++ b/net-ftp/tnftp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/tnftp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.33 2009/11/22 21:52:48 swegener Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.34 2010/01/04 21:34:37 swegener Exp $
+
+*tnftp-20091122 (04 Jan 2010)
+
+  04 Jan 2010; Sven Wegener <swegener@gentoo.org>
+  files/tnftp-20090606-glibc-2.8-ARG_MAX.patch, +tnftp-20091122.ebuild,
+  +files/tnftp-20091122-as-needed.patch,
+  +files/tnftp-20091122-glibc-2.8-ARG_MAX.patch:
+  Version bump.
 
 *tnftp-20090606 (22 Nov 2009)
 
diff --git a/net-ftp/tnftp/files/tnftp-20090606-glibc-2.8-ARG_MAX.patch b/net-ftp/tnftp/files/tnftp-20090606-glibc-2.8-ARG_MAX.patch
index 8c0f91a069e8..5dd3748f5e6d 100644
--- a/net-ftp/tnftp/files/tnftp-20090606-glibc-2.8-ARG_MAX.patch
+++ b/net-ftp/tnftp/files/tnftp-20090606-glibc-2.8-ARG_MAX.patch
@@ -1,7 +1,7 @@
 glibc-2.8 no loner provides the ARG_MAX macro.
 
---- tnftp-20090520/libnetbsd/glob.c
-+++ tnftp-20090520/libnetbsd/glob.c
+--- tnftp-20091122/libnetbsd/glob.c
++++ tnftp-20091122/libnetbsd/glob.c
 @@ -55,6 +55,8 @@
   *	Number of matches in the current invocation of glob.
   */
diff --git a/net-ftp/tnftp/files/tnftp-20091122-as-needed.patch b/net-ftp/tnftp/files/tnftp-20091122-as-needed.patch
new file mode 100644
index 000000000000..3f70c6359387
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20091122-as-needed.patch
@@ -0,0 +1,23 @@
+--- tnftp-20091122/src/Makefile.am
++++ tnftp-20091122/src/Makefile.am
+@@ -22,9 +22,7 @@
+ 	-I$(top_srcdir) \
+ 	-I$(top_builddir)
+ 
+-tnftp_LDADD = \
+-	../libnetbsd/libnetbsd.la 
+-
++tnftp_LDADD =
+ 
+ if USE_LIBEDIT
+ tnftp_CPPFLAGS += \
+@@ -34,6 +32,9 @@
+ 	../libedit/libedit.la
+ endif
+ 
++tnftp_LDADD += \
++	../libnetbsd/libnetbsd.la 
++
+ 
+ man1_MANS = \
+ 	tnftp.1
diff --git a/net-ftp/tnftp/files/tnftp-20091122-glibc-2.8-ARG_MAX.patch b/net-ftp/tnftp/files/tnftp-20091122-glibc-2.8-ARG_MAX.patch
new file mode 100644
index 000000000000..5dd3748f5e6d
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20091122-glibc-2.8-ARG_MAX.patch
@@ -0,0 +1,22 @@
+glibc-2.8 no loner provides the ARG_MAX macro.
+
+--- tnftp-20091122/libnetbsd/glob.c
++++ tnftp-20091122/libnetbsd/glob.c
+@@ -55,6 +55,8 @@
+  *	Number of matches in the current invocation of glob.
+  */
+ 
++#include <unistd.h>
++
+ #include "tnftp.h"
+ 
+ #undef	TILDE			/* XXX: AIX 4.1.5 has this in <sys/ioctl.h> */
+@@ -720,7 +722,7 @@
+ 	}
+ 	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
+ 
+-	if ((pglob->gl_flags & GLOB_LIMIT) && (newsize + *limit) >= ARG_MAX) {
++	if ((pglob->gl_flags & GLOB_LIMIT) && (newsize + *limit) >= sysconf(_SC_ARG_MAX)) {
+ 		errno = 0;
+ 		return(GLOB_NOSPACE);
+ 	}
diff --git a/net-ftp/tnftp/tnftp-20091122.ebuild b/net-ftp/tnftp/tnftp-20091122.ebuild
new file mode 100644
index 000000000000..05e3db817a67
--- /dev/null
+++ b/net-ftp/tnftp/tnftp-20091122.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20091122.ebuild,v 1.1 2010/01/04 21:34:37 swegener Exp $
+
+EAPI="2"
+
+WANT_AUTOMAKE="1.11"
+
+inherit eutils autotools
+
+DESCRIPTION="NetBSD FTP client with several advanced features"
+SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
+	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
+HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 socks5"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	socks5? ( net-proxy/dante )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-glibc-2.8-ARG_MAX.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-editcomplete \
+		$(use_enable ipv6) \
+		$(use_with socks5 socks) \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+	dodoc ChangeLog README THANKS || die "dodoc failed"
+}