diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-04-17 22:24:50 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-04-17 22:24:50 +0800 |
| commit | fd7337ed419b0148526612f6048db7207674d888 (patch) | |
| tree | 9ae115bffaced2f517cd08d1fbe07a1004733a23 | |
| parent | 3707f42fe3fe392f1c8e70722a4f9c3225d4ce37 (diff) | |
| download | xorg-devel-ports-fd7337ed419b0148526612f6048db7207674d888.tar.gz xorg-devel-ports-fd7337ed419b0148526612f6048db7207674d888.tar.zst xorg-devel-ports-fd7337ed419b0148526612f6048db7207674d888.zip | |
Merge r752 758 760
Add xcb to USE_XORG=, to record a dependency on libxcb. Update libX11 to
use this new USE_XORG=.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@832 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | Mk/bsd.xorg.mk | 2 | ||||
| -rw-r--r-- | x11/libX11/Makefile | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index 95effc6..8051cb5 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -194,6 +194,7 @@ XORG_MODULES= bigreqsproto \ xaw6 \ xaw7 \ xbitmaps \ + xcb \ xcmiscproto \ xcomposite \ xcursor \ @@ -276,6 +277,7 @@ xaw_LIB_PC_DEPENDS= ${xaw7_LIB_PC_DEPENDS} xaw6_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw6.pc:${PORTSDIR}/x11-toolkits/libXaw xaw7_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:${PORTSDIR}/x11-toolkits/libXaw xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps +xcb_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb xcmiscproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcmiscproto.pc:${PORTSDIR}/x11/xcmiscproto xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite xcursor_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index e301c41..6bc2c86 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -11,13 +11,10 @@ COMMENT= X11 library LICENSE= MIT -BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb - XORG_CAT= lib USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ kbproto:both inputproto xf86bigfontproto xproto:both \ - xorg-macros + xorg-macros xcb USE_PERL5_BUILD=yes CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \ |