From owner-svn-ports-all@FreeBSD.ORG Fri Feb 14 14:47:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBCE2C78; Fri, 14 Feb 2014 14:47:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D5E3B1FC0; Fri, 14 Feb 2014 14:47:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1EEliG2078074; Fri, 14 Feb 2014 14:47:44 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1EElimb078072; Fri, 14 Feb 2014 14:47:44 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201402141447.s1EElimb078072@svn.freebsd.org> From: Dirk Meyer Date: Fri, 14 Feb 2014 14:47:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344216 - head/graphics/png X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2014 14:47:45 -0000 Author: dinoex Date: Fri Feb 14 14:47:44 2014 New Revision: 344216 URL: http://svnweb.freebsd.org/changeset/ports/344216 QAT: https://qat.redports.org/buildarchive/r344216/ Log: - update to 1.5.18 - new option PNGTEST - support CMAKE_NINJA=yes PR: 186593 Submitted by: Adam Weinberger Modified: head/graphics/png/Makefile head/graphics/png/distinfo Modified: head/graphics/png/Makefile ============================================================================== --- head/graphics/png/Makefile Fri Feb 14 14:43:04 2014 (r344215) +++ head/graphics/png/Makefile Fri Feb 14 14:47:44 2014 (r344216) @@ -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 .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 Modified: head/graphics/png/distinfo ============================================================================== --- head/graphics/png/distinfo Fri Feb 14 14:43:04 2014 (r344215) +++ head/graphics/png/distinfo Fri Feb 14 14:47:44 2014 (r344216) @@ -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