Bump PKGREVISION.

* Fix build for giflib 5.0.4.

5 files changed, 82 insertions, 14 deletions

diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 6f52768e0dc..4fe384ad782 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2013/06/06 12:54:15 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2013/07/05 13:39:05 ryoon Exp $
 
-PKGREVISION=	31
+PKGREVISION=	32
 
 CONFLICTS+=	emacs22-nox11-[0-9]*
 
diff --git a/editors/emacs22/distinfo b/editors/emacs22/distinfo
index 3f8a69e920e..630e9df2acb 100644
--- a/editors/emacs22/distinfo
+++ b/editors/emacs22/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.13 2012/12/27 17:48:29 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2013/07/05 13:39:05 ryoon Exp $
 
 SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0
 RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
 Size (emacs-22.3.tar.gz) = 39587396 bytes
 SHA1 (patch-aa) = e99831448b12ba9cc99b5530dc7de949b44c4337
-SHA1 (patch-ab) = 01ef535f7eca86ff325ed2f2a952ac50e9a59492
+SHA1 (patch-ab) = 2fba73318718032623505da2a66eb5584a734b33
 SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8
 SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
 SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
-SHA1 (patch-af) = 9a30adf280d660c58e841ddb25dfcf1613a5f9fe
+SHA1 (patch-af) = ccb864f27a1f40efd666fe49d7274d20b7382a7a
 SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
 SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c
 SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831
@@ -24,5 +24,6 @@ SHA1 (patch-av) = f2fcb0ccbddba1683cc7f1744bca8b171f83c0e7
 SHA1 (patch-aw) = 575ffdbf0cf9554dee32aa88fd5a5f49c5ab2bf1
 SHA1 (patch-ax) = 4a9a795fd08eedcd83c1c92ede566fd63f365bec
 SHA1 (patch-ba) = 066f6e0f1f69e1e477820589d9b9de4a4a168148
+SHA1 (patch-src_Makefile.in) = 656a199e1f2b2fcc7954935c1f9db1861c12bde0
 SHA1 (patch-src_alloc_c) = 72055017f43d1526a90fdb3a02b6c317f488399d
 SHA1 (patch-xx) = fe52a07d10e8347a721e20611b527c0d626cde3e
diff --git a/editors/emacs22/patches/patch-ab b/editors/emacs22/patches/patch-ab
index 23b13ad9806..e86427340d2 100644
--- a/editors/emacs22/patches/patch-ab
+++ b/editors/emacs22/patches/patch-ab
@@ -1,6 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2009/09/13 02:12:28 jun Exp $
+$NetBSD: patch-ab,v 1.3 2013/07/05 13:39:05 ryoon Exp $
 
---- configure.orig	2008-09-06 01:21:51.000000000 +0900
+* Fix giflib detection with 5.0.
+
+--- configure.orig	2008-09-05 16:21:51.000000000 +0000
 +++ configure
 @@ -1809,7 +1809,7 @@ archlibdir='${libexecdir}/emacs/${versio
  docdir='${datadir}/emacs/${version}/etc'
@@ -32,3 +34,34 @@ $NetBSD: patch-ab,v 1.2 2009/09/13 02:12:28 jun Exp $
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
+@@ -13897,13 +13898,13 @@ fi
+ if test $ac_cv_header_gif_lib_h = yes; then
+   # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
+ # Earlier versions can crash Emacs.
+-      { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5
+-echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; }
++      { echo "$as_me:$LINENO: checking for EGifPutExtensionTrailer in -lgif" >&5
++echo $ECHO_N "checking for EGifPutExtensionTrailer in -lgif... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lungif  $LIBS"
++LIBS="-lgif  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13917,11 +13918,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char EGifPutExtensionLast ();
++char EGifPutExtensionTrailer ();
+ int
+ main ()
+ {
+-return EGifPutExtensionLast ();
++return EGifPutExtensionTrailer ();
+   ;
+   return 0;
+ }
diff --git a/editors/emacs22/patches/patch-af b/editors/emacs22/patches/patch-af
index 427047d3c95..bf2b88c697f 100644
--- a/editors/emacs22/patches/patch-af
+++ b/editors/emacs22/patches/patch-af
@@ -1,10 +1,11 @@
-$NetBSD: patch-af,v 1.2 2011/01/14 11:06:52 tron Exp $
+$NetBSD: patch-af,v 1.3 2013/07/05 13:39:05 ryoon Exp $
 
-Build fix for newer versions of "libpng".
+* Build fix for newer versions of "libpng".
+* Build fix for 5.0 version of giflib.
 
---- src/image.c.orig	2008-08-25 23:18:33.000000000 +0100
-+++ src/image.c	2011-01-14 10:54:46.000000000 +0000
-@@ -6328,11 +6328,7 @@
+--- src/image.c.orig	2008-08-25 22:18:33.000000000 +0000
++++ src/image.c
+@@ -6328,11 +6328,7 @@ png_image_p (object)
  
  #ifdef HAVE_PNG
  
@@ -16,7 +17,7 @@ Build fix for newer versions of "libpng".
  
  #ifdef HAVE_NTGUI
  /* PNG library details.  */
-@@ -6427,7 +6423,11 @@
+@@ -6427,7 +6423,11 @@ my_png_error (png_ptr, msg)
  {
    xassert (png_ptr != NULL);
    image_error ("PNG error: %s", build_string (msg), Qnil);
@@ -28,7 +29,7 @@ Build fix for newer versions of "libpng".
  }
  
  
-@@ -6603,7 +6603,7 @@
+@@ -6603,7 +6603,7 @@ png_load (f, img)
  
    /* Set error jump-back.  We come back here when the PNG library
       detects an error.  */
@@ -37,3 +38,21 @@ Build fix for newer versions of "libpng".
      {
      error:
        if (png_ptr)
+@@ -8108,7 +8108,7 @@ gif_load (f, img)
+ 
+       /* Open the GIF file.  Casting return value avoids a GCC warning
+ 	 on W32.  */
+-      gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file));
++      gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file), NULL);
+       if (gif == NULL)
+ 	{
+ 	  image_error ("Cannot open `%s'", file, Qnil);
+@@ -8125,7 +8125,7 @@ gif_load (f, img)
+       memsrc.index = 0;
+ 
+       /* Casting return value avoids a GCC warning on W32.  */
+-      gif = (GifFileType *)fn_DGifOpen(&memsrc, gif_read_from_memory);
++      gif = (GifFileType *)fn_DGifOpen(&memsrc, gif_read_from_memory, NULL);
+       if (!gif)
+ 	{
+ 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
diff --git a/editors/emacs22/patches/patch-src_Makefile.in b/editors/emacs22/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..5a1a1c7df60
--- /dev/null
+++ b/editors/emacs22/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2013/07/05 13:39:05 ryoon Exp $
+
+* Use giflib instead of libungif.
+
+--- src/Makefile.in.orig	2008-07-11 08:52:53.000000000 +0000
++++ src/Makefile.in
+@@ -441,7 +441,7 @@ XFT_LIBS=@XFT_LIBS@
+ 
+ #if HAVE_GIF
+ #ifndef LIBGIF
+-#define LIBGIF -lungif
++#define LIBGIF -lgif
+ #endif /* not defined LIBGIF */
+ #else /* not HAVE_GIF */
+ #define LIBGIF