Date: Thu, 10 Mar 2005 13:28:08 +0100 (CET) From: Volker Stolz <vs@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/78668: [patch] graphics/cairo: Sanitize CONFIGURE_ENV Message-ID: <200503101228.j2ACS8ip097466@i2.informatik.rwth-aachen.de> Resent-Message-ID: <200503101230.j2ACU4NG034142@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78668
>Category: ports
>Synopsis: [patch] graphics/cairo: Sanitize CONFIGURE_ENV
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 10 12:30:04 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Volker Stolz
>Release: FreeBSD 4.11-STABLE i386
>Organization:
Lehrstuhl für Informatik II; RWTH Aachen Universität
>Environment:
System: FreeBSD menelaos.informatik.rwth-aachen.de 4.11-STABLE FreeBSD 4.11-STABLE #23: Fri Jan 14 09:26:11 CET 2005 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386
>Description:
The attached patch sanitizes graphics/cairo by removing excessive patches
which I expect to reduce maintainability. This should be handled by
pointing configure to the right location.
>How-To-Repeat:
>Fix:
Files removed:
- files/patch-cairo.pc.in
- files/patch-configure
--- cairo.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 9 Mar 2005 13:43:32 -0000 1.11
+++ Makefile 10 Mar 2005 12:24:24 -0000
@@ -24,7 +24,7 @@
CONFIGURE_ARGS= --with-html-dir=${DOCSDIR}
-CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
LDFLAGS="${PTHREAD_LIBS}"
OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off
Index: files/patch-cairo.pc.in
===================================================================
RCS file: files/patch-cairo.pc.in
diff -N files/patch-cairo.pc.in
--- files/patch-cairo.pc.in 9 Mar 2005 04:13:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- cairo.pc.in.orig Thu Mar 3 03:57:38 2005
-+++ cairo.pc.in Thu Mar 3 03:57:50 2005
-@@ -7,6 +7,6 @@
- Description: Multi-platform 2D graphics library
- Version: @VERSION@
-
--Requires: @FREETYPE_REQUIRES@ libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
-+Requires: @FREETYPE_REQUIRES@ libpixman @PNG_REQUIRES@ @GLITZ_REQUIRES@
- Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo
- Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo
Index: files/patch-configure
===================================================================
RCS file: files/patch-configure
diff -N files/patch-configure
--- files/patch-configure 9 Mar 2005 04:13:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
---- configure.orig Thu Mar 3 03:43:20 2005
-+++ configure Thu Mar 3 03:44:40 2005
-@@ -20306,10 +20306,10 @@
- echo "${ECHO_T}$XRENDER_LIBS" >&6
- else
- XRENDER_CFLAGS=""
-- XRENDER_LIBS=""
-+ XRENDER_LIBS="-lXrender"
-+ succeeded=yes
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
-- XRENDER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrender >= 0.6"`
-
- fi
-
--- cairo.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200503101228.j2ACS8ip097466>