Fri Jul 5 13:36:12 2013 UTC ()
Bump PKGREVISION.

* Fix build with giflib 5.0.4.


(ryoon)
diff -r1.6 -r1.7 pkgsrc/editors/emacs23/Makefile
diff -r1.1 -r1.2 pkgsrc/editors/emacs23/distinfo
diff -r1.1 -r1.2 pkgsrc/editors/emacs23/patches/patch-ab
diff -r0 -r1.1 pkgsrc/editors/emacs23/patches/patch-src_image.c
cvs diff -r1.6 -r1.7 pkgsrc/editors/emacs23/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs23/Attic/Makefile 2013/06/06 12:54:15 1.6
+++ pkgsrc/editors/emacs23/Attic/Makefile 2013/07/05 13:36:12 1.7
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.6 2013/06/06 12:54:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2013/07/05 13:36:12 ryoon Exp $
2 2
3CONFLICTS+= emacs23-nox11-[0-9]* 3CONFLICTS+= emacs23-nox11-[0-9]*
4 4
5.include "../../editors/emacs23/Makefile.common" 5.include "../../editors/emacs23/Makefile.common"
6PKGREVISION= 17 6PKGREVISION= 18
7 7
8.include "options.mk" 8.include "options.mk"
9 9
10SUBST_CLASSES+= prefix 10SUBST_CLASSES+= prefix
11SUBST_STAGE.prefix= pre-configure 11SUBST_STAGE.prefix= pre-configure
12SUBST_VARS.prefix= PREFIX 12SUBST_VARS.prefix= PREFIX
13SUBST_FILES.prefix= src/s/netbsd.h 13SUBST_FILES.prefix= src/s/netbsd.h
14 14
15# Replace manual page which only includes another one with a symbolic link 15# Replace manual page which only includes another one with a symbolic link
16# if manual compression is activated. The manual page won't work otherwise. 16# if manual compression is activated. The manual page won't work otherwise.
17.if defined(MANZ) 17.if defined(MANZ)
18post-install: 18post-install:
19 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ctags.1 19 ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ctags.1
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs23/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs23/Attic/distinfo 2013/02/17 04:59:42 1.1
+++ pkgsrc/editors/emacs23/Attic/distinfo 2013/07/05 13:36:12 1.2
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.1 2013/02/17 04:59:42 dholland Exp $ 1$NetBSD: distinfo,v 1.2 2013/07/05 13:36:12 ryoon Exp $
2 2
3SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473 3SHA1 (emacs-23.4.tar.gz) = 0a78466fff52d1f43c0db0ea66651a0b13b7e473
4RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7 4RMD160 (emacs-23.4.tar.gz) = 5fb7e4cd4270a524b8723ad86a145a0e47336bf7
5Size (emacs-23.4.tar.gz) = 47721193 bytes 5Size (emacs-23.4.tar.gz) = 47721193 bytes
6SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50 6SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50
7SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e 7SHA1 (patch-ab) = d8b8cdaf3cc63be042a9972392740c5eccc06d49
8SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9 8SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9
9SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9 9SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9
10SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5 10SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
11SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3 11SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3
12SHA1 (patch-lisp_files.el) = e10c6949029ca7933ea632693843a911b7e010c2 12SHA1 (patch-lisp_files.el) = e10c6949029ca7933ea632693843a911b7e010c2
13SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9 13SHA1 (patch-src_config.in) = c1f7b608dc49da704571a71f96067a0ffac01df9
 14SHA1 (patch-src_image.c) = 674fb9334d089cbf30c545bc0ea83f728c138ddd
14SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507 15SHA1 (patch-src_m_amdx86-64.h) = 0928f4e80c456e5b94a74cfeb3589e411a134507
15SHA1 (patch-src_xgselect.c) = 4a0b246eae2e43fc1e544210fc97c0170e3cffdc 16SHA1 (patch-src_xgselect.c) = 4a0b246eae2e43fc1e544210fc97c0170e3cffdc
cvs diff -r1.1 -r1.2 pkgsrc/editors/emacs23/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/editors/emacs23/patches/Attic/patch-ab 2013/02/17 04:59:42 1.1
+++ pkgsrc/editors/emacs23/patches/Attic/patch-ab 2013/07/05 13:36:12 1.2
@@ -1,39 +1,69 @@ @@ -1,39 +1,69 @@
1$NetBSD: patch-ab,v 1.1 2013/02/17 04:59:42 dholland Exp $ 1$NetBSD: patch-ab,v 1.2 2013/07/05 13:36:12 ryoon Exp $
2 2
3--- work/emacs-23.2/configure.orig 2010-05-08 12:10:16.000000000 +0900 3* Add DragonFly support.
4+++ configure 2010-05-12 20:32:23.000000000 +0900 4* Fix giflib detection with giflib 5.0.
5@@ -1995,7 +1995,7 @@ 5
 6--- configure.orig 2012-01-19 15:01:37.000000000 +0000
 7+++ configure
 8@@ -2468,7 +2468,7 @@ archlibdir='${libexecdir}/emacs/${versio
6 docdir='${datadir}/emacs/${version}/etc' 9 docdir='${datadir}/emacs/${version}/etc'
7 gamedir='${localstatedir}/games/emacs' 10 gamedir='${localstatedir}/games/emacs'
8  11
9-gameuser=games 12-gameuser=games
10+gameuser=${GAMEOWN} 13+gameuser=${GAMEOWN}
11  14
12  15
13  16
14@@ -2652,6 +2652,14 @@ 17@@ -3082,6 +3082,14 @@ case "${canonical}" in
15 amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;; 18 amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
16 esac 19 esac
17 ;; 20 ;;
18+ ## DragonFly ports 21+ ## DragonFly ports
19+ *-*-dragonfly*) 22+ *-*-dragonfly*)
20+ opsys=dragonfly 23+ opsys=dragonfly
21+ case "${canonical}" in 24+ case "${canonical}" in
22+ i[3456]86-*-dragonfly*) machine=intel386 ;; 25+ i[3456]86-*-dragonfly*) machine=intel386 ;;
23+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;; 26+ amd64-*-dragonfly*|x86_64-*-dragonfly*) machine=amdx86-64 ;;
24+ esac 27+ esac
25+ ;; 28+ ;;
26  29
27 ## FreeBSD kernel + glibc based userland 30 ## FreeBSD kernel + glibc based userland
28 *-*-kfreebsd*gnu* ) 31 *-*-kfreebsd*gnu* )
29@@ -9849,9 +9857,9 @@ 32@@ -7249,9 +7257,9 @@ if test "${HAVE_NS}" = yes; then
30 window_system=nextstep 33 window_system=nextstep
31 with_xft=no 34 with_xft=no
32 # set up packaging dirs 35 # set up packaging dirs
33+ if test "${EN_NS_SELF_CONTAINED}" = yes; then 36+ if test "${EN_NS_SELF_CONTAINED}" = yes; then
34 exec_prefix=${ns_appbindir} 37 exec_prefix=${ns_appbindir}
35 libexecdir=${ns_appbindir}/libexec 38 libexecdir=${ns_appbindir}/libexec
36- if test "${EN_NS_SELF_CONTAINED}" = yes; then 39- if test "${EN_NS_SELF_CONTAINED}" = yes; then
37 prefix=${ns_appresdir} 40 prefix=${ns_appresdir}
38 fi 41 fi
39 fi 42 fi
 43@@ -10099,9 +10107,9 @@ if test "${HAVE_X11}" = "yes" && test "$
 44 if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
 45 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 46 # Earlier versions can crash Emacs.
 47- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
 48-$as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
 49-if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
 50+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionTrailer in -lgif" >&5
 51+$as_echo_n "checking for EGifPutExtensionTrailer in -lgif... " >&6; }
 52+if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
 53 $as_echo_n "(cached) " >&6
 54 else
 55 ac_check_lib_save_LIBS=$LIBS
 56@@ -10115,11 +10123,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 57 #ifdef __cplusplus
 58 extern "C"
 59 #endif
 60-char EGifPutExtensionLast ();
 61+char EGifPutExtensionTrailer ();
 62 int
 63 main ()
 64 {
 65-return EGifPutExtensionLast ();
 66+return EGifPutExtensionTrailer ();
 67 ;
 68 return 0;
 69 }
File Added: pkgsrc/editors/emacs23/patches/Attic/patch-src_image.c
$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);