Index: Makefile =================================================================== --- Makefile (revision 375353) +++ Makefile (working copy) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= png -PORTVERSION= 1.5.21 +PORTVERSION= 1.6.15 CATEGORIES= graphics -MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}15/${PORTVERSION} +MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION} DISTNAME= lib${PORTNAME}-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -11,8 +11,6 @@ MAINTAINER= portmgr@FreeBSD.org COMMENT= Library for manipulating PNG images -PORTSCOUT= limit:^1\.5\. - USES= cmake cpe tar:xz CPE_PRODUCT= libpng GNU_CONFIGURE= yes @@ -19,7 +17,6 @@ USE_LDCONFIG= yes CMAKE_ARGS+= -DPNG_MAN_DIR:STRING=man -SOSUFFIX= .${PORTVERSION:E} OPTIONS_DEFINE=APNG PNGTEST OPTIONS_DEFAULT=APNG PNGTEST @@ -29,7 +26,7 @@ .include .if ${PORT_OPTIONS:MAPNG} || make(makesum) || defined(FETCH_ALL) -MASTER_SITES+= SF/apng/libpng/libpng15/:apng +MASTER_SITES+= SF/apng/lib${PORTNAME}/lib${PORTNAME}16/:apng DISTFILES+= ${DISTNAME}-apng.patch.gz:apng EXTRACT_ONLY+= ${DISTNAME}${EXTRACT_SUFX} .endif @@ -46,7 +43,6 @@ post-patch: ${REINPLACE_CMD} \ - -e 's|RELEASE}.0|RELEASE}|' \ -e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt @@ -61,18 +57,4 @@ fi) .endif -pre-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/include/libpng - ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig - -post-install: - ${INSTALL_DATA} ${WRKSRC}/pngdebug.h ${WRKSRC}/pnginfo.h \ - ${WRKSRC}/pngpriv.h ${WRKSRC}/pngstruct.h \ - ${STAGEDIR}${PREFIX}/include/libpng15/ - -${RMDIR} ${STAGEDIR}${PREFIX}/include/libpng - ${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpng.pc - ${LN} -sf libpng15.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpng.pc - ${RM} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15 - ${MV} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15${SOSUFFIX} ${STAGEDIR}${PREFIX}/lib/libpng15.so.15 - .include Index: distinfo =================================================================== --- distinfo (revision 375353) +++ distinfo (working copy) @@ -1,4 +1,4 @@ -SHA256 (libpng-1.5.21.tar.xz) = b5151c64bc70489997790a492e1094d106be90a22b2958c43eee25a70dffdba7 -SIZE (libpng-1.5.21.tar.xz) = 734356 -SHA256 (libpng-1.5.21-apng.patch.gz) = 8a4fffa885f1a1a34a7bdcaa2d1b8f1e025f6e1cf9c5bf17224672d2a6948d94 -SIZE (libpng-1.5.21-apng.patch.gz) = 9511 +SHA256 (libpng-1.6.15.tar.xz) = ad7046f1548b01b736c347d3125598ba507cbd1c9a0f0a1ffcc8df5aaafa53b7 +SIZE (libpng-1.6.15.tar.xz) = 904992 +SHA256 (libpng-1.6.15-apng.patch.gz) = 08f1c809837476705f33f1f8d30cf875275466ae00ea25cd21f084901f7aeb82 +SIZE (libpng-1.6.15-apng.patch.gz) = 9555 Index: files/patch-CMakeLists.txt =================================================================== --- files/patch-CMakeLists.txt (revision 375353) +++ files/patch-CMakeLists.txt (working copy) @@ -1,12 +0,0 @@ ---- CMakeLists.txt~ 2013-07-07 13:31:51.000000000 +0300 -+++ CMakeLists.txt 2013-07-07 13:32:01.000000000 +0300 -@@ -59,9 +59,6 @@ - # SET LIBNAME - set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR}) - --# to distinguish between debug and release lib --set(CMAKE_DEBUG_POSTFIX "d") -- - # Use the prebuilt pnglibconf.h file from the scripts folder - # TODO: fix this by building with awk; without this no cmake build can be - # configured directly (to do so indirectly use your local awk to build a Index: files/patch-libpng-config-body.in =================================================================== --- files/patch-libpng-config-body.in (revision 375353) +++ files/patch-libpng-config-body.in (working copy) @@ -1,16 +0,0 @@ ---- scripts/libpng-config-body.in.orig Wed Sep 18 08:05:43 2002 -+++ scripts/libpng-config-body.in Sun Jul 23 10:27:47 2006 -@@ -77,8 +77,12 @@ - echo ${R_opts} - ;; - -+ --ldopts) -+ echo ${ldopts} -+ ;; -+ - --ldflags) -- echo ${ldflags} ${L_opts} ${R_opts} ${libs} -+ echo ${ldopts} ${L_opts} ${R_opts} ${libs} - ;; - - --static) Index: files/patch-makefile.freebsd =================================================================== --- files/patch-makefile.freebsd (revision 375353) +++ files/patch-makefile.freebsd (working copy) @@ -1,43 +0,0 @@ ---- scripts/makefile.freebsd.orig 2012-06-14 13:28:01.000000000 +0200 -+++ scripts/makefile.freebsd 2012-06-20 21:11:47.000000000 +0200 -@@ -15,13 +15,13 @@ - NO_OBJ= YES - - # where make install puts libpng.a and png.h --DESTDIR= ${PREFIX} --LIBDIR= /lib -+#DESTDIR= ${PREFIX} -+LIBDIR= ${PREFIX}/lib - INCS= png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h pnginfo.h pngdebug.h --INCSDIR= /include/libpng -+INCSDIR= ${PREFIX}/include/libpng - INCDIR= ${INCSDIR} # for 4.x bsd.lib.mk - MAN= libpng.3 libpngpf.3 png.5 --MANDIR= /man/man -+MANDIR= ${PREFIX}/man/man - SYMLINKS= libpng/png.h ${INCSDIR}/../png.h \ - libpng/pngconf.h ${INCSDIR}/../pngconf.h \ - libpng/pnglibconf.h ${INCSDIR}/../pnglibconf.h -@@ -53,4 +53,22 @@ - writelock: - chmod a-w *.[ch35] $(DOCS) scripts/* - -+libpng-config: -+ ( cat scripts/libpng-config-head.in; \ -+ echo prefix=\"${PREFIX}\"; \ -+ echo libdir=\"${LIBDIR}\"; \ -+ echo ccopts=\"${ccopts}\"; \ -+ echo cppflags=\"${cppflags}\"; \ -+ echo I_opts=\"-I${INCSDIR}\"; \ -+ echo L_opts=\"-L${LIBDIR}\"; \ -+ echo libs=\"-lpng -lz -lm\"; \ -+ echo ldopts=\"${ldopts}\"; \ -+ cat scripts/libpng-config-body.in ) > libpng-config -+ chmod +x libpng-config -+ -+beforeinstall: libpng-config -+ ${BSD_INSTALL_SCRIPT} \ -+ libpng-config ${PREFIX}/bin -+ ln -sf libpng-config ${PREFIX}/bin/libpng15-config -+ - .include Index: pkg-plist =================================================================== --- pkg-plist (revision 375353) +++ pkg-plist (working copy) @@ -1,24 +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.15.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