diff --git a/glpng/README b/glpng/README
index a89910af7..fd8d1bc0c 100644
--- a/glpng/README
+++ b/glpng/README
@@ -1,42 +1,44 @@
 glpng
 ------------------------------------------
-This is a library for OpenGL to load PNG graphics files as an OpenGL texture
-as easily as possible. It also has a number of options for generating the
-alpha channel and mipmaps.
+glpng is a small toolkit to make loading PNG image files as an OpenGL texture
+as easy as possible.
 
 Runtime requirements:
-  cygwin-1.7.13-1
-  libGL1-7.11.2-1
-  libpng14-1.4.8-1
+  cygwin-2.9.0-3
+  libGL1-17.2.2-1
+  libglpng-devel-1.46-1bl1
+  libglpng1-1.46-1bl1
+  libpng16-1.6.30-2
+  pkg-config-0.29.1-1
 
 Build requirements:
 (besides corresponding -devel packages)
-  binutils-2.22.51-2
-  cmake-2.8.7-1
-  cygport-0.10.10-1
-  gcc4-core-4.5.3-3
-  make-3.82.90-1
+  binutils-2.29-1
+  cmake-3.6.2-1
+  cygport-0.24.1-1
+  gcc-core-6.4.0-1
+  make-4.2.1-2
 
 Canonical website:
-  http://www.fifi.org/doc/libglpng-dev/glpng.html
+  http://repo.or.cz/w/glpng.git
 
 Canonical download:
-  http://dev.gentooexperimental.org/~scarabeus/glpng-1.45.tar.bz2
+  git://repo.or.cz/glpng.git
 
 -------------------------------------------
 
 Build instructions:
-  unpack glpng-1.45-X-src.tar.bz2
-    if you use setup to install this src package, it will be
-	 unpacked under /usr/src automatically
-  cd /usr/src
-  cygport ./glpng-1.45-X.cygport all
+  1. unpack glpng-1.46-X-src.tar.xz
+  2. if you use setup to install this src package,
+     it will be unpacked under /usr/src automatically
+        % cd /usr/src
+        % cygport ./glpng-1.46-X.cygport all
 
 This will create:
-  /usr/src/glpng-1.45-X-src.tar.bz2
-  /usr/src/glpng-1.45-X.tar.bz2
-  /usr/src/libglpng1-1.45-X.tar.bz2
-  /usr/src/libglpng-devel-1.45-X.tar.bz2
+  /usr/src/glpng-1.46-X-src.tar.xz
+  /usr/src/glpng-1.46-X.tar.xz
+  /usr/src/libglpng1-1.46-X.tar.xz
+  /usr/src/libglpng-devel-1.46-X.tar.xz
 
 -------------------------------------------
 
@@ -44,19 +46,23 @@ Files included in the binary package:
 
 (glpng)
   /usr/share/doc/Cygwin/glpng.README
-  /usr/share/doc/glpng/html/glpng.htm
+  /usr/share/doc/glpng/glpng.htm
 
 (libglpng1)
   /usr/bin/cygglpng-1.dll
 
 (libglpng-devel)
   /usr/include/GL/glpng.h
+  /usr/lib/cmake/glpng/FindGLPNG.cmake
   /usr/lib/libglpng.dll.a
+  /usr/lib/pkgconfig/glpng.pc
 
 ------------------
 
 Port Notes:
 
+----- version 1.46-1bl1 -----
+Version bump.
+
 ----- version 1.45-1bl1 -----
 Initial release for Cygwin-1.7 by fd0 <http://d.hatena.ne.jp/fd0>
-
diff --git a/glpng/glpng-1.45-1bl1.cygport b/glpng/glpng-1.45-1bl1.cygport
deleted file mode 100644
index 0d81c85ef..000000000
--- a/glpng/glpng-1.45-1bl1.cygport
+++ /dev/null
@@ -1,27 +0,0 @@
-inherit cmake
-
-DESCRIPTION="OpenGL png image library"
-HOMEPAGE="http://www.fifi.org/doc/libglpng-dev/${PN}.html"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
-
-PATCH_URI="
-	http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/${PN}/files/${P}-libpng15.patch
-"
-
-HTMLDOCS="${PN}.htm"
-
-PKG_NAMES="
-	${PN}
-	lib${PN}1
-	lib${PN}-devel
-"
-glpng_CONTENTS="
-	usr/share
-"
-libglpng1_CONTENTS="
-	usr/bin
-"
-libglpng_devel_CONTENTS="
-	usr/include
-	usr/lib
-"
diff --git a/glpng/glpng-1.45-1bl1.src.patch b/glpng/glpng-1.45-1bl1.src.patch
deleted file mode 100644
index 5b00f24ff..000000000
--- a/glpng/glpng-1.45-1bl1.src.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- origsrc/glpng-1.45/src/CMakeLists.txt	2008-12-02 22:46:46.000000000 +0900
-+++ src/glpng-1.45/src/CMakeLists.txt	2012-04-12 22:59:36.416478100 +0900
-@@ -8,17 +8,13 @@ LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ${ZLIB
- 		${OPENGL_LIBRARIES} )
- SET ( SRCS ${APPNAME}.c
- )
--SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
- SET(CMAKE_STATIC_LIBRARY_C_FLAG "-Wl," )
- ADD_LIBRARY ( shared SHARED ${SRCS} )
--ADD_LIBRARY ( static STATIC ${SRCS} )
--SET_TARGET_PROPERTIES(shared static PROPERTIES OUTPUT_NAME glpng)
-+SET_TARGET_PROPERTIES(shared PROPERTIES OUTPUT_NAME glpng)
- SET_TARGET_PROPERTIES (shared PROPERTIES VERSION ${VERSION} SOVERSION ${SONAME_VERSION})
- #INCLUDE(MacroCreateLibtoolFile.cmake)
- #CREATE_LIBTOOL_FILE(pango-shared "/${CMAKE_INSTALL_LIBDIR}")
- INSTALL ( TARGETS shared
--	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
--INSTALL ( TARGETS static
-+        RUNTIME DESTINATION bin
- 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
- 
--
diff --git a/glpng/glpng-1.46-1bl1.cygport b/glpng/glpng-1.46-1bl1.cygport
new file mode 100644
index 000000000..20db263e2
--- /dev/null
+++ b/glpng/glpng-1.46-1bl1.cygport
@@ -0,0 +1,34 @@
+HOMEPAGE="http://repo.or.cz/w/${PN}.git"
+GIT_URI="git://repo.or.cz/${PN}.git"
+GIT_TAG="v${PV}"
+
+CATEGORY="Libs"
+SUMMARY="PNG loader for OpenGL"
+DESCRIPTION="glpng is a small toolkit to make loading PNG image files as an OpenGL texture
+as easy as possible."
+
+CYGCMAKE_ARGS="
+	-DBUILD_STATIC_LIBS:BOOL=OFF
+"
+
+inherit cmake
+inherit git
+
+PKG_NAMES="
+	${PN}
+	lib${PN}1
+	lib${PN}-devel
+"
+glpng_CONTENTS="
+	usr/share
+"
+libglpng1_CONTENTS="
+	usr/bin
+"
+libglpng_devel_CONTENTS="
+	usr/include
+	usr/lib
+"
+glpng_SUMMARY="${SUMMARY} (licensing & readmes)"
+libglpng1_SUMMARY="${SUMMARY} (runtime)"
+libglpng_devel_SUMMARY="${SUMMARY} (development)"
diff --git a/glpng/glpng-1.46-1bl1.src.patch b/glpng/glpng-1.46-1bl1.src.patch
new file mode 100644
index 000000000..eea52e931
--- /dev/null
+++ b/glpng/glpng-1.46-1bl1.src.patch
@@ -0,0 +1,52 @@
+--- origsrc/glpng/CMakeLists.txt	2017-10-30 22:34:06.000000000 +0900
++++ src/glpng/CMakeLists.txt	2017-10-30 22:45:05.044000000 +0900
+@@ -18,4 +18,11 @@ configure_file(FindGLPNG.cmake.in FindGL
+ 
+ install(FILES include/GL/glpng.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/)
+ install(FILES glpng.htm DESTINATION ${CMAKE_INSTALL_DOCDIR})
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindGLPNG.cmake DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/FindGLPNG.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/glpng)
++
++SET(prefix ${CMAKE_INSTALL_PREFIX})
++SET(exec_prefix ${CMAKE_INSTALL_PREFIX})
++SET(libdir ${CMAKE_INSTALL_PREFIX}/lib)
++SET(includedir ${CMAKE_INSTALL_PREFIX}/include)
++CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/glpng.pc.in ${CMAKE_BINARY_DIR}/glpng.pc @ONLY)
++INSTALL(FILES ${CMAKE_BINARY_DIR}/glpng.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+--- origsrc/glpng/glpng.pc.in	1970-01-01 09:00:00.000000000 +0900
++++ src/glpng/glpng.pc.in	2017-10-30 22:45:11.596000000 +0900
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: glpng
++Description: PNG loader for OpenGL
++Version: @VERSION@
++Libs: -L${libdir} -lglpng
++Cflags: -I${includedir}
+--- origsrc/glpng/src/CMakeLists.txt	2017-10-30 22:34:06.000000000 +0900
++++ src/glpng/src/CMakeLists.txt	2017-10-30 22:43:31.908000000 +0900
+@@ -13,7 +13,7 @@ link_libraries(
+ 
+ add_library(glpng SHARED glpng.c)
+ set_target_properties(glpng PROPERTIES VERSION ${VERSION} SOVERSION ${SONAME_VERSION})
+-install(TARGETS glpng DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS glpng RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if(BUILD_STATIC_LIBS)
+ 	add_library(glpng-static STATIC glpng.c)
+--- origsrc/glpng/src/glpng.c	2017-10-30 22:34:06.000000000 +0900
++++ src/glpng/src/glpng.c	2017-10-30 22:40:29.662000000 +0900
+@@ -36,6 +36,10 @@
+ #include <math.h>
+ #include <png.h>
+ 
++#if defined(__CYGWIN__)
++#define glColorTableEXT glColorTable
++#endif
++
+ /* Used to decide if GL/gl.h supports the paletted extension */
+ #ifdef GL_COLOR_INDEX1_EXT
+ #define SUPPORTS_PALETTE_EXT
diff --git a/glpng/glpng.hint b/glpng/glpng.hint
deleted file mode 100644
index 325459b26..000000000
--- a/glpng/glpng.hint
+++ /dev/null
@@ -1,6 +0,0 @@
-category: Libs
-requires: cygwin libglpng1
-sdesc: "OpenGL png image library (licensing & readmes)"
-ldesc: "This is a library for OpenGL to load PNG graphics files as an OpenGL
-texture as easily as possible. It also has a number of options for generating
-the alpha channel and mipmaps."
diff --git a/glpng/libglpng-devel.hint b/glpng/libglpng-devel.hint
deleted file mode 100644
index 171e46af8..000000000
--- a/glpng/libglpng-devel.hint
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Devel Libs
-requires: cygwin libglpng1
-external-source: glpng
-sdesc: "OpenGL png image library (development)"
-ldesc: "This is a library for OpenGL to load PNG graphics files as an OpenGL
-texture as easily as possible. It also has a number of options for generating
-the alpha channel and mipmaps."
diff --git a/glpng/libglpng1.hint b/glpng/libglpng1.hint
deleted file mode 100644
index 0ccd0f132..000000000
--- a/glpng/libglpng1.hint
+++ /dev/null
@@ -1,7 +0,0 @@
-category: Libs
-requires: cygwin libGL1 libpng14
-external-source: glpng
-sdesc: "OpenGL png image library (runtime)"
-ldesc: "This is a library for OpenGL to load PNG graphics files as an OpenGL
-texture as easily as possible. It also has a number of options for generating
-the alpha channel and mipmaps."