aboutsummaryrefslogtreecommitdiff
path: root/x11/libX11/Makefile
diff options
context:
space:
mode:
authorFlorent Thoumie <flz@FreeBSD.org>2009-01-23 16:34:50 +0000
committerFlorent Thoumie <flz@FreeBSD.org>2009-01-23 16:34:50 +0000
commitc50335ffe957d27af30f9a12abbac83d8f3b924a (patch)
tree7b2257ceef4283d507c75b2be51ea4cda8606a86 /x11/libX11/Makefile
parent506c9d325a926ef9b462c811315f5b536e8d5031 (diff)
downloadports-c50335ffe957d27af30f9a12abbac83d8f3b924a.tar.gz
ports-c50335ffe957d27af30f9a12abbac83d8f3b924a.zip
Remove XCB option. It'll make upgrade much easier.
Notes
Notes: svn path=/head/; revision=226729
Diffstat (limited to 'x11/libX11/Makefile')
-rw-r--r--x11/libX11/Makefile20
1 files changed, 6 insertions, 14 deletions
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index b6121cefb694..48926d4b22e3 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -13,25 +13,17 @@ CATEGORIES= x11
MAINTAINER= x11@FreeBSD.org
COMMENT= X11 library
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
+
OPTIONS= XCB "use XCB for low-level protocol implementation" on
XORG_CAT= lib
USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \
kbproto:both inputproto xf86bigfontproto xproto:both
USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_XCB)
-BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
-RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb
-CONFIGURE_ARGS+= --with-xcb=yes
-PLIST_SUB+= XCB=""
-.else
-CONFIGURE_ARGS+= --with-xcb=no
-PLIST_SUB+= XCB="@comment "
-.endif
+CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib \
+ --with-xcb=yes
.include "${.CURDIR}/manpages"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>