svn commit: r375643 - head/japanese/ming/files

[Antoine Brodin]

Author: antoine
Date: Fri Dec 26 17:44:35 2014
New Revision: 375643
URL: https://svnweb.freebsd.org/changeset/ports/375643
QAT: https://qat.redports.org/buildarchive/r375643/

Log:
  Allow building with either giflib 4.2 or 5.0

Modified:
  head/japanese/ming/files/patch-util_gif2dbl.c
  head/japanese/ming/files/patch-util_gif2mask.c

Modified: head/japanese/ming/files/patch-util_gif2dbl.c
==============================================================================
--- head/japanese/ming/files/patch-util_gif2dbl.c	Fri Dec 26 17:42:07 2014	(r375642)
+++ head/japanese/ming/files/patch-util_gif2dbl.c	Fri Dec 26 17:44:35 2014	(r375643)
@@ -1,11 +1,22 @@
---- ../util/gif2dbl.c~	2002-06-24 21:21:54.000000000 +0900
-+++ ../util/gif2dbl.c	2013-03-14 04:57:51.000000000 +0900
-@@ -16,7 +16,7 @@
+--- ../util/gif2dbl.c.orig	2002-06-24 12:21:54.000000000 +0000
++++ ../util/gif2dbl.c	2014-12-26 17:29:52.000000000 +0000
+@@ -16,7 +16,6 @@
  void error(char *msg)
  {
    printf("%s:\n\n", msg);
 -  PrintGifError();
-+  GifError();
    exit(-1);
  }
  
+@@ -50,7 +49,11 @@ unsigned char *readGif(char *fileName, i
+   unsigned char *p;
+   int i, nColors, size, alpha, bgColor, alignedWidth;
+ 
++#if GIFLIB_MAJOR >= 5
++  if((file = DGifOpenFileName(fileName, NULL)) == NULL)
++#else
+   if((file = DGifOpenFileName(fileName)) == NULL)
++#endif
+     error("Error opening file");
+ 
+   if(DGifSlurp(file) != GIF_OK)

Modified: head/japanese/ming/files/patch-util_gif2mask.c
==============================================================================
--- head/japanese/ming/files/patch-util_gif2mask.c	Fri Dec 26 17:42:07 2014	(r375642)
+++ head/japanese/ming/files/patch-util_gif2mask.c	Fri Dec 26 17:44:35 2014	(r375643)
@@ -1,11 +1,22 @@
---- ../util/gif2mask.c~	2002-06-24 21:21:54.000000000 +0900
-+++ ../util/gif2mask.c	2013-03-14 04:57:54.000000000 +0900
-@@ -11,7 +11,7 @@
+--- ../util/gif2mask.c.orig	2002-06-24 12:21:54.000000000 +0000
++++ ../util/gif2mask.c	2014-12-26 17:30:23.000000000 +0000
+@@ -11,7 +11,6 @@
  void error(char *msg)
  {
    printf("%s:\n\n", msg);
 -  PrintGifError();
-+  GifError();
    exit(-1);
  }
  
+@@ -23,7 +22,11 @@ unsigned char *readGif(char *fileName, i
+   unsigned char *data;
+   int i, nColors, size;
+ 
++#if GIFLIB_MAJOR >= 5
++  if((file = DGifOpenFileName(fileName, NULL)) == NULL)
++#else
+   if((file = DGifOpenFileName(fileName)) == NULL)
++#endif
+     error("Error opening file");
+ 
+   if(DGifSlurp(file) != GIF_OK)