Fri Jul 5 13:39:05 2013 UTC ()
Bump PKGREVISION.

* Fix build for giflib 5.0.4.


(ryoon)
diff -r1.41 -r1.42 pkgsrc/editors/emacs22/Makefile
diff -r1.13 -r1.14 pkgsrc/editors/emacs22/distinfo
diff -r1.2 -r1.3 pkgsrc/editors/emacs22/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/editors/emacs22/patches/patch-af
diff -r0 -r1.1 pkgsrc/editors/emacs22/patches/patch-src_Makefile.in
cvs diff -r1.41 -r1.42 pkgsrc/editors/emacs22/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/editors/emacs22/Attic/Makefile 2013/06/06 12:54:15 1.41
+++ pkgsrc/editors/emacs22/Attic/Makefile 2013/07/05 13:39:05 1.42
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1# $NetBSD: Makefile,v 1.41 2013/06/06 12:54:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.42 2013/07/05 13:39:05 ryoon Exp $
2 2
3PKGREVISION= 31 3PKGREVISION= 32
4 4
5CONFLICTS+= emacs22-nox11-[0-9]* 5CONFLICTS+= emacs22-nox11-[0-9]*
6 6
7.include "../../editors/emacs22/Makefile.common" 7.include "../../editors/emacs22/Makefile.common"
cvs diff -r1.13 -r1.14 pkgsrc/editors/emacs22/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/editors/emacs22/Attic/distinfo 2012/12/27 17:48:29 1.13
+++ pkgsrc/editors/emacs22/Attic/distinfo 2013/07/05 13:39:05 1.14
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1$NetBSD: distinfo,v 1.13 2012/12/27 17:48:29 ryoon Exp $ 1$NetBSD: distinfo,v 1.14 2013/07/05 13:39:05 ryoon Exp $
2 2
3SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 3SHA1 (emacs-22.3.tar.gz) = 5e9b3e0205099a83be7198fd43ba1c9442a3feb0
4RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 4RMD160 (emacs-22.3.tar.gz) = a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
5Size (emacs-22.3.tar.gz) = 39587396 bytes 5Size (emacs-22.3.tar.gz) = 39587396 bytes
6SHA1 (patch-aa) = e99831448b12ba9cc99b5530dc7de949b44c4337 6SHA1 (patch-aa) = e99831448b12ba9cc99b5530dc7de949b44c4337
7SHA1 (patch-ab) = 01ef535f7eca86ff325ed2f2a952ac50e9a59492 7SHA1 (patch-ab) = 2fba73318718032623505da2a66eb5584a734b33
8SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8 8SHA1 (patch-ac) = c36626c2639b6aedf9ba6f90962e9a858fdec0a8
9SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131 9SHA1 (patch-ad) = b45adb120cca8fd294cdcefbb706d01319f98131
10SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f 10SHA1 (patch-ae) = 5468981ef9a5ba21460b4549804d49b1c66a968f
11SHA1 (patch-af) = 9a30adf280d660c58e841ddb25dfcf1613a5f9fe 11SHA1 (patch-af) = ccb864f27a1f40efd666fe49d7274d20b7382a7a
12SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa 12SHA1 (patch-aj) = 21627a4528d28b666aa0f708359a617bf3253aaa
13SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c 13SHA1 (patch-ak) = 8d640bf8f16bb0396c51626d611ad472fa0b9f9c
14SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831 14SHA1 (patch-am) = 3e5a6501b1b7bd7a15a14e5fc4476c6c589b7831
15SHA1 (patch-an) = 1faa6d8913738278c746c50fff1b0b2f4a869796 15SHA1 (patch-an) = 1faa6d8913738278c746c50fff1b0b2f4a869796
16SHA1 (patch-ao) = 7f2308966583205092885c997c47be83f81a4389 16SHA1 (patch-ao) = 7f2308966583205092885c997c47be83f81a4389
17SHA1 (patch-ap) = b55bc6477c8ca7fd4cb6446ca9487cc0808e2b68 17SHA1 (patch-ap) = b55bc6477c8ca7fd4cb6446ca9487cc0808e2b68
18SHA1 (patch-aq) = 6ee5d195a7dc6d4e94246942689a3b22d9c85636 18SHA1 (patch-aq) = 6ee5d195a7dc6d4e94246942689a3b22d9c85636
19SHA1 (patch-ar) = 96c08701708a8c12c3ea6de12d7632f6ac696793 19SHA1 (patch-ar) = 96c08701708a8c12c3ea6de12d7632f6ac696793
20SHA1 (patch-as) = 00692744b545a98f4339160089eaa5519ca823a5 20SHA1 (patch-as) = 00692744b545a98f4339160089eaa5519ca823a5
21SHA1 (patch-at) = d5468ed9d7ca76f438f7c8b89960c6fcc9cb90c7 21SHA1 (patch-at) = d5468ed9d7ca76f438f7c8b89960c6fcc9cb90c7
22SHA1 (patch-au) = e4a525ed182c3b8f3f7365ee01e186ad5d1b0c7e 22SHA1 (patch-au) = e4a525ed182c3b8f3f7365ee01e186ad5d1b0c7e
23SHA1 (patch-av) = f2fcb0ccbddba1683cc7f1744bca8b171f83c0e7 23SHA1 (patch-av) = f2fcb0ccbddba1683cc7f1744bca8b171f83c0e7
24SHA1 (patch-aw) = 575ffdbf0cf9554dee32aa88fd5a5f49c5ab2bf1 24SHA1 (patch-aw) = 575ffdbf0cf9554dee32aa88fd5a5f49c5ab2bf1
25SHA1 (patch-ax) = 4a9a795fd08eedcd83c1c92ede566fd63f365bec 25SHA1 (patch-ax) = 4a9a795fd08eedcd83c1c92ede566fd63f365bec
26SHA1 (patch-ba) = 066f6e0f1f69e1e477820589d9b9de4a4a168148 26SHA1 (patch-ba) = 066f6e0f1f69e1e477820589d9b9de4a4a168148
 27SHA1 (patch-src_Makefile.in) = 656a199e1f2b2fcc7954935c1f9db1861c12bde0
27SHA1 (patch-src_alloc_c) = 72055017f43d1526a90fdb3a02b6c317f488399d 28SHA1 (patch-src_alloc_c) = 72055017f43d1526a90fdb3a02b6c317f488399d
28SHA1 (patch-xx) = fe52a07d10e8347a721e20611b527c0d626cde3e 29SHA1 (patch-xx) = fe52a07d10e8347a721e20611b527c0d626cde3e
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs22/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/editors/emacs22/patches/Attic/patch-ab 2009/09/13 02:12:28 1.2
+++ pkgsrc/editors/emacs22/patches/Attic/patch-ab 2013/07/05 13:39:05 1.3
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1$NetBSD: patch-ab,v 1.2 2009/09/13 02:12:28 jun Exp $ 1$NetBSD: patch-ab,v 1.3 2013/07/05 13:39:05 ryoon Exp $
2 2
3--- configure.orig 2008-09-06 01:21:51.000000000 +0900 3* Fix giflib detection with 5.0.
 4
 5--- configure.orig 2008-09-05 16:21:51.000000000 +0000
4+++ configure 6+++ configure
5@@ -1809,7 +1809,7 @@ archlibdir='${libexecdir}/emacs/${versio 7@@ -1809,7 +1809,7 @@ archlibdir='${libexecdir}/emacs/${versio
6 docdir='${datadir}/emacs/${version}/etc' 8 docdir='${datadir}/emacs/${version}/etc'
7 gamedir='${localstatedir}/games/emacs' 9 gamedir='${localstatedir}/games/emacs'
8  10
9-gameuser=games 11-gameuser=games
10+gameuser=${GAMEOWN} 12+gameuser=${GAMEOWN}
11  13
12  14
13 # Check whether --with-gcc was given. 15 # Check whether --with-gcc was given.
14@@ -2243,9 +2243,9 @@ _ACEOF 16@@ -2243,9 +2243,9 @@ _ACEOF
15 m68k-*-netbsd*) 17 m68k-*-netbsd*)
16 # This is somewhat bogus. 18 # This is somewhat bogus.
@@ -22,13 +24,44 @@ $NetBSD: patch-ab,v 1.2 2009/09/13 02:12 @@ -22,13 +24,44 @@ $NetBSD: patch-ab,v 1.2 2009/09/13 02:12
22+ mipsel-*-netbsd*) machine=mips ;; 24+ mipsel-*-netbsd*) machine=mips ;;
23+ mipseb-*-netbsd*) machine=mips ;; 25+ mipseb-*-netbsd*) machine=mips ;;
24 ns32k-*-netbsd*) machine=ns32000 ;; 26 ns32k-*-netbsd*) machine=ns32000 ;;
25 powerpc-*-netbsd*) machine=macppc ;; 27 powerpc-*-netbsd*) machine=macppc ;;
26 sparc*-*-netbsd*) machine=sparc ;; 28 sparc*-*-netbsd*) machine=sparc ;;
27@@ -3142,6 +3142,7 @@ _ACEOF 29@@ -3142,6 +3142,7 @@ _ACEOF
28 *-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; 30 *-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
29 *-sysv5OpenUNIX* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;; 31 *-sysv5OpenUNIX* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
30 *-386bsd* ) opsys=386bsd ;; 32 *-386bsd* ) opsys=386bsd ;;
31+ *-dragonfly* ) opsys=dragonfly ;; 33+ *-dragonfly* ) opsys=dragonfly ;;
32 *-nextstep* ) opsys=nextstep ;; 34 *-nextstep* ) opsys=nextstep ;;
33 ## Otherwise, we'll fall through to the generic opsys code at the bottom. 35 ## Otherwise, we'll fall through to the generic opsys code at the bottom.
34 esac 36 esac
 37@@ -13897,13 +13898,13 @@ fi
 38 if test $ac_cv_header_gif_lib_h = yes; then
 39 # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 40 # Earlier versions can crash Emacs.
 41- { echo "$as_me:$LINENO: checking for EGifPutExtensionLast in -lungif" >&5
 42-echo $ECHO_N "checking for EGifPutExtensionLast in -lungif... $ECHO_C" >&6; }
 43+ { echo "$as_me:$LINENO: checking for EGifPutExtensionTrailer in -lgif" >&5
 44+echo $ECHO_N "checking for EGifPutExtensionTrailer in -lgif... $ECHO_C" >&6; }
 45 if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then
 46 echo $ECHO_N "(cached) $ECHO_C" >&6
 47 else
 48 ac_check_lib_save_LIBS=$LIBS
 49-LIBS="-lungif $LIBS"
 50+LIBS="-lgif $LIBS"
 51 cat >conftest.$ac_ext <<_ACEOF
 52 /* confdefs.h. */
 53 _ACEOF
 54@@ -13917,11 +13918,11 @@ cat >>conftest.$ac_ext <<_ACEOF
 55 #ifdef __cplusplus
 56 extern "C"
 57 #endif
 58-char EGifPutExtensionLast ();
 59+char EGifPutExtensionTrailer ();
 60 int
 61 main ()
 62 {
 63-return EGifPutExtensionLast ();
 64+return EGifPutExtensionTrailer ();
 65 ;
 66 return 0;
 67 }
cvs diff -r1.2 -r1.3 pkgsrc/editors/emacs22/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/editors/emacs22/patches/Attic/patch-af 2011/01/14 11:06:52 1.2
+++ pkgsrc/editors/emacs22/patches/Attic/patch-af 2013/07/05 13:39:05 1.3
@@ -1,39 +1,58 @@ @@ -1,39 +1,58 @@
1$NetBSD: patch-af,v 1.2 2011/01/14 11:06:52 tron Exp $ 1$NetBSD: patch-af,v 1.3 2013/07/05 13:39:05 ryoon Exp $
2 2
3Build fix for newer versions of "libpng". 3* Build fix for newer versions of "libpng".
 4* Build fix for 5.0 version of giflib.
4 5
5--- src/image.c.orig 2008-08-25 23:18:33.000000000 +0100 6--- src/image.c.orig 2008-08-25 22:18:33.000000000 +0000
6+++ src/image.c 2011-01-14 10:54:46.000000000 +0000 7+++ src/image.c
7@@ -6328,11 +6328,7 @@ 8@@ -6328,11 +6328,7 @@ png_image_p (object)
8  9
9 #ifdef HAVE_PNG 10 #ifdef HAVE_PNG
10  11
11-#if defined HAVE_LIBPNG_PNG_H 12-#if defined HAVE_LIBPNG_PNG_H
12-# include <libpng/png.h> 13-# include <libpng/png.h>
13-#else 14-#else
14 # include <png.h> 15 # include <png.h>
15-#endif 16-#endif
16  17
17 #ifdef HAVE_NTGUI 18 #ifdef HAVE_NTGUI
18 /* PNG library details. */ 19 /* PNG library details. */
19@@ -6427,7 +6423,11 @@ 20@@ -6427,7 +6423,11 @@ my_png_error (png_ptr, msg)
20 { 21 {
21 xassert (png_ptr != NULL); 22 xassert (png_ptr != NULL);
22 image_error ("PNG error: %s", build_string (msg), Qnil); 23 image_error ("PNG error: %s", build_string (msg), Qnil);
23+#if (PNG_LIBPNG_VER < 10500) 24+#if (PNG_LIBPNG_VER < 10500)
24 longjmp (png_ptr->jmpbuf, 1); 25 longjmp (png_ptr->jmpbuf, 1);
25+#else 26+#else
26+ png_longjmp (png_ptr, 1); 27+ png_longjmp (png_ptr, 1);
27+#endif 28+#endif
28 } 29 }
29  30
30  31
31@@ -6603,7 +6603,7 @@ 32@@ -6603,7 +6603,7 @@ png_load (f, img)
32  33
33 /* Set error jump-back. We come back here when the PNG library 34 /* Set error jump-back. We come back here when the PNG library
34 detects an error. */ 35 detects an error. */
35- if (setjmp (png_ptr->jmpbuf)) 36- if (setjmp (png_ptr->jmpbuf))
36+ if (setjmp (png_jmpbuf(png_ptr))) 37+ if (setjmp (png_jmpbuf(png_ptr)))
37 { 38 {
38 error: 39 error:
39 if (png_ptr) 40 if (png_ptr)
 41@@ -8108,7 +8108,7 @@ gif_load (f, img)
 42
 43 /* Open the GIF file. Casting return value avoids a GCC warning
 44 on W32. */
 45- gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file));
 46+ gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file), NULL);
 47 if (gif == NULL)
 48 {
 49 image_error ("Cannot open `%s'", file, Qnil);
 50@@ -8125,7 +8125,7 @@ gif_load (f, img)
 51 memsrc.index = 0;
 52
 53 /* Casting return value avoids a GCC warning on W32. */
 54- gif = (GifFileType *)fn_DGifOpen(&memsrc, gif_read_from_memory);
 55+ gif = (GifFileType *)fn_DGifOpen(&memsrc, gif_read_from_memory, NULL);
 56 if (!gif)
 57 {
 58 image_error ("Cannot open memory source `%s'", img->spec, Qnil);
File Added: pkgsrc/editors/emacs22/patches/Attic/patch-src_Makefile.in
$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