Date: Wed, 29 Jul 2015 06:07:58 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393143 - in head/graphics/png: . files Message-ID: <201507290607.t6T67wU8066101@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Jul 29 06:07:57 2015 New Revision: 393143 URL: https://svnweb.freebsd.org/changeset/ports/393143 Log: Switch build system from cmake to GNU configure There are 2 benefits: - Reduced number of build dependencies (0 now) - This fixes build on arm64, as configure/Makefile are more updated than CMakeLists.txt (CMakeLists.txt doesn't know about the arm/arm_init.c and arm/filter_neon_intrinsics.c files) PR: 201425 Tested by: Andrew Turner (on arm64) Deleted: head/graphics/png/files/ Modified: head/graphics/png/Makefile head/graphics/png/pkg-plist Modified: head/graphics/png/Makefile ============================================================================== --- head/graphics/png/Makefile Wed Jul 29 04:03:56 2015 (r393142) +++ head/graphics/png/Makefile Wed Jul 29 06:07:57 2015 (r393143) @@ -3,6 +3,7 @@ PORTNAME= png PORTVERSION= 1.6.17 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION} PATCH_SITES= SF/apng/lib${PORTNAME}/lib${PORTNAME}16/ @@ -11,13 +12,13 @@ DISTNAME= lib${PORTNAME}-${PORTVERSION} MAINTAINER= portmgr@FreeBSD.org COMMENT= Library for manipulating PNG images -USES= cmake cpe tar:xz +USES= cpe libtool tar:xz CPE_PRODUCT= libpng GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig +INSTALL_TARGET= install-strip USE_LDCONFIG= yes -CMAKE_ARGS+= -DPNG_MAN_DIR:STRING=man - OPTIONS_DEFINE=APNG PNGTEST OPTIONS_DEFAULT=APNG PNGTEST APNG_DESC=Enable Animated PNG support @@ -29,11 +30,6 @@ PNGTEST_DESC=Enable Regression Test (rec PATCHFILES= ${DISTNAME}-apng.patch.gz .endif -post-patch: - ${REINPLACE_CMD} \ - -e 's|LIBDIR}/pkgconfig|LIBDIR}data/pkgconfig|' \ - ${WRKSRC}/CMakeLists.txt - .if ${PORT_OPTIONS:MPNGTEST} post-build: (cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \ Modified: head/graphics/png/pkg-plist ============================================================================== --- head/graphics/png/pkg-plist Wed Jul 29 04:03:56 2015 (r393142) +++ head/graphics/png/pkg-plist Wed Jul 29 06:07:57 2015 (r393143) @@ -1,5 +1,7 @@ bin/libpng-config bin/libpng16-config +bin/png-fix-itxt +bin/pngfix include/libpng16/png.h include/libpng16/pngconf.h include/libpng16/pnglibconf.h @@ -8,8 +10,6 @@ include/pngconf.h include/pnglibconf.h lib/libpng.a lib/libpng.so -lib/libpng/libpng16-%%CMAKE_BUILD_TYPE%%.cmake -lib/libpng/libpng16.cmake lib/libpng16.a lib/libpng16.so lib/libpng16.so.16
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507290607.t6T67wU8066101>