Index: graphics/png/Makefile
===================================================================
--- graphics/png/Makefile
+++ graphics/png/Makefile
@@ -3,10 +3,11 @@
 
 PORTNAME=	png
 PORTVERSION=	1.6.37
+PORTREVISION=	1
 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/
+PATCH_SITES=	SF/lib${PORTNAME}-apng/lib${PORTNAME}16/${PORTVERSION}/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	portmgr@FreeBSD.org
@@ -18,22 +19,23 @@
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		cpe libtool tar:xz
+USES=		cmake cpe tar:xz
 CPE_PRODUCT=	libpng
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check-TESTS
+TEST_TARGET=	test
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	APNG
+OPTIONS_DEFINE=	APNG DEBUG OPTIMIZE TEST
 OPTIONS_DEFAULT=APNG
 APNG_DESC=Enable Animated PNG support
+OPTIMIZE_DESC=Enable optimization (SSE2,NEON,VSX)
+DEBUG_CMAKE_BOOL=	PNG_DEBUG
+OPTIMIZE_CMAKE_BOOL=	PNG_HARDWARE_OPTIMIZATIONS
+TEST_CMAKE_BOOL=	TEST
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAPNG} || make(makesum)
-PATCHFILES=	${DISTNAME}-apng.patch.gz
+PATCHFILES=	${DISTNAME}-apng.patch.gz:p1
 .endif
 
 .include <bsd.port.mk>
Index: graphics/png/distinfo
===================================================================
--- graphics/png/distinfo
+++ graphics/png/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1556098534
+TIMESTAMP = 1563440468
 SHA256 (libpng-1.6.37.tar.xz) = 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
 SIZE (libpng-1.6.37.tar.xz) = 1012272
-SHA256 (libpng-1.6.37-apng.patch.gz) = 10d9e0cb60e2b387a79b355eb7527c0bee2ed8cbd12cf04417cabc4d6976683c
-SIZE (libpng-1.6.37-apng.patch.gz) = 10334
+SHA256 (libpng-1.6.37-apng.patch.gz) = 823bb2d1f09dc7dae4f91ff56d6c22b4b533e912cbd6c64e8762255e411100b6
+SIZE (libpng-1.6.37-apng.patch.gz) = 10781
Index: graphics/png/files/patch-CMakeLists.txt
===================================================================
--- /dev/null
+++ graphics/png/files/patch-CMakeLists.txt
@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6451fcf..ffd635c 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -67,7 +67,8 @@ if(PNG_HARDWARE_OPTIMIZATIONS)
+ 
+ # set definitions and sources for arm
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
+-  CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
++  CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR
++  CMAKE_SYSTEM_PROCESSOR MATCHES "^arm64")
+   set(PNG_ARM_NEON_POSSIBLE_VALUES check on off)
+   set(PNG_ARM_NEON "check" CACHE STRING "Enable ARM NEON optimizations:
+      check: (default) use internal checking code;
+@@ -122,7 +123,8 @@ endif()
+ 
+ # set definitions and sources for intel
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
+-   CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*")
++   CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*" OR
++   CMAKE_SYSTEM_PROCESSOR MATCHES "^amd64*")
+   set(PNG_INTEL_SSE_POSSIBLE_VALUES on off)
+   set(PNG_INTEL_SSE "on" CACHE STRING "Enable INTEL_SSE optimizations:
+      off: disable the optimizations")
+@@ -172,7 +174,8 @@ else(PNG_HARDWARE_OPTIMIZATIONS)
+ 
+ # set definitions and sources for arm
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" OR
+-   CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
++   CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64" OR
++   CMAKE_SYSTEM_PROCESSOR MATCHES "^arm64")
+   add_definitions(-DPNG_ARM_NEON_OPT=0)
+ endif()
+ 
+@@ -184,7 +187,8 @@ endif()
+ 
+ # set definitions and sources for intel
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^i?86" OR
+-   CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*")
++   CMAKE_SYSTEM_PROCESSOR MATCHES "^x86_64*" OR
++   CMAKE_SYSTEM_PROCESSOR MATCHES "^amd64*")
+   add_definitions(-DPNG_INTEL_SSE_OPT=0)
+ endif()
+ 
Index: graphics/png/pkg-plist
===================================================================
--- graphics/png/pkg-plist
+++ graphics/png/pkg-plist
@@ -10,6 +10,8 @@
 include/pnglibconf.h
 lib/libpng.a
 lib/libpng.so
+lib/libpng/libpng16-%%CMAKE_BUILD_TYPE%%.cmake
+lib/libpng/libpng16.cmake
 lib/libpng16.a
 lib/libpng16.so
 lib/libpng16.so.16