2 files changed, 19 insertions, 3 deletions
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 8e0e3985ed48..dc2fc769938a 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -30,8 +30,6 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 USE_EMACS=		yes
 EMACS_PORT_NAME=	emacs21
 
-BROKEN=		does not compile
-
 CONFLICTS=	emacs-19.* emacs-20.* emacs-22.* \
 		ja-emcws-20.* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
diff --git a/japanese/emacs-emcws/files/patch-src-xfns.c b/japanese/emacs-emcws/files/patch-src-xfns.c
index 208256a93689..5e31c2f9801f 100644
--- a/japanese/emacs-emcws/files/patch-src-xfns.c
+++ b/japanese/emacs-emcws/files/patch-src-xfns.c
@@ -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)
+\ No newline at end of file