Date: Sun, 07 Jul 2013 03:40:27 -0700 (PDT) From: Raphael Kubo da Costa <rakuco@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: dinoex@FreeBSD.org Subject: ports/180361: [PATCH] graphics/png: Build correctly when WITH_DEBUG is set. Message-ID: <51d9459b.c815980a.2411.ffffe047@mx.google.com> Resent-Message-ID: <201307071050.r67Ao09S065566@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180361
>Category: ports
>Synopsis: [PATCH] graphics/png: Build correctly when WITH_DEBUG is set.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 07 10:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Raphael Kubo da Costa
>Release: FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD orwell 10.0-CURRENT FreeBSD 10.0-CURRENT #15 r252035: Thu Jun 20 20:00:52 EEST
>Description:
Unmark BROKEN when WITH_DEBUG is set: by patching CMakeLists.txt, it is
possible to generate binaries and libraries without the "d" suffix. Adjust
pkg-plist not to hardcode "release" in the CMake configuration files that are
installed.
Port maintainer (dinoex@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:
--- png-1.5.17.patch begins here ---
diff -ruN /usr/ports/graphics/png/Makefile ./Makefile
--- /usr/ports/graphics/png/Makefile 2013-07-07 12:55:10.000000000 +0300
+++ ./Makefile 2013-07-07 13:35:48.000000000 +0300
@@ -1,5 +1,5 @@
# Created by: ache
-# $FreeBSD: graphics/png/Makefile 322425 2013-07-07 09:55:10Z dinoex $
+# $FreeBSD: head/graphics/png/Makefile 322425 2013-07-07 09:55:10Z dinoex $
PORTNAME= png
PORTVERSION= 1.5.17
@@ -31,10 +31,6 @@
.include <bsd.port.options.mk>
-.if defined(WITH_DEBUG)
-BROKEN= Please remove WITH_DEBUG for this port
-.endif
-
.if ${PORT_OPTIONS:MAPNG} || make(makesum) || defined(FETCH_ALL)
MASTER_SITES+= SF/apng/libpng/libpng15/:apng
DISTFILES+= ${DISTNAME}-apng.patch.gz:apng
diff -ruN /usr/ports/graphics/png/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
--- /usr/ports/graphics/png/files/patch-CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200
+++ ./files/patch-CMakeLists.txt 2013-07-07 13:32:18.000000000 +0300
@@ -0,0 +1,12 @@
+--- CMakeLists.txt~ 2013-07-07 13:31:51.000000000 +0300
++++ CMakeLists.txt 2013-07-07 13:32:01.000000000 +0300
+@@ -59,9 +59,6 @@
+ # 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
diff -ruN /usr/ports/graphics/png/pkg-plist ./pkg-plist
--- /usr/ports/graphics/png/pkg-plist 2012-07-14 16:54:48.000000000 +0300
+++ ./pkg-plist 2013-07-07 13:33:38.000000000 +0300
@@ -14,7 +14,7 @@
lib/libpng.so
libdata/pkgconfig/libpng15.pc
libdata/pkgconfig/libpng.pc
-lib/libpng/libpng15-release.cmake
+lib/libpng/libpng15-%%CMAKE_BUILD_TYPE%%.cmake
lib/libpng/libpng15.cmake
lib/libpng15.a
lib/libpng15.so
--- png-1.5.17.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?51d9459b.c815980a.2411.ffffe047>