- update png to 1.5.10

62 files changed, 165 insertions, 65 deletions

diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile
index fb8f3b81198c..8f34208d2474 100644
--- a/emulators/aqemu/Makefile
+++ b/emulators/aqemu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aqemu
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S,.0$,,}/
 
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index d2a5bb9b0875..cb88fe11dc1e 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	atari800
 PORTVERSION=	2.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	SF SF/${PORTNAME}/ROM/Original%20XL%20ROM:x
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xf25.zip:x
@@ -18,7 +18,7 @@ MAINTAINER=	gamato@users.sf.net
 COMMENT=	Atari 8-bit computer emulator
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 RESTRICTED=	"xf25 contains copyright ROMs and cannot be distributed."
 
diff --git a/emulators/bsnes/Makefile b/emulators/bsnes/Makefile
index 6a896a490591..8dd1ca13bb61 100644
--- a/emulators/bsnes/Makefile
+++ b/emulators/bsnes/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	bsnes
 PORTVERSION=	0.88
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}-source
diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index 374d85e2170a..8b3ba1a8856a 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	catapult
 PORTVERSION=	0.8.2
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/openmsx/openmsx/${PORTVERSION}
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
diff --git a/emulators/dboxfe/Makefile b/emulators/dboxfe/Makefile
index 6fc429090d53..98e8feb6714c 100644
--- a/emulators/dboxfe/Makefile
+++ b/emulators/dboxfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dboxfe
 PORTVERSION=	0.1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=${PORTNAME}
diff --git a/emulators/desmume/Makefile b/emulators/desmume/Makefile
index 446a92ebf018..4e2a9bc678ef 100644
--- a/emulators/desmume/Makefile
+++ b/emulators/desmume/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	desmume
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/dolphin-emu-devel/Makefile b/emulators/dolphin-emu-devel/Makefile
index c6f3bb0a1b23..ff77adf4eef9 100644
--- a/emulators/dolphin-emu-devel/Makefile
+++ b/emulators/dolphin-emu-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dolphin-emu
 PORTVERSION=	3.0.r${REVDATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 95cda2087bff..1554213e83c1 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	dosbox
 PORTVERSION=	0.74
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
 MAINTAINER=	knyght@gmail.com
 COMMENT=	An emulator of a PC with DOS
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl net sound
diff --git a/emulators/e-uae/Makefile b/emulators/e-uae/Makefile
index 62fd11be7279..89bdffb2ae53 100644
--- a/emulators/e-uae/Makefile
+++ b/emulators/e-uae/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	e-uae
 DISTVERSION=	0.8.29.w4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.rcdrummond.net/uae/${DISTNAME}/
 DISTNAME=	e-uae-0.8.29-WIP4
diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile
index 9cfc6cb0fcfd..5cd03ce3007c 100644
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fceux
 PORTVERSION=	2.1.4a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF/fceultra/Source%20Code/2.1.4%20src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index e83bdfcc43b8..0266ed326d99 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fuse
 PORTVERSION=	1.0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION}
 
@@ -15,6 +15,7 @@ MAINTAINER=	yuri.pankov@gmail.com
 COMMENT=	Free Unix (Sinclair ZX-)Spectrum Emulator
 
 LIB_DEPENDS=	spectrum.8:${PORTSDIR}/emulators/libspectrum \
+		png15:${PORTSDIR}/graphics/png \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt
 
 LICENSE=	GPLv2
diff --git a/emulators/fuse/files/patch-screenshot.c b/emulators/fuse/files/patch-screenshot.c
new file mode 100644
index 000000000000..25205faf3088
--- /dev/null
+++ b/emulators/fuse/files/patch-screenshot.c
@@ -0,0 +1,10 @@
+--- screenshot.c.orig	2011-01-12 22:36:28.000000000 +0100
++++ screenshot.c	2012-05-09 12:59:50.000000000 +0200
+@@ -49,6 +49,7 @@
+ #ifdef USE_LIBPNG
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ static int get_rgb32_data( libspectrum_byte *rgb32_data, size_t stride,
+ 			   size_t height, size_t width );
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index eaac69ab3291..9851ca754227 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gens
 PORTVERSION=	2.12a
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Gens%20Source%20Code/Gens%20WIP%20linux
 DISTNAME=	Gens212a1SrcL
diff --git a/emulators/gngeo/Makefile b/emulators/gngeo/Makefile
index f0fe5e29611a..7e2b88a6c604 100644
--- a/emulators/gngeo/Makefile
+++ b/emulators/gngeo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gngeo
 PORTVERSION=	0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index 48ccb70a7c1e..7ec1b3768a6d 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gns3
 PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF/gns-3/GNS3/${PORTVERSION}
 DISTNAME=	GNS3-${PORTVERSION}-src
diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile
index 9d3344957598..b9e3ff051e3e 100644
--- a/emulators/gsnes9x/Makefile
+++ b/emulators/gsnes9x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gsnes9x
 PORTVERSION=	3.12
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/GSnes9x/${PORTVERSION}
 DISTNAME=	GSnes9x-${PORTVERSION}
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 53ab5efd587d..dfcabae2fe8a 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxmame
 DISTVERSION=	0.35beta2
-PORTREVISION=	11
+PORTREVISION=	12
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.35beta2
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index ddcab29c51f0..10c485d6620f 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hatari
 PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	BERLIOS
 
@@ -18,7 +18,7 @@ LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	portaudio>=19:${PORTSDIR}/audio/portaudio2
 
 USE_BZIP2=	yes
diff --git a/emulators/hugo/Makefile b/emulators/hugo/Makefile
index 6bb98cc27e07..5b82f310b542 100644
--- a/emulators/hugo/Makefile
+++ b/emulators/hugo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hugo
 PORTVERSION=	2.12
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zeograd.com/download/
 
diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile
index ced64af0f356..49602933a18a 100644
--- a/emulators/kcemu/Makefile
+++ b/emulators/kcemu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kcemu
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/KCemu/KCemu-${PORTVERSION}
 DISTNAME=	KCemu-${PORTVERSION}
diff --git a/emulators/lisaem/Makefile b/emulators/lisaem/Makefile
index f677f90061f9..27ddd98fb045 100644
--- a/emulators/lisaem/Makefile
+++ b/emulators/lisaem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lisaem
 DISTVERSION=	1.2.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	emulators
 MASTER_SITES=	http://lisaem.sunder.net/downloads/
 
diff --git a/emulators/mupen64plus-core/Makefile b/emulators/mupen64plus-core/Makefile
index ba13461c9c81..7098bdb5967d 100644
--- a/emulators/mupen64plus-core/Makefile
+++ b/emulators/mupen64plus-core/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mupen64plus
 PORTVERSION?=	1.99.4
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
diff --git a/emulators/mupen64plus-core/Makefile.common b/emulators/mupen64plus-core/Makefile.common
index ceb5822b1020..3c5c2969a2cd 100644
--- a/emulators/mupen64plus-core/Makefile.common
+++ b/emulators/mupen64plus-core/Makefile.common
@@ -10,7 +10,7 @@ EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - "${DISTNAME}/source/${PORTNAME}-core/*" \
 
 .if ${PKGNAMESUFFIX} == "-core"
 LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2 \
-			png.6:${PORTSDIR}/graphics/png
+			png15:${PORTSDIR}/graphics/png
 .else
 PLIST=			${WRKDIR}/pkg-plist
 .endif
@@ -20,7 +20,7 @@ MAN6=	mupen64plus.6
 .endif
 
 .if ${PKGNAMESUFFIX} == "-video-rice"
-LIB_DEPENDS+=		png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=		png15:${PORTSDIR}/graphics/png
 .endif
 
 .if ${PKGNAMESUFFIX} != "-core"
diff --git a/emulators/mupen64plus-rsp-z64/Makefile b/emulators/mupen64plus-rsp-z64/Makefile
index ea19cf2259eb..91dcf05a6cdb 100644
--- a/emulators/mupen64plus-rsp-z64/Makefile
+++ b/emulators/mupen64plus-rsp-z64/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-rsp-z64
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
diff --git a/emulators/mupen64plus-video-arachnoid/Makefile b/emulators/mupen64plus-video-arachnoid/Makefile
index 6e75069f60fb..ded04bd40bf3 100644
--- a/emulators/mupen64plus-video-arachnoid/Makefile
+++ b/emulators/mupen64plus-video-arachnoid/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-video-arachnoid
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
diff --git a/emulators/mupen64plus-video-glide64/Makefile b/emulators/mupen64plus-video-glide64/Makefile
index a841738fdae2..8b3caee2989d 100644
--- a/emulators/mupen64plus-video-glide64/Makefile
+++ b/emulators/mupen64plus-video-glide64/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-video-glide64
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
diff --git a/emulators/mupen64plus-video-z64/Makefile b/emulators/mupen64plus-video-z64/Makefile
index f516a88b5986..750361357662 100644
--- a/emulators/mupen64plus-video-z64/Makefile
+++ b/emulators/mupen64plus-video-z64/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	-video-z64
 DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
 
diff --git a/emulators/nonpareil/Makefile b/emulators/nonpareil/Makefile
index a0c96d5e1943..36b40c1acb8f 100644
--- a/emulators/nonpareil/Makefile
+++ b/emulators/nonpareil/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nonpareil
 PORTVERSION=	0.79
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://nonpareil.brouhaha.com/download/
 
@@ -17,6 +17,8 @@ COMMENT=	Simulator for many HP calculators
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+
 USE_BISON=	build
 USE_GNOME=	gtk20 libxml2
 USE_SDL=	sdl
diff --git a/emulators/nonpareil/files/patch-src_printer.c b/emulators/nonpareil/files/patch-src_printer.c
new file mode 100644
index 000000000000..e0a435bd1d81
--- /dev/null
+++ b/emulators/nonpareil/files/patch-src_printer.c
@@ -0,0 +1,10 @@
+--- src/printer.c.orig	2012-05-09 13:00:47.000000000 +0200
++++ src/printer.c	2012-05-09 13:01:08.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <png.h>
++#include <zlib.h>
+ 
+ #include "util.h"
+ #include "display.h"
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 84436d213aff..1bf8efdc3c39 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		open-vm-tools
 PORTVERSION=		${BUILD_VER}
+PORTREVISION=	1
 PORTEPOCH=		1
 CATEGORIES=		emulators kld
 MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-8.6.x
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 57663a528569..6f3473e98e15 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openmsx
 PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
@@ -15,7 +15,7 @@ MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Open source MSX emulator
 
 LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
-		png:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		ogg:${PORTSDIR}/audio/libogg \
 		vorbis:${PORTSDIR}/audio/libvorbis \
 		theora:${PORTSDIR}/multimedia/libtheora
diff --git a/emulators/osmose/Makefile b/emulators/osmose/Makefile
index a2f8966aa4ce..c0ed53cce4b5 100644
--- a/emulators/osmose/Makefile
+++ b/emulators/osmose/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	osmose
 PORTVERSION=	0.9.96
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://bcz.asterope.fr/osmose/
 DISTNAME=	Osmose-${PORTVERSION:S/./-/g}-QT
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 576e7df2cffc..ec5e9ac450a9 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pcsxr
 PORTVERSION=	1.9.92.r76026
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 02bc543778ab..64e4d9773eaa 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/:release \
 		LOCAL/nox:snapshot
@@ -107,7 +107,7 @@ LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
 .if defined(WITHOUT_PNG)
 CONFIGURE_ARGS+=	--disable-vnc-png
 .else
-LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 .endif
 
 .if defined(WITHOUT_CURL)
diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile
index e06b93f0ff0f..8b27ec2dd890 100644
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	qmc2
 PORTVERSION=	0.35
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/qtemu/Makefile b/emulators/qtemu/Makefile
index 67edafd5e1f8..4f955b5ddef6 100644
--- a/emulators/qtemu/Makefile
+++ b/emulators/qtemu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qtemu
 PORTVERSION=	1.0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index 0381646d8dd3..3cee40691b56 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	raine
 PORTVERSION=	0.43.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators games
 MASTER_SITES=	http://www.rainemu.com/html/archive/
 DISTNAME=	${PORTNAME}s-${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT=	Arcade Emulator for M68000, M68020 and Z80 based hardware
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
 LIB_DEPENDS=	alleg.42:${PORTSDIR}/devel/allegro \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		vga.1:${PORTSDIR}/graphics/svgalib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/emulators/raine/files/patch-patch-source_png_savepng.c b/emulators/raine/files/patch-patch-source_png_savepng.c
new file mode 100644
index 000000000000..110b12470e39
--- /dev/null
+++ b/emulators/raine/files/patch-patch-source_png_savepng.c
@@ -0,0 +1,11 @@
+--- source/png/savepng.c.orig	2005-08-17 12:20:36.000000000 +0200
++++ source/png/savepng.c	2012-05-06 17:19:09.000000000 +0200
+@@ -188,7 +188,7 @@
+ 	goto Error;
+ 
+     /* Set error handling. */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* If we get here, we had a problem reading the file. */
+ 	goto Error;
+     }
diff --git a/emulators/raine/files/patch-source_png_loadpng.c b/emulators/raine/files/patch-source_png_loadpng.c
new file mode 100644
index 000000000000..87bc1b566d0f
--- /dev/null
+++ b/emulators/raine/files/patch-source_png_loadpng.c
@@ -0,0 +1,29 @@
+--- source/png/loadpng.c.orig	2005-08-18 10:52:15.000000000 +0200
++++ source/png/loadpng.c	2012-05-06 15:58:26.000000000 +0200
+@@ -275,7 +275,7 @@
+      * the normal method of doing things with libpng).  REQUIRED unless you
+      * set up your own error handlers in the png_create_read_struct() earlier.
+      */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* Free all of the memory associated with the png_ptr and info_ptr */
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ 	pack_fclose(fp);
+@@ -337,7 +337,7 @@
+      * the normal method of doing things with libpng).  REQUIRED unless you
+      * set up your own error handlers in the png_create_read_struct() earlier.
+      */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* Free all of the memory associated with the png_ptr and info_ptr */
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ 	/* If we get here, we had a problem reading the file */
+@@ -435,7 +435,7 @@
+      * the normal method of doing things with libpng).  REQUIRED unless you
+      * set up your own error handlers in the png_create_read_struct() earlier.
+      */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    if (setjmp(png_jmpbuf(png_ptr))) {
+ 	/* Free all of the memory associated with the png_ptr and info_ptr */
+ 	png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+ 	/* If we get here, we had a problem reading the file */
diff --git a/emulators/skyeye/Makefile b/emulators/skyeye/Makefile
index d7ec4207c21b..5ddc53a9ee4b 100644
--- a/emulators/skyeye/Makefile
+++ b/emulators/skyeye/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	skyeye
 PORTVERSION=	1.2
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONPREFIX=v
 DISTVERSIONSUFFIX=_Rel
 CATEGORIES=	emulators
diff --git a/emulators/snes9express/Makefile b/emulators/snes9express/Makefile
index cef89b9c2f10..0b2b02c1fbda 100644
--- a/emulators/snes9express/Makefile
+++ b/emulators/snes9express/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	snes9express
 PORTVERSION=	1.43
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 
diff --git a/emulators/snes9x-gtk/Makefile b/emulators/snes9x-gtk/Makefile
index 19fea75a19fd..ee4624399099 100644
--- a/emulators/snes9x-gtk/Makefile
+++ b/emulators/snes9x-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snes9x
 PORTVERSION=	1.52r79
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://snes9x-gtk.googlecode.com/files/
 PKGNAMESUFFIX=	-gtk
@@ -16,7 +16,7 @@ DISTNAME=	snes9x-1.52-src
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Super Nintendo Entertainment System(SNES) Emulator
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_PERL5=	5.8.1+
 USE_BZIP2=	yes
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 5aecba0af2eb..621940706c6d 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	snes9x
 PORTVERSION=	1.51
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://files.ipherswipsite.com/snes9x/ \
 		http://www.lysator.liu.se/snes9x/${PORTVERSION}/
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Super Nintendo Entertainment System(SNES) Emulator
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_XORG=	x11 sm ice xext
@@ -79,7 +79,7 @@ SNES9X_BIN=	snes9x
 .endif
 
 .if !defined(WITHOUT_SCREENSHOT)
-LIB_DEPENDS+=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 CONFIGURE_ARGS+=	--with-screenshot
 .else
 CONFIGURE_ARGS+=	--without-screenshot
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index 8a584aed0394..3bfe8bde9d50 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	stella
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -14,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	A multi-platform Atari 2600 VCS emulator
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/emulators/tiemu2/Makefile b/emulators/tiemu2/Makefile
index 17af976cfedf..025935784697 100644
--- a/emulators/tiemu2/Makefile
+++ b/emulators/tiemu2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tiemu2
 PORTVERSION=	2.08
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ticalc.org/pub/unix/ \
 		http://freebsd.nsu.ru/distfiles/tiemu/
diff --git a/emulators/tiemu3/Makefile b/emulators/tiemu3/Makefile
index 2e6555ba2ac9..610c9fcfd978 100644
--- a/emulators/tiemu3/Makefile
+++ b/emulators/tiemu3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tiemu3
 PORTVERSION=	3.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	SF/gtktiemu/tiemu-linux/TIEmu%20${DISTVERSION}
 DISTNAME=	tiemu-${DISTVERSION}
diff --git a/emulators/tilem/Makefile b/emulators/tilem/Makefile
index f4b78356ffd6..619b7e9ac305 100644
--- a/emulators/tilem/Makefile
+++ b/emulators/tilem/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tilem
 PORTVERSION=	0.973
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
 
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 6f172f9a4193..9bf22eda9b7d 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uae
 PORTVERSION=	0.8.29
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.amigaemulator.org/files/sources/develop/
 
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index b4918986cd8d..df0c17d77d32 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	vba
 PORTVERSION=	1.7.2
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/VisualBoyAdvance/${PORTVERSION}
 DISTNAME=	VisualBoyAdvance-src-${PORTVERSION}
@@ -15,13 +15,16 @@ MAINTAINER=	arundel@h3c.de
 COMMENT=	Open Source Gameboy Advance emulator
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 WANT_GNOME=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_SDL=	sdl
-CONFIGURE_ARGS=	LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" LIBS="-lintl"
+USE_GETTEXT=	yes
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}" LIBS="-lintl"
 WRKSRC=		${WRKDIR}/VisualBoyAdvance-${PORTVERSION}
 
 PLIST_SUB=	INSTALL_GTK2="@comment "
diff --git a/emulators/vba/files/patch-src-Util.cpp b/emulators/vba/files/patch-src-Util.cpp
new file mode 100644
index 000000000000..d9c2d7f2ed3e
--- /dev/null
+++ b/emulators/vba/files/patch-src-Util.cpp
@@ -0,0 +1,11 @@
+--- src/Util.cpp.orig	2004-05-20 19:42:37.000000000 +0200
++++ src/Util.cpp	2012-05-02 20:49:07.000000000 +0200
+@@ -79,7 +79,7 @@
+     return false;
+   }
+ 
+-  if(setjmp(png_ptr->jmpbuf)) {
++  if(setjmp(png_jmpbuf(png_ptr))) {
+     png_destroy_write_struct(&png_ptr,NULL);
+     fclose(fp);
+     return false;
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index eb395ebb7a05..c538374ebfb2 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	vice
 PORTVERSION=	2.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
 		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
 		pkg-config:${PORTSDIR}/devel/pkg-config
-LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		gif:${PORTSDIR}/graphics/giflib \
 		mp3lame:${PORTSDIR}/audio/lame
 .if defined(VICE_WITH_XAW3D)
diff --git a/emulators/virtualbox-ose-legacy/Makefile b/emulators/virtualbox-ose-legacy/Makefile
index 60e547e1b7e1..e1575e9cbbcf 100644
--- a/emulators/virtualbox-ose-legacy/Makefile
+++ b/emulators/virtualbox-ose-legacy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		as86:${PORTSDIR}/devel/dev86 \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod-legacy
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 2fd27c60d92d..0ac5406f0cc2 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	virtualbox-ose
 DISTVERSION=	4.1.16
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://tmp.chruetertee.ch/ \
 		http://freebsd.unixfreunde.de/sources/ \
@@ -24,7 +25,7 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		kmk:${PORTSDIR}/devel/kBuild-devel \
 		gtar:${PORTSDIR}/archivers/gtar
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
 		curl.6:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	/boot/modules/vboxdrv.ko:${PORTSDIR}/emulators/virtualbox-ose-kmod
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index fffb0202c850..00fd26a4ec2f 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	visualboyadvance-m
 PORTVERSION=	1.8.0r${SVN_REV}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	emulators
 MASTER_SITES=	http://update.cooltrainer.org/emulators/visualboyadvance-m/
 
 MAINTAINER=	root@cooltrainer.org
 COMMENT=	Game Boy Advance emulator with GTK frontend
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		cairomm-1.0.1:${PORTSDIR}/graphics/cairomm \
 		sfml-system.1:${PORTSDIR}/devel/sfml
 
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index 209c789c9174..5cba372bfce4 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	VisualOS
 PORTVERSION=	1.0.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	emulators gnome
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${PORTVERSION}
 
diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index 894e860e9a9c..72c1e9a16cfb 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vmips
 PORTVERSION=	1.3.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators
 MASTER_SITES=	SF \
 		http://www.dgate.org/vmips/releases/vmips-${PORTVERSION}/
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index ba136073cc88..00843f7bcb78 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.5.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -24,7 +25,7 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		xml2:${PORTSDIR}/textproc/libxml2
 
 CONFLICTS_INSTALL=	wine-1.4*
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 4ba7185e766d..340236439c39 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wine
 DISTVERSION=	1.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -24,7 +25,7 @@ LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		xml2:${PORTSDIR}/textproc/libxml2
 
 CONFLICTS_INSTALL=	wine-1.5.*
diff --git a/emulators/wxmupen64plus/Makefile b/emulators/wxmupen64plus/Makefile
index 6b7c29f66f1c..ae43f34beb13 100644
--- a/emulators/wxmupen64plus/Makefile
+++ b/emulators/wxmupen64plus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wxmupen64plus
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://cdn.bitbucket.org/auria/wxmupen64plus/downloads/
 DIST_SUBDIR=	${PORTNAME:S/wx//}
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 9cb834b9b4bc..ed579f37d141 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	yabause
 PORTVERSION=	0.9.11.1
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/1.1/1/g}/
 
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 1a54a31da7d9..9169b432b3c5 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zsnes
 PORTVERSION=	1.51
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/ZSNES%20v${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT=	Intel x86 only Super Nintendo Entertainment System (SNES) Emulator
 
 # This must be >= 0.98!
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 ONLY_FOR_ARCHS=	i386
 ONLY_FOR_ARCHS_REASON=	non-portable, for a portable emulator see emulators/snes9x
@@ -40,8 +40,8 @@ CONFIGURE_ARGS+=	--disable-cpucheck
 MAN1=		zsnes.1
 PLIST_FILES=	bin/zsnes
 
-CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
diff --git a/emulators/zsnes/files/patch-zpng.c b/emulators/zsnes/files/patch-zpng.c
new file mode 100644
index 000000000000..11fe1536d4f4
--- /dev/null
+++ b/emulators/zsnes/files/patch-zpng.c
@@ -0,0 +1,10 @@
+--- zip/zpng.c.orig	2007-01-16 00:06:29.000000000 +0100
++++ zip/zpng.c	2012-05-06 16:01:13.000000000 +0200
+@@ -21,6 +21,7 @@
+ 
+ #ifndef NO_PNG
+ #include <png.h>
++#include <pngpriv.h>
+ #endif
+ 
+ #ifdef __UNIXSDL__