From owner-svn-ports-head@freebsd.org Sun Nov 3 21:56:56 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E92A11A699C; Sun, 3 Nov 2019 21:56:56 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 475qX868fPz4nC4; Sun, 3 Nov 2019 21:56:56 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B73601A474; Sun, 3 Nov 2019 21:56:56 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA3LuuxV007765; Sun, 3 Nov 2019 21:56:56 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA3LucXn007667; Sun, 3 Nov 2019 21:56:38 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201911032156.xA3LucXn007667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sun, 3 Nov 2019 21:56:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516607 - in head: devel/gccmakedep devel/imake devel/libgudev devel/libpciaccess devel/lndir devel/makedepend devel/xorg-macros graphics/freeglut graphics/glew graphics/imlib2 graphics... X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head: devel/gccmakedep devel/imake devel/libgudev devel/libpciaccess devel/lndir devel/makedepend devel/xorg-macros graphics/freeglut graphics/glew graphics/imlib2 graphics/libepoxy graphics/mesa-d... X-SVN-Commit-Revision: 516607 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Nov 2019 21:56:57 -0000 Author: zeising Date: Sun Nov 3 21:56:37 2019 New Revision: 516607 URL: https://svnweb.freebsd.org/changeset/ports/516607 Log: 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 Modified: head/devel/gccmakedep/Makefile head/devel/imake/Makefile head/devel/libgudev/Makefile head/devel/libpciaccess/Makefile head/devel/lndir/Makefile head/devel/makedepend/Makefile head/devel/xorg-macros/Makefile head/graphics/freeglut/Makefile head/graphics/glew/Makefile head/graphics/imlib2/Makefile head/graphics/libepoxy/Makefile head/graphics/mesa-demos/Makefile head/graphics/mesa-dri/Makefile.common head/graphics/piglit/Makefile head/graphics/waffle/Makefile head/lang/beignet/Makefile head/sysutils/polkit/Makefile head/textproc/xorg-sgml-doctools/Makefile head/x11-clocks/oclock/Makefile head/x11-clocks/xclock/Makefile head/x11-drivers/xf86-input-egalax/Makefile head/x11-drivers/xf86-input-elographics/Makefile head/x11-drivers/xf86-input-evdev/Makefile head/x11-drivers/xf86-input-joystick/Makefile head/x11-drivers/xf86-input-keyboard/Makefile head/x11-drivers/xf86-input-libinput/Makefile head/x11-drivers/xf86-input-mouse/Makefile head/x11-drivers/xf86-input-synaptics/Makefile head/x11-drivers/xf86-input-vmmouse/Makefile head/x11-drivers/xf86-input-void/Makefile head/x11-drivers/xf86-input-wacom/Makefile head/x11-drivers/xf86-video-amdgpu/Makefile head/x11-drivers/xf86-video-apm/Makefile head/x11-drivers/xf86-video-ark/Makefile head/x11-drivers/xf86-video-ast/Makefile head/x11-drivers/xf86-video-ati-legacy/Makefile head/x11-drivers/xf86-video-ati/Makefile head/x11-drivers/xf86-video-chips/Makefile head/x11-drivers/xf86-video-cirrus/Makefile head/x11-drivers/xf86-video-dummy/Makefile head/x11-drivers/xf86-video-geode/Makefile head/x11-drivers/xf86-video-glint/Makefile head/x11-drivers/xf86-video-i128/Makefile head/x11-drivers/xf86-video-i740/Makefile head/x11-drivers/xf86-video-intel/Makefile head/x11-drivers/xf86-video-mach64/Makefile head/x11-drivers/xf86-video-mga/Makefile head/x11-drivers/xf86-video-neomagic/Makefile head/x11-drivers/xf86-video-nv/Makefile head/x11-drivers/xf86-video-openchrome/Makefile head/x11-drivers/xf86-video-qxl/Makefile head/x11-drivers/xf86-video-r128/Makefile head/x11-drivers/xf86-video-rendition/Makefile head/x11-drivers/xf86-video-s3/Makefile head/x11-drivers/xf86-video-s3virge/Makefile head/x11-drivers/xf86-video-savage/Makefile head/x11-drivers/xf86-video-scfb/Makefile head/x11-drivers/xf86-video-siliconmotion/Makefile head/x11-drivers/xf86-video-sis/Makefile head/x11-drivers/xf86-video-sunffb/Makefile head/x11-drivers/xf86-video-tdfx/Makefile head/x11-drivers/xf86-video-trident/Makefile head/x11-drivers/xf86-video-tseng/Makefile head/x11-drivers/xf86-video-vesa/Makefile head/x11-drivers/xf86-video-vmware/Makefile head/x11-drivers/xf86-video-voodoo/Makefile head/x11-fonts/bdftopcf/Makefile head/x11-fonts/encodings/Makefile head/x11-fonts/font-adobe-100dpi/Makefile head/x11-fonts/font-adobe-75dpi/Makefile head/x11-fonts/font-adobe-utopia-100dpi/Makefile head/x11-fonts/font-adobe-utopia-75dpi/Makefile head/x11-fonts/font-adobe-utopia-type1/Makefile head/x11-fonts/font-alias/Makefile head/x11-fonts/font-arabic-misc/Makefile head/x11-fonts/font-bh-100dpi/Makefile head/x11-fonts/font-bh-75dpi/Makefile head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile head/x11-fonts/font-bh-ttf/Makefile head/x11-fonts/font-bh-type1/Makefile head/x11-fonts/font-bitstream-100dpi/Makefile head/x11-fonts/font-bitstream-75dpi/Makefile head/x11-fonts/font-bitstream-type1/Makefile head/x11-fonts/font-cronyx-cyrillic/Makefile head/x11-fonts/font-cursor-misc/Makefile head/x11-fonts/font-daewoo-misc/Makefile head/x11-fonts/font-dec-misc/Makefile head/x11-fonts/font-ibm-type1/Makefile head/x11-fonts/font-isas-misc/Makefile head/x11-fonts/font-jis-misc/Makefile head/x11-fonts/font-micro-misc/Makefile head/x11-fonts/font-misc-cyrillic/Makefile head/x11-fonts/font-misc-ethiopic/Makefile head/x11-fonts/font-misc-meltho/Makefile head/x11-fonts/font-misc-misc/Makefile head/x11-fonts/font-mutt-misc/Makefile head/x11-fonts/font-schumacher-misc/Makefile head/x11-fonts/font-screen-cyrillic/Makefile head/x11-fonts/font-sony-misc/Makefile head/x11-fonts/font-sun-misc/Makefile head/x11-fonts/font-winitzki-cyrillic/Makefile head/x11-fonts/font-xfree86-type1/Makefile head/x11-fonts/fonttosfnt/Makefile head/x11-fonts/fslsfonts/Makefile head/x11-fonts/libFS/Makefile head/x11-fonts/libXfont/Makefile head/x11-fonts/libXfont2/Makefile head/x11-fonts/libXft/Makefile head/x11-fonts/libfontenc/Makefile head/x11-fonts/mkfontscale/Makefile head/x11-fonts/showfont/Makefile head/x11-fonts/xfontsel/Makefile head/x11-fonts/xfs/Makefile head/x11-fonts/xfsinfo/Makefile head/x11-fonts/xlsfonts/Makefile head/x11-fonts/xorg-fonts/Makefile head/x11-servers/xorg-server/Makefile head/x11-themes/xcursor-themes/Makefile head/x11-toolkits/libXmu/Makefile head/x11-toolkits/libXt/Makefile head/x11-wm/compiz/Makefile head/x11-wm/transset/Makefile head/x11-wm/twm/Makefile head/x11-wm/xcompmgr/Makefile head/x11/appres/Makefile head/x11/beforelight/Makefile head/x11/bitmap/Makefile head/x11/editres/Makefile head/x11/fstobdf/Makefile head/x11/iceauth/Makefile head/x11/ico/Makefile head/x11/libICE/Makefile head/x11/libSM/Makefile head/x11/libX11/Makefile head/x11/libXScrnSaver/Makefile head/x11/libXau/Makefile head/x11/libXcomposite/Makefile head/x11/libXcursor/Makefile head/x11/libXdamage/Makefile head/x11/libXdmcp/Makefile head/x11/libXext/Makefile head/x11/libXfixes/Makefile head/x11/libXi/Makefile head/x11/libXinerama/Makefile head/x11/libXpm/Makefile head/x11/libXpresent/Makefile head/x11/libXrandr/Makefile head/x11/libXrender/Makefile head/x11/libXres/Makefile head/x11/libXtst/Makefile head/x11/libXv/Makefile head/x11/libXvMC/Makefile head/x11/libXxf86dga/Makefile head/x11/libXxf86vm/Makefile head/x11/libdmx/Makefile head/x11/libxcb/Makefile head/x11/libxkbcommon/Makefile head/x11/libxkbfile/Makefile head/x11/libxshmfence/Makefile head/x11/listres/Makefile head/x11/mkcomposecache/Makefile head/x11/pixman/Makefile head/x11/rendercheck/Makefile head/x11/rgb/Makefile head/x11/scripts/Makefile head/x11/sessreg/Makefile head/x11/setxkbmap/Makefile head/x11/smproxy/Makefile head/x11/x11perf/Makefile head/x11/xauth/Makefile head/x11/xbacklight/Makefile head/x11/xbiff/Makefile head/x11/xbitmaps/Makefile head/x11/xcalc/Makefile head/x11/xcb-proto/Makefile head/x11/xcb-util-cursor/Makefile head/x11/xcb-util-errors/Makefile head/x11/xcb-util-image/Makefile head/x11/xcb-util-keysyms/Makefile head/x11/xcb-util-renderutil/Makefile head/x11/xcb-util-wm/Makefile head/x11/xcb-util-xrm/Makefile head/x11/xcb-util/Makefile head/x11/xclipboard/Makefile head/x11/xcmsdb/Makefile head/x11/xconsole/Makefile head/x11/xcursorgen/Makefile head/x11/xditview/Makefile head/x11/xdriinfo/Makefile head/x11/xedit/Makefile head/x11/xev/Makefile head/x11/xeyes/Makefile head/x11/xf86dga/Makefile head/x11/xfd/Makefile head/x11/xfindproxy/Makefile head/x11/xfwp/Makefile head/x11/xgamma/Makefile head/x11/xgc/Makefile head/x11/xhost/Makefile head/x11/xinit/Makefile head/x11/xinput/Makefile head/x11/xkbcomp/Makefile head/x11/xkbevd/Makefile head/x11/xkbprint/Makefile head/x11/xkbutils/Makefile head/x11/xkeyboard-config/Makefile head/x11/xkill/Makefile head/x11/xload/Makefile head/x11/xlogo/Makefile head/x11/xlsatoms/Makefile head/x11/xlsclients/Makefile head/x11/xmag/Makefile head/x11/xman/Makefile head/x11/xmessage/Makefile head/x11/xmh/Makefile head/x11/xmodmap/Makefile head/x11/xmore/Makefile head/x11/xorg-cf-files/Makefile head/x11/xorg-docs/Makefile head/x11/xorgproto/Makefile head/x11/xpr/Makefile head/x11/xprop/Makefile head/x11/xrandr/Makefile head/x11/xrdb/Makefile head/x11/xrefresh/Makefile head/x11/xset/Makefile head/x11/xsetroot/Makefile head/x11/xsm/Makefile head/x11/xstdcmap/Makefile head/x11/xtrans/Makefile head/x11/xvidtune/Makefile head/x11/xvinfo/Makefile head/x11/xvmcinfo/Makefile head/x11/xwd/Makefile head/x11/xwininfo/Makefile head/x11/xwud/Makefile Modified: head/devel/gccmakedep/Makefile ============================================================================== --- head/devel/gccmakedep/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/devel/gccmakedep/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/devel/imake/Makefile ============================================================================== --- head/devel/imake/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/devel/imake/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -17,13 +17,11 @@ 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 Modified: head/devel/libgudev/Makefile ============================================================================== --- head/devel/libgudev/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/devel/libgudev/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/devel/libpciaccess/Makefile ============================================================================== --- head/devel/libpciaccess/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/devel/libpciaccess/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -15,7 +15,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:misc/pc CONFIGURE_ARGS= --with-pciids-path=${LOCALBASE}/share/pciids -XORG_CAT= lib +USES= xorg-cat:lib INSTALL_TARGET= install-strip .include Modified: head/devel/lndir/Makefile ============================================================================== --- head/devel/lndir/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/devel/lndir/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 \ Modified: head/devel/makedepend/Makefile ============================================================================== --- head/devel/makedepend/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/devel/makedepend/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/devel/xorg-macros/Makefile ============================================================================== --- head/devel/xorg-macros/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/devel/xorg-macros/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/graphics/freeglut/Makefile ============================================================================== --- head/graphics/freeglut/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/graphics/freeglut/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -13,7 +13,7 @@ COMMENT= open source implementation of the GLUT librar 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 Modified: head/graphics/glew/Makefile ============================================================================== --- head/graphics/glew/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/graphics/glew/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/graphics/imlib2/Makefile ============================================================================== --- head/graphics/imlib2/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/graphics/imlib2/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/graphics/libepoxy/Makefile ============================================================================== --- head/graphics/libepoxy/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/graphics/libepoxy/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -11,7 +11,7 @@ COMMENT= Library to handle OpenGL function pointer man 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 Modified: head/graphics/mesa-demos/Makefile ============================================================================== --- head/graphics/mesa-demos/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/graphics/mesa-demos/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/graphics/mesa-dri/Makefile.common ============================================================================== --- head/graphics/mesa-dri/Makefile.common Sun Nov 3 21:56:05 2019 (r516606) +++ head/graphics/mesa-dri/Makefile.common Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/graphics/piglit/Makefile ============================================================================== --- head/graphics/piglit/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/graphics/piglit/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/graphics/waffle/Makefile ============================================================================== --- head/graphics/waffle/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/graphics/waffle/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -12,7 +12,7 @@ COMMENT= Library that allows to defer selection of an 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 Modified: head/lang/beignet/Makefile ============================================================================== --- head/lang/beignet/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/lang/beignet/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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} Modified: head/sysutils/polkit/Makefile ============================================================================== --- head/sysutils/polkit/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/sysutils/polkit/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/textproc/xorg-sgml-doctools/Makefile ============================================================================== --- head/textproc/xorg-sgml-doctools/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/textproc/xorg-sgml-doctools/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-clocks/oclock/Makefile ============================================================================== --- head/x11-clocks/oclock/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-clocks/oclock/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-clocks/xclock/Makefile ============================================================================== --- head/x11-clocks/xclock/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-clocks/xclock/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-input-egalax/Makefile ============================================================================== --- head/x11-drivers/xf86-input-egalax/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-egalax/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -15,7 +15,6 @@ GH_TAGNAME= 7f1e4ac LICENSE= BSD2CLAUSE -USES= autoreconf -XORG_CAT= driver +USES= autoreconf xorg-cat:driver .include Modified: head/x11-drivers/xf86-input-elographics/Makefile ============================================================================== --- head/x11-drivers/xf86-input-elographics/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-elographics/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -10,6 +10,6 @@ COMMENT= X.Org elographics input driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include Modified: head/x11-drivers/xf86-input-evdev/Makefile ============================================================================== --- head/x11-drivers/xf86-input-evdev/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-evdev/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-input-joystick/Makefile ============================================================================== --- head/x11-drivers/xf86-input-joystick/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-joystick/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-input-keyboard/Makefile ============================================================================== --- head/x11-drivers/xf86-input-keyboard/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-keyboard/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -11,6 +11,6 @@ COMMENT= X.Org keyboard input driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include Modified: head/x11-drivers/xf86-input-libinput/Makefile ============================================================================== --- head/x11-drivers/xf86-input-libinput/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-libinput/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-input-mouse/Makefile ============================================================================== --- head/x11-drivers/xf86-input-mouse/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-mouse/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-input-synaptics/Makefile ============================================================================== --- head/x11-drivers/xf86-input-synaptics/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-synaptics/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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) Modified: head/x11-drivers/xf86-input-vmmouse/Makefile ============================================================================== --- head/x11-drivers/xf86-input-vmmouse/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-vmmouse/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-input-void/Makefile ============================================================================== --- head/x11-drivers/xf86-input-void/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-void/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-input-wacom/Makefile ============================================================================== --- head/x11-drivers/xf86-input-wacom/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-input-wacom/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-amdgpu/Makefile ============================================================================== --- head/x11-drivers/xf86-video-amdgpu/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-amdgpu/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-apm/Makefile ============================================================================== --- head/x11-drivers/xf86-video-apm/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-apm/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-ark/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ark/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-ark/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-ast/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ast/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-ast/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-ati-legacy/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ati-legacy/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-ati-legacy/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-ati/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ati/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-ati/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-chips/Makefile ============================================================================== --- head/x11-drivers/xf86-video-chips/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-chips/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-cirrus/Makefile ============================================================================== --- head/x11-drivers/xf86-video-cirrus/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-cirrus/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-dummy/Makefile ============================================================================== --- head/x11-drivers/xf86-video-dummy/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-dummy/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -11,6 +11,6 @@ COMMENT= X.Org dummy display driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include Modified: head/x11-drivers/xf86-video-geode/Makefile ============================================================================== --- head/x11-drivers/xf86-video-geode/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-geode/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-glint/Makefile ============================================================================== --- head/x11-drivers/xf86-video-glint/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-glint/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-i128/Makefile ============================================================================== --- head/x11-drivers/xf86-video-i128/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-i128/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-i740/Makefile ============================================================================== --- head/x11-drivers/xf86-video-i740/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-i740/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-intel/Makefile ============================================================================== --- head/x11-drivers/xf86-video-intel/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-intel/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -17,7 +17,7 @@ ONLY_FOR_ARCHS_REASON= Intel integrated GPU only exist 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 Modified: head/x11-drivers/xf86-video-mach64/Makefile ============================================================================== --- head/x11-drivers/xf86-video-mach64/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-mach64/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-mga/Makefile ============================================================================== --- head/x11-drivers/xf86-video-mga/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-mga/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-neomagic/Makefile ============================================================================== --- head/x11-drivers/xf86-video-neomagic/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-neomagic/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-nv/Makefile ============================================================================== --- head/x11-drivers/xf86-video-nv/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-nv/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-openchrome/Makefile ============================================================================== --- head/x11-drivers/xf86-video-openchrome/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-openchrome/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-qxl/Makefile ============================================================================== --- head/x11-drivers/xf86-video-qxl/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-qxl/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -14,10 +14,9 @@ BUILD_DEPENDS= spice-protocol>=0.12.10:devel/spice-pro ${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 Modified: head/x11-drivers/xf86-video-r128/Makefile ============================================================================== --- head/x11-drivers/xf86-video-r128/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-r128/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-rendition/Makefile ============================================================================== --- head/x11-drivers/xf86-video-rendition/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-rendition/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-s3/Makefile ============================================================================== --- head/x11-drivers/xf86-video-s3/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-s3/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -10,6 +10,6 @@ COMMENT= X.Org s3 display driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include Modified: head/x11-drivers/xf86-video-s3virge/Makefile ============================================================================== --- head/x11-drivers/xf86-video-s3virge/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-s3virge/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-savage/Makefile ============================================================================== --- head/x11-drivers/xf86-video-savage/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-savage/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-scfb/Makefile ============================================================================== --- head/x11-drivers/xf86-video-scfb/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-scfb/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -12,6 +12,6 @@ COMMENT= X.Org syscons display driver USE_GITHUB= yes GH_ACCOUNT= rayddteam -XORG_CAT= driver +USES= xorg-cat:driver .include Modified: head/x11-drivers/xf86-video-siliconmotion/Makefile ============================================================================== --- head/x11-drivers/xf86-video-siliconmotion/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-siliconmotion/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-sis/Makefile ============================================================================== --- head/x11-drivers/xf86-video-sis/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-sis/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -11,6 +11,6 @@ LICENSE= BSD3CLAUSE MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING -XORG_CAT= driver +USES= xorg-cat:driver .include Modified: head/x11-drivers/xf86-video-sunffb/Makefile ============================================================================== --- head/x11-drivers/xf86-video-sunffb/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-sunffb/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-tdfx/Makefile ============================================================================== --- head/x11-drivers/xf86-video-tdfx/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-tdfx/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-trident/Makefile ============================================================================== --- head/x11-drivers/xf86-video-trident/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-trident/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-tseng/Makefile ============================================================================== --- head/x11-drivers/xf86-video-tseng/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-tseng/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-vesa/Makefile ============================================================================== --- head/x11-drivers/xf86-video-vesa/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-vesa/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-vmware/Makefile ============================================================================== --- head/x11-drivers/xf86-video-vmware/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-vmware/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-drivers/xf86-video-voodoo/Makefile ============================================================================== --- head/x11-drivers/xf86-video-voodoo/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-drivers/xf86-video-voodoo/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/bdftopcf/Makefile ============================================================================== --- head/x11-fonts/bdftopcf/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/bdftopcf/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/encodings/Makefile ============================================================================== --- head/x11-fonts/encodings/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/encodings/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-adobe-100dpi/Makefile ============================================================================== --- head/x11-fonts/font-adobe-100dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-adobe-100dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-adobe-75dpi/Makefile ============================================================================== --- head/x11-fonts/font-adobe-75dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-adobe-75dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-adobe-utopia-100dpi/Makefile ============================================================================== --- head/x11-fonts/font-adobe-utopia-100dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-adobe-utopia-100dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-adobe-utopia-75dpi/Makefile ============================================================================== --- head/x11-fonts/font-adobe-utopia-75dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-adobe-utopia-75dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-adobe-utopia-type1/Makefile ============================================================================== --- head/x11-fonts/font-adobe-utopia-type1/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-adobe-utopia-type1/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-alias/Makefile ============================================================================== --- head/x11-fonts/font-alias/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-alias/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-arabic-misc/Makefile ============================================================================== --- head/x11-fonts/font-arabic-misc/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-arabic-misc/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bh-100dpi/Makefile ============================================================================== --- head/x11-fonts/font-bh-100dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bh-100dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bh-75dpi/Makefile ============================================================================== --- head/x11-fonts/font-bh-75dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bh-75dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile ============================================================================== --- head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile ============================================================================== --- head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bh-ttf/Makefile ============================================================================== --- head/x11-fonts/font-bh-ttf/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bh-ttf/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bh-type1/Makefile ============================================================================== --- head/x11-fonts/font-bh-type1/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bh-type1/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bitstream-100dpi/Makefile ============================================================================== --- head/x11-fonts/font-bitstream-100dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bitstream-100dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bitstream-75dpi/Makefile ============================================================================== --- head/x11-fonts/font-bitstream-75dpi/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bitstream-75dpi/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-bitstream-type1/Makefile ============================================================================== --- head/x11-fonts/font-bitstream-type1/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-bitstream-type1/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-cronyx-cyrillic/Makefile ============================================================================== --- head/x11-fonts/font-cronyx-cyrillic/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-cronyx-cyrillic/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-cursor-misc/Makefile ============================================================================== --- head/x11-fonts/font-cursor-misc/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-cursor-misc/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-daewoo-misc/Makefile ============================================================================== --- head/x11-fonts/font-daewoo-misc/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-daewoo-misc/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-dec-misc/Makefile ============================================================================== --- head/x11-fonts/font-dec-misc/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-dec-misc/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-ibm-type1/Makefile ============================================================================== --- head/x11-fonts/font-ibm-type1/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-ibm-type1/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-isas-misc/Makefile ============================================================================== --- head/x11-fonts/font-isas-misc/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-isas-misc/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -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 Modified: head/x11-fonts/font-jis-misc/Makefile ============================================================================== --- head/x11-fonts/font-jis-misc/Makefile Sun Nov 3 21:56:05 2019 (r516606) +++ head/x11-fonts/font-jis-misc/Makefile Sun Nov 3 21:56:37 2019 (r516607) @@ -9,6 +9,6 @@ CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org miscellaneous JIS fonts -XORG_CAT= font *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***