aboutsummaryrefslogtreecommitdiff
path: root/x11/libX11
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
parent506c9d325a926ef9b462c811315f5b536e8d5031 (diff)
downloadports-c50335ffe957d27af30f9a12abbac83d8f3b924a.tar.gz
ports-c50335ffe957d27af30f9a12abbac83d8f3b924a.zip
Notes
Diffstat (limited to 'x11/libX11')
-rw-r--r--x11/libX11/Makefile20
-rw-r--r--x11/libX11/pkg-plist12
2 files changed, 12 insertions, 20 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>
diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist
index 7f6547521c5d..431c23c3486b 100644
--- a/x11/libX11/pkg-plist
+++ b/x11/libX11/pkg-plist
@@ -2,7 +2,7 @@ include/X11/ImUtil.h
include/X11/XKBlib.h
include/X11/Xcms.h
include/X11/Xlib.h
-%%XCB%%include/X11/Xlib-xcb.h
+include/X11/Xlib-xcb.h
include/X11/XlibConf.h
include/X11/Xlibint.h
include/X11/Xlocale.h
@@ -15,12 +15,12 @@ lib/libX11.a
lib/libX11.la
lib/libX11.so
lib/libX11.so.6
-%%XCB%%lib/libX11-xcb.a
-%%XCB%%lib/libX11-xcb.la
-%%XCB%%lib/libX11-xcb.so
-%%XCB%%lib/libX11-xcb.so.1
+lib/libX11-xcb.a
+lib/libX11-xcb.la
+lib/libX11-xcb.so
+lib/libX11-xcb.so.1
libdata/pkgconfig/x11.pc
-%%XCB%%libdata/pkgconfig/x11-xcb.pc
+libdata/pkgconfig/x11-xcb.pc
lib/X11/XErrorDB
lib/X11/XKeysymDB
lib/X11/locale/am_ET.UTF-8/XI18N_OBJS