With the power of USES=dos2unix, get rid of most patches and files

with CRLF.

While there, run make makepatch, rename patches to use the new scheme,
and various fixes.

With hat:	portmgr
Sponsored by:	Absolight

6 files changed, 20 insertions, 19 deletions

diff --git a/print/panda/Makefile b/print/panda/Makefile
index 7dba2a6d7a1d..574b0b5e99d3 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -23,7 +23,8 @@ CONFIGURE_ARGS=	--enable-berkeley-db
 CPPFLAGS+=	-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 LIBS+=		-L${BDB_LIB_DIR} -L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
-USES=		autoreconf gmake jpeg libtool pathfix pkgconfig tar:bzip2
+USES=		autoreconf dos2unix gmake jpeg libtool pathfix pkgconfig tar:bzip2
+DOS2UNIX_GLOB=	*.c
 PATHFIX_MAKEFILEIN=	Makefile.am
 USE_BDB=	yes
 USE_LDCONFIG=	yes
diff --git a/print/panda/files/patch-configure.in b/print/panda/files/patch-configure.in
index bf1cae63c46b..a214417d1376 100644
--- a/print/panda/files/patch-configure.in
+++ b/print/panda/files/patch-configure.in
@@ -1,6 +1,6 @@
 --- configure.in.orig	2004-04-13 00:46:24 UTC
 +++ configure.in
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ dnl -ldmalloc:
  dnl AC_CHECK_LIB(dmalloc, malloc)
  
  dnl -lpng::
@@ -9,7 +9,7 @@
  
  dnl -ltiff:
  AC_CHECK_LIB(tiff, TIFFOpen, CFLAGS="$CFLAGS -DHAVE_LIBTIFF"  LDFLAGS="$LDFLAGS -ltiff")
-@@ -52,12 +52,12 @@
+@@ -52,12 +52,12 @@ else
     if test "z$DATABASE" = "zedb"; then
       AC_CHECK_LIB(edb, e_db_open,
  	[LDFLAGS="$LDFLAGS -ledb" DATABASE="edb" AC_DEFINE([USE_EDB], [], [Use Edb])],
diff --git a/print/panda/files/patch-database.c b/print/panda/files/patch-database.c
index 6c51db16365b..ec1f7057674d 100644
--- a/print/panda/files/patch-database.c
+++ b/print/panda/files/patch-database.c
@@ -1,6 +1,6 @@
---- ./database.c.orig	2004-04-13 02:46:24.000000000 +0200
-+++ ./database.c	2014-08-15 19:09:39.000000000 +0200
-@@ -160,6 +160,12 @@
+--- database.c.orig	2016-06-20 16:04:03 UTC
++++ database.c
+@@ -160,6 +160,12 @@ panda_dbwrite (panda_pdf * document, cha
      panda_windbwrite (document, key, value);
  #else
  
@@ -13,7 +13,7 @@
  #if defined DEBUG
    printf ("Storing (%s, %s) in 0x%08x\n", key, value, document->db);
  #endif
-@@ -169,13 +175,6 @@
+@@ -169,13 +175,6 @@ panda_dbwrite (panda_pdf * document, cha
    if (value == NULL)
      panda_error (panda_true, "Cannot store null value\n");
  
diff --git a/print/panda/files/patch-images.c b/print/panda/files/patch-images.c
index 9091205519c0..ed5cfbbf68e7 100644
--- a/print/panda/files/patch-images.c
+++ b/print/panda/files/patch-images.c
@@ -1,6 +1,6 @@
---- ./images.c.orig	2004-04-13 02:46:24.000000000 +0200
-+++ ./images.c	2014-08-15 19:11:07.000000000 +0200
-@@ -835,7 +835,7 @@
+--- images.c.orig	2016-06-20 16:04:03 UTC
++++ images.c
+@@ -835,7 +835,7 @@ panda_insertPNG (panda_pdf * output, pan
  		 panda_object * imageObj, char *filename)
  {
    FILE *image;
@@ -9,7 +9,7 @@
    int bitdepth, colourtype, outColourType;
    png_uint_32 i, rowbytes;
    png_structp png;
-@@ -854,7 +854,7 @@
+@@ -854,7 +854,7 @@ panda_insertPNG (panda_pdf * output, pan
  
    // Check that it really is a PNG file
    fread (sig, 1, 8, image);
@@ -18,7 +18,7 @@
      panda_error (panda_true, "PNG file was invalid");
  
    // Start decompressing
-@@ -1399,7 +1399,7 @@
+@@ -1399,7 +1399,7 @@ void
  panda_imagesizePNG (int *width, int *height, char *filename) 
  {
    FILE * image;
@@ -27,7 +27,7 @@
    int bitdepth, colourtype;
    png_structp png;
    png_infop info;
-@@ -1411,7 +1411,7 @@
+@@ -1411,7 +1411,7 @@ panda_imagesizePNG (int *width, int *hei
    
      // Check that it really is a PNG file
      fread (sig, 1, 8, image);
diff --git a/print/panda/files/patch-objects.c b/print/panda/files/patch-objects.c
index af5273fb8915..827842396e69 100644
--- a/print/panda/files/patch-objects.c
+++ b/print/panda/files/patch-objects.c
@@ -1,6 +1,6 @@
---- ./objects.c.orig	2004-04-13 02:46:24.000000000 +0200
-+++ ./objects.c	2014-08-15 19:09:39.000000000 +0200
-@@ -99,7 +99,7 @@
+--- objects.c.orig	2016-06-20 16:04:03 UTC
++++ objects.c
+@@ -99,7 +99,7 @@ panda_newobject (panda_pdf * doc, int ty
    created->children = (panda_child *) panda_xmalloc (sizeof (panda_child));
  
    ((panda_child *) created->children)->next = NULL;
diff --git a/print/panda/files/patch-utility.c b/print/panda/files/patch-utility.c
index c37cb02f288e..12064c916ace 100644
--- a/print/panda/files/patch-utility.c
+++ b/print/panda/files/patch-utility.c
@@ -6,16 +6,16 @@
    length = strlen (input);
 -  output = panda_xmalloc ((length + 1) * sizeof (char));
 +  output = panda_xmalloc ((length*2 + 1) * sizeof (char));
-   

+   
      // todo_mikal: not sure I like the windows version of this code
      for (count = 0; count < length; count++)
 @@ -518,11 +518,11 @@
        sprintf (output[count], "%2x", input[count]);
-       

+       
  #else	/* 
 */
 -      snprintf (output[count], 1, "%2x", input[count]);
 +      sprintf (output+count*2, "%2x", input[count]);
-       

+       
  #endif
      }