diff options
author | flz <flz@FreeBSD.org> | 2008-03-13 18:33:56 +0800 |
---|---|---|
committer | flz <flz@FreeBSD.org> | 2008-03-13 18:33:56 +0800 |
commit | 0168f07d84c75869f83514e0ec3b0292b66a99ea (patch) | |
tree | 4bd27adb95880e52c0aea75078e283f0ae218c9a | |
parent | b2adedb7b99ad39c6e1b3329104bfb688a6f28b1 (diff) | |
download | freebsd-ports-gnome-0168f07d84c75869f83514e0ec3b0292b66a99ea.tar.gz freebsd-ports-gnome-0168f07d84c75869f83514e0ec3b0292b66a99ea.tar.zst freebsd-ports-gnome-0168f07d84c75869f83514e0ec3b0292b66a99ea.zip |
- Mark xtrans as a BUILD_DEPENDS only (unless specified otherwise with :both)
- Bump PORTREVISION on ports having xtrans in USE_XORG.
- Add some missing dependencies in various xorg libraries.
-rw-r--r-- | Mk/bsd.xorg.mk | 2 | ||||
-rw-r--r-- | x11-fonts/libFS/Makefile | 1 | ||||
-rw-r--r-- | x11-fonts/libXfont/Makefile | 4 | ||||
-rw-r--r-- | x11-fonts/xfs/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/libXaw/Makefile | 3 | ||||
-rw-r--r-- | x11-toolkits/libXt/Makefile | 3 | ||||
-rw-r--r-- | x11/libICE/Makefile | 3 | ||||
-rw-r--r-- | x11/libSM/Makefile | 1 | ||||
-rw-r--r-- | x11/libX11/Makefile | 28 | ||||
-rw-r--r-- | x11/libXcursor/Makefile | 3 | ||||
-rw-r--r-- | x11/libXdmcp/Makefile | 3 | ||||
-rw-r--r-- | x11/libXfixes/Makefile | 3 | ||||
-rw-r--r-- | x11/libXrandr/Makefile | 3 | ||||
-rw-r--r-- | x11/libXrender/Makefile | 3 | ||||
-rw-r--r-- | x11/libXres/Makefile | 4 | ||||
-rw-r--r-- | x11/libXv/Makefile | 3 | ||||
-rw-r--r-- | x11/libXvMC/Makefile | 3 | ||||
-rw-r--r-- | x11/libdmx/Makefile | 3 | ||||
-rw-r--r-- | x11/libxkbui/Makefile | 3 | ||||
-rw-r--r-- | x11/xrx/Makefile | 1 |
20 files changed, 50 insertions, 28 deletions
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk index ff5c105fddbb..df185e73f13d 100644 --- a/Mk/bsd.xorg.mk +++ b/Mk/bsd.xorg.mk @@ -220,7 +220,7 @@ xrender_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11 xres_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres xscrnsaver_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver xt_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt -xtrans_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans +xtrans_BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans xtrap_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap xtst_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst xv_LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile index ba00c96739ee..5112b10d68f2 100644 --- a/x11-fonts/libFS/Makefile +++ b/x11-fonts/libFS/Makefile @@ -7,6 +7,7 @@ PORTNAME= libFS PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index 685b241a56f1..a3b0d68e6b29 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -7,7 +7,7 @@ PORTNAME= libXfont PORTVERSION= 1.3.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11-fonts @@ -17,6 +17,6 @@ COMMENT= X font libary LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 XORG_CAT= lib -USE_XORG= fontcacheproto xproto xtrans fontsproto:both fontenc +USE_XORG= fontcacheproto xproto:both xtrans fontsproto:both fontenc .include <bsd.port.mk> diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 208113e69023..69954987ba16 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfs PORTVERSION= 1.0.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-fonts diff --git a/x11-toolkits/libXaw/Makefile b/x11-toolkits/libXaw/Makefile index 2c36ad31e5bb..fa438018306a 100644 --- a/x11-toolkits/libXaw/Makefile +++ b/x11-toolkits/libXaw/Makefile @@ -7,6 +7,7 @@ PORTNAME= libXaw PORTVERSION= 1.0.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits @@ -14,7 +15,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X Athena Widgets library XORG_CAT= lib -USE_XORG= printproto x11 xau xext xextproto xmu xp xpm xproto xt +USE_XORG= printproto:both x11 xau xext xextproto xmu xp xpm xproto:both xt MAN3= Xaw.3 diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index 56d2467cd321..d45808b3863a 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -7,13 +7,14 @@ PORTNAME= libXt PORTVERSION= 1.0.5 +PORTREVISION= 1 CATEGORIES= x11-toolkits MAINTAINER= x11@FreeBSD.org COMMENT= X Toolkit library XORG_CAT= lib -USE_XORG= x11 sm xproto kbproto +USE_XORG= x11 sm xproto:both kbproto MAN1= makestrs.1 MAN3= XtNew.3 \ diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile index 77a0407c9a7f..b186082dccb1 100644 --- a/x11/libICE/Makefile +++ b/x11/libICE/Makefile @@ -7,6 +7,7 @@ PORTNAME= libICE PORTVERSION= 1.0.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 @@ -14,6 +15,6 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Inter Client Exchange library for X11 XORG_CAT= lib -USE_XORG= xproto xtrans +USE_XORG= xproto:both xtrans .include <bsd.port.mk> diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index 8e62f4386360..6bc29012c235 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -7,6 +7,7 @@ PORTNAME= libSM PORTVERSION= 1.0.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 715e1d2203ff..bb5baf630641 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -7,27 +7,33 @@ PORTNAME= libX11 PORTVERSION= 1.1.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X11 library +OPTIONS= XCB "use XCB for low-level protocol implementation" off + +XORG_CAT= lib +USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ + kbproto:both inputproto xf86bigfontproto xproto:both +USE_XORG+= +USE_AUTOTOOLS= libtool:15 +CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib + +.include <bsd.port.pre.mk> + .if defined(WITH_XCB) -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb -RUN_DEPENDS= ${BUILD_DEPENDS} -CONFIGURE_ARGS= --with-xcb=yes +BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb +RUN_DEPENDS+= ${BUILD_DEPENDS} +CONFIGURE_ARGS+= --with-xcb=yes PLIST_SUB+= XCB="" .else -CONFIGURE_ARGS= --with-xcb=no +CONFIGURE_ARGS+= --with-xcb=no PLIST_SUB+= XCB="@comment " .endif -XORG_CAT= lib -USE_XORG= bigreqsproto xau xdmcp xextproto xtrans xcmiscproto kbproto:both \ - inputproto:both xf86bigfontproto xproto:both -USE_AUTOTOOLS= libtool:15 -CONFIGURE_ARGS+= --enable-xdmauth --datadir=${PREFIX}/lib - .include "${.CURDIR}/manpages" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile index 817bc94dd4a5..0c031f6e7a33 100644 --- a/x11/libXcursor/Makefile +++ b/x11/libXcursor/Makefile @@ -7,13 +7,14 @@ PORTNAME= libXcursor PORTVERSION= 1.1.9 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X client-side cursor loading library XORG_CAT= lib -USE_XORG= xrender x11 xfixes renderproto fixesproto xproto:both +USE_XORG= xrender x11 xfixes fixesproto xproto:both CONFIGURE_ARGS= --with-icondir=${PREFIX}/lib/X11/icons diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile index 2c63d7709e76..d69f768f7755 100644 --- a/x11/libXdmcp/Makefile +++ b/x11/libXdmcp/Makefile @@ -7,12 +7,13 @@ PORTNAME= libXdmcp PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X Display Manager Control Protocol library XORG_CAT= lib -USE_XORG= xproto +USE_XORG= xproto:both .include <bsd.port.mk> diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile index cd0b4029a3ba..ac3d0cc4ba1b 100644 --- a/x11/libXfixes/Makefile +++ b/x11/libXfixes/Makefile @@ -7,13 +7,14 @@ PORTNAME= libXfixes PORTVERSION= 4.0.3 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X Fixes extension library XORG_CAT= lib -USE_XORG= x11 fixesproto:both xproto xextproto +USE_XORG= x11 fixesproto:both xproto:both xextproto MAN3= Xfixes.3 diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index cee1292dc523..5f3b30fcd96b 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -7,13 +7,14 @@ PORTNAME= libXrandr PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X Resize and Rotate extension library XORG_CAT= lib -USE_XORG= x11 randrproto:both xext xextproto xrender renderproto +USE_XORG= x11 randrproto:both xext xextproto xrender renderproto xproto:both MAN3= Xrandr.3 \ XRRConfig.3 \ diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index ef6d7e5f5e41..553f8ff678d6 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -7,12 +7,13 @@ PORTNAME= libXrender PORTVERSION= 0.9.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X Render extension library XORG_CAT= lib -USE_XORG= x11 renderproto:both +USE_XORG= x11 renderproto:both xproto:both .include <bsd.port.mk> diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index 739f27112db7..6174f57faa5a 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -7,14 +7,14 @@ PORTNAME= libXres PORTVERSION= 1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X Resource usage library XORG_CAT= lib -USE_XORG= x11 xext xextproto resourceproto +USE_XORG= x11 xext xextproto resourceproto xproto:both MAN3= XRes.3 \ XResQueryClients.3 \ diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index 02f6ad9af1fd..ca1050811ca3 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -7,6 +7,7 @@ PORTNAME= libXv PORTVERSION= 1.0.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 @@ -14,7 +15,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X Video Extension library XORG_CAT= lib -USE_XORG= x11 xext xextproto videoproto:both +USE_XORG= x11 xext xextproto videoproto:both xproto:both MAN3= Xv.3 \ XvFreeAdaptorInfo.3 \ diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile index 2b51d6adc515..d5c4d3a38ac0 100644 --- a/x11/libXvMC/Makefile +++ b/x11/libXvMC/Makefile @@ -7,12 +7,13 @@ PORTNAME= libXvMC PORTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X Video Extension Motion Compensation library XORG_CAT= lib -USE_XORG= x11 xext xv xextproto videoproto +USE_XORG= x11 xext xv xextproto videoproto:both xproto:both .include <bsd.port.mk> diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile index 58cb2d504903..31f854975596 100644 --- a/x11/libdmx/Makefile +++ b/x11/libdmx/Makefile @@ -7,13 +7,14 @@ PORTNAME= libdmx PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= DMX extension library XORG_CAT= lib -USE_XORG= x11 xext xextproto dmxproto +USE_XORG= x11 xext xextproto dmxproto:both MAN3= DMX.3 \ DMXAddInput.3 \ diff --git a/x11/libxkbui/Makefile b/x11/libxkbui/Makefile index eeced2ca5392..c4cb3351c379 100644 --- a/x11/libxkbui/Makefile +++ b/x11/libxkbui/Makefile @@ -7,12 +7,13 @@ PORTNAME= libxkbui PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= The xkbui library XORG_CAT= lib -USE_XORG= x11 xt xkbfile kbproto +USE_XORG= x11 xt xkbfile kbproto:both .include <bsd.port.mk> diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile index a1278ea72541..bf73af76db56 100644 --- a/x11/xrx/Makefile +++ b/x11/xrx/Makefile @@ -7,6 +7,7 @@ PORTNAME= xrx PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org |