From b691139a41b5ae252fd8d71ce8be8f31668da892 Mon Sep 17 00:00:00 2001 From: Charlie Shepherd Date: Mon, 6 Nov 2006 06:28:37 +0000 Subject: wput/wput-0.4.ebuild: Update wput-0.6-gentoo.patch, closes bug 154158 svn path=/; revision=67 --- net-misc/wput/Manifest | 28 ++++++++++---- net-misc/wput/files/digest-wput-0.4 | 1 - net-misc/wput/files/digest-wput-0.6_pre | 1 - net-misc/wput/files/wput-0.6-gentoo.diff | 35 ++++++++--------- net-misc/wput/files/wput-0.6_pre-gentoo.diff | 57 ---------------------------- net-misc/wput/wput-0.4.ebuild | 30 --------------- net-misc/wput/wput-0.6.ebuild | 7 +--- net-misc/wput/wput-0.6_pre.ebuild | 37 ------------------ 8 files changed, 37 insertions(+), 159 deletions(-) delete mode 100644 net-misc/wput/files/digest-wput-0.4 delete mode 100644 net-misc/wput/files/digest-wput-0.6_pre delete mode 100644 net-misc/wput/files/wput-0.6_pre-gentoo.diff delete mode 100644 net-misc/wput/wput-0.4.ebuild delete mode 100644 net-misc/wput/wput-0.6_pre.ebuild diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest index e9cda53..aa0d566 100644 --- a/net-misc/wput/Manifest +++ b/net-misc/wput/Manifest @@ -1,16 +1,25 @@ -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.5-gentoo.diff 1164 RMD160 48f524d593bbafe62f51fbf4d7146b10fcb0f968 SHA1 fe36a3b56b7c0bf9ad6c6f9965a55989afff5269 SHA256 74ad0396d475a881b1a6c1baeb25532203998824d96a2dcf651662f4baf10dfe +MD5 25eb8a44df9c58935f1fa03421d2a493 files/wput-0.5-gentoo.diff 1164 +RMD160 48f524d593bbafe62f51fbf4d7146b10fcb0f968 files/wput-0.5-gentoo.diff 1164 +SHA256 74ad0396d475a881b1a6c1baeb25532203998824d96a2dcf651662f4baf10dfe files/wput-0.5-gentoo.diff 1164 +AUX wput-0.6-gentoo.diff 1557 RMD160 1956cada37f72c799199d31a6fe9b4950e09878e SHA1 09110eef5be0e249b4d6546b7a9cdd61490854e3 SHA256 ca52188f326e5dbe18927d161978704acf8995da0ab1bec7504d058de5be813e +MD5 81b3f68b704036d22592501aea2a28f2 files/wput-0.6-gentoo.diff 1557 +RMD160 1956cada37f72c799199d31a6fe9b4950e09878e files/wput-0.6-gentoo.diff 1557 +SHA256 ca52188f326e5dbe18927d161978704acf8995da0ab1bec7504d058de5be813e files/wput-0.6-gentoo.diff 1557 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.5.tgz 121543 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 +EBUILD wput-0.5.ebuild 943 RMD160 f19cbc3bf3f93783b650a0eca547c89aa0a1a05d SHA1 700079a11ed69139408ea8c55238fab1bf57623b SHA256 dc1a4e51da572a18f5b599f1cbafdb5369992cdc89be7abcf2f387e63f210191 +MD5 b565e76bf336a1cfa9ee427f45311ba8 wput-0.5.ebuild 943 +RMD160 f19cbc3bf3f93783b650a0eca547c89aa0a1a05d wput-0.5.ebuild 943 +SHA256 dc1a4e51da572a18f5b599f1cbafdb5369992cdc89be7abcf2f387e63f210191 wput-0.5.ebuild 943 +EBUILD wput-0.6.ebuild 973 RMD160 af8895214ff9727b496eacc2f28020ab57f8beb8 SHA1 71bcaf88ca99097c25c237b03334bd0394bb341d SHA256 696aae856c37c37f094cb517e8fbff98341374dbd6d3d9b688e35e53d3a571e5 +MD5 d344e3bfdbca88331ee778cc2287e7f3 wput-0.6.ebuild 973 +RMD160 af8895214ff9727b496eacc2f28020ab57f8beb8 wput-0.6.ebuild 973 +SHA256 696aae856c37c37f094cb517e8fbff98341374dbd6d3d9b688e35e53d3a571e5 wput-0.6.ebuild 973 MISC ChangeLog 1335 RMD160 1b1b7f48df2a23354cda6447a6f9dc3fb55fc75f SHA1 0900925aece222460cd8b9e404a14a3bb0158c4f SHA256 5b46751399eae8de73742ae1d293b004392dde8373a333832232b098dc9b04fb MD5 c0c615f8bdf4187e33907c487c9d7845 ChangeLog 1335 RMD160 1b1b7f48df2a23354cda6447a6f9dc3fb55fc75f ChangeLog 1335 @@ -19,6 +28,9 @@ MISC metadata.xml 357 RMD160 712ef080d70daeeb03889634acda7ad09eaf8938 SHA1 a3516 MD5 91f7a2df14ccdd08f27967738dadb86b metadata.xml 357 RMD160 712ef080d70daeeb03889634acda7ad09eaf8938 metadata.xml 357 SHA256 15524606fffe88de74315c582aee7e65de24537cf3dabcd2f6961d5260af3857 metadata.xml 357 +MD5 5658b10fdaa5e2c2663e63aa8d58db37 files/digest-wput-0.5 57 +RMD160 92797027505824fd33ac03c0c53fd6590a28e1e6 files/digest-wput-0.5 57 +SHA256 9eabe011f6627723a8d391d1cafd42f0c8cf9827b3392bc56e126b649032b59c files/digest-wput-0.5 57 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.4 b/net-misc/wput/files/digest-wput-0.4 deleted file mode 100644 index 43c0688..0000000 --- a/net-misc/wput/files/digest-wput-0.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 13db5b6b9ff0c4ce3cc2647a70185808 wput-0.4.tgz 151360 diff --git a/net-misc/wput/files/digest-wput-0.6_pre b/net-misc/wput/files/digest-wput-0.6_pre deleted file mode 100644 index fb25816..0000000 --- a/net-misc/wput/files/digest-wput-0.6_pre +++ /dev/null @@ -1 +0,0 @@ -MD5 63b99c1b02db81d8dbb89f2caf0fe00a wput-pre0.6.tgz 240481 diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff index 4ca6046..1f2a39f 100644 --- a/net-misc/wput/files/wput-0.6-gentoo.diff +++ b/net-misc/wput/files/wput-0.6-gentoo.diff @@ -1,25 +1,22 @@ -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 @@ +diff -urN wput/Makefile wput/Makefile +--- wput/Makefile 2006-04-04 19:06:27.000000000 +0100 ++++ wput/Makefile 2006-11-06 06:24:58.000000000 +0000 +@@ -15,8 +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) ++ mkdir -p $(DESTDIR)/$(bindir) ++ mkdir -p $(DESTDIR)/$(mandir) ++ install -m0755 wput $(DESTDIR)/$(bindir) ++ 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 +diff -urN wput/src/ftp.c wput/src/ftp.c +--- wput/src/ftp.c 2006-04-07 23:14:47.000000000 +0100 ++++ wput/src/ftp.c 2006-11-06 06:21:24.000000000 +0000 @@ -88,7 +88,7 @@ * path and change there again */ /* error-levels: ERR_RECONNECT, ERR_FAILED, ERR_SKIP (failed for '/'), 1 */ @@ -38,11 +35,10 @@ diff --exclude='*~' -urN wput.orig/src/ftp.c wput/src/ftp.c 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 @@ +diff -urN wput/src/ftp-ls.c wput/src/ftp-ls.c +--- wput/src/ftp-ls.c 2006-04-06 22:09:18.000000000 +0100 ++++ wput/src/ftp-ls.c 2006-11-06 06:21:24.000000000 +0000 +@@ -44,6 +44,11 @@ #include #include @@ -54,4 +50,3 @@ diff --exclude='*~' -urN wput.orig/src/ftp-ls.c wput/src/ftp-ls.c #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_pre-gentoo.diff b/net-misc/wput/files/wput-0.6_pre-gentoo.diff deleted file mode 100644 index 4ca6046..0000000 --- a/net-misc/wput/files/wput-0.6_pre-gentoo.diff +++ /dev/null @@ -1,57 +0,0 @@ -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/wput-0.4.ebuild b/net-misc/wput/wput-0.4.ebuild deleted file mode 100644 index f6cc3d5..0000000 --- a/net-misc/wput/wput-0.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.4.ebuild,v 1.7 2004/12/07 21:58:01 config Exp $ - -S="${WORKDIR}/${PN}" - -DESCRIPTION="a tiny program that looks like wget and is designed to upload files or whole directories to remote ftp-servers" -HOMEPAGE="http://itooktheredpill.dyndns.org/wput/" -SRC_URI="http://itooktheredpill.dyndns.org/${PN}/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~ppc ~sparc ~amd64" -IUSE="" - -DEPEND="" - -src_compile() { - econf --prefix=/usr || die "configure failed" - emake || die "make failed" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - einstall mandir=${D}/usr/share/man/man1 || die "install failed" - - # Documentation - dodoc COPYING ChangeLog INSTALL TODO -} diff --git a/net-misc/wput/wput-0.6.ebuild b/net-misc/wput/wput-0.6.ebuild index 9598b11..7fd0aaa 100644 --- a/net-misc/wput/wput-0.6.ebuild +++ b/net-misc/wput/wput-0.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: +# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.6.ebuild,v 1.1 2006/11/05 16:39:06 genstef Exp $ inherit eutils @@ -13,9 +13,6 @@ SLOT="0" KEYWORDS="~x86 ~ppc ~sparc ~amd64" IUSE="debug" -DEPEND="" -RDEPEND="$DEPEND" - S="${WORKDIR}/${PN}" src_unpack() { diff --git a/net-misc/wput/wput-0.6_pre.ebuild b/net-misc/wput/wput-0.6_pre.ebuild deleted file mode 100644 index 412136b..0000000 --- a/net-misc/wput/wput-0.6_pre.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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.6_pre.ebuild,v 1.1 2005/04/18 17:25:10 ka0ttic Exp $ - -inherit eutils - -MY_P="${PN}-pre${PV%_pre}" -DESCRIPTION="a tiny program that looks like wget and is designed to upload files or whole directories to remote ftp-servers" -HOMEPAGE="http://itooktheredpill.dyndns.org/wput/" -SRC_URI="http://itooktheredpill.dyndns.org/${PN}/${MY_P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~amd64" -IUSE="debug" - -DEPEND="virtual/libc" - -S="${WORKDIR}/${PN}" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-gentoo.diff -} - -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