diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2019-11-03 21:56:37 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2019-11-03 21:56:37 +0000 |
| commit | c32f72e68d63a930e5ea4ad5cc6e2ea4d3bb5360 (patch) | |
| tree | 21deb0ada9c792042c1b4d28f91cef612f466309 | |
| parent | net-mgmt/zabbix44-*: Update to 4.4.1 (diff) | |
Switch all ports to use USES=xorg-cat
Change all ports to use USES=xorg-cat instead of the old XORG_CAT
Add USES=xorg and USES=gl as needed to x11@ ports
Notes
Notes:
svn path=/head/; revision=516607
237 files changed, 241 insertions, 302 deletions
diff --git a/devel/gccmakedep/Makefile b/devel/gccmakedep/Makefile index 9e1a60036ac6..c5c02c909400 100644 --- a/devel/gccmakedep/Makefile +++ b/devel/gccmakedep/Makefile @@ -8,7 +8,7 @@ CATEGORIES= devel MAINTAINER= x11@FreeBSD.org COMMENT= Create dependencies in makefiles using 'gcc -M' -XORG_CAT= util +USES= xorg-cat:util BUILD_DEPENDS= tradcpp:devel/tradcpp diff --git a/devel/imake/Makefile b/devel/imake/Makefile index 0d619675dda4..2cef81d88620 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -17,14 +17,12 @@ RUN_DEPENDS= gccmakedep:devel/gccmakedep \ makedepend:devel/makedepend \ ${LOCALBASE}/lib/X11/config/xorg.cf:x11/xorg-cf-files -USES= shebangfix perl5 pkgconfig +USES= shebangfix perl5 pkgconfig xorg xorg-cat:util +USE_XORG= xorgproto USE_PERL5= run SHEBANG_FILES= mkhtmlindex.pl -XORG_CAT= util -USE_XORG= xorgproto - CONFIGURE_ENV= ac_cv_path_RAWCPP=tradcpp .include <bsd.port.mk> diff --git a/devel/libgudev/Makefile b/devel/libgudev/Makefile index b77f56322d77..62fc7554f284 100644 --- a/devel/libgudev/Makefile +++ b/devel/libgudev/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libudev.so:devel/libudev-devd -USES= gettext-runtime gmake libtool pathfix pkgconfig tar:xz +USES= gettext-runtime gmake gnome libtool pathfix pkgconfig tar:xz USE_GNOME= glib20 introspection:build GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libpciaccess/Makefile b/devel/libpciaccess/Makefile index 2f8e358020f4..da00e3e01524 100644 --- a/devel/libpciaccess/Makefile +++ b/devel/libpciaccess/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pciids CONFIGURE_ARGS= --with-pciids-path=${LOCALBASE}/share/pciids -XORG_CAT= lib +USES= xorg-cat:lib INSTALL_TARGET= install-strip .include <bsd.port.mk> diff --git a/devel/lndir/Makefile b/devel/lndir/Makefile index 30f1bef1cbf6..df355fff9070 100644 --- a/devel/lndir/Makefile +++ b/devel/lndir/Makefile @@ -9,7 +9,7 @@ CATEGORIES= devel MAINTAINER= unixmania@gmail.com COMMENT= Create a shadow directory of symbolic links to another directory tree -XORG_CAT= util +USES= xorg xorg-cat:util USE_XORG= xorgproto PLIST_FILES= bin/lndir \ diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile index bafb60377f99..555ecdc3b634 100644 --- a/devel/makedepend/Makefile +++ b/devel/makedepend/Makefile @@ -11,7 +11,7 @@ COMMENT= Dependency generator for makefiles LICENSE= MIT -XORG_CAT= util +USES= xorg xorg-cat:util USE_XORG= xorgproto PLIST_FILES= bin/makedepend man/man1/makedepend.1.gz diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile index 359bbcf28f5a..0d74be0b5012 100644 --- a/devel/xorg-macros/Makefile +++ b/devel/xorg-macros/Makefile @@ -12,7 +12,7 @@ COMMENT= X.Org development aclocal macros LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= util +USES= xorg-cat:util NO_ARCH= yes diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index dab2fde5caac..d5ef2bb8d37d 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -13,7 +13,7 @@ COMMENT= open source implementation of the GLUT library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cmake:insource pathfix +USES= cmake:insource gl pathfix xorg USE_LDCONFIG= yes USE_XORG= ice x11 xi xrandr USE_GL= gl glu diff --git a/graphics/glew/Makefile b/graphics/glew/Makefile index bca418df7474..d2049dc52f5b 100644 --- a/graphics/glew/Makefile +++ b/graphics/glew/Makefile @@ -12,7 +12,7 @@ COMMENT= OpenGL Extension Wrangler Library LICENSE= MIT BSD3CLAUSE LICENSE_COMB= dual -USES= gmake tar:tgz +USES= gmake gl tar:tgz xorg USE_XORG= x11 xext xi xmu USE_GL= gl glu USE_LDCONFIG= yes diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 466c3f485b6a..072beeefc039 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -32,6 +32,7 @@ OPTIONS_DEFINE= JPEG PNG TIFF GIF ID3 X11 OPTIONS_DEFAULT= JPEG PNG TIFF GIF ID3 X11 OPTIONS_SUB= yes +X11_USES= xorg X11_USE= XORG=x11,sm,xcb,xext X11_CONFIGURE_ON= --with-x --with-x-shm-fd X11_CONFIGURE_OFF= --without-x --without-x-shm-fd diff --git a/graphics/libepoxy/Makefile b/graphics/libepoxy/Makefile index 8c4db6adea2c..2d6540819b2e 100644 --- a/graphics/libepoxy/Makefile +++ b/graphics/libepoxy/Makefile @@ -11,7 +11,7 @@ COMMENT= Library to handle OpenGL function pointer management LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= localbase meson pkgconfig python:3.3+,build tar:xz +USES= gl localbase meson pkgconfig python:3.3+,build tar:xz xorg USE_XORG= x11 USE_GL= gl glesv2 egl USE_LDCONFIG= yes diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index dd32ed45de94..3df8d143038f 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -14,8 +14,8 @@ LICENSE= MIT LIB_DEPENDS= libdrm.so:graphics/libdrm +USES= gmake gl localbase pkgconfig tar:bzip2 xorg GNU_CONFIGURE= yes -USES= gmake localbase pkgconfig tar:bzip2 USE_GL= egl gbm gl glesv2 glew glu glut USE_XORG= xorgproto x11 xdamage xext xfixes xi xxf86vm diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index d701227bbca9..36d55e811344 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -31,6 +31,9 @@ COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs LIB_DEPENDS+= libexpat.so:textproc/expat2 +.if ${COMPONENT} != clover +USES+= xorg +.endif .if ${COMPONENT} != osmesa LIB_DEPENDS+= libdrm.so:graphics/libdrm .endif diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile index 7b5a19453a7c..2881335f5eff 100644 --- a/graphics/piglit/Makefile +++ b/graphics/piglit/Makefile @@ -31,7 +31,7 @@ GH_ACCOUNT= dumbbell GH_PROJECT= piglit GH_TAGNAME= a0db4427446ab50882a721ae3084fa26cc9e751a -USES= cmake compiler:c11 gl pkgconfig python:2.7 shebangfix +USES= cmake compiler:c11 gl pkgconfig python:2.7 shebangfix xorg USE_GL= egl gbm gl glu USE_XORG= x11 xcb xext xrender SHEBANG_FILES= piglit diff --git a/graphics/waffle/Makefile b/graphics/waffle/Makefile index 7d09eec7f35c..fac6b90fb9b7 100644 --- a/graphics/waffle/Makefile +++ b/graphics/waffle/Makefile @@ -12,7 +12,7 @@ COMMENT= Library that allows to defer selection of an OpenGL API until runtime LICENSE= BSD2CLAUSE -USES= cmake compiler:c11 localbase pathfix pkgconfig tar:xz +USES= cmake compiler:c11 gl localbase pathfix pkgconfig tar:xz xorg USE_GL= egl gl USE_LDCONFIG= yes USE_XORG= x11 xcb diff --git a/lang/beignet/Makefile b/lang/beignet/Makefile index ca8e8a99aba2..9f8e0532dbb6 100644 --- a/lang/beignet/Makefile +++ b/lang/beignet/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= opencl>=0:devel/opencl \ WRKSRC= ${WRKDIR}/Beignet-${DISTVERSION}-Source -USES= cmake ncurses pkgconfig shebangfix +USES= cmake gl ncurses pkgconfig shebangfix xorg USE_XORG= sm ice x11 xext xfixes USE_GL= gl egl USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 525911699ad0..1481b5889056 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -20,8 +20,8 @@ RUN_DEPENDS= dbus-launch:devel/dbus USERS= polkitd GROUPS= polkitd -USES= compiler:c++11-lib gettext gmake libtool localbase pathfix \ - pkgconfig shebangfix +USES= compiler:c++11-lib gettext gmake gnome libtool localbase \ + pathfix pkgconfig shebangfix USE_GNOME= glib20 intlhack introspection:build SHEBANG_FILES= ${WRKSRC}/src/polkitbackend/toarray.pl GNU_CONFIGURE= yes diff --git a/textproc/xorg-sgml-doctools/Makefile b/textproc/xorg-sgml-doctools/Makefile index 428fc9ba949a..861c81c56896 100644 --- a/textproc/xorg-sgml-doctools/Makefile +++ b/textproc/xorg-sgml-doctools/Makefile @@ -8,8 +8,6 @@ CATEGORIES= textproc x11 MAINTAINER= x11@FreeBSD.org COMMENT= Stylesheets and entities for X.Org documentation -XORG_CAT= doc - -USES= pathfix gmake +USES= gmake pathfix xorg-cat:doc .include <bsd.port.mk> diff --git a/x11-clocks/oclock/Makefile b/x11-clocks/oclock/Makefile index 32def301872a..b3b4d9d01c10 100644 --- a/x11-clocks/oclock/Makefile +++ b/x11-clocks/oclock/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11-clocks MAINTAINER= x11@FreeBSD.org COMMENT= Round clock application for X -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xmu xext xt xkbfile .include <bsd.port.mk> diff --git a/x11-clocks/xclock/Makefile b/x11-clocks/xclock/Makefile index 9cc96d2a7788..d2cb8d98d2ea 100644 --- a/x11-clocks/xclock/Makefile +++ b/x11-clocks/xclock/Makefile @@ -10,8 +10,7 @@ COMMENT= Analog and digital clock for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= iconv -XORG_CAT= app +USES= iconv xorg xorg-cat:app USE_XORG= x11 xaw xft xkbfile xmu xrender xt .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-egalax/Makefile b/x11-drivers/xf86-input-egalax/Makefile index f4b0627d4a53..45bde004168c 100644 --- a/x11-drivers/xf86-input-egalax/Makefile +++ b/x11-drivers/xf86-input-egalax/Makefile @@ -15,7 +15,6 @@ GH_TAGNAME= 7f1e4ac LICENSE= BSD2CLAUSE -USES= autoreconf -XORG_CAT= driver +USES= autoreconf xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-elographics/Makefile b/x11-drivers/xf86-input-elographics/Makefile index eee2fcd2c82c..1f0ef070842a 100644 --- a/x11-drivers/xf86-input-elographics/Makefile +++ b/x11-drivers/xf86-input-elographics/Makefile @@ -10,6 +10,6 @@ COMMENT= X.Org elographics input driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-evdev/Makefile b/x11-drivers/xf86-input-evdev/Makefile index a5f1a651f6c0..b6ffeeff4799 100644 --- a/x11-drivers/xf86-input-evdev/Makefile +++ b/x11-drivers/xf86-input-evdev/Makefile @@ -16,8 +16,7 @@ LIB_DEPENDS= libevdev.so:devel/libevdev \ libmtdev.so:devel/libmtdev RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd -XORG_CAT= driver -USES= pathfix +USES= pathfix xorg-cat:driver CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" " .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-joystick/Makefile b/x11-drivers/xf86-input-joystick/Makefile index 60b8f474aef3..3a09bf61b06a 100644 --- a/x11-drivers/xf86-input-joystick/Makefile +++ b/x11-drivers/xf86-input-joystick/Makefile @@ -11,8 +11,6 @@ COMMENT= X.Org joystick input driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver - -USES= pathfix +USES= pathfix xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 5bd266346a65..cb6280fea1dc 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -11,6 +11,6 @@ COMMENT= X.Org keyboard input driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-libinput/Makefile b/x11-drivers/xf86-input-libinput/Makefile index 1a018ef81323..833b13d65864 100644 --- a/x11-drivers/xf86-input-libinput/Makefile +++ b/x11-drivers/xf86-input-libinput/Makefile @@ -13,7 +13,6 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libinput.so:x11/libinput -XORG_CAT= driver -USES= pathfix +USES= pathfix xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index 4cbe57ed9732..9a2b64a43ac7 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -11,7 +11,6 @@ COMMENT= X.Org mouse input driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver -USES= pathfix +USES= pathfix xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile index 2651a344f7a3..7386fa0c1ed8 100644 --- a/x11-drivers/xf86-input-synaptics/Makefile +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -11,9 +11,8 @@ COMMENT= X.Org synaptics input driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= pathfix +USES= pathfix xorg xorg-cat:driver USE_XORG= x11 xtst -XORG_CAT= driver OPTIONS_DEFINE= EVDEV EVDEV_DESC= Use evdev for input events (requires kernel support) diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index 305adaaac2bd..45cc030ae885 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -11,8 +11,7 @@ COMMENT= X.Org vmmouse input driver LIB_DEPENDS= libhal.so:sysutils/hal -USES= gmake -XORG_CAT= driver +USES= gmake xorg-cat:driver CONFIGURE_ARGS= --with-hal-callouts-dir=${PREFIX}/libexec/hal/scripts ONLY_FOR_ARCHS= i386 amd64 diff --git a/x11-drivers/xf86-input-void/Makefile b/x11-drivers/xf86-input-void/Makefile index edf4b444acce..c58efe5ab472 100644 --- a/x11-drivers/xf86-input-void/Makefile +++ b/x11-drivers/xf86-input-void/Makefile @@ -8,6 +8,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org void input driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile index c41a2a7159fd..4819143289f3 100644 --- a/x11-drivers/xf86-input-wacom/Makefile +++ b/x11-drivers/xf86-input-wacom/Makefile @@ -13,9 +13,8 @@ LICENSE= GPLv2+ BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd -USES= gmake pathfix +USES= gmake pathfix xorg xorg-cat:driver USE_XORG= x11 xext xinerama xrandr -XORG_CAT= driver LDFLAGS+= -Wl,--as-needed # Xext USE_RC_SUBR= wacom SUB_FILES= pkg-message diff --git a/x11-drivers/xf86-video-amdgpu/Makefile b/x11-drivers/xf86-video-amdgpu/Makefile index a355869f235d..cfebd2c4dde7 100644 --- a/x11-drivers/xf86-video-amdgpu/Makefile +++ b/x11-drivers/xf86-video-amdgpu/Makefile @@ -14,8 +14,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdrm_amdgpu.so:graphics/libdrm +USES= gl xorg-cat:driver USE_GL= gbm -XORG_CAT= driver # No amdgpu kernel driver on non-x86 and PC98. ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= KMS is required and currently only available on x86 diff --git a/x11-drivers/xf86-video-apm/Makefile b/x11-drivers/xf86-video-apm/Makefile index 4d2b16fd80f9..7e4520a73b6b 100644 --- a/x11-drivers/xf86-video-apm/Makefile +++ b/x11-drivers/xf86-video-apm/Makefile @@ -7,6 +7,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org apm display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-ark/Makefile b/x11-drivers/xf86-video-ark/Makefile index e7ac35a182a8..ab0278a5c6d9 100644 --- a/x11-drivers/xf86-video-ark/Makefile +++ b/x11-drivers/xf86-video-ark/Makefile @@ -8,6 +8,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org ark display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-ast/Makefile b/x11-drivers/xf86-video-ast/Makefile index 2dc7ff18c61e..5369c626d7e7 100644 --- a/x11-drivers/xf86-video-ast/Makefile +++ b/x11-drivers/xf86-video-ast/Makefile @@ -11,7 +11,7 @@ COMMENT= X.Org ASPEED display driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver INSTALL_TARGET= install-strip PLIST_FILES= lib/xorg/modules/drivers/ast_drv.so diff --git a/x11-drivers/xf86-video-ati-legacy/Makefile b/x11-drivers/xf86-video-ati-legacy/Makefile index 2c78997c6356..a7f909145501 100644 --- a/x11-drivers/xf86-video-ati-legacy/Makefile +++ b/x11-drivers/xf86-video-ati-legacy/Makefile @@ -24,8 +24,8 @@ CONFLICTS_INSTALL= xf86-video-ati PORTSCOUT= limit:^7\.9\.0 +USES= gl xorg xorg-cat:driver USE_GL= gl -XORG_CAT= driver USE_XORG= pciaccess CONFIGURE_ARGS+=--disable-udev diff --git a/x11-drivers/xf86-video-ati/Makefile b/x11-drivers/xf86-video-ati/Makefile index a24bceb62aeb..0cd389edfb38 100644 --- a/x11-drivers/xf86-video-ati/Makefile +++ b/x11-drivers/xf86-video-ati/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \ CONFLICTS_INSTALL= xf86-video-ati-legacy +USES= gl xorg xorg-cat:driver USE_GL= gl -XORG_CAT= driver USE_XORG= pciaccess CONFIGURE_ARGS+=--disable-udev diff --git a/x11-drivers/xf86-video-chips/Makefile b/x11-drivers/xf86-video-chips/Makefile index dd79c9ee0e3f..99a6eb7cc725 100644 --- a/x11-drivers/xf86-video-chips/Makefile +++ b/x11-drivers/xf86-video-chips/Makefile @@ -7,6 +7,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org chips display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-cirrus/Makefile b/x11-drivers/xf86-video-cirrus/Makefile index b264510c7a69..0047c28aebf6 100644 --- a/x11-drivers/xf86-video-cirrus/Makefile +++ b/x11-drivers/xf86-video-cirrus/Makefile @@ -8,6 +8,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org cirrus display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-dummy/Makefile b/x11-drivers/xf86-video-dummy/Makefile index e40986e7af31..688a4c912b6f 100644 --- a/x11-drivers/xf86-video-dummy/Makefile +++ b/x11-drivers/xf86-video-dummy/Makefile @@ -11,6 +11,6 @@ COMMENT= X.Org dummy display driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-geode/Makefile b/x11-drivers/xf86-video-geode/Makefile index 820a3aef35f5..efa9b31117cc 100644 --- a/x11-drivers/xf86-video-geode/Makefile +++ b/x11-drivers/xf86-video-geode/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org geode display driver -XORG_CAT= driver +USES= xorg-cat:driver ONLY_FOR_ARCHS= i386 ONLY_FOR_ARCHS_REASON= Geode processors are 32bit x86 only diff --git a/x11-drivers/xf86-video-glint/Makefile b/x11-drivers/xf86-video-glint/Makefile index 252da9497271..f7a5e065abcf 100644 --- a/x11-drivers/xf86-video-glint/Makefile +++ b/x11-drivers/xf86-video-glint/Makefile @@ -8,8 +8,7 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org glint display driver +USES= gl xorg-cat:driver USE_GL= gl -XORG_CAT= driver - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-i128/Makefile b/x11-drivers/xf86-video-i128/Makefile index becefd048acb..0991ca909e9f 100644 --- a/x11-drivers/xf86-video-i128/Makefile +++ b/x11-drivers/xf86-video-i128/Makefile @@ -7,6 +7,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org i128 display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-i740/Makefile b/x11-drivers/xf86-video-i740/Makefile index 45cea3f5eca1..c79050ce4373 100644 --- a/x11-drivers/xf86-video-i740/Makefile +++ b/x11-drivers/xf86-video-i740/Makefile @@ -7,6 +7,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org i740 display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile index a2cfac4e9aaa..ea9031f6f538 100644 --- a/x11-drivers/xf86-video-intel/Makefile +++ b/x11-drivers/xf86-video-intel/Makefile @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS_REASON= Intel integrated GPU only exists in Intel x86 processors/ LIB_DEPENDS= libxcb-util.so:x11/xcb-util \ libdrm.so:graphics/libdrm -USES= cpe xorg xorg-cat:driver +USES= cpe gl xorg xorg-cat:driver USE_GITLAB= yes GL_COMMIT= e5ff8e1828f97891c819c919d7115c6e18b2eb1f USE_GL= gl diff --git a/x11-drivers/xf86-video-mach64/Makefile b/x11-drivers/xf86-video-mach64/Makefile index f41a8abfce92..6ee3f20fb0cf 100644 --- a/x11-drivers/xf86-video-mach64/Makefile +++ b/x11-drivers/xf86-video-mach64/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mach64 display driver +USES= gl xorg-cat:driver USE_GL= gl -XORG_CAT= driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-mga/Makefile b/x11-drivers/xf86-video-mga/Makefile index e389db14d4dd..599ac5112893 100644 --- a/x11-drivers/xf86-video-mga/Makefile +++ b/x11-drivers/xf86-video-mga/Makefile @@ -8,8 +8,7 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mga display driver -USES= gl +USES= gl xorg-cat:driver USE_GL= gl -XORG_CAT= driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-neomagic/Makefile b/x11-drivers/xf86-video-neomagic/Makefile index 60f1b505eed5..73eb011ea9a8 100644 --- a/x11-drivers/xf86-video-neomagic/Makefile +++ b/x11-drivers/xf86-video-neomagic/Makefile @@ -7,6 +7,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org neomagic display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile index 34341ef6bcd9..1b335edf8a5a 100644 --- a/x11-drivers/xf86-video-nv/Makefile +++ b/x11-drivers/xf86-video-nv/Makefile @@ -8,6 +8,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org nv display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-openchrome/Makefile b/x11-drivers/xf86-video-openchrome/Makefile index 322975b582af..20dc37da3022 100644 --- a/x11-drivers/xf86-video-openchrome/Makefile +++ b/x11-drivers/xf86-video-openchrome/Makefile @@ -13,9 +13,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdrm.so:graphics/libdrm +USES= gl xorg xorg-cat:driver USE_GL= gl -XORG_CAT= driver USE_XORG= x11 xext xv # Override pkg-config to prevent linking against libudev diff --git a/x11-drivers/xf86-video-qxl/Makefile b/x11-drivers/xf86-video-qxl/Makefile index 42481b5e3d12..971f1dc4a179 100644 --- a/x11-drivers/xf86-video-qxl/Makefile +++ b/x11-drivers/xf86-video-qxl/Makefile @@ -14,10 +14,9 @@ BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-protocol \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libspice-server.so:devel/libspice-server -USES= localbase:ldflags pkgconfig python:2.7 shebangfix - +USES= localbase:ldflags pkgconfig python:2.7 shebangfix xorg \ + xorg-cat:driver USE_XORG= xfont -XORG_CAT= driver CONFIGURE_ARGS+=--enable-xspice diff --git a/x11-drivers/xf86-video-r128/Makefile b/x11-drivers/xf86-video-r128/Makefile index 369ec8353679..0bf6ebed0ebc 100644 --- a/x11-drivers/xf86-video-r128/Makefile +++ b/x11-drivers/xf86-video-r128/Makefile @@ -10,8 +10,7 @@ COMMENT= X.Org r128 display driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gl +USES= gl xorg-cat:driver USE_GL= gl -XORG_CAT= driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-rendition/Makefile b/x11-drivers/xf86-video-rendition/Makefile index 638042f99b74..5357b33949f7 100644 --- a/x11-drivers/xf86-video-rendition/Makefile +++ b/x11-drivers/xf86-video-rendition/Makefile @@ -8,6 +8,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org rendition display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-s3/Makefile b/x11-drivers/xf86-video-s3/Makefile index 04ac219d47c9..b1f414e4dfab 100644 --- a/x11-drivers/xf86-video-s3/Makefile +++ b/x11-drivers/xf86-video-s3/Makefile @@ -10,6 +10,6 @@ COMMENT= X.Org s3 display driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-s3virge/Makefile b/x11-drivers/xf86-video-s3virge/Makefile index c857bf3cc110..05301a15b92c 100644 --- a/x11-drivers/xf86-video-s3virge/Makefile +++ b/x11-drivers/xf86-video-s3virge/Makefile @@ -7,6 +7,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org s3virge display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-savage/Makefile b/x11-drivers/xf86-video-savage/Makefile index b632b929f125..a8092815fbef 100644 --- a/x11-drivers/xf86-video-savage/Makefile +++ b/x11-drivers/xf86-video-savage/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org savage display driver +USES= gl xorg-cat:driver USE_GL= gl -XORG_CAT= driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-scfb/Makefile b/x11-drivers/xf86-video-scfb/Makefile index b8ef5074ae93..f9da99dd3f87 100644 --- a/x11-drivers/xf86-video-scfb/Makefile +++ b/x11-drivers/xf86-video-scfb/Makefile @@ -12,6 +12,6 @@ COMMENT= X.Org syscons display driver USE_GITHUB= yes GH_ACCOUNT= rayddteam -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-siliconmotion/Makefile b/x11-drivers/xf86-video-siliconmotion/Makefile index f0533130be54..d68366eee551 100644 --- a/x11-drivers/xf86-video-siliconmotion/Makefile +++ b/x11-drivers/xf86-video-siliconmotion/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org siliconmotion display driver -XORG_CAT= driver +USES= xorg-cat:driver BROKEN_aarch64= error: implicit declaration of function outb is invalid in C99 BROKEN_armv6= error: implicit declaration of function outb is invalid in C99 diff --git a/x11-drivers/xf86-video-sis/Makefile b/x11-drivers/xf86-video-sis/Makefile index 48aee38fb326..a88b7c681696 100644 --- a/x11-drivers/xf86-video-sis/Makefile +++ b/x11-drivers/xf86-video-sis/Makefile @@ -11,6 +11,6 @@ LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-sunffb/Makefile b/x11-drivers/xf86-video-sunffb/Makefile index 296a803dd110..9dbdb05996a1 100644 --- a/x11-drivers/xf86-video-sunffb/Makefile +++ b/x11-drivers/xf86-video-sunffb/Makefile @@ -8,8 +8,8 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org sunffb display driver +USES= gl xorg-cat:drivers USE_GL= gl -XORG_CAT= driver ONLY_FOR_ARCHS= sparc64 diff --git a/x11-drivers/xf86-video-tdfx/Makefile b/x11-drivers/xf86-video-tdfx/Makefile index e828c7bc27cc..1c0868a7a5e6 100644 --- a/x11-drivers/xf86-video-tdfx/Makefile +++ b/x11-drivers/xf86-video-tdfx/Makefile @@ -10,9 +10,7 @@ COMMENT= X.Org tdfx display driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gl +USES= gl xorg-cat:driver USE_GL= gl -XORG_CAT= driver - .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-trident/Makefile b/x11-drivers/xf86-video-trident/Makefile index 481bca01d46a..c1dc614929e9 100644 --- a/x11-drivers/xf86-video-trident/Makefile +++ b/x11-drivers/xf86-video-trident/Makefile @@ -8,6 +8,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org trident display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-tseng/Makefile b/x11-drivers/xf86-video-tseng/Makefile index cc512d83e0dd..c0782a777abd 100644 --- a/x11-drivers/xf86-video-tseng/Makefile +++ b/x11-drivers/xf86-video-tseng/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org tseng display driver -XORG_CAT= driver +USES= xorg-cat:driver BROKEN_aarch64= error: implicit declaration of function outb is invalid in C99 BROKEN_armv6= error: implicit declaration of function outb is invalid in C99 diff --git a/x11-drivers/xf86-video-vesa/Makefile b/x11-drivers/xf86-video-vesa/Makefile index eb19d205aff0..64f9a6056540 100644 --- a/x11-drivers/xf86-video-vesa/Makefile +++ b/x11-drivers/xf86-video-vesa/Makefile @@ -8,6 +8,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vesa display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-vmware/Makefile b/x11-drivers/xf86-video-vmware/Makefile index 56f1ebf11b7d..7768647ff1c7 100644 --- a/x11-drivers/xf86-video-vmware/Makefile +++ b/x11-drivers/xf86-video-vmware/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= The vmware gfx protocol is only supported on x86-compatible architectures. -XORG_CAT= driver +USES= xorg-cat:driver LIB_DEPENDS+= libdrm.so:graphics/libdrm \ libxatracker.so:graphics/libxatracker diff --git a/x11-drivers/xf86-video-voodoo/Makefile b/x11-drivers/xf86-video-voodoo/Makefile index 827addb9c73a..665535b56c5d 100644 --- a/x11-drivers/xf86-video-voodoo/Makefile +++ b/x11-drivers/xf86-video-voodoo/Makefile @@ -8,6 +8,6 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org voodoo display driver -XORG_CAT= driver +USES= xorg-cat:driver .include <bsd.port.mk> diff --git a/x11-fonts/bdftopcf/Makefile b/x11-fonts/bdftopcf/Makefile index 46653e26a79f..cd2275798417 100644 --- a/x11-fonts/bdftopcf/Makefile +++ b/x11-fonts/bdftopcf/Makefile @@ -12,9 +12,8 @@ COMMENT= Convert X font from BDF to PCF LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= localbase +USES= localbase xorg xorg-cat:app -XORG_CAT= app USE_XORG= xorgproto PLIST_FILES= bin/bdftopcf man/man1/bdftopcf.1.gz diff --git a/x11-fonts/encodings/Makefile b/x11-fonts/encodings/Makefile index a0833c46319c..e651a5c0d3f7 100644 --- a/x11-fonts/encodings/Makefile +++ b/x11-fonts/encodings/Makefile @@ -13,7 +13,7 @@ LICENSE= PD BUILD_DEPENDS= mkfontscale:x11-fonts/mkfontscale -USES= tar:bzip2 +USES= tar:bzip2 xorg USE_XORG= fontutil GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-fontrootdir=${PREFIX}/share/fonts diff --git a/x11-fonts/font-adobe-100dpi/Makefile b/x11-fonts/font-adobe-100dpi/Makefile index c4a2140dfaa2..c4ceb7bbfe92 100644 --- a/x11-fonts/font-adobe-100dpi/Makefile +++ b/x11-fonts/font-adobe-100dpi/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Adobe 100dpi font -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-75dpi/Makefile b/x11-fonts/font-adobe-75dpi/Makefile index 014964053dce..ae0c37beacdf 100644 --- a/x11-fonts/font-adobe-75dpi/Makefile +++ b/x11-fonts/font-adobe-75dpi/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Adobe 75dpi font -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-utopia-100dpi/Makefile b/x11-fonts/font-adobe-utopia-100dpi/Makefile index c4bc7847fda5..e2612e1ea16a 100644 --- a/x11-fonts/font-adobe-utopia-100dpi/Makefile +++ b/x11-fonts/font-adobe-utopia-100dpi/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Adobe Utopia 100dpi font -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-utopia-75dpi/Makefile b/x11-fonts/font-adobe-utopia-75dpi/Makefile index d8500c3da153..ba5829c584d5 100644 --- a/x11-fonts/font-adobe-utopia-75dpi/Makefile +++ b/x11-fonts/font-adobe-utopia-75dpi/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Adobe Utopia 75dpi font -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-adobe-utopia-type1/Makefile b/x11-fonts/font-adobe-utopia-type1/Makefile index ce1b7855be11..12bc6421757a 100644 --- a/x11-fonts/font-adobe-utopia-type1/Makefile +++ b/x11-fonts/font-adobe-utopia-type1/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Adobe Utopia Type1 font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-alias/Makefile b/x11-fonts/font-alias/Makefile index 5bd7488cb5df..294e73026444 100644 --- a/x11-fonts/font-alias/Makefile +++ b/x11-fonts/font-alias/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Font aliases -XORG_CAT= font +USES= xorg-cat:font NOFONT= yes .include <bsd.port.mk> diff --git a/x11-fonts/font-arabic-misc/Makefile b/x11-fonts/font-arabic-misc/Makefile index 267af53054e7..648b74154180 100644 --- a/x11-fonts/font-arabic-misc/Makefile +++ b/x11-fonts/font-arabic-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Arabic fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-100dpi/Makefile b/x11-fonts/font-bh-100dpi/Makefile index df7cf89e3974..f516fa706c6b 100644 --- a/x11-fonts/font-bh-100dpi/Makefile +++ b/x11-fonts/font-bh-100dpi/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bigelow Holmes 100dpi font -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-75dpi/Makefile b/x11-fonts/font-bh-75dpi/Makefile index 443b37c60ee9..c9b18538486d 100644 --- a/x11-fonts/font-bh-75dpi/Makefile +++ b/x11-fonts/font-bh-75dpi/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bigelow Holmes 75dpi font -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile index c7ed0e08e380..0d354eacda68 100644 --- a/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile +++ b/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bigelow Holmes Lucida TypeWriter 100dpi font -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile index 809bd612753f..1491d1a20d8a 100644 --- a/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile +++ b/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bigelow Holmes Lucida TypeWriter 75dpi font -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-ttf/Makefile b/x11-fonts/font-bh-ttf/Makefile index 1df0904ce1cd..b029424ab807 100644 --- a/x11-fonts/font-bh-ttf/Makefile +++ b/x11-fonts/font-bh-ttf/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bigelow & Holmes TTF font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-bh-type1/Makefile b/x11-fonts/font-bh-type1/Makefile index 2249a87bca7b..5ac81da8e4f6 100644 --- a/x11-fonts/font-bh-type1/Makefile +++ b/x11-fonts/font-bh-type1/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bigelow Holmes Type1 font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-bitstream-100dpi/Makefile b/x11-fonts/font-bitstream-100dpi/Makefile index c873207d514a..c23591e18e92 100644 --- a/x11-fonts/font-bitstream-100dpi/Makefile +++ b/x11-fonts/font-bitstream-100dpi/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bitstream Vera 100dpi font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-bitstream-75dpi/Makefile b/x11-fonts/font-bitstream-75dpi/Makefile index c538b3e90bd9..6ced08340c71 100644 --- a/x11-fonts/font-bitstream-75dpi/Makefile +++ b/x11-fonts/font-bitstream-75dpi/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bitstream Vera 75dpi font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-bitstream-type1/Makefile b/x11-fonts/font-bitstream-type1/Makefile index af6f905e354b..1902960b457d 100644 --- a/x11-fonts/font-bitstream-type1/Makefile +++ b/x11-fonts/font-bitstream-type1/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Bitstream Vera Type1 font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-cronyx-cyrillic/Makefile b/x11-fonts/font-cronyx-cyrillic/Makefile index be1119b3ebb6..5fd096b90a4d 100644 --- a/x11-fonts/font-cronyx-cyrillic/Makefile +++ b/x11-fonts/font-cronyx-cyrillic/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Cronyx Cyrillic font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-cursor-misc/Makefile b/x11-fonts/font-cursor-misc/Makefile index 3816b9a32f21..7616c4f91adb 100644 --- a/x11-fonts/font-cursor-misc/Makefile +++ b/x11-fonts/font-cursor-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Cursor fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-daewoo-misc/Makefile b/x11-fonts/font-daewoo-misc/Makefile index caf025f58529..8981ee983a06 100644 --- a/x11-fonts/font-daewoo-misc/Makefile +++ b/x11-fonts/font-daewoo-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Daewoo fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-dec-misc/Makefile b/x11-fonts/font-dec-misc/Makefile index ed2a83bfb27f..05c9c0a234b8 100644 --- a/x11-fonts/font-dec-misc/Makefile +++ b/x11-fonts/font-dec-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Dec fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-ibm-type1/Makefile b/x11-fonts/font-ibm-type1/Makefile index 66a11287fdfd..d87a357c589f 100644 --- a/x11-fonts/font-ibm-type1/Makefile +++ b/x11-fonts/font-ibm-type1/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org IBM Type1 font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-isas-misc/Makefile b/x11-fonts/font-isas-misc/Makefile index 57beee7a0f1b..7190ebea615d 100644 --- a/x11-fonts/font-isas-misc/Makefile +++ b/x11-fonts/font-isas-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous ISAS fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-jis-misc/Makefile b/x11-fonts/font-jis-misc/Makefile index 9b74fd84364d..fe1221db60bb 100644 --- a/x11-fonts/font-jis-misc/Makefile +++ b/x11-fonts/font-jis-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous JIS fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-micro-misc/Makefile b/x11-fonts/font-micro-misc/Makefile index a5dbfa9d1cf0..b0a370fa518f 100644 --- a/x11-fonts/font-micro-misc/Makefile +++ b/x11-fonts/font-micro-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Micro fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-cyrillic/Makefile b/x11-fonts/font-misc-cyrillic/Makefile index 2f9535262f13..11c86adc1101 100644 --- a/x11-fonts/font-misc-cyrillic/Makefile +++ b/x11-fonts/font-misc-cyrillic/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Cyrillic font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-ethiopic/Makefile b/x11-fonts/font-misc-ethiopic/Makefile index 17fa85949ba0..055191c6099b 100644 --- a/x11-fonts/font-misc-ethiopic/Makefile +++ b/x11-fonts/font-misc-ethiopic/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Ethiopic font -XORG_CAT= font +USES= xorg-cat:font FONTNAME= TTF PLIST_FILES= "@fcfontsdir ${PREFIX}/share/fonts/OTF" \ "@comment ${PREFIX}/share/fonts/OTF/fonts.dir" \ diff --git a/x11-fonts/font-misc-meltho/Makefile b/x11-fonts/font-misc-meltho/Makefile index ae59f3b7f6b5..48c37279f6e6 100644 --- a/x11-fonts/font-misc-meltho/Makefile +++ b/x11-fonts/font-misc-meltho/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Meltho font -XORG_CAT= font +USES= xorg-cat:font FONTNAME= OTF .include <bsd.port.mk> diff --git a/x11-fonts/font-misc-misc/Makefile b/x11-fonts/font-misc-misc/Makefile index 59fee2f7ea33..c2de460af9b7 100644 --- a/x11-fonts/font-misc-misc/Makefile +++ b/x11-fonts/font-misc-misc/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Misc fonts -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-mutt-misc/Makefile b/x11-fonts/font-mutt-misc/Makefile index ba2c7f455d61..37e7b313ed1c 100644 --- a/x11-fonts/font-mutt-misc/Makefile +++ b/x11-fonts/font-mutt-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Mutt fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-schumacher-misc/Makefile b/x11-fonts/font-schumacher-misc/Makefile index 5a06b9b3c494..79486b54a1f7 100644 --- a/x11-fonts/font-schumacher-misc/Makefile +++ b/x11-fonts/font-schumacher-misc/Makefile @@ -9,7 +9,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Schumacher fonts -XORG_CAT= font +USES= xorg xorg-cat:font USE_XORG= fontutil .include <bsd.port.mk> diff --git a/x11-fonts/font-screen-cyrillic/Makefile b/x11-fonts/font-screen-cyrillic/Makefile index 03791c81728a..8f7906459e19 100644 --- a/x11-fonts/font-screen-cyrillic/Makefile +++ b/x11-fonts/font-screen-cyrillic/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Screen Cyrillic font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-sony-misc/Makefile b/x11-fonts/font-sony-misc/Makefile index 3c6219581f3f..4ccaca5be549 100644 --- a/x11-fonts/font-sony-misc/Makefile +++ b/x11-fonts/font-sony-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Sony fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-sun-misc/Makefile b/x11-fonts/font-sun-misc/Makefile index cd7178d3ea9f..0901d4e75d83 100644 --- a/x11-fonts/font-sun-misc/Makefile +++ b/x11-fonts/font-sun-misc/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous Sun fonts -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-winitzki-cyrillic/Makefile b/x11-fonts/font-winitzki-cyrillic/Makefile index 6273a1b10061..19295e0daa63 100644 --- a/x11-fonts/font-winitzki-cyrillic/Makefile +++ b/x11-fonts/font-winitzki-cyrillic/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org Winitzki Cyrillic font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/font-xfree86-type1/Makefile b/x11-fonts/font-xfree86-type1/Makefile index 4dda901d7301..874007d8a9f9 100644 --- a/x11-fonts/font-xfree86-type1/Makefile +++ b/x11-fonts/font-xfree86-type1/Makefile @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org XFree86 Type1 font -XORG_CAT= font +USES= xorg-cat:font .include <bsd.port.mk> diff --git a/x11-fonts/fonttosfnt/Makefile b/x11-fonts/fonttosfnt/Makefile index 24829fd9d7e7..10e0442e0e1f 100644 --- a/x11-fonts/fonttosfnt/Makefile +++ b/x11-fonts/fonttosfnt/Makefile @@ -10,7 +10,7 @@ COMMENT= Wrap a bitmap font in a sftn wrapper LIB_DEPENDS= libfreetype.so:print/freetype2 -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xorgproto fontenc PLIST_FILES= bin/fonttosfnt man/man1/fonttosfnt.1.gz diff --git a/x11-fonts/fslsfonts/Makefile b/x11-fonts/fslsfonts/Makefile index 339b1b53d54b..7b69c8e8e34e 100644 --- a/x11-fonts/fslsfonts/Makefile +++ b/x11-fonts/fslsfonts/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= List fonts served by the X font server -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 libfs PLIST_FILES= bin/fslsfonts man/man1/fslsfonts.1.gz diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile index 12f8adb0f588..c935b1867f21 100644 --- a/x11-fonts/libFS/Makefile +++ b/x11-fonts/libFS/Makefile @@ -10,9 +10,7 @@ COMMENT= The FS library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe - -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= xorgproto xtrans CPE_VENDOR= x CPE_PRODUCT= libfs diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index c3f7f1351713..6161ef677aa9 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -16,8 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= cpe -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= xorgproto xtrans fontenc INSTALL_TARGET= install-strip CPE_PRODUCT= libxfont diff --git a/x11-fonts/libXfont2/Makefile b/x11-fonts/libXfont2/Makefile index 499b1b4eb6c2..f9e87b19936c 100644 --- a/x11-fonts/libXfont2/Makefile +++ b/x11-fonts/libXfont2/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= xorg-cat:lib xorg +USES= xorg xorg-cat:lib USE_XORG= xorgproto xtrans fontenc INSTALL_TARGET= install-strip #USES+= cpe diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile index a2b0f9d5e762..c7b5ef937797 100644 --- a/x11-fonts/libXft/Makefile +++ b/x11-fonts/libXft/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= xorgproto xrender INSTALL_TARGET= install-strip diff --git a/x11-fonts/libfontenc/Makefile b/x11-fonts/libfontenc/Makefile index 529a38d0f0cd..4af886ea0195 100644 --- a/x11-fonts/libfontenc/Makefile +++ b/x11-fonts/libfontenc/Makefile @@ -11,7 +11,7 @@ COMMENT= The fontenc Library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= xorgproto CONFIGURE_ARGS= --with-encodingsdir=${LOCALBASE}/share/fonts/encodings diff --git a/x11-fonts/mkfontscale/Makefile b/x11-fonts/mkfontscale/Makefile index 97cad4ff2538..e9c45fa43ba4 100644 --- a/x11-fonts/mkfontscale/Makefile +++ b/x11-fonts/mkfontscale/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xorgproto fontenc PLIST_FILES= bin/mkfontdir \ diff --git a/x11-fonts/showfont/Makefile b/x11-fonts/showfont/Makefile index d8eff2c5ba4f..a92a2d73cc85 100644 --- a/x11-fonts/showfont/Makefile +++ b/x11-fonts/showfont/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= Font dumper for the X font server -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= libfs xorgproto PLIST_FILES= bin/showfont man/man1/showfont.1.gz diff --git a/x11-fonts/xfontsel/Makefile b/x11-fonts/xfontsel/Makefile index 9103f1561f9a..b4c76270bc08 100644 --- a/x11-fonts/xfontsel/Makefile +++ b/x11-fonts/xfontsel/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= Point and click selection of X11 font names -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xaw xmu xt .include <bsd.port.mk> diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index 9cced71c7759..7d0e73f6679f 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -8,8 +8,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org font server -XORG_CAT= app -USES= cpe gmake +USES= cpe gmake xorg xorg-cat:app CPE_VENDOR= x CPE_PRODUCT= x_font_server USE_XORG= libfs xfont2 xorgproto xtrans diff --git a/x11-fonts/xfsinfo/Makefile b/x11-fonts/xfsinfo/Makefile index 4b05f62b3de7..f4fc29cd6c9d 100644 --- a/x11-fonts/xfsinfo/Makefile +++ b/x11-fonts/xfsinfo/Makefile @@ -10,7 +10,7 @@ COMMENT= X font server information utility LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 libfs PLIST_FILES= bin/xfsinfo man/man1/xfsinfo.1.gz diff --git a/x11-fonts/xlsfonts/Makefile b/x11-fonts/xlsfonts/Makefile index a26e8efd0ab8..db00ce5040c7 100644 --- a/x11-fonts/xlsfonts/Makefile +++ b/x11-fonts/xlsfonts/Makefile @@ -10,7 +10,7 @@ COMMENT= Server font list displayer for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= bin/xlsfonts man/man1/xlsfonts.1.gz diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile index 506070f80e9b..18362cb4d029 100644 --- a/x11-fonts/xorg-fonts/Makefile +++ b/x11-fonts/xorg-fonts/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.org fonts meta-port -USES= metaport +USES= metaport xorg USE_XORG= fontutil RUN_DEPENDS= xorg-fonts-100dpi>0:x11-fonts/xorg-fonts-100dpi \ diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index ca66ff787193..56d05c7391bf 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -17,7 +17,6 @@ LICENSE= MIT RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp -XORG_CAT= xserver SLAVE_PORT?= no OPTIONS_SUB= yes @@ -33,7 +32,7 @@ OPTIONS_EXCLUDE_sparc64= HAL .include <bsd.port.options.mk> -USES= gmake libtool perl5 ssl tar:bzip2 +USES= gmake gl libtool perl5 ssl tar:bzip2 xorg xorg-cat:xserver USE_PERL5= build USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont xkbfile xorgproto xshmfence xtrans diff --git a/x11-themes/xcursor-themes/Makefile b/x11-themes/xcursor-themes/Makefile index e177b93227bc..2d0fab26e726 100644 --- a/x11-themes/xcursor-themes/Makefile +++ b/x11-themes/xcursor-themes/Makefile @@ -14,6 +14,6 @@ BUILD_DEPENDS= xcursorgen:x11/xcursorgen NO_ARCH= yes -XORG_CAT= data +USES= xorg-cat:data .include <bsd.port.mk> diff --git a/x11-toolkits/libXmu/Makefile b/x11-toolkits/libXmu/Makefile index d7e8731b20ce..1cff53d48c99 100644 --- a/x11-toolkits/libXmu/Makefile +++ b/x11-toolkits/libXmu/Makefile @@ -12,7 +12,7 @@ COMMENT= X Miscellaneous Utilities libraries LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= xorgproto x11 xt xext INSTALL_TARGET= install-strip diff --git a/x11-toolkits/libXt/Makefile b/x11-toolkits/libXt/Makefile index 26b5bb93fc16..14fa37e88286 100644 --- a/x11-toolkits/libXt/Makefile +++ b/x11-toolkits/libXt/Makefile @@ -12,8 +12,7 @@ COMMENT= X Toolkit library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 sm ice xorgproto CPE_VENDOR= x CPE_PRODUCT= libxt diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index ab38f3e4c779..ce7bc229f454 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -24,13 +24,12 @@ RUN_DEPENDS= glxinfo:graphics/mesa-demos \ nvidia-settings:x11/nvidia-settings USES= gettext-runtime gettext-tools gl gmake gnome libtool \ - localbase pathfix tar:bzip2 + localbase pathfix tar:bzip2 xorg xorg-cat:app USE_GL= gl glu USE_GNOME= cairo gconf2 intltool libxslt USE_LDCONFIG= yes USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama \ xorgproto xrandr xrender -XORG_CAT= app GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-kde4 \ diff --git a/x11-wm/transset/Makefile b/x11-wm/transset/Makefile index d267a71a50d0..9ba4855c001e 100644 --- a/x11-wm/transset/Makefile +++ b/x11-wm/transset/Makefile @@ -10,7 +10,7 @@ CATEGORIES= x11-wm MAINTAINER= x11@FreeBSD.org COMMENT= Make your windows transparent -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xorgproto PLIST_FILES= bin/transset man/man1/transset.1.gz diff --git a/x11-wm/twm/Makefile b/x11-wm/twm/Makefile index cfa2d231914c..5f74ddd7dad5 100644 --- a/x11-wm/twm/Makefile +++ b/x11-wm/twm/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11-wm MAINTAINER= x11@FreeBSD.org COMMENT= Tab Window Manager for the X Window System -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= ice sm x11 xext xt xmu .include <bsd.port.mk> diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile index cc2040686296..d01cbec437ee 100644 --- a/x11-wm/xcompmgr/Makefile +++ b/x11-wm/xcompmgr/Makefile @@ -11,7 +11,7 @@ COMMENT= Sample X compositing manager LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xcomposite xext xfixes xdamage xrender PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz diff --git a/x11/appres/Makefile b/x11/appres/Makefile index e24008c96c08..0eec6322e28f 100644 --- a/x11/appres/Makefile +++ b/x11/appres/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Program to list application's resources -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xt PLIST_FILES= bin/appres man/man1/appres.1.gz diff --git a/x11/beforelight/Makefile b/x11/beforelight/Makefile index 7e20b65ca14f..0cb8fb2e3f3d 100644 --- a/x11/beforelight/Makefile +++ b/x11/beforelight/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Sample screen saver for X -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xscrnsaver xt xaw7 xt .include <bsd.port.mk> diff --git a/x11/bitmap/Makefile b/x11/bitmap/Makefile index 3760869466f4..3bd7a9eb81b4 100644 --- a/x11/bitmap/Makefile +++ b/x11/bitmap/Makefile @@ -10,7 +10,7 @@ COMMENT= Bitmap editor and converter utilities for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xaw xbitmaps xmu xorgproto xt .include <bsd.port.mk> diff --git a/x11/editres/Makefile b/x11/editres/Makefile index 102f46f55e33..4901d472e00f 100644 --- a/x11/editres/Makefile +++ b/x11/editres/Makefile @@ -10,7 +10,7 @@ COMMENT= Dynamic resource editor for X Toolkit Applications LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xt xmu xaw .include <bsd.port.mk> diff --git a/x11/fstobdf/Makefile b/x11/fstobdf/Makefile index e256cdd11151..05af0347994e 100644 --- a/x11/fstobdf/Makefile +++ b/x11/fstobdf/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Generate BDF font from X font server -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 libfs PLIST_FILES= bin/fstobdf man/man1/fstobdf.1.gz diff --git a/x11/iceauth/Makefile b/x11/iceauth/Makefile index 84440cb661d2..50188446b978 100644 --- a/x11/iceauth/Makefile +++ b/x11/iceauth/Makefile @@ -11,7 +11,7 @@ COMMENT= ICE authority file utility for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xorgproto ice PLIST_FILES= bin/iceauth man/man1/iceauth.1.gz diff --git a/x11/ico/Makefile b/x11/ico/Makefile index ad43d16b81bc..77ea23c89c40 100644 --- a/x11/ico/Makefile +++ b/x11/ico/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Displays a wire-frame rotating plyhedron -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= bin/ico man/man1/ico.1.gz diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile index c83d21044c01..b8e3d5eec105 100644 --- a/x11/libICE/Makefile +++ b/x11/libICE/Makefile @@ -12,7 +12,7 @@ COMMENT= Inter Client Exchange library for X11 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= xorgproto xtrans INSTALL_TARGET= install-strip diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index 12b8ff8a1ae0..485a456b1662 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -11,8 +11,7 @@ COMMENT= Session Management library for X11 LICENSE= MIT -USES= pathfix -XORG_CAT= lib +USES= pathfix xorg xorg-cat:lib USE_XORG= ice xorgproto xtrans CONFIGURE_ARGS+=--disable-docs --without-xmlto diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 65d9e9480983..82ce094a6675 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -11,8 +11,7 @@ COMMENT= X11 library LICENSE= MIT -USES= cpe perl5 -XORG_CAT= lib +USES= cpe perl5 xorg xorg-cat:lib USE_XORG= xau xdmcp xtrans xorgproto xcb USE_PERL5= build CPE_VENDOR= x diff --git a/x11/libXScrnSaver/Makefile b/x11/libXScrnSaver/Makefile index 4fb8cbd7d42b..d23ef4448a9d 100644 --- a/x11/libXScrnSaver/Makefile +++ b/x11/libXScrnSaver/Makefile @@ -11,7 +11,7 @@ COMMENT= The XScrnSaver library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= x11 xext xorgproto .include <bsd.port.mk> diff --git a/x11/libXau/Makefile b/x11/libXau/Makefile index ee9539802685..e894f5bfc59b 100644 --- a/x11/libXau/Makefile +++ b/x11/libXau/Makefile @@ -11,7 +11,7 @@ COMMENT= Authentication Protocol library for X11 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= xorgproto INSTALL_TARGET=install-strip diff --git a/x11/libXcomposite/Makefile b/x11/libXcomposite/Makefile index b8a64024f793..2cd2eac5b733 100644 --- a/x11/libXcomposite/Makefile +++ b/x11/libXcomposite/Makefile @@ -12,7 +12,7 @@ COMMENT= X Composite extension library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= x11 xfixes xext xorgproto INSTALL_TARGET= install-strip diff --git a/x11/libXcursor/Makefile b/x11/libXcursor/Makefile index d04cbeae9ca7..2a4e05865155 100644 --- a/x11/libXcursor/Makefile +++ b/x11/libXcursor/Makefile @@ -11,8 +11,7 @@ COMMENT= X client-side cursor loading library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= xrender x11 xfixes xorgproto CPE_VENDOR= x CPE_PRODUCT= libxcursor diff --git a/x11/libXdamage/Makefile b/x11/libXdamage/Makefile index affb3c93f623..f55ca39f18fc 100644 --- a/x11/libXdamage/Makefile +++ b/x11/libXdamage/Makefile @@ -11,7 +11,7 @@ COMMENT= X Damage extension library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= x11 xfixes xorgproto INSTALL_TARGET= install-strip diff --git a/x11/libXdmcp/Makefile b/x11/libXdmcp/Makefile index 0b303a8d8c82..127aeb672f01 100644 --- a/x11/libXdmcp/Makefile +++ b/x11/libXdmcp/Makefile @@ -10,7 +10,7 @@ COMMENT= X Display Manager Control Protocol library LICENSE= MIT -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= xorgproto:both CONFIGURE_ARGS+=--disable-docs --without-xmlto diff --git a/x11/libXext/Makefile b/x11/libXext/Makefile index d7364981c790..eac85076ae72 100644 --- a/x11/libXext/Makefile +++ b/x11/libXext/Makefile @@ -12,8 +12,7 @@ COMMENT= X11 Extension library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xau xorgproto CPE_VENDOR= x CPE_PRODUCT= libxext diff --git a/x11/libXfixes/Makefile b/x11/libXfixes/Makefile index 9b961274be6e..35f63c87745e 100644 --- a/x11/libXfixes/Makefile +++ b/x11/libXfixes/Makefile @@ -11,9 +11,8 @@ COMMENT= X Fixes extension library LICENSE= MIT -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xorgproto -USES+= cpe CPE_PRODUCT= libxfixes CPE_VENDOR= x diff --git a/x11/libXi/Makefile b/x11/libXi/Makefile index d8c46d460b17..9857694cee1d 100644 --- a/x11/libXi/Makefile +++ b/x11/libXi/Makefile @@ -11,10 +11,9 @@ COMMENT= X Input extension library LICENSE= MIT -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xfixes xorgproto INSTALL_TARGET= install-strip -USES+= cpe CPE_PRODUCT= libxi CPE_VENDOR= x diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index 4cb1d9d208b8..db8329797369 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -12,9 +12,8 @@ COMMENT= X11 Xinerama library LICENSE= MIT -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xorgproto -USES+= cpe CPE_PRODUCT= libxinerama CPE_VENDOR= x diff --git a/x11/libXpm/Makefile b/x11/libXpm/Makefile index 4a0149d0e74e..5038857ffa32 100644 --- a/x11/libXpm/Makefile +++ b/x11/libXpm/Makefile @@ -11,7 +11,7 @@ COMMENT= X Pixmap library LICENSE= MIT -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= xorgproto x11 xext xt LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11/libXpresent/Makefile b/x11/libXpresent/Makefile index 42be25f6776e..731c59bda871 100644 --- a/x11/libXpresent/Makefile +++ b/x11/libXpresent/Makefile @@ -10,7 +10,7 @@ COMMENT= X Present Extension library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= xorg-cat:lib +USES= xorg xorg-cat:lib USE_XORG= x11 xfixes xext xorgproto xrandr INSTALL_TARGET= install-strip diff --git a/x11/libXrandr/Makefile b/x11/libXrandr/Makefile index 05e1b28f1dc6..f859d99003e9 100644 --- a/x11/libXrandr/Makefile +++ b/x11/libXrandr/Makefile @@ -11,8 +11,7 @@ COMMENT= X Resize and Rotate extension library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xrender xorgproto CPE_VENDOR= x CPE_PRODUCT= libxrandr diff --git a/x11/libXrender/Makefile b/x11/libXrender/Makefile index 7389f496efa9..3cbd9f7275f4 100644 --- a/x11/libXrender/Makefile +++ b/x11/libXrender/Makefile @@ -11,7 +11,7 @@ COMMENT= X Render extension library LICENSE= MIT -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= x11 xorgproto .include <bsd.port.mk> diff --git a/x11/libXres/Makefile b/x11/libXres/Makefile index 5c3c45a2dd1f..555b43f4b0fd 100644 --- a/x11/libXres/Makefile +++ b/x11/libXres/Makefile @@ -11,10 +11,9 @@ COMMENT= X Resource usage library LICENSE= MIT -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xorgproto INSTALL_TARGET= install-strip -USES+= cpe CPE_PRODUCT= libxres CPE_VENDOR= x diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile index c31728c552f6..aad6e92615e5 100644 --- a/x11/libXtst/Makefile +++ b/x11/libXtst/Makefile @@ -11,9 +11,8 @@ COMMENT= X Test extension LICENSE= MIT -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xi xorgproto -USES+= cpe CPE_PRODUCT= libxtst CPE_VENDOR= x diff --git a/x11/libXv/Makefile b/x11/libXv/Makefile index b1f9ae9750f7..29724d6f11a5 100644 --- a/x11/libXv/Makefile +++ b/x11/libXv/Makefile @@ -12,9 +12,8 @@ COMMENT= X Video Extension library LICENSE= MIT -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xorgproto -USES+= cpe CPE_PRODUCT= libxv CPE_VENDOR= x diff --git a/x11/libXvMC/Makefile b/x11/libXvMC/Makefile index 2ca4569bff9a..32b5c140e576 100644 --- a/x11/libXvMC/Makefile +++ b/x11/libXvMC/Makefile @@ -11,8 +11,7 @@ COMMENT= X Video Extension Motion Compensation library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xv xorgproto CPE_VENDOR= x CPE_PRODUCT= libxvmc diff --git a/x11/libXxf86dga/Makefile b/x11/libXxf86dga/Makefile index bb816d09c47f..c3694ece7376 100644 --- a/x11/libXxf86dga/Makefile +++ b/x11/libXxf86dga/Makefile @@ -11,8 +11,7 @@ COMMENT= X DGA Extension LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= cpe -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xorgproto CPE_VENDOR= x CPE_PRODUCT= libxxf86dga diff --git a/x11/libXxf86vm/Makefile b/x11/libXxf86vm/Makefile index 53f4fc51d3c8..fd880a3e4ce6 100644 --- a/x11/libXxf86vm/Makefile +++ b/x11/libXxf86vm/Makefile @@ -11,9 +11,8 @@ COMMENT= X Vidmode Extension LICENSE= MIT -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= xorgproto x11 xext -USES+= cpe CPE_PRODUCT= libxxf86vm CPE_VENDOR= x diff --git a/x11/libdmx/Makefile b/x11/libdmx/Makefile index 2c86c2a1d461..570dfefdcba7 100644 --- a/x11/libdmx/Makefile +++ b/x11/libdmx/Makefile @@ -9,9 +9,8 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= DMX extension library -XORG_CAT= lib +USES= cpe xorg xorg-cat:lib USE_XORG= x11 xext xorgproto -USES+= cpe CPE_VENDOR= x .include <bsd.port.mk> diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index 73d2a5eec640..c68c1b2793cc 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -19,8 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-st CONFIGURE_ARGS+= --disable-build-docs --without-doxygen --enable-xinput -XORG_CAT= lib -USES= cpe gmake gnome python:build +USES= cpe gmake gnome python:build xorg xorg-cat:lib USE_GNOME= libxslt:build USE_XORG= xau xdmcp INSTALL_TARGET= install-strip diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile index 65dab783ff0a..144fc89afa47 100644 --- a/x11/libxkbcommon/Makefile +++ b/x11/libxkbcommon/Makefile @@ -13,9 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config -XORG_CAT= lib -USES= gmake bison tar:xz - +USES= gmake bison tar:xz xorg xorg-cat:lib USE_XORG= xcb INSTALL_TARGET= install-strip diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile index c2d90fb65393..f7f60bbc80f5 100644 --- a/x11/libxkbfile/Makefile +++ b/x11/libxkbfile/Makefile @@ -11,7 +11,7 @@ COMMENT= XKB file library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= x11 xorgproto INSTALL_TARGET= install-strip diff --git a/x11/libxshmfence/Makefile b/x11/libxshmfence/Makefile index 36a9672a672d..3aba474dfd2e 100644 --- a/x11/libxshmfence/Makefile +++ b/x11/libxshmfence/Makefile @@ -9,8 +9,8 @@ COMMENT= Shared memory 'SyncFence' synchronization primitive LICENSE= MIT +USES= xorg xorg-cat:lib USE_XORG= xorgproto -XORG_CAT= lib CONFIGURE_ARGS= --with-shared-memory-dir=/tmp INSTALL_TARGET= install-strip diff --git a/x11/listres/Makefile b/x11/listres/Makefile index 03f939fe6586..1128356a7ec7 100644 --- a/x11/listres/Makefile +++ b/x11/listres/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= List resources in widgets -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xaw xmu xorgproto xt PLIST_FILES= bin/listres man/man1/listres.1.gz diff --git a/x11/mkcomposecache/Makefile b/x11/mkcomposecache/Makefile index 0395cc91318d..d96bfd4ec32d 100644 --- a/x11/mkcomposecache/Makefile +++ b/x11/mkcomposecache/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Program to create Compose cache files -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= sbin/mkcomposecache man/man8/mkcomposecache.8.gz diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 3be28da2dac0..3a7b3a9727af 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -12,9 +12,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING PORTSCOUT= limitw:1,even -USES= cpe perl5 +USES= cpe perl5 xorg-cat:lib USE_PERL5= build -XORG_CAT= lib CONFIGURE_ARGS= --disable-gtk INSTALL_TARGET= install-strip diff --git a/x11/rendercheck/Makefile b/x11/rendercheck/Makefile index 89b3a2647bd2..61fc594522c7 100644 --- a/x11/rendercheck/Makefile +++ b/x11/rendercheck/Makefile @@ -8,7 +8,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Small program for testing basic Render extension conformance -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xrender PLIST_FILES= bin/rendercheck man/man1/rendercheck.1.gz diff --git a/x11/rgb/Makefile b/x11/rgb/Makefile index 58c23c280a6a..a46898e2e5ff 100644 --- a/x11/rgb/Makefile +++ b/x11/rgb/Makefile @@ -10,7 +10,7 @@ COMMENT= Uncompile an rgb color-name database CONFIGURE_ARGS= --with-rgb-db-dir=${PREFIX}/lib/X11/rgb -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xorgproto PLIST_FILES= bin/showrgb lib/X11/rgb.txt man/man1/showrgb.1.gz diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile index 64df7a2faa28..1c987027874f 100644 --- a/x11/scripts/Makefile +++ b/x11/scripts/Makefile @@ -10,9 +10,8 @@ COMMENT= Various X related scripts RUN_DEPENDS= ksh:shells/pdksh -XORG_CAT= app +USES= shebangfix xorg xorg-cat:app USE_XORG= x11 -USES= shebangfix post-patch: @${REINPLACE_CMD} -e 's|XCOMM!/bin/ksh|XCOMM!${ksh_CMD}|' ${WRKSRC}/xauth_switch_to_sun-des-1.cpp diff --git a/x11/sessreg/Makefile b/x11/sessreg/Makefile index 56f752979f5e..d4435e10a018 100644 --- a/x11/sessreg/Makefile +++ b/x11/sessreg/Makefile @@ -10,7 +10,7 @@ COMMENT= Manage utmp/wtmp entries for non-init X clients LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= bin/sessreg man/man1/sessreg.1.gz diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile index f8c3272480b3..162916f1c163 100644 --- a/x11/setxkbmap/Makefile +++ b/x11/setxkbmap/Makefile @@ -10,7 +10,7 @@ COMMENT= Set the keyboard using the X Keyboard Extension LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xkbfile x11 CONFIGURE_ARGS= --with-xkb-config-root=${LOCALBASE}/share/X11/xkb diff --git a/x11/smproxy/Makefile b/x11/smproxy/Makefile index bfe050c67c08..dd871c06d90b 100644 --- a/x11/smproxy/Makefile +++ b/x11/smproxy/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Session Manager Proxy -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xt xmu PLIST_FILES= bin/smproxy man/man1/smproxy.1.gz diff --git a/x11/x11perf/Makefile b/x11/x11perf/Makefile index 2a85197d591c..5e546cfa261f 100644 --- a/x11/x11perf/Makefile +++ b/x11/x11perf/Makefile @@ -10,9 +10,8 @@ COMMENT= X11 server performance test program LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= cpe xorg xorg-cat:app USE_XORG= x11 xmuu xrender xft xext -USES= cpe CPE_VENDOR= xfree86 .include <bsd.port.mk> diff --git a/x11/xauth/Makefile b/x11/xauth/Makefile index f6f8ad81ff2e..4f5f9ae0bb05 100644 --- a/x11/xauth/Makefile +++ b/x11/xauth/Makefile @@ -12,8 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= cmdtest:devel/py-cmdtest -USES= shebangfix -XORG_CAT= app +USES= shebangfix xorg xorg-cat:app USE_XORG= x11 xau xext xmuu INSTALL_TARGET= install-strip TEST_TARGET= check diff --git a/x11/xbacklight/Makefile b/x11/xbacklight/Makefile index 07109ca3dae1..83a048dcbbb9 100644 --- a/x11/xbacklight/Makefile +++ b/x11/xbacklight/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxcb-util.so:x11/xcb-util -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xrender xrandr xcb PLIST_FILES= bin/xbacklight man/man1/xbacklight.1.gz diff --git a/x11/xbiff/Makefile b/x11/xbiff/Makefile index 1f0c75ca384d..ffe27ee7fa2d 100644 --- a/x11/xbiff/Makefile +++ b/x11/xbiff/Makefile @@ -10,7 +10,7 @@ COMMENT= Mailbox flag for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xaw xbitmaps xext xmu xt PLIST_FILES= bin/xbiff man/man1/xbiff.1.gz diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile index 595b56b5bf9d..884e6f8250e8 100644 --- a/x11/xbitmaps/Makefile +++ b/x11/xbitmaps/Makefile @@ -11,8 +11,6 @@ COMMENT= X.Org bitmaps data LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= pathfix - -XORG_CAT= data +USES= pathfix xorg-cat:data .include <bsd.port.mk> diff --git a/x11/xcalc/Makefile b/x11/xcalc/Makefile index 5e28515dcc28..550b7f39e005 100644 --- a/x11/xcalc/Makefile +++ b/x11/xcalc/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= font-misc-misc>=1.1.2:x11-fonts/font-misc-misc \ font-alias>=1.0.3:x11-fonts/font-alias \ xbitmaps>=1.1.0:x11/xbitmaps -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xaw xt .include <bsd.port.mk> diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index 30b0eda04b4c..0c3ab6d324a8 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -13,9 +13,8 @@ COMMENT= The X protocol C-language Binding (XCB) protocol LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING +USES= gnome python xorg-cat:proto USE_GNOME= libxml2:build -XORG_CAT= proto -USES= python USE_PYTHON= py3kplist NO_ARCH= yes diff --git a/x11/xcb-util-cursor/Makefile b/x11/xcb-util-cursor/Makefile index 7942418e4275..564aee3986ed 100644 --- a/x11/xcb-util-cursor/Makefile +++ b/x11/xcb-util-cursor/Makefile @@ -19,10 +19,9 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb-util.pc:x11/xcb-util \ ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil \ ${LOCALBASE}/libdata/pkgconfig/xcb-image.pc:x11/xcb-util-image -XORG_CAT= lib +USES= gmake gperf xorg xorg-cat:lib USE_XORG= xcb INSTALL_TARGET= install-strip -USES= gmake gperf post-patch: @${REINPLACE_CMD} -e \ diff --git a/x11/xcb-util-errors/Makefile b/x11/xcb-util-errors/Makefile index 97fb276a0f0b..707b32b4b95f 100644 --- a/x11/xcb-util-errors/Makefile +++ b/x11/xcb-util-errors/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xcb-proto>=1.6:x11/xcb-proto -XORG_CAT= lib +USES= xorg xorg-cat:lib USE_XORG= xcb INSTALL_TARGET= install-strip diff --git a/x11/xcb-util-image/Makefile b/x11/xcb-util-image/Makefile index a947e34ae806..ed576c482a4d 100644 --- a/x11/xcb-util-image/Makefile +++ b/x11/xcb-util-image/Makefile @@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxcb-util.so:x11/xcb-util -XORG_CAT= lib -USES= gmake +USES= gmake xorg xorg-cat:lib USE_XORG= xcb post-patch: diff --git a/x11/xcb-util-keysyms/Makefile b/x11/xcb-util-keysyms/Makefile index e21fafc6ee19..03610c52caf5 100644 --- a/x11/xcb-util-keysyms/Makefile +++ b/x11/xcb-util-keysyms/Makefile @@ -13,8 +13,7 @@ LICENSE= MIT LIB_DEPENDS= libxcb-util.so:x11/xcb-util -XORG_CAT= lib -USES= gmake +USES= gmake xorg xorg-cat:lib USE_XORG= xcb post-patch: diff --git a/x11/xcb-util-renderutil/Makefile b/x11/xcb-util-renderutil/Makefile index 237f2bfacf4d..1a32a19bace6 100644 --- a/x11/xcb-util-renderutil/Makefile +++ b/x11/xcb-util-renderutil/Makefile @@ -14,8 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxcb-util.so:x11/xcb-util -XORG_CAT= lib -USES= gmake +USES= gmake xorg xorg-cat:lib USE_XORG= xcb INSTALL_TARGET= install-strip diff --git a/x11/xcb-util-wm/Makefile b/x11/xcb-util-wm/Makefile index b4433e4f510e..b3a883ef1a39 100644 --- a/x11/xcb-util-wm/Makefile +++ b/x11/xcb-util-wm/Makefile @@ -13,8 +13,7 @@ LICENSE= MIT LIB_DEPENDS= libxcb-util.so:x11/xcb-util -XORG_CAT= lib -USES= gmake +USES= gmake xorg xorg-cat:lib USE_XORG= xcb post-patch: diff --git a/x11/xcb-util-xrm/Makefile b/x11/xcb-util-xrm/Makefile index 904dcc9f602e..a82e9c4145d9 100644 --- a/x11/xcb-util-xrm/Makefile +++ b/x11/xcb-util-xrm/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libxcb-util.so:x11/xcb-util -USES= libtool pkgconfig tar:bzip2 +USES= libtool pkgconfig tar:bzip2 xorg INSTALL_TARGET= install-strip GNU_CONFIGURE= yes USE_XORG= xcb diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile index d6610d512a3f..87db4c07d0f8 100644 --- a/x11/xcb-util/Makefile +++ b/x11/xcb-util/Makefile @@ -14,8 +14,7 @@ COMMENT= Module with libxcb/libX11 extension/replacement libraries LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= lib -USES= gmake tar:bzip2 +USES= gmake tar:bzip2 xorg xorg-cat:lib USE_XORG= xau xcb xdmcp INSTALL_TARGET= install-strip diff --git a/x11/xclipboard/Makefile b/x11/xclipboard/Makefile index 312238191293..98541d197d0e 100644 --- a/x11/xclipboard/Makefile +++ b/x11/xclipboard/Makefile @@ -10,7 +10,7 @@ COMMENT= X clipboard client LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xt xaw .include <bsd.port.mk> diff --git a/x11/xcmsdb/Makefile b/x11/xcmsdb/Makefile index 22e80d421042..ca46643812e6 100644 --- a/x11/xcmsdb/Makefile +++ b/x11/xcmsdb/Makefile @@ -9,7 +9,7 @@ COMMENT= Device Color Characterization utility for X LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= bin/xcmsdb man/man1/xcmsdb.1.gz diff --git a/x11/xconsole/Makefile b/x11/xconsole/Makefile index e260a8f1431b..cf25ef2ceba7 100644 --- a/x11/xconsole/Makefile +++ b/x11/xconsole/Makefile @@ -10,7 +10,7 @@ COMMENT= Monitor system console messages with X LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xmu xt xaw .include <bsd.port.mk> diff --git a/x11/xcursorgen/Makefile b/x11/xcursorgen/Makefile index eb2d7eb26439..d962afac415d 100644 --- a/x11/xcursorgen/Makefile +++ b/x11/xcursorgen/Makefile @@ -11,7 +11,7 @@ LICENSE= MIT LIB_DEPENDS= libpng.so:graphics/png -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xcursor xorgproto INSTALL_TARGET= install-strip diff --git a/x11/xditview/Makefile b/x11/xditview/Makefile index c2173a6ea546..0b1744579b81 100644 --- a/x11/xditview/Makefile +++ b/x11/xditview/Makefile @@ -10,7 +10,7 @@ COMMENT= Display ditroff output LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xaw xmu xt .include <bsd.port.mk> diff --git a/x11/xdriinfo/Makefile b/x11/xdriinfo/Makefile index 702757dc85b9..380d87d3b1e4 100644 --- a/x11/xdriinfo/Makefile +++ b/x11/xdriinfo/Makefile @@ -8,9 +8,8 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Query configuration information of DRI drivers +USES= gl xorg xorg-cat:app USE_GL= gl - -XORG_CAT= app USE_XORG= x11 xorgproto PLIST_FILES= bin/xdriinfo man/man1/xdriinfo.1.gz diff --git a/x11/xedit/Makefile b/x11/xedit/Makefile index 87b1fd681f0d..e0ebe20e0fcb 100644 --- a/x11/xedit/Makefile +++ b/x11/xedit/Makefile @@ -12,8 +12,7 @@ LICENSE= MIT BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -USES= xorg-cat:app xorg - +USES= xorg xorg-cat:app USE_XORG= x11 xmu xt xaw7 .include <bsd.port.mk> diff --git a/x11/xev/Makefile b/x11/xev/Makefile index 437e973c59b1..de4e6d2bb234 100644 --- a/x11/xev/Makefile +++ b/x11/xev/Makefile @@ -10,7 +10,7 @@ COMMENT= Print contents of X events LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xrandr PLIST_FILES= bin/xev man/man1/xev.1.gz diff --git a/x11/xeyes/Makefile b/x11/xeyes/Makefile index 23052fa59b04..a2e649148803 100644 --- a/x11/xeyes/Makefile +++ b/x11/xeyes/Makefile @@ -10,7 +10,7 @@ COMMENT= Follow the mouse X demo LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xt xext xmu xrender PLIST_FILES= bin/xeyes man/man1/xeyes.1.gz diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile index b3ac04500831..9c097b3a93bb 100644 --- a/x11/xf86dga/Makefile +++ b/x11/xf86dga/Makefile @@ -10,7 +10,7 @@ COMMENT= Test program for the XFree86-DGA extension LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xxf86dga xt xaw7 xmu PLIST_FILES= bin/dga man/man1/dga.1.gz diff --git a/x11/xfd/Makefile b/x11/xfd/Makefile index cf0b41de88e9..1eb069f844e5 100644 --- a/x11/xfd/Makefile +++ b/x11/xfd/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 BUILD_DEPENDS= fc-cache:x11-fonts/fontconfig RUN_DEPENDS= fc-cache:x11-fonts/fontconfig -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xft xkbfile xmu xrender xt xaw .include <bsd.port.mk> diff --git a/x11/xfindproxy/Makefile b/x11/xfindproxy/Makefile index 8204ace3802d..ba60fa5beb8c 100644 --- a/x11/xfindproxy/Makefile +++ b/x11/xfindproxy/Makefile @@ -13,7 +13,7 @@ EXPIRATION_DATE=2019-11-06 LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 ice xt xorgproto PLIST_FILES= bin/xfindproxy man/man1/xfindproxy.1.gz diff --git a/x11/xfwp/Makefile b/x11/xfwp/Makefile index d44cd8c5ea18..e7a3320eb92f 100644 --- a/x11/xfwp/Makefile +++ b/x11/xfwp/Makefile @@ -13,7 +13,7 @@ EXPIRATION_DATE=2019-11-06 LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 ice xorgproto PLIST_FILES= bin/xfwp man/man1/xfwp.1.gz diff --git a/x11/xgamma/Makefile b/x11/xgamma/Makefile index 4288bd622350..a1128ddb9c72 100644 --- a/x11/xgamma/Makefile +++ b/x11/xgamma/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Gamma correction through the X server -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xxf86vm PLIST_FILES= bin/xgamma man/man1/xgamma.1.gz diff --git a/x11/xgc/Makefile b/x11/xgc/Makefile index 943c88b80216..c555a99140d5 100644 --- a/x11/xgc/Makefile +++ b/x11/xgc/Makefile @@ -9,7 +9,7 @@ COMMENT= X graphics demo LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xt xaw .include <bsd.port.mk> diff --git a/x11/xhost/Makefile b/x11/xhost/Makefile index b7d97ca340c1..16ec1765002f 100644 --- a/x11/xhost/Makefile +++ b/x11/xhost/Makefile @@ -10,7 +10,7 @@ COMMENT= Server access control program for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xmuu xau PLIST_FILES= bin/xhost man/man1/xhost.1.gz diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index d3a39d8da5ab..7c587240d94d 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -11,7 +11,7 @@ COMMENT= X Window System initializer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 post-patch: diff --git a/x11/xinput/Makefile b/x11/xinput/Makefile index a85a2e9a2356..bb335136f185 100644 --- a/x11/xinput/Makefile +++ b/x11/xinput/Makefile @@ -11,7 +11,7 @@ COMMENT= Very useful utility for configuring and testing XInput devices LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xorgproto x11 xi xext xrandr xinerama PLIST_FILES= bin/xinput man/man1/xinput.1.gz diff --git a/x11/xkbcomp/Makefile b/x11/xkbcomp/Makefile index 68f526bbaf4f..494fa309b1aa 100644 --- a/x11/xkbcomp/Makefile +++ b/x11/xkbcomp/Makefile @@ -10,8 +10,7 @@ COMMENT= Compile XKB keyboard description LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= pathfix -XORG_CAT= app +USES= pathfix xorg xorg-cat:app USE_XORG= x11 xkbfile PLIST_FILES= bin/xkbcomp \ diff --git a/x11/xkbevd/Makefile b/x11/xkbevd/Makefile index 77b15beed388..17ea0392bbbe 100644 --- a/x11/xkbevd/Makefile +++ b/x11/xkbevd/Makefile @@ -9,7 +9,7 @@ COMMENT= XKB event daemon LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xkbfile x11 PLIST_FILES= bin/xkbevd man/man1/xkbevd.1.gz diff --git a/x11/xkbprint/Makefile b/x11/xkbprint/Makefile index ef29903b51e6..63f168cf92f1 100644 --- a/x11/xkbprint/Makefile +++ b/x11/xkbprint/Makefile @@ -9,7 +9,7 @@ COMMENT= Utility for printing an XKB keyboard description LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xkbfile x11 PLIST_FILES= bin/xkbprint man/man1/xkbprint.1.gz diff --git a/x11/xkbutils/Makefile b/x11/xkbutils/Makefile index 181c44040a97..880420de0d0f 100644 --- a/x11/xkbutils/Makefile +++ b/x11/xkbutils/Makefile @@ -10,7 +10,7 @@ COMMENT= XKB utility demos LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xkbfile x11 xaw xorgproto .include <bsd.port.mk> diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index 155766e13465..cdb257d9113a 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -13,9 +13,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xkbcomp:x11/xkbcomp -USES= gmake gnome localbase pathfix perl5 +USES= gmake gnome localbase pathfix perl5 xorg-cat:data -XORG_CAT= data NO_ARCH= yes USE_GNOME= libxslt:build USE_PERL5= build diff --git a/x11/xkill/Makefile b/x11/xkill/Makefile index dc90791a3010..e8b78237e42e 100644 --- a/x11/xkill/Makefile +++ b/x11/xkill/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Utility for killing a client by its X resource -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xmuu PLIST_FILES= bin/xkill man/man1/xkill.1.gz diff --git a/x11/xload/Makefile b/x11/xload/Makefile index 59c01ff7bea6..97ac79922ef1 100644 --- a/x11/xload/Makefile +++ b/x11/xload/Makefile @@ -10,7 +10,7 @@ COMMENT= System load average display for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xaw xmu xt .include <bsd.port.mk> diff --git a/x11/xlogo/Makefile b/x11/xlogo/Makefile index d9b62ab3c692..3271bc073ec7 100644 --- a/x11/xlogo/Makefile +++ b/x11/xlogo/Makefile @@ -10,7 +10,7 @@ COMMENT= Displays the X Window System logo LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= sm x11 xaw xext xft xmu xrender xt .include <bsd.port.mk> diff --git a/x11/xlsatoms/Makefile b/x11/xlsatoms/Makefile index 4a4eeeb83acb..cf18fd76ff10 100644 --- a/x11/xlsatoms/Makefile +++ b/x11/xlsatoms/Makefile @@ -9,7 +9,7 @@ COMMENT= List interned atoms defined on a server LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xcb PLIST_FILES= bin/xlsatoms man/man1/xlsatoms.1.gz diff --git a/x11/xlsclients/Makefile b/x11/xlsclients/Makefile index d9056519c876..5e100f3de3f7 100644 --- a/x11/xlsclients/Makefile +++ b/x11/xlsclients/Makefile @@ -10,7 +10,7 @@ COMMENT= List client applications running on a display LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xcb xmuu PLIST_FILES= bin/xlsclients man/man1/xlsclients.1.gz diff --git a/x11/xmag/Makefile b/x11/xmag/Makefile index c79717aa6876..a79c1cc47b9a 100644 --- a/x11/xmag/Makefile +++ b/x11/xmag/Makefile @@ -9,7 +9,7 @@ COMMENT= X application for screen magnifying LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xt xaw .include <bsd.port.mk> diff --git a/x11/xman/Makefile b/x11/xman/Makefile index 1a625a173cfb..1b0c35f4823a 100644 --- a/x11/xman/Makefile +++ b/x11/xman/Makefile @@ -10,7 +10,7 @@ COMMENT= Manual page display program for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xt xaw .include <bsd.port.mk> diff --git a/x11/xmessage/Makefile b/x11/xmessage/Makefile index d5721a2dbac0..3559b45b2346 100644 --- a/x11/xmessage/Makefile +++ b/x11/xmessage/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Display message or query in a X window -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xt xaw .include <bsd.port.mk> diff --git a/x11/xmh/Makefile b/x11/xmh/Makefile index 5a51948caac5..459bf06dd779 100644 --- a/x11/xmh/Makefile +++ b/x11/xmh/Makefile @@ -9,7 +9,7 @@ COMMENT= Send and read mail with an X interface to MH RUN_DEPENDS+= repl:mail/nmh -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xaw xmu xt xbitmaps .include <bsd.port.mk> diff --git a/x11/xmodmap/Makefile b/x11/xmodmap/Makefile index 9442fdaef3bb..ac8580926ca0 100644 --- a/x11/xmodmap/Makefile +++ b/x11/xmodmap/Makefile @@ -10,7 +10,7 @@ COMMENT= Utility for modifying keymaps and pointer button mappings in X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= bin/xmodmap man/man1/xmodmap.1.gz diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile index 36e45e111b36..d8196dd8cdfe 100644 --- a/x11/xmore/Makefile +++ b/x11/xmore/Makefile @@ -9,7 +9,7 @@ COMMENT= Plain text display program for X LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xaw xt .include <bsd.port.mk> diff --git a/x11/xorg-cf-files/Makefile b/x11/xorg-cf-files/Makefile index 01e11bdf9bc9..2d56801be8f9 100644 --- a/x11/xorg-cf-files/Makefile +++ b/x11/xorg-cf-files/Makefile @@ -10,7 +10,7 @@ COMMENT= X.org cf files for use with imake builds LICENSE= MIT -XORG_CAT= util +USES= xorg-cat:util post-patch: @${REINPLACE_CMD} 's|\(define ExtraXaw[^ ]*\) [$$].*|\1 /**/|' \ diff --git a/x11/xorg-docs/Makefile b/x11/xorg-docs/Makefile index 89c29d9f7f74..fb5ef6f92252 100644 --- a/x11/xorg-docs/Makefile +++ b/x11/xorg-docs/Makefile @@ -10,6 +10,6 @@ COMMENT= X.org documentation files CONFIGURE_ARGS+= --without-xmlto --without-fop --disable-specs -XORG_CAT= doc +USES= xorg-cat:doc .include <bsd.port.mk> diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile index d58e0ca6906e..dba4da7a39f0 100644 --- a/x11/xorgproto/Makefile +++ b/x11/xorgproto/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= xorg protocol headers -XORG_CAT= proto +USES= xorg-cat:proto CONFIGURE_ARGS= --without-fop \ --without-xmlto \ diff --git a/x11/xpr/Makefile b/x11/xpr/Makefile index 7f7935b92dcb..b355a8341d32 100644 --- a/x11/xpr/Makefile +++ b/x11/xpr/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Utility for printing an X window dump -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xmuu x11 PLIST_FILES= bin/xdpr bin/xpr man/man1/xdpr.1.gz man/man1/xpr.1.gz diff --git a/x11/xprop/Makefile b/x11/xprop/Makefile index 32021a4b1bbd..a907c356ed71 100644 --- a/x11/xprop/Makefile +++ b/x11/xprop/Makefile @@ -10,7 +10,7 @@ COMMENT= Property displayer for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= bin/xprop man/man1/xprop.1.gz diff --git a/x11/xrandr/Makefile b/x11/xrandr/Makefile index 590c9df3eae6..2334c6774f6f 100644 --- a/x11/xrandr/Makefile +++ b/x11/xrandr/Makefile @@ -10,8 +10,7 @@ COMMENT= Primitive command line interface to the RandR extension LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= tar:xz -XORG_CAT= app +USES= tar:xz xorg xorg-cat:app USE_XORG= xrandr xrender x11 PLIST_FILES= bin/xrandr \ diff --git a/x11/xrdb/Makefile b/x11/xrdb/Makefile index bd3c11509ea0..d002c58def0f 100644 --- a/x11/xrdb/Makefile +++ b/x11/xrdb/Makefile @@ -10,7 +10,7 @@ COMMENT= X server resource database utility LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xmuu x11 PLIST_FILES= bin/xrdb man/man1/xrdb.1.gz diff --git a/x11/xrefresh/Makefile b/x11/xrefresh/Makefile index 0175ebc5f0b9..3c975c7d123f 100644 --- a/x11/xrefresh/Makefile +++ b/x11/xrefresh/Makefile @@ -9,7 +9,7 @@ COMMENT= Refresh all or part of an X screen LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= bin/xrefresh man/man1/xrefresh.1.gz diff --git a/x11/xset/Makefile b/x11/xset/Makefile index 3e9fdf85778d..662ab572e984 100644 --- a/x11/xset/Makefile +++ b/x11/xset/Makefile @@ -12,7 +12,6 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING USES= xorg xorg-cat:app - USE_XORG= xmuu x11 xext CONFIGURE_ARGS= --without-xf86misc \ --without-fontcache diff --git a/x11/xsetroot/Makefile b/x11/xsetroot/Makefile index 34a8613feadd..ee89424a3db5 100644 --- a/x11/xsetroot/Makefile +++ b/x11/xsetroot/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Root window parameter setting utility for X -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xmuu x11 xbitmaps xcursor PLIST_FILES= bin/xsetroot man/man1/xsetroot.1.gz diff --git a/x11/xsm/Makefile b/x11/xsm/Makefile index 43f16b456bd5..14727dbd0ff3 100644 --- a/x11/xsm/Makefile +++ b/x11/xsm/Makefile @@ -7,6 +7,6 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X Session Manager -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= ice sm x11 xaw xt .include <bsd.port.mk> diff --git a/x11/xstdcmap/Makefile b/x11/xstdcmap/Makefile index 04ddf5c9a32d..56c38f9905a4 100644 --- a/x11/xstdcmap/Makefile +++ b/x11/xstdcmap/Makefile @@ -9,7 +9,7 @@ COMMENT= X standard colormap utility LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xmu xt PLIST_FILES= bin/xstdcmap man/man1/xstdcmap.1.gz diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile index d954407eb036..49f205bdc983 100644 --- a/x11/xtrans/Makefile +++ b/x11/xtrans/Makefile @@ -10,7 +10,7 @@ COMMENT= Abstract network code for X LICENSE= MIT -XORG_CAT= lib +USES= xorg-cat:lib CONFIGURE_ARGS+=--disable-docs --without-xmlto diff --git a/x11/xvidtune/Makefile b/x11/xvidtune/Makefile index 6e905ce2f845..5822dda5e703 100644 --- a/x11/xvidtune/Makefile +++ b/x11/xvidtune/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Video mode tuner for X -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xxf86vm xt xaw .include <bsd.port.mk> diff --git a/x11/xvinfo/Makefile b/x11/xvinfo/Makefile index c6fbf52ffa14..df5a10d27ede 100644 --- a/x11/xvinfo/Makefile +++ b/x11/xvinfo/Makefile @@ -10,7 +10,7 @@ COMMENT= Print out X-Video extension adaptor information LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= xv x11 PLIST_FILES= bin/xvinfo man/man1/xvinfo.1.gz diff --git a/x11/xvmcinfo/Makefile b/x11/xvmcinfo/Makefile index a85d9cf19818..3efecdab9e23 100644 --- a/x11/xvmcinfo/Makefile +++ b/x11/xvmcinfo/Makefile @@ -9,6 +9,7 @@ DISTFILES= MAINTAINER= x11@FreeBSD.org COMMENT= Print out XvMC extension adaptor information +USES= xorg USE_XORG= xvmc xv x11 LDFLAGS+= -lXvMC -lXv -lX11 diff --git a/x11/xwd/Makefile b/x11/xwd/Makefile index a64d006f0b0f..d6f39e923ee4 100644 --- a/x11/xwd/Makefile +++ b/x11/xwd/Makefile @@ -9,7 +9,7 @@ COMMENT= Dump an image of an X window LICENSE= MIT -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 xkbfile PLIST_FILES= bin/xwd man/man1/xwd.1.gz diff --git a/x11/xwininfo/Makefile b/x11/xwininfo/Makefile index cdf2579729a8..f5310a6b5946 100644 --- a/x11/xwininfo/Makefile +++ b/x11/xwininfo/Makefile @@ -10,8 +10,7 @@ COMMENT= Window information utility for X LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= app -USES= iconv +USES= iconv xorg xorg-cat:app USE_XORG= x11 xcb xorgproto LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm diff --git a/x11/xwud/Makefile b/x11/xwud/Makefile index f2ef19c39022..d3a6f64193cc 100644 --- a/x11/xwud/Makefile +++ b/x11/xwud/Makefile @@ -7,7 +7,7 @@ CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Image displayer for X -XORG_CAT= app +USES= xorg xorg-cat:app USE_XORG= x11 PLIST_FILES= bin/xwud man/man1/xwud.1.gz |