Rename all files containing a : in their filename.

While there, run make makepatch on affected ports, and rename patches
accordingly.

Sponsored by:	Absolight

11 files changed, 41 insertions, 49 deletions

diff --git a/graphics/graphopt/files/patch-pixmaps:Makefile.in b/graphics/graphopt/files/patch-pixmaps_Makefile.in
index 4ed67aa4c26e..72034c271f50 100644
--- a/graphics/graphopt/files/patch-pixmaps:Makefile.in
+++ b/graphics/graphopt/files/patch-pixmaps_Makefile.in
@@ -1,6 +1,6 @@
---- pixmaps/Makefile.in.orig	Fri Dec  5 23:02:55 2003
-+++ pixmaps/Makefile.in	Fri Dec  5 23:03:06 2003
-@@ -67,7 +67,7 @@
+--- pixmaps/Makefile.in.orig	2003-05-07 15:10:47 UTC
++++ pixmaps/Makefile.in
+@@ -67,7 +67,7 @@ PACKAGE = @PACKAGE@
  RANLIB = @RANLIB@
  VERSION = @VERSION@
  
diff --git a/graphics/graphopt/files/patch-src:classes:psExporter.cc b/graphics/graphopt/files/patch-src:classes:psExporter.cc
deleted file mode 100644
index 2d649f2d5790..000000000000
--- a/graphics/graphopt/files/patch-src:classes:psExporter.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/classes/psExporter.cc.orig	Mon Aug  9 09:31:11 2004
-+++ src/classes/psExporter.cc	Mon Aug  9 09:31:38 2004
-@@ -1,4 +1,5 @@
- #include "psExporter.h"
-+#include <cstdlib>
- 
- 
- psExporter::psExporter(char *what_file, nodes *what_nodes) {
-@@ -26,7 +27,7 @@
- 
- void psExporter::write_headers(FILE *outfile) {
-    char *line = new char[200];
--   sprintf(line, "\%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
-+   sprintf(line, "%%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
-            translatexcoord((double) biggest_x) + 2 * margin,
-            translateycoord((double) biggest_y) + 2 * margin);
-    fwrite(line, strlen(line), 1, outfile);
diff --git a/graphics/graphopt/files/patch-src__classes__dotImporter.cc b/graphics/graphopt/files/patch-src_classes_dotImporter.cc
index 807beedb09cd..8c1d030e309e 100644
--- a/graphics/graphopt/files/patch-src__classes__dotImporter.cc
+++ b/graphics/graphopt/files/patch-src_classes_dotImporter.cc
@@ -1,4 +1,4 @@
---- src/classes/dotImporter.cc.orig
+--- src/classes/dotImporter.cc.orig	2003-03-20 07:37:55 UTC
 +++ src/classes/dotImporter.cc
 @@ -1,5 +1,6 @@
  #include "dotImporter.h"
diff --git a/graphics/graphopt/files/patch-src__classes__optFileReader.cc b/graphics/graphopt/files/patch-src_classes_optFileReader.cc
index 1529cb2e2656..db86a01d28e0 100644
--- a/graphics/graphopt/files/patch-src__classes__optFileReader.cc
+++ b/graphics/graphopt/files/patch-src_classes_optFileReader.cc
@@ -1,4 +1,4 @@
---- src/classes/optFileReader.cc.orig
+--- src/classes/optFileReader.cc.orig	2003-03-20 07:42:59 UTC
 +++ src/classes/optFileReader.cc
 @@ -1,5 +1,6 @@
  #include "optFileReader.h"
diff --git a/graphics/graphopt/files/patch-src_classes_psExporter.cc b/graphics/graphopt/files/patch-src_classes_psExporter.cc
index 3c776c960e4e..56bdb6a2ee65 100644
--- a/graphics/graphopt/files/patch-src_classes_psExporter.cc
+++ b/graphics/graphopt/files/patch-src_classes_psExporter.cc
@@ -1,10 +1,19 @@
---- src/classes/psExporter.cc.intermediate	2015-09-20 01:43:24 UTC
+--- src/classes/psExporter.cc.orig	2003-04-18 04:47:40 UTC
 +++ src/classes/psExporter.cc
-@@ -1,6 +1,6 @@
+@@ -1,5 +1,6 @@
  #include "psExporter.h"
- #include <cstdlib>
 -
++#include <cstdlib>
 +#include <cstring>
  
  psExporter::psExporter(char *what_file, nodes *what_nodes) {
     filename = strdup(what_file);
+@@ -26,7 +27,7 @@ void psExporter::do_export() {
+ 
+ void psExporter::write_headers(FILE *outfile) {
+    char *line = new char[200];
+-   sprintf(line, "\%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
++   sprintf(line, "%%!PS-Adobe-1.0\n%%%%BoundingBox: 0 0 %d %d\n%%%%DocumentFonts: Helvetica\n%%%%Pages: 1\n",
+            translatexcoord((double) biggest_x) + 2 * margin,
+            translateycoord((double) biggest_y) + 2 * margin);
+    fwrite(line, strlen(line), 1, outfile);
diff --git a/graphics/graphopt/files/patch-src:main.cc b/graphics/graphopt/files/patch-src_main.cc
index 1d54fd7ca8c5..e115e6bbfc1d 100644
--- a/graphics/graphopt/files/patch-src:main.cc
+++ b/graphics/graphopt/files/patch-src_main.cc
@@ -1,6 +1,6 @@
---- src/main.cc.orig	Fri Dec  5 22:57:02 2003
-+++ src/main.cc	Fri Dec  5 22:57:20 2003
-@@ -18,7 +18,7 @@
+--- src/main.cc.orig	2003-05-07 15:06:31 UTC
++++ src/main.cc
+@@ -18,7 +18,7 @@ int main (int argc, char *argv[]) {
     gtk_set_locale ();
     gtk_init (&argc, &argv);
  
diff --git a/graphics/libafterimage/files/patch-Makefile.in b/graphics/libafterimage/files/patch-Makefile.in
index 7e09800ea376..63ac01547148 100644
--- a/graphics/libafterimage/files/patch-Makefile.in
+++ b/graphics/libafterimage/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-06-19 05:34:51.000000000 +0900
-+++ Makefile.in	2008-06-26 21:27:22.000000000 +0900
-@@ -81,7 +81,7 @@
+--- Makefile.in.orig	2011-01-15 05:52:22 UTC
++++ Makefile.in
+@@ -83,7 +83,7 @@ CP		= @CP@
  MV		= @MV@
  RM		= @RM@
  RMF		= @RM@ -f
@@ -9,7 +9,7 @@
  FIND		= @FIND@
  XARGS		= @XARGS@
  LDCONFIG	= @LDCONFIG@
-@@ -94,16 +94,16 @@
+@@ -96,16 +96,16 @@ YACCFLAGS	= -d
  LEXFLAGS	=
  
  INSTALL		= @INSTALL@
@@ -32,7 +32,7 @@
  
  USER_LD_FLAGS	= @user_ldflags@
  LIBS_X		= @x_libs@
-@@ -122,7 +122,7 @@
+@@ -124,7 +124,7 @@ AFTER_BIN_DIR	= $(DESTDIR)@bindir@
  AFTER_MAN_DIR	= $(DESTDIR)@mandir@/man3
  AFTER_APP_MAN_DIR	= $(DESTDIR)@mandir@/man1
  AFTER_SHAREDIR	= $(DESTDIR)@datadir@/$(LIB_DIR_NAME)
@@ -41,7 +41,7 @@
  
  # We want to build both static and dynamic libs, as some service apps may need 
  # static library as they gets run at compile time (ASDocGen for example)
-@@ -163,11 +163,10 @@
+@@ -165,11 +165,10 @@ install.static: 	mkdir
  install.script:
  
  install.dyn:	mkdir
@@ -56,7 +56,7 @@
  		$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIBDIR)/$(LIB_SHARED); \
  		if test `uname` = "Linux"; then \
  		   if test $(LIBDIR) = "/lib" || test $(LIBDIR) = "/usr/lib"; then \
-@@ -391,11 +390,8 @@
+@@ -393,11 +392,8 @@ $(LIB_SHARED_CYG): $(LIB_OBJS) $(LIB_INC
  $(LIB_SHARED): $(LIB_SHARED).$(LIBVERMAJOR)
  	$(LN_S) -f $(LIB_SHARED).$(LIBVERMAJOR) $(LIB_SHARED)
  
@@ -70,7 +70,7 @@
  	 $(LIB_OBJS)
  
  install.man:
-@@ -421,7 +417,7 @@
+@@ -423,7 +419,7 @@ install.doc:
  			cd ../..; \
  		fi
  
diff --git a/graphics/libafterimage/files/patch-apps:Makefile.in b/graphics/libafterimage/files/patch-apps_Makefile.in
index 3e238247e571..887161e53ac9 100644
--- a/graphics/libafterimage/files/patch-apps:Makefile.in
+++ b/graphics/libafterimage/files/patch-apps_Makefile.in
@@ -1,6 +1,6 @@
---- ./apps/Makefile.in.orig	Thu Aug  2 07:09:02 2007
-+++ ./apps/Makefile.in	Sun Aug  5 21:11:50 2007
-@@ -13,14 +13,14 @@
+--- apps/Makefile.in.orig	2011-01-15 05:52:22 UTC
++++ apps/Makefile.in
+@@ -13,14 +13,14 @@ CP		= @CP@
  MV		= @MV@
  RM		= @RM@
  RMF		= @RM@ -f
@@ -18,7 +18,7 @@
  
  INCS_X		= @X_CFLAGS@
  INCS_PRIVATE    = 
-@@ -30,7 +30,7 @@
+@@ -30,7 +30,7 @@ USER_LD_FLAGS	= @user_ldflags@
  LIBS_X		= @x_libs@
  LIBS_XEXTS	=
  LIBS_AFTERIMAGE = @AFTERIMAGE_APPS_LIBS@
diff --git a/graphics/libafterimage/files/patch-libpng15 b/graphics/libafterimage/files/patch-libpng15
index 44d5b944007c..2f748158cd9d 100644
--- a/graphics/libafterimage/files/patch-libpng15
+++ b/graphics/libafterimage/files/patch-libpng15
@@ -1,6 +1,6 @@
---- export.c
+--- export.c.orig	2011-01-15 05:52:22 UTC
 +++ export.c
-@@ -496,7 +496,7 @@
+@@ -496,7 +496,7 @@ ASImage2png_int ( ASImage *im, void *dat
  	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
      if ( png_ptr != NULL )
      	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
@@ -9,9 +9,9 @@
  			{
  				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
  				info_ptr = NULL ;
---- import.c
+--- import.c.orig	2011-01-15 05:52:22 UTC
 +++ import.c
-@@ -1251,7 +1251,7 @@
+@@ -1251,7 +1251,7 @@ png2ASImage_int( void *data, png_rw_ptr 
  			 * the normal method of doing things with libpng).  REQUIRED unless you
  			 * set up your own error handlers in the png_create_read_struct() earlier.
  			 */
@@ -20,7 +20,7 @@
  			{
  				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
  
-@@ -1468,7 +1468,7 @@
+@@ -1468,7 +1468,7 @@ typedef struct ASImPNGReadBuffer
  
  static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
  {
diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile
index 6cd549c908b1..226a02b2785a 100644
--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@@ -21,7 +21,7 @@ NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-pre-patch:
+post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKSRC}/pstoepsi.prefix
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKSRC}
 
diff --git a/graphics/pstoepsi/files/patch-src:ps2epsi b/graphics/pstoepsi/files/patch-pstoepsi.prefix
index c43f69991fe7..bab339ae1874 100644
--- a/graphics/pstoepsi/files/patch-src:ps2epsi
+++ b/graphics/pstoepsi/files/patch-pstoepsi.prefix
@@ -1,6 +1,6 @@
---- pstoepsi.prefix.orig	Mon Jul 22 19:41:04 2002
-+++ pstoepsi.prefix	Mon Jul 22 19:40:51 2002
-@@ -33,10 +33,10 @@
+--- pstoepsi.prefix.orig	2016-06-17 22:43:43 UTC
++++ pstoepsi.prefix
+@@ -33,10 +33,10 @@ USAGE="Usage: $0 [ -gs | -news ] [ -stri
  <file>.ps <file>.epsi"
  
  ########################## Edit these variables #####################