Bump PKGREVISION.

* Fix build with giflib 5.0.4.

4 files changed, 65 insertions, 10 deletions

diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index c7a45639fa7..5b62fa8befe 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2013/06/06 12:54:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/05 13:36:12 ryoon Exp $
 
 CONFLICTS+=	emacs23-nox11-[0-9]*
 
 .include "../../editors/emacs23/Makefile.common"
-PKGREVISION=	17
+PKGREVISION=	18
 
 .include "options.mk"
 
diff --git a/editors/emacs23/distinfo b/editors/emacs23/distinfo
index 66fbf866bad..a8790be324a 100644
--- a/editors/emacs23/distinfo
+++ b/editors/emacs23/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.1 2013/02/17 04:59:42 dholland Exp $
+$NetBSD: distinfo,v 1.2 2013/07/05 13:36:12 ryoon Exp $
 
 SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473
 RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7
 Size (emacs-23.4.tar.gz) = 47721193 bytes
 SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50
-SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e
+SHA1 (patch-ab) = d8b8cdaf3cc63be042a9972392740c5eccc06d49
 SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9
 SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9
 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
 SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3
 SHA1 (patch-lisp_files.el) = e10c6949029ca7933ea632693843a911b7e010c2
 SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9
+SHA1 (patch-src_image.c) = 674fb9334d089cbf30c545bc0ea83f728c138ddd
 SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507
 SHA1 (patch-src_xgselect.c) = 4a0b246eae2e43fc1e544210fc97c0170e3cffdc
diff --git a/editors/emacs23/patches/patch-ab b/editors/emacs23/patches/patch-ab
index 917427e75e8..1746b32f5d5 100644
--- a/editors/emacs23/patches/patch-ab
+++ b/editors/emacs23/patches/patch-ab
@@ -1,8 +1,11 @@
-$NetBSD: patch-ab,v 1.1 2013/02/17 04:59:42 dholland Exp $
+$NetBSD: patch-ab,v 1.2 2013/07/05 13:36:12 ryoon Exp $
 
---- work/emacs-23.2/configure.orig	2010-05-08 12:10:16.000000000 +0900
-+++ configure	2010-05-12 20:32:23.000000000 +0900
-@@ -1995,7 +1995,7 @@
+* Add DragonFly support.
+* Fix giflib detection with giflib 5.0.
+
+--- configure.orig	2012-01-19 15:01:37.000000000 +0000
++++ configure
+@@ -2468,7 +2468,7 @@ archlibdir='${libexecdir}/emacs/${versio
  docdir='${datadir}/emacs/${version}/etc'
  gamedir='${localstatedir}/games/emacs'
  
@@ -11,7 +14,7 @@ $NetBSD: patch-ab,v 1.1 2013/02/17 04:59:42 dholland Exp $
  
  
  
-@@ -2652,6 +2652,14 @@
+@@ -3082,6 +3082,14 @@ case "${canonical}" in
        amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
      esac
    ;;
@@ -26,7 +29,7 @@ $NetBSD: patch-ab,v 1.1 2013/02/17 04:59:42 dholland Exp $
  
    ## FreeBSD kernel + glibc based userland
    *-*-kfreebsd*gnu* )
-@@ -9849,9 +9857,9 @@
+@@ -7249,9 +7257,9 @@ if test "${HAVE_NS}" = yes; then
    window_system=nextstep
    with_xft=no
    # set up packaging dirs
@@ -37,3 +40,30 @@ $NetBSD: patch-ab,v 1.1 2013/02/17 04:59:42 dholland Exp $
       prefix=${ns_appresdir}
    fi
  fi
+@@ -10099,9 +10107,9 @@ if test "${HAVE_X11}" = "yes" && test "$
+ if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
+   # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
+ # Earlier versions can crash Emacs.
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
+-$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
+-if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionTrailer in -lgif" >&5
++$as_echo_n "checking for EGifPutExtensionTrailer in -lgif... " >&6; }
++if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -10115,11 +10123,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char EGifPutExtensionLast ();
++char EGifPutExtensionTrailer ();
+ int
+ main ()
+ {
+-return EGifPutExtensionLast ();
++return EGifPutExtensionTrailer ();
+   ;
+   return 0;
+ }
diff --git a/editors/emacs23/patches/patch-src_image.c b/editors/emacs23/patches/patch-src_image.c
new file mode 100644
index 00000000000..a23edde72b9
--- /dev/null
+++ b/editors/emacs23/patches/patch-src_image.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_image.c,v 1.1 2013/07/05 13:36:12 ryoon Exp $
+
+* Fix build with giflib 5.0.
+
+--- src/image.c.orig	2012-01-11 12:35:01.000000000 +0000
++++ src/image.c
+@@ -7350,7 +7350,7 @@ gif_load (f, img)
+ 	}
+ 
+       /* Open the GIF file.  */
+-      gif = fn_DGifOpenFileName (SDATA (file));
++      gif = fn_DGifOpenFileName (SDATA (file), NULL);
+       if (gif == NULL)
+ 	{
+ 	  image_error ("Cannot open `%s'", file, Qnil);
+@@ -7366,7 +7366,7 @@ gif_load (f, img)
+       memsrc.len = SBYTES (specified_data);
+       memsrc.index = 0;
+ 
+-      gif = fn_DGifOpen (&memsrc, gif_read_from_memory);
++      gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL);
+       if (!gif)
+ 	{
+ 	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);