ports/115870: [DEPS] graphics/cairo reduce X dependencies

[Martin Matuska]

>Number:         115870
>Category:       ports
>Synopsis:       [DEPS] graphics/cairo reduce X dependencies
>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:   Mon Aug 27 14:40:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-STABLE i386 amd64
>Organization:
>Environment:
System: FreeBSD 6.2-STABLE i386 amd64
>Description:
cario requires only USE_XORG=xrender

Tested on amd64+i386 tinderboxes.
USE_XORG needs to be before bsd.port.pre.mk
>How-To-Repeat:
>Fix:
Index: ports/graphics/cairo/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- ports/graphics/cairo/Makefile	28 Jun 2007 00:22:14 -0000	1.29
+++ ports/graphics/cairo/Makefile	27 Aug 2007 14:28:04 -0000
@@ -8,7 +8,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.4.10
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 #MASTER_SITES=	http://cairographics.org/snapshots/
@@ -34,6 +34,14 @@
 
 OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off
 
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--disable-xlib
+PLIST_SUB+=	X11="@comment "
+.else
+USE_XORG=	xrender
+PLIST_SUB+=	X11=""
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GLITZ)
@@ -45,14 +53,6 @@
 PLIST_SUB+=	GLITZ="@comment "
 .endif
 
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=--disable-xlib
-PLIST_SUB+=	X11="@comment "
-.else
-USE_XLIB=	yes
-PLIST_SUB+=	X11=""
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/test/Makefile.in
>Release-Note:
>Audit-Trail:
>Unformatted: