- update png to 1.5.10

55 files changed, 101 insertions, 51 deletions

diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index 3c736011c6e3..3aa79cd1c09e 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	aterm
 PORTVERSION=	0.4.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES+=	japanese x11
 MASTER_SITES=	SF
 
@@ -22,7 +22,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A color vt102 terminal emulator with transparency support
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png
+		png15:${PORTSDIR}/graphics/png
 
 USE_AUTOTOOLS=	autoconf:env
 USE_XORG=	xpm xmu
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 3a1c65f6feed..04e8711f2f91 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ddskk
 PORTVERSION=	14.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
 		ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 4a7adfc018b5..196331a5b756 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvipsk
 PORTVERSION=	5.95b
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		${MASTER_SITE_LOCAL:S,%SUBDIR%,hrs/teTeX,:S,$,:udvipspatch,}
@@ -31,7 +31,7 @@ RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
 
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index 862d90cd85b9..ab2a19351e57 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebview
 PORTVERSION=	0.3.6
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	japanese
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-gtk2
diff --git a/japanese/ebview/Makefile b/japanese/ebview/Makefile
index 779d28b90737..c6d05920975a 100644
--- a/japanese/ebview/Makefile
+++ b/japanese/ebview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebview
 PORTVERSION=	0.2.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	japanese
 MASTER_SITES=	SF
 
diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile
index 5d49d5b99f3e..dc2fc769938a 100644
--- a/japanese/emacs-emcws/Makefile
+++ b/japanese/emacs-emcws/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emcws
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	japanese editors ipv6
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
@@ -25,6 +25,8 @@ PATCHFILES+=		emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
 MAINTAINER=	nakaji@jp.freebsd.org
 COMMENT=	Emacs + Canna + Wnn + Sj3
 
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+
 USE_EMACS=		yes
 EMACS_PORT_NAME=	emacs21
 
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 2c8e3c3d7b08..8d1e9946fa10 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	groff
 PORTVERSION=	1.18.1
 DISTVERSIONSUFFIX=	.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_LOCAL:S,%SUBDIR%,okazaki/&,} \
 		${MASTER_SITE_DEBIAN:S,$,:debian,}
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 538a9b1e8096..6e212305c1f1 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	gxditview
 PORTVERSION=	1.18.1
 DISTVERSIONSUFFIX=	.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/g/groff
diff --git a/japanese/ibus-anthy/Makefile b/japanese/ibus-anthy/Makefile
index 95b5a451f848..f1785fefb6ac 100644
--- a/japanese/ibus-anthy/Makefile
+++ b/japanese/ibus-anthy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ibus-anthy
 PORTVERSION=	1.2.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese
 PROJECTHOST=	ibus
diff --git a/japanese/ibus-skk/Makefile b/japanese/ibus-skk/Makefile
index 2e62893aeedb..8ca294409e3d 100644
--- a/japanese/ibus-skk/Makefile
+++ b/japanese/ibus-skk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ibus-skk
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://cloud.github.com/downloads/ueno/ibus-skk/
 
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 1e692796d7d9..2a45623f15a3 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	im-ja
 PORTVERSION=	1.5
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	http://im-ja.sourceforge.net/
 
diff --git a/japanese/jadetex-ptex/Makefile b/japanese/jadetex-ptex/Makefile
index 30732577b93a..e1dc0a7479b4 100644
--- a/japanese/jadetex-ptex/Makefile
+++ b/japanese/jadetex-ptex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jadetex
 PORTVERSION=	3.13
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese print
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-ptex
@@ -17,7 +17,7 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A pTeX backend for Jade, for typesetting SGML documents
 
 BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile
index 6288791fc4c9..b6ea41a715be 100644
--- a/japanese/jd/Makefile
+++ b/japanese/jd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		jd
 PORTVERSION=		2.8.2
+PORTREVISION=	1
 CATEGORIES=		japanese www
 MASTER_SITES=		SFJP
 MASTER_SITE_SUBDIR=	jd4linux/52863
diff --git a/japanese/kanjipad/Makefile b/japanese/kanjipad/Makefile
index 7ddafbef61b1..d411302ef2ec 100644
--- a/japanese/kanjipad/Makefile
+++ b/japanese/kanjipad/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kanjipad
 PORTVERSION=	2.0.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese x11
 MASTER_SITES=	http://fishsoup.net/software/kanjipad/
 
diff --git a/japanese/kasumi/Makefile b/japanese/kasumi/Makefile
index 6772c4b78138..5a176ff888a7 100644
--- a/japanese/kasumi/Makefile
+++ b/japanese/kasumi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kasumi
 PORTVERSION=	2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	${PORTNAME}/41436
diff --git a/japanese/kde3-i18n/Makefile b/japanese/kde3-i18n/Makefile
index b75f2fd0e433..2c7a8473f6eb 100644
--- a/japanese/kde3-i18n/Makefile
+++ b/japanese/kde3-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kde-i18n
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src/kde-i18n
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index bec84611c796..34537dc15ecc 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kde-l10n
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	japanese kde
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/japanese/kiten/Makefile b/japanese/kiten/Makefile
index ea2420bc5f68..6ed06386c579 100644
--- a/japanese/kiten/Makefile
+++ b/japanese/kiten/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kiten
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	japanese kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/japanese/latex2html/Makefile b/japanese/latex2html/Makefile
index a418c7e74090..22402f8f79e4 100644
--- a/japanese/latex2html/Makefile
+++ b/japanese/latex2html/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	latex2html
 PORTVERSION=	${VERSION}j${JP_VERSION}
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/${PORTNAME}
diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 4787ae97e096..8af30981337d 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libtomoe-gtk
 PORTVERSION=	0.6.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/tomoe-gtk/tomoe-gtk-${PORTVERSION}
 DISTNAME=	tomoe-gtk-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index dc285478007c..a27c286dea47 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lookup
 PORTVERSION=	1.4.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/lookup/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index 2a40bb28ac77..4f1848827e83 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	man-doc
 PORTVERSION=	5.4.20050911
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 .if !defined(WITH_CVS)
 MASTER_SITES=	${MASTER_SITE_LOCAL}
diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 33aa43084c0a..be961df12f18 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	man
 PORTVERSION=	1.1j
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
 		${MASTER_SITE_PORTS_JP}
diff --git a/japanese/migemo/Makefile b/japanese/migemo/Makefile
index 9c1428d8922c..5d1fe073d6de 100644
--- a/japanese/migemo/Makefile
+++ b/japanese/migemo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	migemo
 PORTVERSION=	0.40
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://0xcc.net/migemo/ \
diff --git a/japanese/ming/Makefile b/japanese/ming/Makefile
index d591baff108c..859dead19e44 100644
--- a/japanese/ming/Makefile
+++ b/japanese/ming/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ming
 PORTVERSION=	0.1.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese graphics
 MASTER_SITES=	http://dist.bsdlab.org/
 #MASTER_SITES=	http://blue.ribbon.to/~harpy/ming/jaming/
@@ -16,7 +16,7 @@ DISTNAME=	jaming-${PORTVERSION}
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	LGPL'ed Flash 4/5 movie output library with Japanese languages support
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		gif.5:${PORTSDIR}/graphics/giflib
 
 CONFLICTS=	ming-*
diff --git a/japanese/ming/files/patch-util_png2dbl.c b/japanese/ming/files/patch-util_png2dbl.c
new file mode 100644
index 000000000000..8782dda505ba
--- /dev/null
+++ b/japanese/ming/files/patch-util_png2dbl.c
@@ -0,0 +1,11 @@
+--- ../util/png2dbl.c.orig	2002-06-24 14:21:54.000000000 +0200
++++ ../util/png2dbl.c	2012-05-06 06:30:46.000000000 +0200
+@@ -80,7 +80,7 @@
+     error("Couldn't create end_info\n");
+   }
+ 
+-  if(setjmp(png_ptr->jmpbuf)) {
++  if(setjmp(png_jmpbuf(png_ptr))) {
+     png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
+     fclose(fp);
+     error("Mystery error (longjmp called)\n");
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index f98ca8f01d68..d81598340205 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	mozc
 PORTVERSION=	1.5.1090.102
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX?=	ja-
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index 8f13895945bf..2613937fc487 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	navi2ch
 PORTVERSION=	1.8.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
 MASTER_SITES=	SF
diff --git a/japanese/netype/Makefile b/japanese/netype/Makefile
index d86c8bc8b86a..48cb913f840c 100644
--- a/japanese/netype/Makefile
+++ b/japanese/netype/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	netype
 PORTVERSION=	0.1.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.i.his.fukui-u.ac.jp/~funakami/software/netype/src/
 DISTNAME=	${PORTNAME}-0.1.0
diff --git a/japanese/ochusha/Makefile b/japanese/ochusha/Makefile
index 0ae59c31b7a1..0969a35f9e37 100644
--- a/japanese/ochusha/Makefile
+++ b/japanese/ochusha/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ochusha
 PORTVERSION=	0.5.8.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=		ochusha/16560
diff --git a/japanese/platex-japanese/Makefile b/japanese/platex-japanese/Makefile
index b7d92085b92a..78b21e010ce4 100644
--- a/japanese/platex-japanese/Makefile
+++ b/japanese/platex-japanese/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	japanese
 PORTVERSION=	1.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	language/japanese
diff --git a/japanese/platex-otf/Makefile b/japanese/platex-otf/Makefile
index e80a8ca09212..41b698436a9b 100644
--- a/japanese/platex-otf/Makefile
+++ b/japanese/platex-otf/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	platex-otf
 PORTVERSION=	1.2.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	hrs
diff --git a/japanese/platex209/Makefile b/japanese/platex209/Makefile
index 74be9cbacc2c..c936c759813e 100644
--- a/japanese/platex209/Makefile
+++ b/japanese/platex209/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	platex209
 PORTVERSION=	1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/
 DISTNAME=	${PORTNAME}
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 967ab4f29b77..b35b50589c11 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ptex
 PORTVERSION=	3.1.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/:1 \
@@ -28,7 +28,7 @@ BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
 
@@ -120,7 +120,7 @@ pre-configure:
 			--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
 			--with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \
 			--with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \
-			--with-pnglib-include=${LIBPNG_PREFIX}/include \
+			--with-pnglib-include=${LIBPNG_PREFIX}/include/libpng15 \
 			--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
 			--with-t1lib-include=${LIBT1_PREFIX}/include \
 			--without-xdvik --without-oxdvik \
diff --git a/japanese/ptex/files/patch-texk-pdftexdir-writepng.c b/japanese/ptex/files/patch-texk-pdftexdir-writepng.c
new file mode 100644
index 000000000000..1bc4ab625be7
--- /dev/null
+++ b/japanese/ptex/files/patch-texk-pdftexdir-writepng.c
@@ -0,0 +1,19 @@
+--- texk/web2c/pdftexdir/writepng.c.orig	2005-02-03 17:16:39.000000000 +0100
++++ texk/web2c/pdftexdir/writepng.c	2012-04-27 09:06:18.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include "ptexlib.h"
+ #include "image.h"
++#include "pngpriv.h"
+ 
+ static const char perforce_id[] = 
+     "$Id: //depot/Build/source.development/TeX/texk/web2c/pdftexdir/writepng.c#5 $";
+@@ -34,7 +35,7 @@
+         pdftex_fail("libpng: png_create_read_struct() failed");
+     if ((png_info(img) = png_create_info_struct(png_ptr(img))) == NULL)
+         pdftex_fail("libpng: png_create_info_struct() failed");
+-    if (setjmp(png_ptr(img)->jmpbuf))
++    if (setjmp(png_jmpbuf(png_ptr(img))))
+         pdftex_fail("libpng: internal error");
+     png_init_io(png_ptr(img), png_file);
+     png_read_info(png_ptr(img), png_info(img));
diff --git a/japanese/ptex/files/patch-texk-web2c-pdftexdir-writeimg.c b/japanese/ptex/files/patch-texk-web2c-pdftexdir-writeimg.c
new file mode 100644
index 000000000000..fa3b43fdc83e
--- /dev/null
+++ b/japanese/ptex/files/patch-texk-web2c-pdftexdir-writeimg.c
@@ -0,0 +1,10 @@
+--- texk/web2c/pdftexdir/writeimg.c.orig	2005-02-03 17:16:39.000000000 +0100
++++ texk/web2c/pdftexdir/writeimg.c	2012-04-27 09:30:39.000000000 +0200
+@@ -22,6 +22,7 @@
+ 
+ #include "ptexlib.h"
+ #include "image.h"
++#include "pngpriv.h"
+ #include <kpathsea/c-auto.h>
+ #include <kpathsea/c-memstr.h>
+ 
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 8c77887f7d4b..910ba00c328e 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-anthy
 PORTVERSION=	1.2.7
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=scim-imengine/37309
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 91d6e608b496..16ce41586294 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-canna
 PORTVERSION=	1.0.0
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/18849
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 9283246734b2..1986a936b56d 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-honoka-plugin-romkan
 PORTVERSION=	0.9.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-plugin-romkan-${PORTVERSION}
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index a844646650e3..0701701e7064 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-honoka-plugin-wnn
 PORTVERSION=	0.9.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-plugin-wnn-${PORTVERSION}
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 99393e2d1460..ea8c4b34db29 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-honoka
 PORTVERSION=	0.9.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese
 MASTER_SITES=	http://nop.net-p.org/files/honoka/
 DISTNAME=	honoka-${PORTVERSION}
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index b31abae9c4cd..2ee23f213fe4 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-prime
 PORTVERSION=	0.3.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/17192
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 434fd3133f51..2807df1b6cc2 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-skk
 PORTVERSION=	0.5.2
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	scim-imengine/18121
diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile
index 49de49a67043..ab5f7277b972 100644
--- a/japanese/scim-tables/Makefile
+++ b/japanese/scim-tables/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	scim-tables
 PORTVERSION=	0.5.10
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION}
 
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index f4c6d3502c7f..0c980dc11812 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-tomoe
 PORTVERSION=	0.6.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index be2aab1983c2..68b9c791937e 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	scim-uim
 PORTVERSION=	0.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese
 MASTER_SITES=	SF/scim/${PORTNAME}/${PORTVERSION} \
 		http://freedesktop.org/~suzhe/sources/
diff --git a/japanese/teTeX/Makefile b/japanese/teTeX/Makefile
index 6bcd005fda19..addca6a23d70 100644
--- a/japanese/teTeX/Makefile
+++ b/japanese/teTeX/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	teTeX
 PORTVERSION=	1.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese print
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/japanese/texfamily-vfn2a/Makefile b/japanese/texfamily-vfn2a/Makefile
index f3f954f22b36..44bde6789b24 100644
--- a/japanese/texfamily-vfn2a/Makefile
+++ b/japanese/texfamily-vfn2a/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	texfamily-vfn2a
 PORTVERSION=	1.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/
 DISTNAME=	vftool-${PORTVERSION}
diff --git a/japanese/texfamily/Makefile b/japanese/texfamily/Makefile
index 8e5770a9fe98..2884368abe5b 100644
--- a/japanese/texfamily/Makefile
+++ b/japanese/texfamily/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	texfamily
 PORTVERSION=	1.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/texfam-1.2/ \
 		${MASTER_SITE_LOCAL}
@@ -32,7 +32,7 @@ BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
 
diff --git a/japanese/texinfo/Makefile b/japanese/texinfo/Makefile
index f74c76a79985..8735a01e876e 100644
--- a/japanese/texinfo/Makefile
+++ b/japanese/texinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	texinfo
 PORTVERSION=	4.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/japanese/uim-tomoe-gtk/Makefile b/japanese/uim-tomoe-gtk/Makefile
index 11e3c49cf61e..8eb4de0f6a38 100644
--- a/japanese/uim-tomoe-gtk/Makefile
+++ b/japanese/uim-tomoe-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uim-tomoe-gtk
 PORTVERSION=	0.6.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	japanese
 MASTER_SITES=	SF/tomoe/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/japanese/xdtp/Makefile b/japanese/xdtp/Makefile
index dc7d92843fd0..dfa6b888b465 100644
--- a/japanese/xdtp/Makefile
+++ b/japanese/xdtp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdtp
 PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese
 MASTER_SITES+=	http://www.ongs.co.jp/projects/xdtp/
 DISTNAME=	xdtp-${PORTVERSION}
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 5c3c1c82ce0c..4dfcd5ebfdcd 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	japanese print
 MASTER_SITES=	SF/xdvi/OldFiles
 PKGNAMESUFFIX=	-tetex
diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index 225fc1d4dbe6..57a79b5ebdf6 100644
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xjtext
 PORTVERSION=	1.3
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	japanese
 MASTER_SITES=	http://plaza.harmonix.ne.jp/~onizuka/
 DISTNAME=	XJTEXT-${PORTVERSION}
diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile
index 4249c03415a9..e4b0236b0c90 100644
--- a/japanese/yc.el/Makefile
+++ b/japanese/yc.el/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yc.el
 PORTVERSION=	5.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://www.ceres.dti.ne.jp/~knak/