From 73f2aa4c6fb3b5a57d3d4d2f287c558145fdce57 Mon Sep 17 00:00:00 2001 From: Charlie Shepherd Date: Sun, 5 Nov 2006 16:24:28 +0000 Subject: wput/files/wput-0.6-gentoo.diff: Update to version 0.6, closing bug 128899, thanks to Daniel Persson; and add a patch to respect LDFLAGS, thanks to Diego Pettenò, bug 126828 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn path=/; revision=65 --- net-misc/wput/Manifest | 42 +++++++++-------- net-misc/wput/files/digest-wput-0.6 | 3 ++ net-misc/wput/files/wput-0.6-gentoo.diff | 57 +++++++++++++++++++++++ net-misc/wput/files/wput-0.6-respectldflags.patch | 13 ++++++ net-misc/wput/wput-0.6.ebuild | 39 ++++++++++++++++ 5 files changed, 135 insertions(+), 19 deletions(-) create mode 100644 net-misc/wput/files/digest-wput-0.6 create mode 100644 net-misc/wput/files/wput-0.6-gentoo.diff create mode 100644 net-misc/wput/files/wput-0.6-respectldflags.patch create mode 100644 net-misc/wput/wput-0.6.ebuild diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest index 749129c..e9cda53 100644 --- a/net-misc/wput/Manifest +++ b/net-misc/wput/Manifest @@ -1,20 +1,24 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 b565e76bf336a1cfa9ee427f45311ba8 wput-0.5.ebuild 943 -MD5 99ee84722a32630b8271c4932a346e42 wput-0.4.ebuild 825 +AUX wput-0.6-gentoo.diff 1906 RMD160 9750f8b86151f10dd4f98b0c2b3d263f36b96623 SHA1 ab1ea3f4d1e2693a926d7efe26108b7b116e0b67 SHA256 7cdd59a037b155adc5c7845d57f18c7d78e6bef536eae67c6bc8bf685a3943bc +MD5 85947ddfe7018ac0babd3ea2a7263672 files/wput-0.6-gentoo.diff 1906 +RMD160 9750f8b86151f10dd4f98b0c2b3d263f36b96623 files/wput-0.6-gentoo.diff 1906 +SHA256 7cdd59a037b155adc5c7845d57f18c7d78e6bef536eae67c6bc8bf685a3943bc files/wput-0.6-gentoo.diff 1906 +AUX wput-0.6-respectldflags.patch 391 RMD160 e68430076fca2ebba4435e4641a3eb24d7d2e252 SHA1 0014904099a917127788fb137ba307d2a75421f3 SHA256 27ca4093b3abeb4ba4bf9c201f5a0588bab5af991d1dc7146b0431fb8fb43b59 +MD5 ce0ca85fa1666ebe2a14b44aee6cb1e9 files/wput-0.6-respectldflags.patch 391 +RMD160 e68430076fca2ebba4435e4641a3eb24d7d2e252 files/wput-0.6-respectldflags.patch 391 +SHA256 27ca4093b3abeb4ba4bf9c201f5a0588bab5af991d1dc7146b0431fb8fb43b59 files/wput-0.6-respectldflags.patch 391 +DIST wput-0.6.tgz 252823 RMD160 ebe32dd745b0d713102980268acce65aa8f41d51 SHA1 83c2a538041f667398b23611a993eafa738ab01d SHA256 98548282c031433be3222fbdadded7c1ad780137dda9bb00314ebbf5958cd4b5 +EBUILD wput-0.6.ebuild 1001 RMD160 796986a1749df5f5d472da559be88d2b8659374e SHA1 9bfa0a877bd2935100a4e8009934347573ebc42b SHA256 51713371acfb162926305cb9c359261e1cabea6f6114847b0c1adfc0004c454f +MD5 012e6f1b90373f4a5f7708b83cae00d4 wput-0.6.ebuild 1001 +RMD160 796986a1749df5f5d472da559be88d2b8659374e wput-0.6.ebuild 1001 +SHA256 51713371acfb162926305cb9c359261e1cabea6f6114847b0c1adfc0004c454f wput-0.6.ebuild 1001 +MISC ChangeLog 1335 RMD160 1b1b7f48df2a23354cda6447a6f9dc3fb55fc75f SHA1 0900925aece222460cd8b9e404a14a3bb0158c4f SHA256 5b46751399eae8de73742ae1d293b004392dde8373a333832232b098dc9b04fb MD5 c0c615f8bdf4187e33907c487c9d7845 ChangeLog 1335 -MD5 0ea3ffdc7ca29f08414d91f62d259c31 metadata.xml 249 -MD5 d67f907f4b0e4e2d56c0e2a9a7aefecc wput-0.6_pre.ebuild 978 -MD5 c4f33a3f597e892402d506bb45c85e71 files/digest-wput-0.4 57 -MD5 5658b10fdaa5e2c2663e63aa8d58db37 files/digest-wput-0.5 57 -MD5 25eb8a44df9c58935f1fa03421d2a493 files/wput-0.5-gentoo.diff 1164 -MD5 dca13fc1fa17e657e296a43d7a76ce77 files/digest-wput-0.6_pre 60 -MD5 85947ddfe7018ac0babd3ea2a7263672 files/wput-0.6_pre-gentoo.diff 1906 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCY+2QEZCkKN40op4RAgCuAJ9pqY9ux86DJcy1LauxVjjf88qAHACgs/nd -wrWaVCNjJa5nBGNbK/oLEYE= -=TXXq ------END PGP SIGNATURE----- +RMD160 1b1b7f48df2a23354cda6447a6f9dc3fb55fc75f ChangeLog 1335 +SHA256 5b46751399eae8de73742ae1d293b004392dde8373a333832232b098dc9b04fb ChangeLog 1335 +MISC metadata.xml 357 RMD160 712ef080d70daeeb03889634acda7ad09eaf8938 SHA1 a35162bcbfa04750cf3292022ce911baf3eabf5b SHA256 15524606fffe88de74315c582aee7e65de24537cf3dabcd2f6961d5260af3857 +MD5 91f7a2df14ccdd08f27967738dadb86b metadata.xml 357 +RMD160 712ef080d70daeeb03889634acda7ad09eaf8938 metadata.xml 357 +SHA256 15524606fffe88de74315c582aee7e65de24537cf3dabcd2f6961d5260af3857 metadata.xml 357 +MD5 9ed97f7adf1238434494bab775118457 files/digest-wput-0.6 217 +RMD160 046d99d3f76e5bb9d9103ede6a09516e746e0b62 files/digest-wput-0.6 217 +SHA256 cb549cf752ade9bb9ae8c3d7152f6752fa12a5ed9987b13e7c4e12304ba8281a files/digest-wput-0.6 217 diff --git a/net-misc/wput/files/digest-wput-0.6 b/net-misc/wput/files/digest-wput-0.6 new file mode 100644 index 0000000..5474857 --- /dev/null +++ b/net-misc/wput/files/digest-wput-0.6 @@ -0,0 +1,3 @@ +MD5 7ddb03154262df66e0e33f0676373ceb wput-0.6.tgz 252823 +RMD160 ebe32dd745b0d713102980268acce65aa8f41d51 wput-0.6.tgz 252823 +SHA256 98548282c031433be3222fbdadded7c1ad780137dda9bb00314ebbf5958cd4b5 wput-0.6.tgz 252823 diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff new file mode 100644 index 0000000..4ca6046 --- /dev/null +++ b/net-misc/wput/files/wput-0.6-gentoo.diff @@ -0,0 +1,57 @@ +diff --exclude='*~' -urN wput.orig/Makefile.in wput/Makefile.in +--- wput.orig/Makefile.in 2005-04-18 13:14:14.000000000 -0400 ++++ wput/Makefile.in 2005-04-18 13:17:46.000000000 -0400 +@@ -15,10 +15,10 @@ + + install: all + cd po && $(MAKE) $(MAKEDEFS) $@ +- install -d $(bindir) wput +- install -m0755 wput $(bindir) +- install -d $(mandir) doc/wput.1.gz +- install -m0644 doc/wput.1.gz $(mandir) ++ install -d $(DESTDIR)$(bindir) ++ install -m0755 wput $(DESTDIR)$(bindir) ++ install -d $(DESTDIR)$(mandir) ++ install -m0644 doc/wput.1.gz $(DESTDIR)$(mandir) + @echo "----------------" + @echo "Wput installed. See 'wput -h' or 'man wput' for usage information." + @echo "Further documentation is located in the doc/USAGE.* files." +Files wput.orig/.Makefile.in.swo and wput/.Makefile.in.swo differ +diff --exclude='*~' -urN wput.orig/src/ftp.c wput/src/ftp.c +--- wput.orig/src/ftp.c 2005-04-18 13:14:14.000000000 -0400 ++++ wput/src/ftp.c 2005-04-18 13:19:01.000000000 -0400 +@@ -88,7 +88,7 @@ + * path and change there again */ + /* error-levels: ERR_RECONNECT, ERR_FAILED, ERR_SKIP (failed for '/'), 1 */ + int try_do_cwd(ftp_con * ftp, char * path, int mkd) { +- int res; ++ int res = -1; + if(!strcmp(path, ".")) + return mkd; + if(!strcmp(path, "..")) +@@ -201,7 +201,7 @@ + } + + int open_input_file(_fsession * fsession) { +- int fd; ++ int fd = -1; + int oflags = O_RDONLY; + char * cmd; + FILE * pipe; +Files wput.orig/src/.ftp.c.swp and wput/src/.ftp.c.swp differ +diff --exclude='*~' -urN wput.orig/src/ftp-ls.c wput/src/ftp-ls.c +--- wput.orig/src/ftp-ls.c 2005-04-18 13:14:14.000000000 -0400 ++++ wput/src/ftp-ls.c 2005-04-18 13:20:30.000000000 -0400 +@@ -42,6 +42,11 @@ + #include + #include + ++#ifndef _XOPEN_SOURCE ++# define _XOPEN_SOURCE ++#endif ++#include ++ + #include "wget.h" + #include "utils.h" + #include "ftp.h" +Files wput.orig/src/.ftp-ls.c.swp and wput/src/.ftp-ls.c.swp differ diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch new file mode 100644 index 0000000..d2b460b --- /dev/null +++ b/net-misc/wput/files/wput-0.6-respectldflags.patch @@ -0,0 +1,13 @@ +Index: wput/src/Makefile.in +=================================================================== +--- wput.orig/src/Makefile.in ++++ wput/src/Makefile.in +@@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h + ftp-ls.o: ftp.h wget.h url.h + + wput: $(OBJ) +- $(CC) -o $(EXE) $(OBJ) $(LIBS) ++ $(CC) $(LDFLAGS) -o $(EXE) $(OBJ) $(LIBS) + clean: + rm -f *.o *~ *.bak ../wput getopt/*.o + win-clean: clean diff --git a/net-misc/wput/wput-0.6.ebuild b/net-misc/wput/wput-0.6.ebuild new file mode 100644 index 0000000..952d6fc --- /dev/null +++ b/net-misc/wput/wput-0.6.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.5.ebuild,v 1.2 2005/01/12 11:56:21 ka0ttic Exp $ + +inherit eutils + +DESCRIPTION="A tiny program that looks like wget and is designed to upload files or whole directories to remote ftp-servers" +HOMEPAGE="http://wput.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 ~ppc ~sparc ~amd64" +IUSE="debug" + +DEPEND="" +RDEPEND="$DEPEND" + +S="${WORKDIR}/${PN}" + +src_unpack() { + unpack "${A}" + cd "${S}" + epatch "${FILESDIR}/${P}-gentoo.diff" + # Fix bug 126828 + epatch "${FILESDIR}/wput-0.6-respectldflags.patch" +} + +src_compile() { + local myconf + use debug && myconf="--enable-memdbg=yes" || myconf="--enable-g-switch=no" + econf ${myconf} || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc ChangeLog INSTALL TODO +} -- cgit v1.2.3-65-gdbad