Attachment 159316 Details for Bug 201425 – Use gnu configure instead of cmake

[patch] Use gnu configure instead of cmake

png.diff (text/plain), 2.44 KB, created by Antoine Brodin on 2015-07-27 19:02:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2015-07-27 19:02:17 UTC

Size: 2.44 KB

patch

obsolete

>Index: graphics/png/Makefile
>===================================================================
>--- graphics/png/Makefile	(revision 392994)
>+++ graphics/png/Makefile	(working copy)
>@@ -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 @@
> 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 @@
> 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 \
>Index: graphics/png/files/patch-CMakeLists.txt
>===================================================================
>--- graphics/png/files/patch-CMakeLists.txt	(revision 392994)
>+++ graphics/png/files/patch-CMakeLists.txt	(working copy)
>@@ -1,12 +0,0 @@
>---- CMakeLists.txt.orig	2015-03-26 13:06:23 UTC
>-+++ CMakeLists.txt
>-@@ -50,9 +50,6 @@ option(PNGARG        "Disable ANSI-C pro
>- # 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: graphics/png/pkg-plist
>===================================================================
>--- graphics/png/pkg-plist	(revision 392994)
>+++ graphics/png/pkg-plist	(working copy)
>@@ -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/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

Actions: View | Diff

Attachments on bug 201425: 158531 | 159316