diff options
| author | dinoex <dinoex@FreeBSD.org> | 2014-02-14 22:47:44 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2014-02-14 22:47:44 +0800 |
| commit | 6111538810eee08b72a16c207f6a7968092337e4 (patch) | |
| tree | 5cbf573a3d064b24dd075c43611a7a0d3ba4fa3a | |
| parent | d4ed3b75e0db2bcc29f088b417010ceb1496509c (diff) | |
| download | freebsd-ports-gnome-6111538810eee08b72a16c207f6a7968092337e4.tar.gz freebsd-ports-gnome-6111538810eee08b72a16c207f6a7968092337e4.tar.zst freebsd-ports-gnome-6111538810eee08b72a16c207f6a7968092337e4.zip | |
- update to 1.5.18
- new option PNGTEST
- support CMAKE_NINJA=yes
PR: 186593
Submitted by: Adam Weinberger
| -rw-r--r-- | graphics/png/Makefile | 17 | ||||
| -rw-r--r-- | graphics/png/distinfo | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 7efa6ee24ced..5b89c352011b 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= png -PORTVERSION= 1.5.17 +PORTVERSION= 1.5.18 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}15/${PORTVERSION} DISTNAME= lib${PORTNAME}-${PORTVERSION} @@ -21,26 +21,27 @@ USE_LDCONFIG= yes CMAKE_ARGS+= -DPNG_MAN_DIR:STRING=man SOSUFFIX= .${PORTVERSION:E} -OPTIONS_DEFINE=APNG -OPTIONS_DEFAULT=APNG +OPTIONS_DEFINE=APNG PNGTEST +OPTIONS_DEFAULT=APNG PNGTEST APNG_DESC=Enable Animated PNG support +PNGTEST_DESC=Enable Regression Test (recommended) .include <bsd.port.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} +EXTRACT_ONLY+= ${DISTNAME}${EXTRACT_SUFX} .endif .if ${PORT_OPTIONS:MAPNG} -EXTRA_PATCHES= ${WRKSRC}/${DISTNAME}-apng.patch +EXTRA_PATCHES+= ${WRKSRC}/${DISTNAME}-apng.unix .endif post-extract: .if ${PORT_OPTIONS:MAPNG} - @${LN} -sf ${WRKSRC} ${WRKSRC}/ ${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: @@ -49,14 +50,16 @@ post-patch: -e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt +.if ${PORT_OPTIONS:MPNGTEST} post-build: - @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \ + (cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \ if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ fi; \ ${FALSE}; \ fi) +.endif pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/libpng diff --git a/graphics/png/distinfo b/graphics/png/distinfo index 320b25413f71..819a66df20ba 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,4 +1,4 @@ -SHA256 (libpng-1.5.17.tar.xz) = 572631353d4ac12433765f7db55e824c2fd4b16019fa41d6738b5e92471292a7 -SIZE (libpng-1.5.17.tar.xz) = 721568 -SHA256 (libpng-1.5.17-apng.patch.gz) = 87e9bb553217d7be8c5eaadd3eeab8fb6eb185e7675bdf8b8363898b4abba9a0 -SIZE (libpng-1.5.17-apng.patch.gz) = 9510 +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 |