Attachment #159316 for bug #201425

Lines 3-8 Link Here

(-)graphics/png/Makefile (-8 / +4 lines)
3		3
4	PORTNAME= png	4	PORTNAME= png
5	PORTVERSION= 1.6.17	5	PORTVERSION= 1.6.17
		6	PORTREVISION= 1
6	CATEGORIES= graphics	7	CATEGORIES= graphics
7	MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION}	8	MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}16/${PORTVERSION}
8	PATCH_SITES= SF/apng/lib${PORTNAME}/lib${PORTNAME}16/	9	PATCH_SITES= SF/apng/lib${PORTNAME}/lib${PORTNAME}16/
Lines 11-23 Link Here
11	MAINTAINER= portmgr@FreeBSD.org	12	MAINTAINER= portmgr@FreeBSD.org
12	COMMENT= Library for manipulating PNG images	13	COMMENT= Library for manipulating PNG images
13		14
14	USES= cmake cpe tar:xz	15	USES= cpe libtool tar:xz
15	CPE_PRODUCT= libpng	16	CPE_PRODUCT= libpng
16	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
		18	CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
		19	INSTALL_TARGET= install-strip
17	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
18		21
19	CMAKE_ARGS+= -DPNG_MAN_DIR:STRING=man
20
21	OPTIONS_DEFINE=APNG PNGTEST	22	OPTIONS_DEFINE=APNG PNGTEST
22	OPTIONS_DEFAULT=APNG PNGTEST	23	OPTIONS_DEFAULT=APNG PNGTEST
23	APNG_DESC=Enable Animated PNG support	24	APNG_DESC=Enable Animated PNG support
Lines 29-39 Link Here
29	PATCHFILES= ${DISTNAME}-apng.patch.gz	30	PATCHFILES= ${DISTNAME}-apng.patch.gz
30	.endif	31	.endif
31		32
32	post-patch:
33	${REINPLACE_CMD} \
34	-e 's\|LIBDIR}/pkgconfig\|LIBDIR}data/pkgconfig\|' \
35	${WRKSRC}/CMakeLists.txt
36
37	.if ${PORT_OPTIONS:MPNGTEST}	33	.if ${PORT_OPTIONS:MPNGTEST}
38	post-build:	34	post-build:
39	(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \	35	(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \




--- 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

Lines 1-5 Link Here

(-)graphics/png/pkg-plist (-2 / +2 lines)
1	bin/libpng-config	1	bin/libpng-config
2	bin/libpng16-config	2	bin/libpng16-config
		3	bin/png-fix-itxt
		4	bin/pngfix
3	include/libpng16/png.h	5	include/libpng16/png.h
4	include/libpng16/pngconf.h	6	include/libpng16/pngconf.h
5	include/libpng16/pnglibconf.h	7	include/libpng16/pnglibconf.h
Lines 8-15 Link Here
8	include/pnglibconf.h	10	include/pnglibconf.h
9	lib/libpng.a	11	lib/libpng.a
10	lib/libpng.so	12	lib/libpng.so
11	lib/libpng/libpng16-%%CMAKE_BUILD_TYPE%%.cmake
12	lib/libpng/libpng16.cmake
13	lib/libpng16.a	13	lib/libpng16.a
14	lib/libpng16.so	14	lib/libpng16.so
15	lib/libpng16.so.16	15	lib/libpng16.so.16

Return to bug 201425

Lines 1-12 Link Here

(-)graphics/png/files/patch-CMakeLists.txt (-12 lines)
1	--- CMakeLists.txt.orig 2015-03-26 13:06:23 UTC
2	+++ CMakeLists.txt
3	@@ -50,9 +50,6 @@ option(PNGARG "Disable ANSI-C pro
4	# SET LIBNAME
5	set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
6
7	-# to distinguish between debug and release lib
8	-set(CMAKE_DEBUG_POSTFIX "d")
9	-
10	# Use the prebuilt pnglibconf.h file from the scripts folder
11	# TODO: fix this by building with awk; without this no cmake build can be
12	# configured directly (to do so indirectly use your local awk to build a