[Midnightbsd-cvs] mports [18064] trunk/graphics/png: png 1.6.16

[laffer1 at midnightbsd.org]

Revision: 18064
          http://svnweb.midnightbsd.org/mports/?rev=18064
Author:   laffer1
Date:     2015-03-07 16:15:14 -0500 (Sat, 07 Mar 2015)
Log Message:
-----------
png 1.6.16

Modified Paths:
--------------
    trunk/graphics/png/Makefile
    trunk/graphics/png/distinfo
    trunk/graphics/png/pkg-plist

Modified: trunk/graphics/png/Makefile
===================================================================
--- trunk/graphics/png/Makefile	2015-03-07 21:12:32 UTC (rev 18063)
+++ trunk/graphics/png/Makefile	2015-03-07 21:15:14 UTC (rev 18064)
@@ -1,12 +1,12 @@
 # $MidnightBSD$
 
 PORTNAME=	png
-PORTVERSION=	1.5.18
-PORTREVISION=	1
+PORTVERSION=	1.6.16
+PORTREVISION=	0
 CATEGORIES=	graphics
-MASTER_SITES=	http://sourceforge.net/projects/libpng/files/libpng15/1.5.18/libpng-1.5.18.tar.xz/download
+MASTER_SITES=	SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION}
+PATCH_SITES=	SF/apng/lib${PORTNAME}/lib${PORTNAME}16/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 FAKE_OPTS=	trueprefix
 
@@ -15,12 +15,12 @@
 
 LICENSE=	other
 
-USES=		tar:xz cmake
+USES=		cmake cpe tar:xz
+CPE_PRODUCT=	libpng
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPNG_MAN_DIR:STRING=man
-SOSUFFIX=	.${PORTVERSION:E}
 
 OPTIONS_DEFINE=APNG PNGTEST
 OPTIONS_DEFAULT=APNG PNGTEST
@@ -29,25 +29,12 @@
 
 .include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MAPNG} || make(makesum) || defined(FETCH_ALL)
-MASTER_SITES+=	SF/apng/libpng/libpng15/:apng
-DISTFILES+=	${DISTNAME}-apng.patch.gz:apng
-EXTRACT_ONLY+=	${DISTNAME}${EXTRACT_SUFX}
+.if ${PORT_OPTIONS:MAPNG} || make(makesum)
+PATCHFILES=	${DISTNAME}-apng.patch.gz
 .endif
-.if ${PORT_OPTIONS:MAPNG}
-EXTRA_PATCHES+=	${WRKSRC}/${DISTNAME}-apng.unix
-.endif
 
-post-extract:
-.if ${PORT_OPTIONS:MAPNG}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}-apng.patch.gz ${WRKSRC}/
-	${GZIP_CMD} -d ${WRKSRC}/${DISTNAME}-apng.patch.gz
-	${TR} -d '\r' < ${WRKSRC}/${DISTNAME}-apng.patch > ${WRKSRC}/${DISTNAME}-apng.unix
-.endif
-
 post-patch:
 	${REINPLACE_CMD} \
-		-e 's|RELEASE}.0|RELEASE}|' \
 		-e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt
 
@@ -62,18 +49,4 @@
         fi)
 .endif
 
-pre-install:
-	@${MKDIR} ${PREFIX}/include/libpng
-	@${MKDIR} ${PREFIX}/libdata/pkgconfig
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/pngdebug.h ${WRKSRC}/pnginfo.h \
-		${WRKSRC}/pngpriv.h ${WRKSRC}/pngstruct.h \
-		${PREFIX}/include/libpng15/
-	-${RMDIR} ${PREFIX}/include/libpng
-	${RM} ${PREFIX}/libdata/pkgconfig/libpng.pc
-	${LN} -sf libpng15.pc ${PREFIX}/libdata/pkgconfig/libpng.pc
-	${RM} ${PREFIX}/lib/libpng15.so.15
-	${MV} ${PREFIX}/lib/libpng15.so.15${SOSUFFIX} ${PREFIX}/lib/libpng15.so.15
-
 .include <bsd.port.mk>

Modified: trunk/graphics/png/distinfo
===================================================================
--- trunk/graphics/png/distinfo	2015-03-07 21:12:32 UTC (rev 18063)
+++ trunk/graphics/png/distinfo	2015-03-07 21:15:14 UTC (rev 18064)
@@ -1,4 +1,4 @@
-SHA256 (libpng-1.5.18.tar.xz) = c093c2f779fecb029e51b73d6d646b77edce882474326485f50347606e383585
-SIZE (libpng-1.5.18.tar.xz) = 730340
-SHA256 (libpng-1.5.18-apng.patch.gz) = 9b0d8edb61808e9863997055f7fbb1574877ff8aae50d477b9d97fcab65166b7
-SIZE (libpng-1.5.18-apng.patch.gz) = 9580
+SHA256 (libpng-1.6.16.tar.xz) = 42f754df633e4e700544e5913cbe2fd4928bbfccdc07708a5cf84e59827fbe60
+SIZE (libpng-1.6.16.tar.xz) = 907284
+SHA256 (libpng-1.6.16-apng.patch.gz) = 07eb4825f6787283aa2c4f77b6fd421875ec7982e2a5b1705c3bea0cdccf5c2d
+SIZE (libpng-1.6.16-apng.patch.gz) = 9552

Modified: trunk/graphics/png/pkg-plist
===================================================================
--- trunk/graphics/png/pkg-plist	2015-03-07 21:12:32 UTC (rev 18063)
+++ trunk/graphics/png/pkg-plist	2015-03-07 21:15:14 UTC (rev 18064)
@@ -1,26 +1,21 @@
 bin/libpng-config
-bin/libpng15-config
-include/libpng15/png.h
-include/libpng15/pngconf.h
-include/libpng15/pngdebug.h
-include/libpng15/pnginfo.h
-include/libpng15/pnglibconf.h
-include/libpng15/pngpriv.h
-include/libpng15/pngstruct.h
+bin/libpng16-config
+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
-libdata/pkgconfig/libpng15.pc
+lib/libpng/libpng16-%%CMAKE_BUILD_TYPE%%.cmake
+lib/libpng/libpng16.cmake
+lib/libpng16.a
+lib/libpng16.so
+lib/libpng16.so.16
+lib/libpng16.so.16.16.0
 libdata/pkgconfig/libpng.pc
-lib/libpng/libpng15-%%CMAKE_BUILD_TYPE%%.cmake
-lib/libpng/libpng15.cmake
-lib/libpng15.a
-lib/libpng15.so
-lib/libpng15.so.15
+libdata/pkgconfig/libpng16.pc
 man/man3/libpng.3.gz
 man/man3/libpngpf.3.gz
 man/man5/png.5.gz
- at dirrm lib/libpng
- at dirrm include/libpng15