fix patch

Package-Manager: portage-2.1.2_rc1-r4

diff --git a/net-misc/wput/ChangeLog b/net-misc/wput/ChangeLog
index efef604f6e3809c3e87e0d460037ddb51de43632..7c0f62c3e009e35cc7dbcead0efb6c31888c4bc6 100644 (file)
--- 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.12 2006/11/05 16:39:06 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/ChangeLog,v 1.13 2006/11/07 00:38:57 genstef Exp $
+
+  07 Nov 2006; Stefan Schweizer <genstef@gentoo.org>
+  files/wput-0.6-gentoo.diff:
+  fix patch
 
 *wput-0.6 (05 Nov 2006)
 

diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index f908b0ce316d18fc0d2e59a0939210e4a627ecf1..cc77f83df854d6d4543ec164709d0117216abe00 100644 (file)
--- 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 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-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
@@ -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 1665 RMD160 456e4fbec40127bd9b00776935c9c6d5ad87b093 SHA1 d82b189828646ea68baaf1fdc403169a2f680d10 SHA256 a66aa49b01440381b489270a1d5a714fcdf4669082bc97ccef5cfafade057a83
-MD5 4555aba94bd7ec4e6e72da3a1dbf6825 ChangeLog 1665
-RMD160 456e4fbec40127bd9b00776935c9c6d5ad87b093 ChangeLog 1665
-SHA256 a66aa49b01440381b489270a1d5a714fcdf4669082bc97ccef5cfafade057a83 ChangeLog 1665
+MISC ChangeLog 1761 RMD160 38a71c1f85a0fc38c30282c8b158fffb6841dd51 SHA1 de458a8d0ebdddac37d1bed7746c861bab709a56 SHA256 f8e0b68be8b3b42bef2b1d54b05b37858ae8373eda428f6e0e6696306f170d6f
+MD5 ebdf7317400b559e1f842eb963c14160 ChangeLog 1761
+RMD160 38a71c1f85a0fc38c30282c8b158fffb6841dd51 ChangeLog 1761
+SHA256 f8e0b68be8b3b42bef2b1d54b05b37858ae8373eda428f6e0e6696306f170d6f ChangeLog 1761
 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 4ca604602c13eab8da0da94376bbecc3da378c5a..1f2a39f29168552b29087aac212452a0a5c6321a 100644 (file)
--- 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 <sys/types.h>
  #include <errno.h>
  
@@ -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