the png headers are now directly under include/

2013-06-04 18:41:39 +00:00 · 2013-06-04 18:41:39 +00:00 · 10bfdff492
commit 10bfdff492
parent 78f49cd53e
104 changed files with 196 additions and 255 deletions
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2013/05/31 15:34:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2013/06/04 18:41:39 naddy Exp $

 COMMENT=	free space simulator and planetarium

@ -36,8 +36,7 @@ RUN_DEPENDS=	devel/desktop-file-utils
 USE_GMAKE=	Yes

 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lGL" \
 		LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
 		LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2013/03/10 22:55:02 espie Exp $
+# $OpenBSD: Makefile,v 1.56 2013/06/04 18:41:40 naddy Exp $

 COMMENT=		front-end to various audio players

@ -28,8 +28,7 @@ LIB_DEPENDS=		x11/gtk+2

 USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng \
-			-I${LOCALBASE}/include" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			ac_cv_path_GNOME_CONFIG=no

--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2013/03/21 08:45:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.72 2013/06/04 18:41:40 naddy Exp $

 COMMENT=	tools to connect your PalmOS(R) compatible handheld

@ -31,7 +31,7 @@ USE_GMAKE=		Yes
 USE_GROFF =		Yes

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -pthread" \
 			PTHREAD_CFLAGS="-pthread" \
 			PTHREAD_LIBS="-pthread" \
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2013/03/21 08:45:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2013/06/04 18:41:40 naddy Exp $

 COMMENT =	convert various Microsoft formats into HTML/PNG

@ -31,7 +31,6 @@ MAKE_FILE =	GNUmakefile
 USE_GMAKE =	Yes
 USE_GROFF =	Yes
 CONFIGURE_STYLE = gnu
-CONFIGURE_ENV =	 CPPFLAGS="-I${LOCALBASE}/include/libpng/"
 CONFIGURE_ARGS = ${CONFIGURE_SHARED} --enable-static \
 		 --with-png=${LOCALBASE} --with-libwmf=${LOCALBASE}

--- a/devel/fox/Makefile
+++ b/devel/fox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2013/05/08 13:05:33 bcallah Exp $
+# $OpenBSD: Makefile,v 1.26 2013/06/04 18:41:40 naddy Exp $

 COMMENT =	C++ toolkit for GUI
 CATEGORIES =	devel
@ -19,7 +19,7 @@ LIB_DEPENDS =	archivers/bzip2 \
 		graphics/tiff

 CONFIGURE_ENV += \
-	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+	CPPFLAGS="-I${LOCALBASE}/include" \
 	LDFLAGS="-L${LOCALBASE}/lib" 
 CONFIGURE_ARGS += \
 	--x-includes="${X11BASE}/include -I${X11BASE}/include/freetype2" \
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.90 2013/05/31 15:34:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.91 2013/06/04 18:41:40 naddy Exp $

 SHARED_ONLY=	Yes

@ -68,8 +68,7 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 #		--disable-collab-backend-tcp
 #		--disable-collab-backend-service

-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

 SUBST_VARS=	MAJORVER
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2013/05/07 07:06:42 jasper Exp $
+# $OpenBSD: Makefile,v 1.38 2013/06/04 18:41:41 naddy Exp $

 BROKEN-hppa =		Invalid function: "DEAD"

@ -32,9 +32,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 CONFIGURE_ARGS=		--build="${GCCARCH}" \
 			--without-compress-info

-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
-				  -I${LOCALBASE}/include/libpng \
-				  -DHAVE_SOUND" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -DHAVE_SOUND" \
 			LDFLAGS="-L${LOCALBASE}/lib -nopie"
 CFLAGS+=		-fno-pie

--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2013/03/15 14:09:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.66 2013/06/04 18:41:41 naddy Exp $

 COMMENT-main=		GNU editor: extensible, customizable, self documenting
 COMMENT-el=		elisp sources for those who want to read/modify them
@ -45,8 +45,7 @@ LDFLAGS +=		-nopie
 CFLAGS +=		-fno-pie
 .endif

-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
-				  -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="${LDFLAGS}"

 MAKE_ENV=		INSTALL_EMACS="${INSTALL_SCRIPT}"
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2013/03/11 11:06:04 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2013/06/04 18:41:41 naddy Exp $

 ONLY_FOR_ARCHS=	${GCC4_ARCHS}

@ -32,7 +32,7 @@ BUILD_DEPENDS=          ${MODGNU_AUTOCONF_DEPENDS} \
 			${MODGNU_AUTOMAKE_DEPENDS}

 CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include"
+CONFIGURE_ENV=CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
 CONFIGURE_ENV+=LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS+=	--disable-alsatest
 CONFIGURE_ARGS+=	--disable-opengl
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2013/06/04 18:41:41 naddy Exp $

 COMMENT=		Free Unix Spectrum Emulator
 DISTNAME=		fuse-0.10.0.2
@ -23,7 +23,7 @@ LIB_DEPENDS=		devel/glib2 \
 			audio/libao

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			LIBS="-lbz2"
 CONFIGURE_ARGS=		--with-libao
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2013/03/11 11:06:04 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2013/06/04 18:41:41 naddy Exp $

 COMMENT =		Atari 2600 VCS emulator

@ -20,8 +20,7 @@ MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=stella/}
 LIB_DEPENDS =		devel/sdl \
 			graphics/png

-CXXFLAGS +=		-I${LOCALBASE}/include/libpng \
-			-I${X11BASE}/include \
+CXXFLAGS +=		-I${X11BASE}/include \
 			-L${LOCALBASE}/lib
 CONFIGURE_STYLE =	simple
 CONFIGURE_ARGS +=	--disable-gl
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2013/03/26 17:00:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2013/06/04 18:41:42 naddy Exp $

 ONLY_FOR_ARCHS=		i386

@ -33,7 +33,7 @@ CONFIGURE_ARGS=		--with-sdl-prefix=${LOCALBASE} \
 			--with-opengl \
 			--target=${MACHINE}-unknown-openbsd${OSREV}
 CONFIGURE_ENV+=		LDFLAGS="-lm" \
-			CFLAGS="${CFLAGS:N-O*} -I${X11BASE}/include -I${LOCALBASE}/include/libpng"
+			CFLAGS="${CFLAGS:N-O*} -I${X11BASE}/include"
 ALL_TARGET=

 WRKSRC=			${WRKDIST}/src
--- a/games/capitan-sevilla/Makefile
+++ b/games/capitan-sevilla/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/11 11:07:38 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2013/06/04 18:41:42 naddy Exp $

 COMMENT =		platform game set in seville and in space
 VERSION = 		1.0.3
@ -33,7 +33,6 @@ USE_GMAKE =		Yes
 NO_TEST =		Yes

 CFLAGS =		-O2 -pipe -pthread \
-			-I${LOCALBASE}/include/libpng \
 			-I${X11BASE}/include \
 			-I${X11BASE}/include/freetype2 \
 			-I./include \
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2013/03/11 11:07:38 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2013/06/04 18:41:42 naddy Exp $

 COMMENT=	graphical networked AD&D style game

@ -36,11 +36,8 @@ LIB_DEPENDS=	x11/gtk+2 \
 USE_GROFF =	Yes

 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng \
-			-I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib \
-			-L${X11BASE}/lib -lm -lXi -lXmu" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lXi -lXmu" \
 		ac_cv_path_SVNVERSION="" \
 		sndio_sound="yes"
 CONFIGURE_ARGS=	--enable-gtkv2 \
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2013/03/11 11:07:38 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2013/06/04 18:41:42 naddy Exp $

 COMMENT=	Oxyd/Rock'n'Roll clone

@ -39,11 +39,8 @@ USE_GROFF =	Yes

 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--enable-cxxlua=no
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng \
-			-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib \
-			-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
 		LIBS="-lm -lz -lenet -pthread"

 .include <bsd.port.mk>
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2013/03/11 11:07:39 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2013/06/04 18:41:42 naddy Exp $

 ONLY_FOR_ARCHS=	${GCC4_ARCHS}

@ -33,8 +33,7 @@ LIB_DEPENDS=	devel/libexecinfo \
 		${MODLUA_LIB_DEPENDS}

 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PTHREAD_CFLAGS="-pthread" \
 		PTHREAD_LIBS="-pthread" \
--- a/games/kslide/Makefile
+++ b/games/kslide/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2013/06/04 18:41:43 naddy Exp $

 COMMENT=	puzzle game for KDE

@ -34,7 +34,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include/libpng:${LOCALBASE}/include
+CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${LOCALBASE} 

 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/admin
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2013/03/11 11:07:39 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2013/06/04 18:41:43 naddy Exp $

 COMMENT =	breakout game with many levels, powerups, good graphics

@ -28,7 +28,7 @@ LOCALSTATEDIR=	${BASELOCALSTATEDIR}/games

 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS +=	--with-docdir=${PREFIX}/share/doc
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			LIBS="-lintl -liconv"

--- a/games/numptyphysics/Makefile
+++ b/games/numptyphysics/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2013/03/11 11:07:40 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2013/06/04 18:41:43 naddy Exp $

 COMMENT-main =		physics-based drawing puzzle game
 COMMENT-npcomplete =	extra levels for physics-based drawing puzzle game
@ -40,7 +40,6 @@ AUTOCONF_VERSION =	2.61
 AUTOMAKE_VERSION =	1.9

 CPPFLAGS =	-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libpng \
 		-I${X11BASE}/include
 LDFLAGS =	-pthread \
 		-L${LOCALBASE}/lib \
--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2013/03/11 11:07:40 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2013/06/04 18:41:44 naddy Exp $

 COMMENT=	free Lemmings-like game

@ -33,11 +33,8 @@ pre-configure:
 do-configure:
 	cd ${WRKSRC} && ${MODSCONS_BIN} configure \
 		${MODSCONS_ENV} \
-		CPPFLAGS="-I${LOCALBASE}/include \
-			-I${X11BASE}/include \
-			-I${LOCALBASE}/include/libpng" \
-		LINKFLAGS="-L${LOCALBASE}/lib -lz \
-				-L${X11BASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LINKFLAGS="-L${LOCALBASE}/lib -lz -L${X11BASE}/lib" \
 		with_xinput=1 \
 		with_linuxusbmouse=0 \
 		with_wiimote=0 \
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2013/03/31 21:09:32 bentley Exp $
+# $OpenBSD: Makefile,v 1.23 2013/06/04 18:41:44 naddy Exp $

 COMMENT=	enhanced clone of Id Software's Doom game; multiplayer
 DISTNAME=	prboom-2.5.0
@ -16,7 +16,7 @@ LIB_DEPENDS =	devel/sdl-mixer \
 		devel/sdl-net \
 		graphics/png

-CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--disable-cpu-opt \
--- a/games/renpy/Makefile
+++ b/games/renpy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2013/05/10 20:30:31 rpe Exp $
+# $OpenBSD: Makefile,v 1.6 2013/06/04 18:41:44 naddy Exp $

 COMMENT =		visual novel engine

@ -29,8 +29,7 @@ LIB_DEPENDS =		devel/fribidi \
 			graphics/ffmpeg \
 			graphics/glew

-MAKE_ENV =		RENPY_DEPS_INSTALL=/usr::${LOCALBASE}::${X11BASE} \
-			CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libpng"
+MAKE_ENV =		RENPY_DEPS_INSTALL=/usr::${LOCALBASE}::${X11BASE}

 NO_TEST =		Yes

--- a/games/spacehulk/Makefile
+++ b/games/spacehulk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2013/06/04 18:41:44 naddy Exp $

 COMMENT=	total conversion of the Space Hulk board game

@ -24,7 +24,7 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS= --with-qt-includes=${MODQT_INCDIR} \
 		--with-qt-libraries=${MODQT_LIBDIR}
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include/libpng"
+		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include"

 USE_GMAKE=	Yes

--- a/games/stone-soup/Makefile
+++ b/games/stone-soup/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2013/03/11 11:07:40 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2013/06/04 18:41:44 naddy Exp $

 COMMENT = 	dungeon crawl stone soup
 CATEGORIES = 	games
@ -15,8 +15,8 @@ BROKEN-arm=	tilegen.elf loops burning cpu
 WRKDIST = 	${WRKDIR}/stone_soup-${VERSION}
 WRKSRC = 	${WRKDIST}/source
 USE_GMAKE = 	Yes
-CFLAGS +=	"-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/SDL"
-CXXFLAGS += 	"-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/SDL"
+CFLAGS +=	"-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL"
+CXXFLAGS += 	"-I${LOCALBASE}/include -I${LOCALBASE}/include/SDL"
 MAKE_FLAGS = 	CC="${CC}" CXX="${CXX}" \
 		LUA_INCLUDE_DIR=${MODLUA_INCL_DIR} \
 		LUA_LIB=${MODLUA_LIB} \
--- a/games/taxipilot/Makefile
+++ b/games/taxipilot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2013/06/04 18:41:45 naddy Exp $

 COMMENT=	silly little game based on Spacetaxi for the C64

@ -35,7 +35,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
 CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
-CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include/libpng:${LOCALBASE}/include
+CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
 CONFIGURE_ENV=	KDEDIR=${LOCALBASE} 
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/admin

--- a/games/ufoai/base/Makefile
+++ b/games/ufoai/base/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2013/05/16 10:10:35 kirby Exp $
+# $OpenBSD: Makefile,v 1.9 2013/06/04 18:41:45 naddy Exp $

 COMMENT-main =		squad-based tactical strategy game
 COMMENT-editor = 	UFO:AI map editor
@ -62,8 +62,7 @@ CONFIGURE_ARGS =	--enable-release \
 			--datadir=${PREFIX}/share/ufoai

 CONFIGURE_ENV +=	CFLAGS="${CFLAGS}" \
-			CCFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-				-I${LOCALBASE}/include/libpng" \
+			CCFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv -lexecinfo" \
 			Q=

--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2013/03/11 11:07:41 espie Exp $
+# $OpenBSD: Makefile,v 1.22 2013/06/04 18:41:45 naddy Exp $

 ONLY_FOR_ARCHS=	amd64 i386

@ -40,8 +40,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.69
 CONFIGURE_ARGS+= --with-distributor="OpenBSD"
-CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include/libpng \
-		    -I${LOCALBASE}/include" \
+CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
 		PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig:${X11BASE}/lib/pkgconfig:${LOCALBASE}/lib/pkgconfig:${LOCALBASE}/lib/qt4/pkgconfig" \
 		YACC="bison -y" \
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/03/11 11:07:41 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2013/06/04 18:41:45 naddy Exp $

 COMMENT=	economic and military simulation game

@ -39,7 +39,7 @@ MODSCONS_FLAGS=	\
 	bindir=${PREFIX}/bin \
 	datadir=${PREFIX}/share/widelands \
 	localedir=${PREFIX}/share \
-	extra_compile_flags="-I${LOCALBASE}/include/libpng ${CXXFLAGS}" \
+	extra_compile_flags="${CXXFLAGS}" \
 	extra_include_path=${LOCALBASE}/include \
 	extra_lib_path="${LOCALBASE}/lib"

--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/11 11:07:42 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2013/06/04 18:41:45 naddy Exp $

 COMMENT=		Z-code interpreter for X11

@ -23,8 +23,7 @@ USE_GMAKE=		Yes

 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
-			CPPFLAGS="-I${LOCALBASE}/include \
-				-I${LOCALBASE}/include/libpng"
+			CPPFLAGS="-I${LOCALBASE}/include"

 VMEM_WARNING=		Yes

--- a/geo/gdal/Makefile
+++ b/geo/gdal/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2013/05/31 15:00:08 landry Exp $
+# $OpenBSD: Makefile,v 1.27 2013/06/04 18:41:46 naddy Exp $

 COMMENT-main =	translator library for geospatial data formats
 COMMENT-python =python bindings and utilities for GDAL
@ -69,8 +69,7 @@ MAKE_FLAGS =	LIBTOOL_FINISH=:
 USE_GMAKE =	Yes
 NO_TEST =	Yes
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include \
-			  -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -pthread"

 CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
--- a/geo/spatialite/Makefile.inc
+++ b/geo/spatialite/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2013/03/21 09:01:56 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2013/06/04 18:41:46 naddy Exp $

 CATEGORIES ?=	geo

@ -14,7 +14,7 @@ CONFIGURE_STYLE ?=	gnu

 # libpng header needed by gaiagraphics & librasterlite
 # lt_cv_dlopen_libs= needed by libspatialite
-CONFIGURE_ENV ?=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng/" \
+CONFIGURE_ENV ?=	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" lt_cv_dlopen_libs=

 LIBTOOL_FLAGS ?=	--tag=disable-static
--- a/graphics/DevIL/Makefile
+++ b/graphics/DevIL/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2013/06/04 18:41:46 naddy Exp $

 COMMENT=		library for powerful image loading capabilities

@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--with-squish=no \

 # This would only install three binary examples, we'll install it manually.
 CONFIGURE_ARGS+=	--with-examples=no
-CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng/ -I${X11BASE}/include" \
+CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lz"

 WRKDIST=		${WRKDIR}/${DISTNAME:L}
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2013/04/15 01:58:32 brad Exp $
+# $OpenBSD: Makefile,v 1.32 2013/06/04 18:41:46 naddy Exp $

 SHARED_ONLY=	Yes

@ -52,7 +52,7 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--without-gslib \
 			--without-trio \
 			--disable-ltdl-install
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
 			LDFLAGS="-L${WRKBUILD}/magick/.libs -L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib" \
 			ac_cv_path_LaunchDelegate=no

--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.127 2013/03/21 08:45:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.128 2013/06/04 18:41:46 naddy Exp $

 SHARED_ONLY=		Yes

@ -74,7 +74,7 @@ CONFIGURE_ARGS+=	--with-quantum-depth=16 \
 			--with-ltdl-lib=${LOCALBASE}/lib \
 			--disable-ltdl-install

-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include/libxml2 -I${LOCALBASE}/include" \
 			LDFLAGS="-L${WRKBUILD}/magick/.libs -L${WRKBUILD}/wand/.libs -L${LOCALBASE}/lib" \
 			PTHREAD_CFLAGS="-pthread" PTHREAD_LIBS="-pthread" \
 			ac_cv_path_LaunchDelegate=no \
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2013/04/26 23:10:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2013/06/04 18:41:47 naddy Exp $

 # requires SSE
 ONLY_FOR_ARCHS=	i386 amd64
@ -62,7 +62,7 @@ CONFIGURE_ARGS=	-DCMAKE_BUILD_TYPE=Release \
 		-DBINARY_PACKAGE_BUILD=1
 CFLAGS+= -D_DEBUG

-CPPFLAGS+=	-I${LOCALBASE}/include/libpng
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

 post-install:
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.95 2013/05/31 15:34:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.96 2013/06/04 18:41:47 naddy Exp $

 SHARED_ONLY=	Yes

@ -36,7 +36,6 @@ MODULES=	devel/gettext \

 MODGNOME_DESKTOP_FILE=	Yes
 MODGNOME_ICON_CACHE=	Yes
-MODGNOME_CPPFLAGS=	-I${LOCALBASE}/include/libpng

 LIBTOOL_FLAGS=	--tag=disable-static

--- a/graphics/enblend-enfuse/Makefile
+++ b/graphics/enblend-enfuse/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2013/03/11 11:10:52 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2013/06/04 18:41:47 naddy Exp $

 VMEM_WARNING =	Yes
 ONLY_FOR_ARCHS = ${GCC4_ARCHS}
@ -51,7 +51,6 @@ USE_GROFF =	Yes

 CPPFLAGS +=	-I${WRKSRC}/src/vigra_impex \
 		-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libpng \
 		-I${X11BASE}/include

 LDFLAGS +=	-L${LOCALBASE}/lib \
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2013/05/20 07:56:48 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.52 2013/06/04 18:41:47 naddy Exp $

 COMMENT=	lightweight image viewer

@ -27,7 +27,6 @@ RUN_DEPENDS=	graphics/jpeg
 RUN_DEPENDS+=	devel/desktop-file-utils

 CFLAGS+=	-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libpng \
 		-I${X11BASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
 MAKE_FLAGS=	LDFLAGS="${LDFLAGS}" man_dir="${DESTDIR}${PREFIX}/man" \
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2013/04/16 13:17:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2013/06/04 18:41:47 naddy Exp $

 COMMENT=		graphic library for gtk+2

@ -33,7 +33,6 @@ BUILD_DEPENDS +=	misc/shared-mime-info
 RUN_DEPENDS +=		misc/shared-mime-info

 MODGNOME_TOOLS=		gi
-MODGNOME_CPPFLAGS=	-I${LOCALBASE}/include/libpng

 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-libjasper \
--- a/graphics/gimp/stable/Makefile
+++ b/graphics/gimp/stable/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.89 2013/05/31 15:34:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.90 2013/06/04 18:41:48 naddy Exp $

 COMMENT=	GNU Image Manipulation Program

@ -76,7 +76,7 @@ CONFIGURE_ARGS+=--enable-gimp-console \
 		--with-libcurl \
 		--without-gvfs \
 		--without-webkit
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 # If one of these tools is found at configure stage, it might be used,
 # no matter whether we use --disable-gtk-doc or not.
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.70 2013/06/04 18:41:48 naddy Exp $

 COMMENT=	image manipulation library for X11

@ -29,7 +29,7 @@ SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --disable-modules
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"

 post-install:
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2013/06/04 18:41:48 naddy Exp $

 COMMENT=	image manipulation library

@ -29,7 +29,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+= --disable-mmx
 .endif
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"

 .include <bsd.port.mk>
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2013/04/07 10:37:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2013/06/04 18:41:48 naddy Exp $

 COMMENT=	SVG vector drawing application

@ -54,7 +54,7 @@ USE_GROFF=	Yes
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.68
 CONFIGURE_ARGS=	--without-gnome-vfs
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/ImageMagick \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ImageMagick \
 			  -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"

--- a/graphics/jbig2dec/Makefile
+++ b/graphics/jbig2dec/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2013/06/04 18:41:48 naddy Exp $

 SHARED_LIBS +=	jbig2dec             0.0      # 0.0

@ -26,7 +26,6 @@ SEPARATE_BUILD =	Yes
 AUTOCONF_VERSION =	2.63
 CONFIGURE_STYLE =	autoconf
 CONFIGURE_ARGS =	--with-libpng=${LOCALBASE}
-CFLAGS +=		-I${LOCALBASE}/include/libpng
 CONFIGURE_ENV =		LDFLAGS="`pkg-config --libs libpng`"

 MODULES =		lang/python
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/05/16 09:04:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2013/06/04 18:41:49 naddy Exp $

 COMMENT=	library to adjust for photographic lens characteristics
 DISTNAME=	lensfun-0.2.7
@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc/lensfun \

 NO_TEST =		Yes

-CFLAGS+=		-I/usr/include -I${LOCALBASE}/include/libpng
+CFLAGS+=		-I/usr/include
 MAKE_FILE=		GNUmakefile

 ALL_TARGET =		all
--- a/graphics/leptonica/Makefile
+++ b/graphics/leptonica/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2013/06/04 18:41:49 naddy Exp $

 COMMENT=	image processing and analysis library

@ -23,7 +23,7 @@ LIB_DEPENDS=	graphics/libwebp \


 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lm -lz"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED}

--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2013/06/04 18:41:49 naddy Exp $

 COMMENT =		library for processing panoramic images
 DISTNAME =		libpano13-2.9.18
@ -35,7 +35,6 @@ LIB_DEPENDS =		graphics/jpeg \
 			graphics/tiff

 CPPFLAGS +=		-I${LOCALBASE}/include/ \
-			-I${LOCALBASE}/include/libpng \
 			-I${LOCALBASE}/include/gtk-2.0
 LDFLAGS +=		-L${LOCALBASE}/lib \
 			-L${LOCALBASE}/lib/gtk-2.0
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2013/03/21 08:45:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2013/06/04 18:41:49 naddy Exp $

 COMMENT=	WMF handling and conversion library

@ -32,7 +32,6 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-zlib=/usr \
 		--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts/ \
 		--disable-gd
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng" \
-		PKG_CONFIG="/usr/bin/false"
+CONFIGURE_ENV=	PKG_CONFIG="/usr/bin/false"

 .include <bsd.port.mk>
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/05/20 14:51:42 rpe Exp $
+# $OpenBSD: Makefile,v 1.12 2013/06/04 18:41:49 naddy Exp $

 COMMENT =	toolkit for developing mapping applications

@ -46,7 +46,7 @@ WANTLIB += xcb-shm

 MODSCONS_FLAGS =	PREFIX="${TRUEPREFIX}" \
 			DESTDIR="${WRKINST}" \
-			PNG_INCLUDES="${LOCALBASE}/include/libpng/" \
+			PNG_INCLUDES="${LOCALBASE}/include" \
 			INTERNAL_LIBAGG=no \
 			SYSTEM_FONTS="${X11BASE}/lib/X11/fonts/TTF/" \
 			FAST=yes \
--- a/graphics/ocaml-camlimages/Makefile
+++ b/graphics/ocaml-camlimages/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/11 11:10:54 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2013/06/04 18:41:50 naddy Exp $

 COMMENT=	image manipulation functions for Objective Caml
 CATEGORIES=	graphics
@ -28,9 +28,6 @@ BUILD_DEPENDS=	devel/omake \
 		sysutils/findlib \
 		print/ghostscript/gnu

-# The camlimages build system seems to need some include paths in CPATH and
-# others in CFLAGS. I don't know why, but this way at least it works.
-MAKE_ENV+=	CPATH="${LOCALBASE}/include/libpng"
 .include <bsd.port.arch.mk>
 .if ${PROPERTIES:Mocaml_native}
 MAKE_ENV +=	OCAML_NATIVE=1
--- a/graphics/p5-Image-Scale/Makefile
+++ b/graphics/p5-Image-Scale/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/11 11:10:54 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2013/06/04 18:41:50 naddy Exp $

 SHARED_ONLY=	Yes

@ -22,7 +22,7 @@ LIB_DEPENDS=	graphics/libungif \
 MAKE_ENV=	TEST_POD=Yes

 CONFIGURE_ARGS=	--with-jpeg-libs="${LOCALBASE}/lib" \
-		--with-png-include="${LOCALBASE}/include/libpng" \
+		--with-png-include="${LOCALBASE}/include" \
 		--with-png-libs="${LOCALBASE}/lib" \
 		--with-gif-libs="${LOCALBASE}/lib"

--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2013/03/11 11:10:55 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2013/06/04 18:41:50 naddy Exp $

 SHARED_ONLY=	Yes

@ -31,7 +31,7 @@ DOCSDIR=	${PREFIX}/share/doc/py-gd

 do-configure:
 	@perl -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g;" \
-		-e "s,%%LIBPNG%%,${LOCALBASE}/include/libpng,g" \
+		-e "s,%%LIBPNG%%,${LOCALBASE}/include,g" \
 			${WRKSRC}/${MODPY_SETUP}

 post-install:
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2013/05/31 12:29:41 edd Exp $
+# $OpenBSD: Makefile,v 1.45 2013/06/04 18:41:50 naddy Exp $

 VMEM_WARNING=	Yes

@ -38,7 +38,7 @@ BUILD_DEPENDS=	${RUN_DEPENDS}
 LIB_DEPENDS=	graphics/png
 TEST_DEPENDS =	${RUN_DEPENDS}

-MAKE_ENV+=	EXTRA_INCLUDES="${WRKSRC} ${LOCALBASE}/include/libpng ${MODTCL_INCDIR} ${MODTK_INCDIR}" \
+MAKE_ENV+=	EXTRA_INCLUDES="${WRKSRC} ${MODTCL_INCDIR} ${MODTK_INCDIR}" \
 		LDSHARED="${CC} -shared -fPIC"

 pre-configure:
--- a/graphics/tiff2png/Makefile
+++ b/graphics/tiff2png/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/11 11:10:56 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2013/06/04 18:41:50 naddy Exp $

 COMMENT =	converts TIFF images to PNG format

@ -22,7 +22,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=png-mng/}

 MAKE_FLAGS =	CC="${CC}" OPTIMFLAGS="${CFLAGS}" DEBUGFLAGS="-Wall -W" \
-		CFLAGS='$$(TIFF_VERSION) -DFAXPECT $$(MIN_INVERT) $$(OPTIMFLAGS) $$(DEBUGFLAGS) -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include' \
+		CFLAGS='$$(TIFF_VERSION) -DFAXPECT $$(MIN_INVERT) $$(OPTIMFLAGS) $$(DEBUGFLAGS) -I${LOCALBASE}/include' \
 		LDFLAGS="-L${LOCALBASE}/lib -lpng -lz -ltiff -ljpeg -lm"

 MAKE_FILE =	Makefile.unx
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@ -34,8 +34,6 @@ CONFIGURE_ARGS +=	--with-gsl=yes \
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

-MAKE_FLAGS =		CPPFLAGS="-I${LOCALBASE}/include/libpng"
-
 pre-configure:
 	perl -pi -e 's#/usr(/share/locale)#${PREFIX}\1#g' \
 		${WRKSRC}/configure ${WRKSRC}/src/ui/ui.c
--- a/graphics/xmedcon/Makefile
+++ b/graphics/xmedcon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2013/05/31 15:34:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2013/06/04 18:41:51 naddy Exp $

 COMMENT =	medical image conversion

@ -36,7 +36,7 @@ CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
 		 --enable-static \
 		 --sysconfdir="${SYSCONFDIR}"
-CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
                         
 NO_TEST =	Yes
--- a/graphics/xmms-kj/Makefile
+++ b/graphics/xmms-kj/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2013/03/11 11:10:56 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2013/06/04 18:41:51 naddy Exp $

 SHARED_ONLY=	Yes

@ -31,7 +31,6 @@ MAKE_FILE=      makefile
 ALL_TARGET=	vislib
 NO_TEST=	Yes

-CFLAGS+=	-I${LOCALBASE}/include/libpng
 MAKE_FLAGS=	CC="${CC}"
 MTREE_FILE=	${FILESDIR}/mtree

--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2013/03/11 11:10:56 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2013/06/04 18:41:51 naddy Exp $

 COMMENT=	scanner frontend for SANE

@ -35,8 +35,7 @@ USE_GMAKE=	Yes
 USE_GROFF =	Yes
 CONFIGURE_STYLE=gnu

-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv" \
 		gt_cv_func_gettext_libintl=yes

--- a/inputmethods/scim-qtimm/Makefile
+++ b/inputmethods/scim-qtimm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/03/21 08:46:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2013/06/04 18:41:51 naddy Exp $

 SHARED_ONLY=	Yes

@ -35,8 +35,7 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-skim-support \
 		--with-qt-includes=${MODQT_INCDIR} \
 		--with-qt-libraries=${MODQT_LIBDIR}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		UIC_PATH=${MODQT_UIC} \
 		QTDIR=${MODQT_QTDIR}
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2013/05/29 14:32:11 jasper Exp $
+# $OpenBSD: Makefile,v 1.56 2013/06/04 18:41:52 naddy Exp $

 COMMENT =	command-driven interactive function plotting program

@ -31,7 +31,7 @@ CONFIGURE_ARGS =	--without-linux-vga \
 			--disable-qt \
 			--without-lua \
 			--without-pdf
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

 FAKE_FLAGS =		appdefaultdir="${PREFIX}/lib/X11/app-defaults/"
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2013/05/29 20:46:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.41 2013/06/04 18:41:52 naddy Exp $

 COMMENT=	GRaphing, Advanced Computation and Exploration of data

@ -20,7 +20,7 @@ MASTER_SITES=	${GRACE_SITES:=grace/src/grace5/}
 CONFIGURE_STYLE=	gnu
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/ac-tools
 CONFIGURE_ARGS+=	--with-bundled-xbae \
-			--with-extra-incpath=${LOCALBASE}/include:${LOCALBASE}/include/libpng \
+			--with-extra-incpath=${LOCALBASE}/include \
 			--with-extra-ldpath=${LOCALBASE}/lib \
 			--enable-grace-home=${PREFIX}/grace
 USE_GROFF =	Yes
--- a/misc/ktimeclock/Makefile
+++ b/misc/ktimeclock/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2013/03/21 08:46:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2013/06/04 18:41:52 naddy Exp $

 COMMENT=	task-based timeclock for KDE

@ -36,7 +36,7 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	 ${MODQT_CONFIGURE_ARGS}
 CONFIGURE_ARGS+= --disable-debug --enable-final
 CONFIGURE_ARGS+= --with-extra-libs="${LOCALBASE}/lib"
-CONFIGURE_ARGS+= --with-extra-includes="${LOCALBASE}/include/libpng:${LOCALBASE}/include"
+CONFIGURE_ARGS+= --with-extra-includes="${LOCALBASE}/include"
 CONFIGURE_ARGS+= --with-xinerama
 CONFIGURE_ENV=	KDEDIR="${LOCALBASE}"
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin
--- a/misc/xnc/Makefile
+++ b/misc/xnc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2013/03/11 11:23:58 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2013/06/04 18:41:52 naddy Exp $

 COMMENT=	filemanager for X Window

@ -27,7 +27,7 @@ NO_TEST=	Yes
 CONFIGURE_STYLE=	autoconf old dest
 AUTOCONF_VERSION=	2.13

-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-x
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2013/05/31 15:34:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2013/06/04 18:41:52 naddy Exp $

 COMMENT=	free video editor

@ -45,8 +45,7 @@ AUTOCONF_VERSION=2.60
 AUTOMAKE_VERSION=1.9

 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
-		-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -logg -lm -lz"
 CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
 		--enable-xv \
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2013/03/11 11:35:43 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2013/06/04 18:41:53 naddy Exp $

 COMMENT=	creates DVD file structures

@ -25,7 +25,7 @@ MAKE_FLAGS+=	BISON="yacc"

 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

 WRKDIST=	${WRKDIR}/dvdauthor
--- a/multimedia/gstreamer-0.10/Makefile.inc
+++ b/multimedia/gstreamer-0.10/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.26 2013/03/21 08:46:33 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.27 2013/06/04 18:41:53 naddy Exp $

 # Most frequent usage of the GStreamer packages:
 # core          base library
@ -76,7 +76,6 @@ CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
 		ac_cv_path_GTKDOC_MKPDF=""

 CPPFLAGS +=		-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng \
 			-I${X11BASE}/include
 LDFLAGS +=		-L${LOCALBASE}/lib \
 			-L${X11BASE}/lib
--- a/multimedia/gstreamer1/Makefile.inc
+++ b/multimedia/gstreamer1/Makefile.inc
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2013/03/21 08:46:33 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2013/06/04 18:41:53 naddy Exp $

 # Most frequent usage of the GStreamer packages:
 # core		base library
@ -79,7 +79,6 @@ CONFIGURE_ENV +=ac_cv_path_GTKDOC_CHECK="" \
 		ac_cv_path_GTKDOC_MKPDF=""

 CPPFLAGS +=		-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng \
 			-I${X11BASE}/include
 LDFLAGS +=		-L${LOCALBASE}/lib \
 			-L${X11BASE}/lib
--- a/multimedia/kguitar/Makefile
+++ b/multimedia/kguitar/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2013/03/21 08:46:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2013/06/04 18:41:53 naddy Exp $

 COMMENT =		guitar tab editor

@ -33,7 +33,7 @@ CONFIGURE_ARGS +=	--disable-midisupport \
 			--with-qt-libraries="${LOCALBASE}/lib/qt3" \
 			--with-qt-includes="${LOCALBASE}/include/X11/qt3" \
 			--with-extra-libs="${LOCALBASE}/lib" \
-			--with-extra-includes="${LOCALBASE}/include/libpng"
+			--with-extra-includes="${LOCALBASE}/include"

 CONFIGURE_ENV =		KDEDIR=${LOCALBASE}

--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2013/03/21 08:46:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.42 2013/06/04 18:41:53 naddy Exp $

 SHARED_ONLY=	Yes

@ -50,7 +50,7 @@ CONFIGURE_ARGS=	--enable-gpl \
 		--with-libdv \
 		--without-alsa \
 		--without-faac
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		ac_cv_lib_ossaudio__oss_ioctl=no \
 		ac_cv_header_soundcard_h=no
--- a/multimedia/ming/Makefile
+++ b/multimedia/ming/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/03/21 08:46:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2013/06/04 18:41:54 naddy Exp $

 COMMENT=	Flash 4/5 movie output library

@ -23,7 +23,7 @@ YACC=		bison
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.65
 CONFIGURE_ARGS=	${CONFIGURE_SHARED}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

 .include <bsd.port.mk>
--- a/net/amsn/Makefile
+++ b/net/amsn/Makefile
@ -1,4 +1,4 @@
-#$OpenBSD: Makefile,v 1.27 2013/06/01 14:18:40 ajacoutot Exp $
+#$OpenBSD: Makefile,v 1.28 2013/06/04 18:41:54 naddy Exp $

 COMMENT=	open source MSN Messenger clone

@ -41,8 +41,7 @@ CONFIGURE_ARGS+=--disable-libv4l \
 		--with-tcl="${MODTCL_LIBDIR}" \
 		--with-tk="${MODTK_LIBDIR}"

-CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include \
-		    -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV+=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-lm -L${LOCALBASE}/lib" \
 		TK_INC_SPEC="${MODTK_INCDIR}/generic" \
 		TCLSH="${MODTCL_BIN}"
--- a/net/mldonkey/stable/Makefile
+++ b/net/mldonkey/stable/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2013/03/11 11:35:49 espie Exp $
+# $OpenBSD: Makefile,v 1.53 2013/06/04 18:41:54 naddy Exp $

 COMMENT =	e-donkey client
 DISTNAME =	mldonkey-3.1.3
@ -33,8 +33,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config

 CONFIGURE_ARGS +=	--enable-gui=newgui2 \
 			--enable-upnp-natpmp
-CONFIGURE_ENV +=	CPPFLAGS='-I${LOCALBASE}/include/libpng \
-			-I${LOCALBASE}/include -I${X11BASE}/include' \
+CONFIGURE_ENV +=	CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \
 			LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' \
 			ac_cv_prog_RPMBUILD="" \
 			ac_cv_prog_WGET=""
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.70 2013/03/21 08:46:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.71 2013/06/04 18:41:54 naddy Exp $

 SHARED_ONLY=	Yes

@ -45,7 +45,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 		--enable-ruby-site-install \
 		--disable-tcl
 CPPFLAGS+=	-I${LOCALBASE}/include/libart-2.0 \
-		-I${LOCALBASE}/include/libpng \
 		-I${X11BASE}/include/ \
 		-I${X11BASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib
--- a/net/valknut/Makefile
+++ b/net/valknut/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/21 08:46:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2013/06/04 18:41:55 naddy Exp $

 COMMENT=	Graphical Direct-Connect client

@ -23,7 +23,7 @@ WANTLIB +=	pthread-stubs ssl stdc++ xcb xml2 z
 USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS}
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		MOC=${MODQT_MOC} UIC_PATH=${MODQT_UIC}
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/admin
--- a/net/ziproxy/Makefile
+++ b/net/ziproxy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2013/03/11 11:35:58 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2013/06/04 18:41:55 naddy Exp $

 COMMENT =		compressing non-caching HTTP proxy

@ -29,7 +29,7 @@ SEPARATE_BUILD =	Yes

 CONFIGURE_STYLE =	gnu

-CPPFLAGS =		-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng
+CPPFLAGS =		-I${LOCALBASE}/include

 CONFIGURE_ARGS =	--with-jasper=${LOCALBASE}

--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/05/16 09:16:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2013/06/04 18:41:55 naddy Exp $

 # XXX remove @exec-update when we branch 5.4-current

@ -51,9 +51,7 @@ FAKE_FLAGS=	pkgfontconfigdir=${PREFIX}/share/examples/cups-filters \
 		pkgcupsserverrootdir=${PREFIX}/share/examples/cups-filters/cups

 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include \
-			-I${LOCALBASE}/include \
-			-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"

 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.156 2013/05/17 13:47:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.157 2013/06/04 18:41:55 naddy Exp $

 COMMENT-main=		Common Unix Printing System
 COMMENT-libs=		CUPS libraries and headers
@ -80,8 +80,7 @@ USE_GMAKE=		Yes

 MAKE_ENV=		${LIBS_ENV}

-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include \
-				-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -pthread" \
 			${LIBS_ENV}

--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2013/03/21 08:46:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2013/06/04 18:41:55 naddy Exp $

 SHARED_ONLY=		Yes

@ -47,8 +47,7 @@ LIB_DEPENDS=		${MODPY_LIB_DEPENDS}	\
 WRKDIST=		${WRKDIR}/${DISTNAME:S,_full,,}

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include		\
-				  -I${LOCALBASE}/include/libpng"	\
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include"		\
 			LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib	\
 				 -lintl -liconv -lz"
 CONFIGURE_ARGS=		--without-freetype-src \
--- a/print/ghostscript/gnu/Makefile
+++ b/print/ghostscript/gnu/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.96 2013/03/11 11:37:53 espie Exp $
+# $OpenBSD: Makefile,v 1.97 2013/06/04 18:41:56 naddy Exp $

 COMMENT=	GNU PostScript interpreter

@ -39,8 +39,7 @@ LIB_DEPENDS=	graphics/jbig2dec	\

 CFLAGS+=	-DSYS_TYPES_HAS_STDINT_TYPES	\
 		-I${LOCALBASE}/include		\
-		-I${LOCALBASE}/include/ijs	\
-		-I${LOCALBASE}/include/libpng
+		-I${LOCALBASE}/include/ijs
 USE_GROFF =	Yes

 STDLIBS=	-pthread -lm -liconv
--- a/print/htmldoc/Makefile
+++ b/print/htmldoc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2013/05/08 10:56:45 benoit Exp $
+# $OpenBSD: Makefile,v 1.32 2013/06/04 18:41:56 naddy Exp $

 COMMENT=	convert HTML pages to PDF/PS format

@ -29,8 +29,7 @@ LIB_DEPENDS=		graphics/jpeg \
 CONFIGURE_STYLE=	gnu dest
 CONFIGURE_ARGS+=	--without-gui
 CONFIGURE_ENV= 		LDFLAGS="-L${LOCALBASE}/lib" \
-			CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include \
-				-I${LOCALBASE}/include/libpng" \
+			CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 			CPPFLAGS="-I${LOCALBASE}/include"
 PORTHOME=		${WRKDIR}

--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2013/03/21 08:46:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2013/06/04 18:41:56 naddy Exp $

 COMMENT=		C library to produce PDF files

@ -33,8 +33,8 @@ CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--without-py \
 			--without-tcl

-CONFIGURE_ENV=		LDFLAGS="-L${DEPBASE}/lib" \
-			CPPFLAGS="-I${DEPBASE}/include/libpng -I${DEPBASE}/include" \
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
+			CPPFLAGS="-I${LOCALBASE}/include" \
 			LIBS="-lm"
 MAKE_ENV=		${CONFIGURE_ENV}

--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2013/03/21 08:46:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.75 2013/06/04 18:41:56 naddy Exp $

 COMMENT-main=	PDF rendering library
 COMMENT-qt=	qt interface to PDF rendering library
@ -100,7 +100,7 @@ CONFIGURE_ARGS+= --disable-gtk-doc \
 		--enable-zlib \
 		--disable-gtk-test

-CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBJPEG_CFLAGS="-I${LOCALBASE}/include"

--- a/print/texlive/base/Makefile
+++ b/print/texlive/base/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2013/05/29 20:04:13 zhuk Exp $
+# $OpenBSD: Makefile,v 1.68 2013/06/04 18:41:57 naddy Exp $

 COMMENT =		base binaries for TeXLive typesetting distribution

@ -162,12 +162,12 @@ CONFIGURE_ARGS +=	--mandir=${PREFIX}/man \
 			--with-system-gd \
 			--with-gd-libdir=${LOCALBASE}/lib \
 			--with-system-libpng \
-			--with-libpng-includes=${LOCALBASE}/include/libpng \
+			--with-libpng-includes=${LOCALBASE}/include \
 			--with-libpng-libdir=${LOCALBASE}/lib \
 			--with-system-ncurses \
 			--with-system-pnglib \
 			--with-pnglib-libdir=${LOCALBASE}/lib \
-			--with-pnglib-include=${LOCALBASE}/include/libpng \
+			--with-pnglib-include=${LOCALBASE}/include \
 			--with-system-zlib \
 			--with-system-t1lib \
 			--with-t1lib-libdir=${LOCALBASE}/lib \
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2013/04/19 14:33:51 bcallah Exp $
+# $OpenBSD: Makefile,v 1.44 2013/06/04 18:41:57 naddy Exp $

 COMMENT =		fast and light graphical web browser

@ -34,7 +34,7 @@ CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS =	--enable-ipv6 \
 			--disable-threaded-dns \
 			--enable-ssl
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

 FAKE_FLAGS =		sysconfdir=${PREFIX}/share/examples/dillo/
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.86 2013/05/31 20:07:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.87 2013/06/04 18:41:57 naddy Exp $

 ONLY_FOR_ARCHS=	${GCC4_ARCHS}

@ -36,7 +36,7 @@ MODPY_ADJ_FILES =	Tools/gtk/generate-feature-defines-files

 CONFIGURE_STYLE =	gnu

-CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11" \
 		ac_cv_path_FLEX=${LOCALBASE}/bin/gflex \
 		ac_cv_path_RUBY=${RUBY}
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2013/03/11 11:46:08 espie Exp $
+# $OpenBSD: Makefile,v 1.46 2013/06/04 18:41:57 naddy Exp $

 COMMENT=	window manager, continuation of the Bowman NeXTSTEP clone

@ -38,7 +38,7 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--with-helpcommand="urxvt -e man" \
 		--with-jpeg-includes=${LOCALBASE}/include \
 		--with-jpeg-library=${LOCALBASE}/lib \
-		--with-png-includes=${LOCALBASE}/include/libpng \
+		--with-png-includes=${LOCALBASE}/include \
 		--with-png-library=${LOCALBASE}/lib \
 		--disable-send-postcard-to-developer \
 		--enable-i18n \
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2013/03/22 22:50:25 bcallah Exp $
+# $OpenBSD: Makefile,v 1.47 2013/06/04 18:41:57 naddy Exp $

 COMMENT=	Fast-Light Tool Kit

@ -34,7 +34,7 @@ CONFIGURE_STYLE=autoconf no-autoheader
 AUTOCONF_VERSION=2.68
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--enable-threads
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 		CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib" \
--- a/x11/gnustep/gui/Makefile
+++ b/x11/gnustep/gui/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2013/05/17 17:16:56 sebastia Exp $
+# $OpenBSD: Makefile,v 1.31 2013/06/04 18:41:58 naddy Exp $

 COMMENT=	GNUstep gui library

@ -34,7 +34,7 @@ LIB_DEPENDS=	audio/flite \

 AUTOCONF_VERSION = 2.69
 CONFIGURE_STYLE=autoconf gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++ -lm"
 CONFIGURE_ARGS=	--with-x
 USE_GROFF =	Yes
--- a/x11/gtk+2/Makefile
+++ b/x11/gtk+2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.169 2013/05/31 15:29:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.170 2013/06/04 18:41:58 naddy Exp $

 COMMENT-main=		multi-platform graphical toolkit
 COMMENT-guic=		gtk+ icon theme caching utility
@ -69,7 +69,7 @@ MODPY_RUNDEP=		No
 MODPY_ADJ_FILES=	gtk/gtk-builder-convert

 MODGNOME_TOOLS=		gi
-MODGNOME_CPPFLAGS=	-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include/libpng
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include/freetype2

 TEST_IS_INTERACTIVE=	x11

--- a/x11/gtk+3/Makefile
+++ b/x11/gtk+3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.77 2013/05/31 15:29:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.78 2013/06/04 18:41:58 naddy Exp $

 SHARED_ONLY=		Yes

@ -72,7 +72,7 @@ WANTLIB-cups += asn1 crypto cups gdk-3 gssapi gtk-3 krb5 ssl
 WANTLIB-cups += avahi-client avahi-common colordprivate

 MODGNOME_TOOLS=		gi
-MODGNOME_CPPFLAGS=	-I${X11BASE}/include/freetype2 -I${LOCALBASE}/include/libpng
+MODGNOME_CPPFLAGS=	-I${X11BASE}/include/freetype2
 MODGNOME_ICON_CACHE=	Yes

 TEST_IS_INTERACTIVE=	x11
--- a/x11/irrlicht/Makefile
+++ b/x11/irrlicht/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/11 11:46:13 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2013/06/04 18:41:58 naddy Exp $

 COMMENT =		fast, real time 3D engine
 DISTNAME =		irrlicht-1.8
@ -38,7 +38,7 @@ MAKE_ENV +=		CC="${CC}" \
 				  -DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_" \
 			NDEBUG=1 \
 			SO_VERSION="${SO_VERSION}"
-MAKE_FLAGS +=		CXXINCS="-I../../include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
+MAKE_FLAGS +=		CXXINCS="-I../../include -I${LOCALBASE}/include -I${X11BASE}/include" \

 NO_TEST =		Yes

--- a/x11/krusader/Makefile
+++ b/x11/krusader/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2013/03/21 08:48:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2013/06/04 18:41:58 naddy Exp $

 SHARED_ONLY=	Yes

@ -45,7 +45,7 @@ CONFIGURE_ENV=	${MODKDE_CONFIGURE_ENV}
 CONFIGURE_ARGS=	${MODQT_CONFIGURE_ARGS} \
 		--disable-dependency-tracking \
 		--with-extra-libs="${LOCALBASE}/lib" \
-		--with-extra-includes="${LOCALBASE}/include/libpng:${LOCALBASE}/include" \
+		--with-extra-includes="${LOCALBASE}/include" \
 		--without-acl

 pre-configure:
--- a/x11/libgdiplus/Makefile
+++ b/x11/libgdiplus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/21 08:48:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2013/06/04 18:41:59 naddy Exp $

 COMMENT=	GDI+ comptible API

@ -36,8 +36,7 @@ LIB_DEPENDS=	devel/pango \

 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libpng"
+		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-pango

--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.221 2013/05/05 21:11:32 brad Exp $
+# $OpenBSD: Makefile,v 1.222 2013/06/04 18:41:59 naddy Exp $

 SHARED_ONLY=		Yes

@ -82,7 +82,7 @@ CONFIGURE_STYLE = simple
 # CONFIGURE_ARGS for misc stuff
 CONFIGURE_ARGS += --confdir=${CONFDIR} \
 		--mandir=${LOCALBASE}/man \
-		--extra-cflags="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+		--extra-cflags="-I${LOCALBASE}/include" \
 		--extra-ldflags="-L${LOCALBASE}/lib" \
 		--extra-libs-mplayer="-lrtunes -lcrypto"

--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2013/03/21 08:48:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2013/06/04 18:41:59 naddy Exp $

 COMMENT-main=		Motif toolkit
 COMMENT-demos=		Motif toolkit demos
@ -34,7 +34,7 @@ CONFIGURE_ARGS=		--enable-themes \
 			--enable-jpeg \
 			--disable-printing \
 			--enable-png
-CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -lm"
 MAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
--- a/x11/pekwm/Makefile
+++ b/x11/pekwm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2013/03/11 11:46:14 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2013/06/04 18:41:59 naddy Exp $

 COMMENT=	aewm++ based pretty themable window manager

@ -26,8 +26,7 @@ USE_GROFF =	Yes
 NO_TEST=	Yes

 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include/libpng" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-xinerama

--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.107 2013/05/25 00:33:11 brad Exp $
+# $OpenBSD: Makefile,v 1.108 2013/06/04 18:42:00 naddy Exp $

 COMMENT-main=		C++ X11 GUI toolkit
 COMMENT-examples=	examples and tutorial for qt3
@ -86,7 +86,6 @@ CONFIGURE_ARGS=	-qt-gif -system-libmng -system-libpng -system-libjpeg -system-zl
 		-xinerama \
 		-cups \
 		-inputmethod \
-		-I${LOCALBASE}/include/libpng \
 		-I${X11BASE}/include/freetype2 \
 		-I${LOCALBASE}/include \
 		-L${WRKSRC}/lib \
--- a/x11/qt4/Makefile
+++ b/x11/qt4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.112 2013/05/25 00:33:11 brad Exp $
+# $OpenBSD: Makefile,v 1.113 2013/06/04 18:42:00 naddy Exp $

 ONLY_FOR_ARCHS =	${GCC4_ARCHS}
 SHARED_ONLY =		Yes
@ -96,7 +96,6 @@ CONFIGURE_ARGS =	-system-libpng -system-libjpeg -system-zlib \
 			-cups \
 			-confirm-license \
 			-opensource \
-			-I${LOCALBASE}/include/libpng \
 			-I${X11BASE}/include/freetype2 \
 			-I${X11BASE}/include \
 			-L${WRKBUILD}/lib \
--- a/x11/vlc/Makefile
+++ b/x11/vlc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.172 2013/06/03 22:36:00 brad Exp $
+# $OpenBSD: Makefile,v 1.173 2013/06/04 18:42:00 naddy Exp $

 SHARED_ONLY=	Yes

@ -90,7 +90,7 @@ RUN_DEPENDS-jack= ${BUILD_PKGPATH}

 MAKE_ENV=	AUTOCONF_VERSION=${AUTOCONF_VERSION} AUTOMAKE_VERSION=${AUTOMAKE_VERSION}

-CPPFLAGS=	-I${X11BASE}/include -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng
+CPPFLAGS=	-I${X11BASE}/include -I${LOCALBASE}/include

 USE_GMAKE=	Yes
 # Fails to link _pic libs properly resulting in undefined symbols in the live555 plugin
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.87 2013/03/21 08:48:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.88 2013/06/04 18:42:00 naddy Exp $

 COMMENT-main=		window manager that emulates NEXTSTEP(tm)
 COMMENT-lang=		language subpackage for Window Maker
@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--with-datadir="${LOCALBASE}/share/WindowMaker" \
 			--with-nlsdir="${LOCALBASE}/share/locale"

-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" LIBS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
 			LINGUAS='be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW'

 MULTI_PACKAGES=         -main -lang
--- a/Show More
+++ b/Show More