fix patch

Package-Manager: portage-2.1.2_rc1-r4

3 files changed, 21 insertions, 51 deletions

diff --git a/net-misc/wput/ChangeLog b/net-misc/wput/ChangeLog
index 7c0f62c3e009..92c42092968a 100644
--- a/net-misc/wput/ChangeLog
+++ b/net-misc/wput/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/wput
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/ChangeLog,v 1.13 2006/11/07 00:38:57 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/ChangeLog,v 1.14 2006/11/07 18:14:46 genstef Exp $
+
+  07 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+  files/wput-0.6-gentoo.diff:
+  fix patch
 
   07 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
   files/wput-0.6-gentoo.diff:
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index cc77f83df854..1453ac5c1c26 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -2,10 +2,10 @@ AUX wput-0.5-gentoo.diff 1164 RMD160 48f524d593bbafe62f51fbf4d7146b10fcb0f968 SH
 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-gentoo.diff 641 RMD160 e725ce22fac960e6a14a1d651b9791d203c12d72 SHA1 3783cbd0886d6cf9ec0f4803fce04c6119cd4331 SHA256 e72d178f76b6f877ae4379f6c729fdb95267f28e9efd887c29abe862957c9c40
+MD5 b90cca9c5b9252d59a8343ea52879612 files/wput-0.6-gentoo.diff 641
+RMD160 e725ce22fac960e6a14a1d651b9791d203c12d72 files/wput-0.6-gentoo.diff 641
+SHA256 e72d178f76b6f877ae4379f6c729fdb95267f28e9efd887c29abe862957c9c40 files/wput-0.6-gentoo.diff 641
 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
@@ -20,10 +20,10 @@ EBUILD wput-0.6.ebuild 973 RMD160 af8895214ff9727b496eacc2f28020ab57f8beb8 SHA1
 MD5 d344e3bfdbca88331ee778cc2287e7f3 wput-0.6.ebuild 973
 RMD160 af8895214ff9727b496eacc2f28020ab57f8beb8 wput-0.6.ebuild 973
 SHA256 696aae856c37c37f094cb517e8fbff98341374dbd6d3d9b688e35e53d3a571e5 wput-0.6.ebuild 973
-MISC ChangeLog 1761 RMD160 38a71c1f85a0fc38c30282c8b158fffb6841dd51 SHA1 de458a8d0ebdddac37d1bed7746c861bab709a56 SHA256 f8e0b68be8b3b42bef2b1d54b05b37858ae8373eda428f6e0e6696306f170d6f
-MD5 ebdf7317400b559e1f842eb963c14160 ChangeLog 1761
-RMD160 38a71c1f85a0fc38c30282c8b158fffb6841dd51 ChangeLog 1761
-SHA256 f8e0b68be8b3b42bef2b1d54b05b37858ae8373eda428f6e0e6696306f170d6f ChangeLog 1761
+MISC ChangeLog 1857 RMD160 47e328ca5065f365a9349ad59d0ce27dc161d4a8 SHA1 876e40fa1838e7550c7fb4970deca971b4bd9f9e SHA256 949be2e5ae5294e3ed1c543f9f11cda8dffe62b728bd752c57be763a93fc3520
+MD5 e0c7f8e25e92fb0d31d84431fcf367ad ChangeLog 1857
+RMD160 47e328ca5065f365a9349ad59d0ce27dc161d4a8 ChangeLog 1857
+SHA256 949be2e5ae5294e3ed1c543f9f11cda8dffe62b728bd752c57be763a93fc3520 ChangeLog 1857
 MISC metadata.xml 357 RMD160 712ef080d70daeeb03889634acda7ad09eaf8938 SHA1 a35162bcbfa04750cf3292022ce911baf3eabf5b SHA256 15524606fffe88de74315c582aee7e65de24537cf3dabcd2f6961d5260af3857
 MD5 91f7a2df14ccdd08f27967738dadb86b metadata.xml 357
 RMD160 712ef080d70daeeb03889634acda7ad09eaf8938 metadata.xml 357
diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff
index 1f2a39f29168..312172348d02 100644
--- a/net-misc/wput/files/wput-0.6-gentoo.diff
+++ b/net-misc/wput/files/wput-0.6-gentoo.diff
@@ -1,52 +1,18 @@
-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 @@
+diff -urN wput/Makefile.in wput/Makefile.in
+--- wput/Makefile.in	2006-04-04 18:16:52.000000000 +0100
++++ wput/Makefile.in	2006-11-07 17:31:10.000000000 +0000
+@@ -15,8 +15,12 @@
  
  install: all
  	cd po && $(MAKE) $(MAKEDEFS) $@
 -	install -m0755 wput $(bindir)
 -	install -m0644 doc/wput.1.gz $(mandir)
-+	mkdir -p $(DESTDIR)/$(bindir)
-+	mkdir -p $(DESTDIR)/$(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."
-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 */
- 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;
-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 <sys/types.h>
- #include <errno.h>
- 
-+#ifndef _XOPEN_SOURCE
-+# define _XOPEN_SOURCE
-+#endif
-+#include <time.h>
-+
- #include "wget.h"
- #include "utils.h"
- #include "ftp.h"