Index: head/graphics/png/Makefile
===================================================================
--- head/graphics/png/Makefile	(revision 423619)
+++ head/graphics/png/Makefile	(revision 423620)
@@ -1,43 +1,39 @@
 # Created by: ache
 # $FreeBSD$
 
 PORTNAME=	png
-PORTVERSION=	1.6.23
+PORTVERSION=	1.6.25
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION} \
 		ftp://ftp.simplesystems.org/pub/lib${PORTNAME}/${PORTNAME}/src/lib${PORTNAME}16/
 PATCH_SITES=	SF/apng/lib${PORTNAME}/lib${PORTNAME}16/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	portmgr@FreeBSD.org
 COMMENT=	Library for manipulating PNG images
 
+LICENSE=	Libpng
+LICENSE_GROUPS=	FSF GPL OSI
+LICENSE_NAME=	libpng License
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 USES=		cpe libtool tar:xz
 CPE_PRODUCT=	libpng
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check-TESTS
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=APNG PNGTEST
-OPTIONS_DEFAULT=APNG PNGTEST
+OPTIONS_DEFINE=	APNG
+OPTIONS_DEFAULT=APNG
 APNG_DESC=Enable Animated PNG support
-PNGTEST_DESC=Enable Regression Test (recommended)
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPNG} || make(makesum)
 PATCHFILES=	${DISTNAME}-apng.patch.gz
-.endif
-
-# Do not fail until https://sourceforge.net/p/libpng/bugs/243/ is fixed
-.if ${PORT_OPTIONS:MPNGTEST}
-post-build:
-	(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \
-	if [ -f ${WRKSRC}/test-suite.log ]; then \
-	${CAT} ${WRKSRC}/test-suite.log ; \
-	fi; \
-	fi)
 .endif
 
 .include <bsd.port.mk>
Index: head/graphics/png/distinfo
===================================================================
--- head/graphics/png/distinfo	(revision 423619)
+++ head/graphics/png/distinfo	(revision 423620)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1467972197
-SHA256 (libpng-1.6.23.tar.xz) = 6d921e7bdaec56e9f6594463ec1fe1981c3cd2d5fc925d3781e219b5349262f1
-SIZE (libpng-1.6.23.tar.xz) = 961520
-SHA256 (libpng-1.6.23-apng.patch.gz) = 58018fc71c0e584a482fdcec4f3347859dc41d7da4d06d943171684682810197
-SIZE (libpng-1.6.23-apng.patch.gz) = 10331
+TIMESTAMP = 1475915301
+SHA256 (libpng-1.6.25.tar.xz) = 09fe8d8341e8bfcfb3263100d9ac7ea2155b28dd8535f179111c1672ac8d8811
+SIZE (libpng-1.6.25.tar.xz) = 982204
+SHA256 (libpng-1.6.25-apng.patch.gz) = e264d917d84872f01af3acf9666471a9bf64b75558b4b35236fef1e23c2a094f
+SIZE (libpng-1.6.25-apng.patch.gz) = 10342
Index: head/graphics/png/pkg-plist
===================================================================
--- head/graphics/png/pkg-plist	(revision 423619)
+++ head/graphics/png/pkg-plist	(revision 423620)
@@ -1,21 +1,21 @@
 bin/libpng-config
 bin/libpng16-config
 bin/png-fix-itxt
 bin/pngfix
 include/libpng16/png.h
 include/libpng16/pngconf.h
 include/libpng16/pnglibconf.h
 include/png.h
 include/pngconf.h
 include/pnglibconf.h
 lib/libpng.a
 lib/libpng.so
 lib/libpng16.a
 lib/libpng16.so
 lib/libpng16.so.16
-lib/libpng16.so.16.23.0
+lib/libpng16.so.16.25.0
 libdata/pkgconfig/libpng.pc
 libdata/pkgconfig/libpng16.pc
 man/man3/libpng.3.gz
 man/man3/libpngpf.3.gz
 man/man5/png.5.gz