Bump PKGREVISION.

* Fix build for giflib 5.0.4.

9 files changed, 176 insertions, 32 deletions

diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index af9e569e1ea..cf5f07663a0 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2013/05/31 12:40:58 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2013/07/05 13:43:44 ryoon Exp $
 
-PKGREVISION=	27
+PKGREVISION=	28
 CATEGORIES=	editors
 
 CONFLICTS+=	emacs21-nox11-[0-9]*
diff --git a/editors/emacs21/distinfo b/editors/emacs21/distinfo
index a3ceb0546a5..abc8fbc0873 100644
--- a/editors/emacs21/distinfo
+++ b/editors/emacs21/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2011/12/31 23:56:46 dholland Exp $
+$NetBSD: distinfo,v 1.14 2013/07/05 13:43:44 ryoon Exp $
 
 SHA1 (emacs-21.4a.tar.gz) = cdb33731180fe4a912838af805dd35e3f55394d4
 RMD160 (emacs-21.4a.tar.gz) = c312e739935b56d08783bbfe97992297a363cb8a
 Size (emacs-21.4a.tar.gz) = 20403483 bytes
 SHA1 (patch-aa) = fee6fe91fb9a2f75300903cc5c6e023bb8de6be5
-SHA1 (patch-ab) = 54970ba05aa5b638f1a4420c75d2e9bcdaba5acf
+SHA1 (patch-ab) = 0c3396736776fc2d267ab5fe24c3a1be05d64849
 SHA1 (patch-ac) = a2de7619fece50cb42b0e23b1651b5bf742ff69a
 SHA1 (patch-ad) = 39a11bc214ae3d2f9d634c30b196a46d473ab92f
 SHA1 (patch-ae) = e2b66b23efb90608470aef5ebd0c75e27bcd6b55
@@ -26,12 +26,13 @@ SHA1 (patch-at) = bdd1bf7eea72a0b81677817d9b36cddaa07a189c
 SHA1 (patch-au) = e5d90961b4d78c37dec196097a16e0b6ac22e3bb
 SHA1 (patch-av) = 9b6ea439df406a55310e2ca1af45ed56f1663263
 SHA1 (patch-aw) = d7d9013734853a9542fd657f1b532d3c108f88e0
-SHA1 (patch-ax) = 183dd9f3339564f0884f38be22080b333d85f58d
+SHA1 (patch-ax) = 1b4abed8dca34f6148a5f0dd4b323e19e8c799b2
 SHA1 (patch-ay) = 82e4eb371be4dff891878973888c38ca53e9f326
 SHA1 (patch-az) = 43753accb1b9ffc2c63e638c31236b8e4880080b
 SHA1 (patch-ba) = ae05985ce8cabffdfbfb84905e1d6b0de7690b25
 SHA1 (patch-bb) = bf748292c57459b1240da01f9d3df16e4dc40fa2
 SHA1 (patch-bg) = 567ccce83e2b6d898a87f20763d5ff4b19c30deb
 SHA1 (patch-cf) = 1b5b83eb02872414fd7ca29c344c0560feaf1b7e
+SHA1 (patch-src_Makefile.in) = cecef2516c4b9a4171926080a32826fad92ea077
 SHA1 (patch-src_alloc_c) = c9d2c7832b8b48835b81789f938540e3827f7cd8
 SHA1 (patch-xx) = cf1cb21e0bd96202622ff54e39d202bdae78c942
diff --git a/editors/emacs21/patches/patch-ab b/editors/emacs21/patches/patch-ab
index 90d1f53fa32..f34fef8e333 100644
--- a/editors/emacs21/patches/patch-ab
+++ b/editors/emacs21/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2011/12/31 23:56:47 dholland Exp $
+$NetBSD: patch-ab,v 1.4 2013/07/05 13:43:44 ryoon Exp $
 
 Caution: the extra cpp checking (the three hunks containing "Should be
 one line") is manually hacked and not reflected in configure.in; do
@@ -6,6 +6,9 @@ not regenerate configure with autoconf without merging it. This
 checking is required because somewhere between gcc 4.1 and 4.5 cpp
 started doing regrettable things with backslash-escaped newlines.
 
+* Fix build on NetBSD 6.99.23, gcc -E -traditional-cpp with native X
+  results syntax error. Use -traditional-cpp for Makefile generation only.
+
 --- configure.orig	2003-03-18 14:19:12.000000000 +0000
 +++ configure
 @@ -822,9 +822,17 @@ case "${canonical}" in
@@ -45,7 +48,7 @@ started doing regrettable things with backslash-escaped newlines.
        *-nextstep* )             opsys=nextstep ;;
        ## Otherwise, we'll fall through to the generic opsys code at the bottom.
      esac
-@@ -2052,15 +2065,21 @@ else
+@@ -2052,15 +2065,20 @@ else
    CPP="${CC-cc} -E"
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
@@ -56,8 +59,7 @@ started doing regrettable things with backslash-escaped newlines.
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
-+Should \\
-+be one line.
++Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
@@ -69,12 +71,18 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -2074,10 +2093,14 @@ else
+@@ -2068,16 +2086,19 @@ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+-  CPP="${CC-cc} -E -traditional-cpp"
++  CPP="${CC-cc} -E"
+   cat > conftest.$ac_ext <<EOF
+ #line 2074 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
-+Should \\
-+be one line.
++Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
@@ -86,12 +94,11 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -2091,10 +2114,14 @@ else
+@@ -2091,10 +2112,13 @@ else
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
-+Should \\
-+be one line.
++Should be one line.
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 +ac_try="$ac_cpp conftest.$ac_ext >conftest2.out 2>conftest.out"
@@ -103,7 +110,38 @@ started doing regrettable things with backslash-escaped newlines.
  if test -z "$ac_err"; then
    :
  else
-@@ -9124,6 +9151,22 @@ EOF
+@@ -5583,24 +5607,24 @@ if eval "test \"`echo '$ac_cv_header_'$a
+   echo "$ac_t""yes" 1>&6
+   # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
+ # Earlier versions can crash Emacs.
+-      echo $ac_n "checking for EGifPutExtensionLast in -lungif""... $ac_c" 1>&6
+-echo "configure:5588: checking for EGifPutExtensionLast in -lungif" >&5
+-ac_lib_var=`echo ungif'_'EGifPutExtensionLast | sed 'y%./+-%__p_%'`
++      echo $ac_n "checking for EGifPutExtensionTrailer in -lgif""... $ac_c" 1>&6
++echo "configure:5588: checking for EGifPutExtensionTrailer in -lgif" >&5
++ac_lib_var=`echo ungif'_'EGifPutExtensionTrailer | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lungif  $LIBS"
++LIBS="-lgif  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 5596 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char EGifPutExtensionLast();
++char EGifPutExtensionTrailer();
+ 
+ int main() {
+-EGifPutExtensionLast()
++EGifPutExtensionTrailer()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:5607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -9124,6 +9148,22 @@ EOF
  fi
  
  
@@ -126,3 +164,21 @@ started doing regrettable things with backslash-escaped newlines.
  # Set up the CFLAGS for real compilation, so we can substitute it.
  CFLAGS="$REAL_CFLAGS"
  CPPFLAGS="$REAL_CPPFLAGS"
+@@ -9735,7 +9777,7 @@ echo creating lib-src/Makefile
+   sed -e '1,/start of cpp stuff/d'\
+       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+       < Makefile.c > junk.c
+-  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
++  $CPP -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
+   cat junk1.c junk2.c > Makefile.new
+   rm -f junk.c junk1.c junk2.c
+@@ -9751,7 +9793,7 @@ echo creating src/Makefile
+   sed -e '1,/start of cpp stuff/d'\
+       -e 's,/\*\*/#\(.*\)$,/* \1 */,' \
+       < Makefile.c > junk.c
+-  $CPP $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
++  $CPP  -traditional-cpp $undefs -I. -I$top_srcdir/src $CPPFLAGS junk.c | \
+       sed -e 's/^ /	/' -e '/^#/d' -e '/^[ 	]*$/d' > junk2.c
+   cat junk1.c junk2.c > Makefile.new
+   rm -f junk.c junk1.c junk2.c
diff --git a/editors/emacs21/patches/patch-ax b/editors/emacs21/patches/patch-ax
index 7a8c72a7fe6..a7a343505fb 100644
--- a/editors/emacs21/patches/patch-ax
+++ b/editors/emacs21/patches/patch-ax
@@ -1,6 +1,7 @@
-$NetBSD: patch-ax,v 1.1 2011/01/24 09:42:40 wiz Exp $
+$NetBSD: patch-ax,v 1.2 2013/07/05 13:43:44 ryoon Exp $
 
-Fix build with png-1.5.
+* Fix build with png-1.5.
+* Fix build with giflib 5.0.
 
 --- src/xfns.c.orig	2002-12-06 17:05:35.000000000 +0000
 +++ src/xfns.c
@@ -25,3 +26,21 @@ Fix build with png-1.5.
      {
      error:
        if (png_ptr)
+@@ -9759,7 +9763,7 @@ gif_load (f, img)
+ 	}
+ 
+       /* Open the GIF file.  */
+-      gif = DGifOpenFileName (XSTRING (file)->data);
++      gif = DGifOpenFileName (XSTRING (file)->data, NULL);
+       if (gif == NULL)
+ 	{
+ 	  image_error ("Cannot open `%s'", file, Qnil);
+@@ -9775,7 +9779,7 @@ gif_load (f, img)
+       memsrc.len = STRING_BYTES (XSTRING (specified_data));
+       memsrc.index = 0;
+ 
+-      gif = DGifOpen(&memsrc, gif_read_from_memory);
++      gif = DGifOpen(&memsrc, gif_read_from_memory, NULL);
+       if (!gif)
+ 	{
+ 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
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