diff options
| author | flz <flz@FreeBSD.org> | 2009-01-24 00:34:50 +0800 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2009-01-24 00:34:50 +0800 |
| commit | d4389a1019cfdbc74c12767f1d450e68b6bb9d69 (patch) | |
| tree | 1da54c19221a8614d3f9c76f80509db36f7265c7 /x11 | |
| parent | 651934ac838dadc958e06117151b9fa2612f740d (diff) | |
| download | freebsd-ports-gnome-d4389a1019cfdbc74c12767f1d450e68b6bb9d69.tar.gz freebsd-ports-gnome-d4389a1019cfdbc74c12767f1d450e68b6bb9d69.tar.zst freebsd-ports-gnome-d4389a1019cfdbc74c12767f1d450e68b6bb9d69.zip | |
Remove XCB option. It'll make upgrade much easier.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libX11/Makefile | 20 | ||||
| -rw-r--r-- | x11/libX11/pkg-plist | 12 |
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 |