From owner-freebsd-gnome@FreeBSD.ORG  Tue Mar  8 14:53:45 2005
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: freebsd-gnome@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DE3F916A4CE
	for <gnome@FreeBSD.org>; Tue,  8 Mar 2005 14:53:45 +0000 (GMT)
Received: from atlas.informatik.rwth-aachen.de
	(atlas.informatik.RWTH-Aachen.DE [137.226.194.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CFECE43D3F
	for <gnome@FreeBSD.org>; Tue,  8 Mar 2005 14:53:44 +0000 (GMT)
	(envelope-from stolz@i2.informatik.rwth-aachen.de)
Received: from i2.informatik.rwth-aachen.de
	(menelaos.informatik.RWTH-Aachen.DE [137.226.194.73])
	with ESMTP id j28Erhos010007
	for <gnome@FreeBSD.org>; Tue, 8 Mar 2005 15:53:43 +0100
Received: (from stolz@localhost)j28ErhXK044128
	for gnome@FreeBSD.org; Tue, 8 Mar 2005 15:53:43 +0100 (CET)
	(envelope-from stolz)
Date: Tue, 8 Mar 2005 15:53:43 +0100
From: Volker Stolz <vs@FreeBSD.org>
To: gnome@FreeBSD.org
Message-ID: <20050308145343.GM71411@i2.informatik.rwth-aachen.de>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="RDS4xtyBfx+7DiaI"
Content-Disposition: inline
X-PGP-Key: finger vs@foldr.org
X-PGP-Id: 0x3FD1B6B5
User-Agent: Mutt/1.5.8i
Subject: graphics/cairo
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Mar 2005 14:53:46 -0000


--RDS4xtyBfx+7DiaI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Please give me a thumbs-up on this. I don't expect any problems,
in fact, this will unbreak cad/oregano.

Cheers,
  Volker
-- 
http://www-i2.informatik.rwth-aachen.de/stolz/ *** PGP *** S/MIME

--RDS4xtyBfx+7DiaI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="cairo.diff"

Index: graphics/cairo/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- graphics/cairo/Makefile	8 Mar 2005 09:34:18 -0000	1.9
+++ graphics/cairo/Makefile	8 Mar 2005 14:52:34 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	0.3.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/snapshots/
 
@@ -21,7 +22,7 @@
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${X11BASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS}"
 
 OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off
@@ -32,7 +33,9 @@
 LIB_DEPENDS+=	glitz-glx.1:${PORTSDIR}/graphics/glitz
 .endif
 
-.if !defined(WITHOUT_X11)
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS=	--disable-xlib
+.else
 USE_XLIB=	yes
 .endif
 

--RDS4xtyBfx+7DiaI--