ports/169240: [patch] japanese/emacs-emcws: Fix the BROKEN flag

[WATANABE Kazuhiro]

>Number:         169240
>Category:       ports
>Synopsis:       [patch] japanese/emacs-emcws: Fix the BROKEN flag
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 19 12:50:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     WATANABE Kazuhiro
>Release:        FreeBSD 9.0-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD capricorn.sign.local 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #3 r237003M: Wed Jun 13 19:05:59 JST 2012 nabe at capricorn:/FreeBSD/obj/i386/releng_9.0/FreeBSD/releng_9.0/src/sys/GENERIC i386
>Description:
More fix is needed for this port to fit graphics/png 1.5.10.
This patch are obtained from editors/emacs21.  Thanks!
>How-To-Repeat:
# cd /usr/ports/japanese/emacs-emcws
# make TRYBROKEN=yes
(snip)
cc -c -I/usr/X11R6/include -I/usr/local/include -L/usr/local/lib   -Demacs -DHAVE_CONFIG_H -DUSE_LUCID  -I. -I/FreeBSD/ports/japanese/emacs-emcws/work/emacs-21.3/src -I/usr/X11R6/include -I/usr/local/include -L/usr/local/lib -I/usr/local/include -I/usr/local/include/wnn7/wnn -I/usr/local/include -O2 -pipe -fno-strict-aliasing xfns.c
xfns.c: In function 'my_png_error':
xfns.c:8544: error: dereferencing pointer to incomplete type
xfns.c: In function 'png_load':
xfns.c:8702: error: dereferencing pointer to incomplete type
gmake: *** [xfns.o] Error 1
*** Error code 2

Stop in /FreeBSD/ports/japanese/emacs-emcws.
*** Error code 1

Stop in /FreeBSD/ports/japanese/emacs-emcws.
# 
>Fix:
diff -urN emacs-emcws.orig/files/patch-src-xfns.c emacs-emcws/files/patch-src-xfns.c
--- emacs-emcws.orig/files/patch-src-xfns.c	2010-03-30 13:47:26.000000000 +0900
+++ emacs-emcws/files/patch-src-xfns.c	2012-06-19 17:02:46.000000000 +0900
@@ -1,5 +1,14 @@
 --- src/xfns.c.orig	2002-12-06 18:05:35.000000000 +0100
-+++ src/xfns.c	2010-03-30 06:35:54.000000000 +0200
++++ src/xfns.c	2012-05-02 19:50:40.000000000 +0200
+@@ -8541,7 +8541,7 @@
+ {
+   xassert (png_ptr != NULL);
+   image_error ("PNG error: %s", build_string (msg), Qnil);
+-  longjmp (png_ptr->jmpbuf, 1);
++  longjmp (png_jmpbuf(png_ptr), 1);
+ }
+ 
+ 
 @@ -8641,7 +8641,7 @@
  
        /* Check PNG signature.  */
@@ -18,3 +27,12 @@
  	{
  	  image_error ("Not a PNG image: `%s'", img->spec, Qnil);
  	  UNGCPRO;
+@@ -8699,7 +8699,7 @@
+ 
+   /* Set error jump-back.  We come back here when the PNG library
+      detects an error.  */
+-  if (setjmp (png_ptr->jmpbuf))
++  if (setjmp (png_jmpbuf(png_ptr)))
+     {
+     error:
+       if (png_ptr)
>Release-Note:
>Audit-Trail:
>Unformatted: