Clean up patches.

(Portage version: 2.2_rc88/cvs/Linux i686)

6 files changed, 19 insertions, 13 deletions

diff --git a/app-text/pinfo/ChangeLog b/app-text/pinfo/ChangeLog
index 58b57795736f..8b668f05e4d3 100644
--- a/app-text/pinfo/ChangeLog
+++ b/app-text/pinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pinfo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.41 2010/06/18 14:37:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.42 2010/10/06 16:42:08 jer Exp $
+
+  06 Oct 2010; Jeroen Roovers <jer@gentoo.org>
+  files/pinfo-0.6.9-FTPVIEWER.patch, files/pinfo-0.6.9-GROFF_NO_SGR.patch,
+  files/pinfo-0.6.9-as-needed.patch, files/pinfo-0.6.9-lzma-xz.patch,
+  files/pinfo-0.6.9-version.patch:
+  Clean up patches.
 
 *pinfo-0.6.9-r1 (18 Jun 2010)
 
diff --git a/app-text/pinfo/files/pinfo-0.6.9-FTPVIEWER.patch b/app-text/pinfo/files/pinfo-0.6.9-FTPVIEWER.patch
index 52dbe0cbd097..0ab17f6008b0 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-FTPVIEWER.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-FTPVIEWER.patch
@@ -1,5 +1,5 @@
-+++ src/parse_config.c	2006-03-09 20:44:51.000000000 +0100
---- src/parse_config.c	2006-06-23 14:16:02.000000000 +0200
++++ b/src/parse_config.c	2006-03-09 20:44:51.000000000 +0100
+--- a/src/parse_config.c	2006-06-23 14:16:02.000000000 +0200
 @@ -601,7 +601,7 @@
  		else
  			return 1;
diff --git a/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch b/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch
index 7aa7b3e87b33..dc902c0cae0a 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch
@@ -1,5 +1,5 @@
---- src/manual.c.orig	2006-03-16 15:14:30.000000000 +0100
-+++ src/manual.c	2010-06-03 19:47:11.000000000 +0200
+--- a/src/manual.c	2006-03-16 15:14:30.000000000 +0100
++++ b/src/manual.c	2010-06-03 19:47:11.000000000 +0200
 @@ -261,6 +261,7 @@
  		xfree(tmpfilename1);
  	}
diff --git a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
index e2c005099b8f..85a80e6f2602 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
@@ -1,5 +1,5 @@
---- ./macros/curses.m4.orig	2006-06-26 22:29:10.000000000 +0200
-+++ ./macros/curses.m4	2006-06-26 22:31:16.000000000 +0200
+--- a/macros/curses.m4
++++ b/macros/curses.m4
 @@ -257,8 +257,8 @@
  	dnl save CFLAGS and LDFLAGS and set new ones
  	CFLAGS_OLD=$CFLAGS
diff --git a/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch b/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch
index 3e738c888205..6ae0766fb803 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch
@@ -1,5 +1,5 @@
---- src/filehandling_functions.c
-+++ src/filehandling_functions.c
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
 @@ -41,14 +41,16 @@
   * you dump the file through `gunzip -d -c', etc.                              *
   ******************************************************************************/
diff --git a/app-text/pinfo/files/pinfo-0.6.9-version.patch b/app-text/pinfo/files/pinfo-0.6.9-version.patch
index a2960e780338..fd8b75e4279d 100644
--- a/app-text/pinfo/files/pinfo-0.6.9-version.patch
+++ b/app-text/pinfo/files/pinfo-0.6.9-version.patch
@@ -1,5 +1,5 @@
---- doc/pinfo.info.orig	2006-03-16 17:28:00.000000000 +0100
-+++ doc/pinfo.info	2010-06-18 16:20:24.000000000 +0200
+--- a/doc/pinfo.info	2006-03-16 17:28:00.000000000 +0100
++++ b/doc/pinfo.info	2010-06-18 16:20:24.000000000 +0200
 @@ -1,6 +1,6 @@
  This is pinfo.info, produced by makeinfo version 4.8 from pinfo.texi.
  
@@ -17,8 +17,8 @@
  
     Original manpage written on 21 Mar 1999 by Przemek Borys,
  <pborys@dione.ids.pl>, `http://zeus.polsl.gliwice.pl/~pborys/'.
---- doc/pinfo.texi.orig	2006-03-16 16:40:41.000000000 +0100
-+++ doc/pinfo.texi	2010-06-18 16:20:24.000000000 +0200
+--- a/doc/pinfo.texi	2006-03-16 16:40:41.000000000 +0100
++++ b/doc/pinfo.texi	2010-06-18 16:20:24.000000000 +0200
 @@ -5,7 +5,7 @@
  @c %**end of header