Index: head/graphics/libimg/Makefile
===================================================================
--- head/graphics/libimg/Makefile	(revision 375495)
+++ head/graphics/libimg/Makefile	(revision 375496)
@@ -1,57 +1,57 @@
 # Created by: Glenn Johnson
 # $FreeBSD$
 
 PORTNAME=	libimg
 PORTVERSION=	1.4.2
 CATEGORIES?=	graphics tk
 MASTER_SITES=	SF/tkimg/tkimg/${PORTVERSION:R}
 DISTNAME=	tkimg${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Library of image format handlers for Tk4.1 and later
 
 BUILD_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib
-LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
 PLIST_SUB+=	SHLIB_NAME="${SHLIB_NAME}" \
 		SHLIB_LINK="${SHLIB_LINK}"
 
 WRKSRC=		${WRKDIR}/tkimg${PORTVERSION:R}
 USES=		tk tar:bzip2
 
 # We don't need the bundled libraries:
 EXTRACT_AFTER_ARGS=	--exclude '*/libz/*' --exclude zlib \
 		--exclude 'config.*' --exclude Makefile \
 		--exclude '*/compat/*' --exclude '*/libtiff/*' \
 		--exclude '*/libjpeg/*' --exclude '*/libpng/*'
 MAKE_ARGS+=	INSTALL_ROOT="${STAGEDIR}"
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--with-tcl="${TCL_LIBDIR}" --with-tk="${TK_LIBDIR}"
 CONFIGURE_ENV=	WRKDIR="${WRKDIR}"
 
 post-patch:
 	${REINPLACE_CMD} -E -e 's,"(zlib|tiff|jpeg|png)tcl.h",<\1.h>,' \
 		-e 's,jpeg\.h,jpeglib.h,' ${WRKSRC}/*/*.[ch]
 .for d in jpeg png tiff zlib
 	touch ${WRKDIR}/$dtclConfig.sh
 .endfor
 
 post-configure:
 	# Do not link with X11 -- none of tkimg code uses X directly
 	${REINPLACE_CMD} -E -e 's,-L[^[:space:]]+[[:space:]]+-lX[^[:space:]]*,,g' \
 		${WRKSRC}/*/Makefile
 .for l in jpeg png tiff
 	# Link with -l$l
 	${REINPLACE_CMD} -E \
 		-e 's,^SHLIB_LD_LIBS[[:space:]]*=[[:space:]]*(.*),SHLIB_LD_LIBS=\1 -l$l,' \
-		-e 's,-lpng$$,-lpng15,' ${WRKSRC}/$l/Makefile
+		${WRKSRC}/$l/Makefile
 .endfor
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/msgs/
 	${INSTALL_DATA} ${WRKSRC}/msgs/*.msg ${STAGEDIR}${EXAMPLESDIR}/msgs/
 	${INSTALL_SCRIPT} ${WRKSRC}/demo.tcl ${WRKSRC}/tkv.tcl ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
Index: head/graphics/libimg/pkg-plist
===================================================================
--- head/graphics/libimg/pkg-plist	(revision 375495)
+++ head/graphics/libimg/pkg-plist	(revision 375496)
@@ -1,50 +1,53 @@
 %%EXAMPLESDIR%%/demo.tcl
 %%EXAMPLESDIR%%/tkv.tcl
 %%EXAMPLESDIR%%/msgs/de.msg
 %%EXAMPLESDIR%%/msgs/el.msg
 %%EXAMPLESDIR%%/msgs/en.msg
 %%EXAMPLESDIR%%/msgs/es.msg
 %%EXAMPLESDIR%%/msgs/fr.msg
 %%EXAMPLESDIR%%/msgs/ja.msg
 %%EXAMPLESDIR%%/msgs/nl.msg
 man/mann/img-bmp.n.gz
 man/mann/img-dted.n.gz
 man/mann/img-gif.n.gz
 man/mann/img-ico.n.gz
 man/mann/img-jpeg.n.gz
 man/mann/img-pcx.n.gz
 man/mann/img-pixmap.n.gz
 man/mann/img-png.n.gz
 man/mann/img-ppm.n.gz
 man/mann/img-ps.n.gz
 man/mann/img-raw.n.gz
 man/mann/img-sgi.n.gz
 man/mann/img-sun.n.gz
 man/mann/img-tga.n.gz
 man/mann/img-tiff.n.gz
 man/mann/img-window.n.gz
 man/mann/img-xbm.n.gz
 man/mann/img-xpm.n.gz
 man/mann/img.n.gz
 lib/Img/libtkimg142.so.1
 lib/Img/libtkimgbmp142.so.1
 lib/Img/libtkimgdted142.so.1
 lib/Img/libtkimggif142.so.1
 lib/Img/libtkimgico142.so.1
 lib/Img/libtkimgjpeg142.so.1
 lib/Img/libtkimgpcx142.so.1
 lib/Img/libtkimgpixmap142.so.1
 lib/Img/libtkimgpng142.so.1
 lib/Img/libtkimgppm142.so.1
 lib/Img/libtkimgps142.so.1
 lib/Img/libtkimgraw142.so.1
 lib/Img/libtkimgsgi142.so.1
 lib/Img/libtkimgstub142.a
 lib/Img/libtkimgsun142.so.1
 lib/Img/libtkimgtga142.so.1
 lib/Img/libtkimgxbm142.so.1
 lib/Img/libtkimgtiff142.so.1
 lib/Img/libtkimgwindow142.so.1
 lib/Img/libtkimgxpm142.so.1
 lib/Img/pkgIndex.tcl
 lib/Img/tkimgConfig.sh
+@comment include/tkimg.h
+@comment include/tkimgDecls.h
+@comment lib/tkimgConfig.sh