revision bump which now adds patches from mandrake's source rpm to handle large files properly and other misc. fixes: french and german translations; proper handling of username/passwords in urls; spelling referrer correctly, printing out the percentage in the output, removing rpath from the binary, and finally in wgetrc: passive ftp is the default (closing bug #89814 by Tor Klingberg <tor.klingberg@gmx.net>), and the references to /usr/local/etc now point to /etc instead

Package-Manager: portage-2.0.51.21-r1

5 files changed, 89 insertions, 11 deletions

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 6193bdb520ae..4d723119ed25 100644
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-misc/wget
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.57 2005/05/10 13:51:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.58 2005/05/10 15:56:47 seemant Exp $
+
+*wget-1.9.1-r4 (10 May 2005)
+
+  10 May 2005; Seemant Kulleen <seemant@gentoo.org> wget-1.9.1-r3.ebuild,
+  +wget-1.9.1-r4.ebuild:
+  revision bump which now adds patches from mandrake's source rpm to handle
+  large files properly and other misc. fixes: french and german translations;
+  proper handling of username/passwords in urls; spelling referrer correctly,
+  printing out the percentage in the output, removing rpath from the binary,
+  and finally in wgetrc: passive ftp is the default (closing bug #89814 by Tor
+  Klingberg <tor.klingberg@gmx.net>), and the references to /usr/local/etc now
+  point to /etc instead
 
   10 May 2005; Seemant Kulleen <seemant@gentoo.org>
   -files/wget-1.9.1+ipvmisc.patch, -files/wget-1.9.1-locale.patch,
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 71433fbd8206..f1734d5d2e42 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,6 @@
-MD5 4fba729a73d583c967b491dda1e4b674 ChangeLog 9504
+MD5 ed77fa8ccd511fdf217c735777009a8b ChangeLog 10125
 MD5 d8da3021a3e635af9c4511b2a55b5633 metadata.xml 343
-MD5 16fd2df045f1098a2ceec805ea69ad0b wget-1.9.1-r3.ebuild 1850
+MD5 a0a0a49fd392c3a858b70242aa3f7268 wget-1.9.1-r3.ebuild 1561
+MD5 b790b63d8ae00c3b527072f2ef20b111 wget-1.9.1-r4.ebuild 1645
 MD5 94ce8e0557c28ef33d5814ab3dd34980 files/digest-wget-1.9.1-r3 135
+MD5 00d0d47b0f3c0eb0a56d45ff0ee01e6e files/digest-wget-1.9.1-r4 136
diff --git a/net-misc/wget/files/digest-wget-1.9.1-r4 b/net-misc/wget/files/digest-wget-1.9.1-r4
new file mode 100644
index 000000000000..f86f46e5bd88
--- /dev/null
+++ b/net-misc/wget/files/digest-wget-1.9.1-r4
@@ -0,0 +1,2 @@
+MD5 e6051f1e1487ec0ebfdbda72bedc70ad wget-1.9.1.tar.gz 1322378
+MD5 ba28627c75280bbf10e7e3e750e0324a wget-1.9.1-gentoo-0.2.tar.bz2 23605
diff --git a/net-misc/wget/wget-1.9.1-r3.ebuild b/net-misc/wget/wget-1.9.1-r3.ebuild
index f1eab5ded6b2..ebb63d5194eb 100644
--- a/net-misc/wget/wget-1.9.1-r3.ebuild
+++ b/net-misc/wget/wget-1.9.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9.1-r3.ebuild,v 1.13 2005/05/10 13:51:20 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9.1-r3.ebuild,v 1.14 2005/05/10 15:56:47 seemant Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
@@ -27,11 +27,6 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/gentoo
-#	epatch ${FILESDIR}/${P}+ipvmisc.patch
-#	epatch ${FILESDIR}/${PN}-1.9-uclibc.patch
-#	epatch ${FILESDIR}/${P}-locale.patch
-#	# security patch for bug 74008
-#	epatch ${FILESDIR}/${PN}-CAN-2004-1487.patch
 }
 
 src_compile() {
@@ -62,8 +57,7 @@ src_install() {
 		dobin ${S}/src/wget
 		return
 	fi
-	make prefix=${D}/usr sysconfdir=${D}/etc/wget \
-		mandir=${D}/usr/share/man infodir=${D}/usr/share/info install || die
+	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING ChangeLog MACHINES MAILING-LIST NEWS README TODO
 	dodoc doc/sample.wgetrc
 }
diff --git a/net-misc/wget/wget-1.9.1-r4.ebuild b/net-misc/wget/wget-1.9.1-r4.ebuild
new file mode 100644
index 000000000000..9a534254e40e
--- /dev/null
+++ b/net-misc/wget/wget-1.9.1-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.9.1-r4.ebuild,v 1.1 2005/05/10 15:56:47 seemant Exp $
+
+inherit gnuconfig eutils flag-o-matic
+
+IUSE="build debug ipv6 nls socks5 ssl static"
+
+PATCHVER=0.2
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="http://wget.sunsite.dk/"
+SRC_URI="mirror://gnu/wget/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sh sparc x86"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
+	socks5? ( net-proxy/dante )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	sys-devel/autoconf"
+
+
+PATCHDIR="${WORKDIR}/patches"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/gentoo
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}/mandrake
+}
+
+src_compile() {
+	# Make wget use up-to-date configure scripts
+	gnuconfig_update
+
+	use ssl && append-flags -I/usr/include/openssl
+
+	econf \
+		--sysconfdir=/etc/wget \
+		$(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_with socks5 socks) \
+		|| die
+
+	if use static; then
+		emake LDFLAGS="--static" || die
+	else
+		emake || die
+	fi
+}
+
+src_install() {
+	if use build; then
+		insinto /usr
+		dobin ${S}/src/wget
+		return
+	fi
+
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS COPYING ChangeLog MACHINES MAILING-LIST NEWS README TODO
+	dodoc doc/sample.wgetrc
+}