diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk index c075935ad73b..f876ca8dfe45 100644 --- a/Mk/Uses/xorg-cat.mk +++ b/Mk/Uses/xorg-cat.mk @@ -1,174 +1,178 @@ # xorg ports categories and other things needed to build xorg ports. # This is intended only for ports of xorg and freedesktop.org applications. # # Use USES=xorg and USE_XORG to depend on various xorg components. # # Feature: xorg-cat # Usage: USES=xorg-cat:category[,buildsystem] # # category is one of: # * app Installs applications, no shared libraries. # * data Installs only data. # * doc no particular notes # * driver depends on xorgproto at least # * font don't install .pc file # * lib various dependencies, install .pc file, needs # pathfix +# * proto install .pc file, most only needed at build time # * test no particular notes # * util no particular notes # # These categories has to match upstream categories. Don't invent # your own. # # builsystem is one of: # * autotools (default) -# * meson (experimental) +# * meson # # # By defining USE_GITLAB and GL_TAGNAME, it is possible to pull code straight # from the freedesktop.org gitlab, instead of official release tarballs. # #.MAINTAINER: x11@FreeBSD.org .if !defined(_INCLUDE_USES_XORG_CAT_MK) _INCLUDE_USES_XORG_CAT_MK=yes -_XORG_CATEGORIES= app data doc driver font lib test util +_XORG_CATEGORIES= app data doc driver font lib proto test util _XORG_BUILDSYSTEMS= autotools meson _XORG_CAT= # empty _XORG_BUILDSYS= # empty . if empty(xorg-cat_ARGS) IGNORE= no arguments specified to xorg-cat . endif . for _arg in ${xorg-cat_ARGS} . if ${_XORG_CATEGORIES:M${_arg}} . if empty(_XORG_CAT) _XORG_CAT= ${_arg} . else IGNORE= multipe xorg categories specified via xorg-cat:${xorg-cat_ARGS:ts,} . endif . elif ${_XORG_BUILDSYSTEMS:M${_arg}} . if empty(_XORG_BUILDSYS) _XORG_BUILDSYS= ${_arg} . else IGNORE= multipe xorg build systems specified via xorg-cat:${xorg-cat_ARGS:ts,} . endif . else IGNORE= unknown argument specified via xorg-cat:${xorg-cat_ARGS:ts,} . endif . endfor # Default to the autotools build system . if empty(_XORG_BUILDSYS) _XORG_BUILDSYS= autotools . endif # Default variables, common to all new modular xorg ports. . if empty(USES:Mtar) -EXTRACT_SUFX?= .tar.bz2 +EXTRACT_SUFX?= .tar.xz . endif DIST_SUBDIR= xorg/${_XORG_CAT} . if ${_XORG_BUILDSYS} == meson .include "${USESDIR}/meson.mk" . elif ${_XORG_BUILDSYS} == autotools GNU_CONFIGURE= yes . else # This should not happen IGNORE= unknown build system specified via xorg-cat:${xorg-cat_ARGS:ts,} . endif . if defined(USE_GITLAB) # Set up things for fetching from freedesktop.org gitlab. # This can be overridden using normal GL_* macros in the ports Makefile. # We make a best guess for GL_ACCOUNT and GL_PROJECT. GL_SITE?= https://gitlab.freedesktop.org/xorg GL_ACCOUNT?= ${_XORG_CAT} GL_PROJECT?= ${PORTNAME:tl} . if ${_XORG_BUILDSYS} == meson # set up meson stuff here . else # Things from GL doesn't come with pre-generated configure, add dependency on # autoreconf and run it, if we're using autotools. .include "${USESDIR}/autoreconf.mk" . endif . else MASTER_SITES?= XORG/individual/${_XORG_CAT} . endif # ## All xorg ports needs pkgconfig to build, but some ports look for pkgconfig ## and then continues the build. .include "${USESDIR}/pkgconfig.mk" # ## All xorg ports needs xorg-macros. . if ${PORTNAME} != xorg-macros USE_XORG+= xorg-macros . endif . if ${_XORG_CAT} == app # Nothing at the moment . elif ${_XORG_CAT} == data NO_ARCH= yes . elif ${_XORG_CAT} == doc NO_ARCH= yes . elif ${_XORG_CAT} == driver USE_XORG+= xi xorg-server xorgproto CFLAGS+= -Werror=uninitialized . if ${_XORG_BUILDSYS} == meson # Put special stuff for meson here . else CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' libtool_ARGS?= # empty .include "${USESDIR}/libtool.mk" INSTALL_TARGET= install-strip . endif . elif ${_XORG_CAT} == font FONTNAME?= ${PORTNAME:C/.*-//g:S/type/Type/:S/ttf/TTF/:S/speedo/Speedo/} . if ${_XORG_BUILDSYS} == meson # Put special stuff for meson here . else CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts CONFIGURE_ENV+= FONTROOTDIR=${PREFIX}/share/fonts . endif . if !defined(NOFONT) .include "${USESDIR}/fonts.mk" BUILD_DEPENDS+= mkfontscale>=0:x11-fonts/mkfontscale \ bdftopcf:x11-fonts/bdftopcf PLIST_FILES+= "@comment ${FONTSDIR}/fonts.dir" \ "@comment ${FONTSDIR}/fonts.scale" NO_ARCH= yes . endif . elif ${_XORG_CAT} == lib CFLAGS+= -Werror=uninitialized .include "${USESDIR}/pathfix.mk" USE_LDCONFIG= yes . if ${_XORG_BUILDSYS} == meson # put meson stuff here . else libtool_ARGS?= # empty .include "${USESDIR}/libtool.mk" CONFIGURE_ARGS+=--enable-malloc0returnsnull . endif +. elif ${_XORG_CAT} == proto +NO_ARCH= yes + . endif # ${_XORG_CAT} == # We only need to include xorg.mk if we want USE_XORG modules # USES+=xorg does not provide any functionality, it just silences an error # message about USES=xorg not being set . if defined(USE_XORG) && !empty(USE_XORG) USES+= xorg .include "${USESDIR}/xorg.mk" . endif .endif diff --git a/x11-drivers/xf86-input-evdev/Makefile b/x11-drivers/xf86-input-evdev/Makefile index 9e7ec147e052..4528bd346584 100644 --- a/x11-drivers/xf86-input-evdev/Makefile +++ b/x11-drivers/xf86-input-evdev/Makefile @@ -1,22 +1,22 @@ PORTNAME= xf86-input-evdev PORTVERSION= 2.10.6 PORTREVISION= 8 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org event device input driver WWW= https://www.x.org/ LICENSE= MIT # various styles LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto LIB_DEPENDS= libevdev.so:devel/libevdev \ libmtdev.so:devel/libmtdev RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd -USES= pathfix xorg-cat:driver -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USES= pathfix tar:bz2 xorg-cat:driver + CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" " .include diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile index 5a2989c24184..29e8a5e76057 100644 --- a/x11-drivers/xf86-input-keyboard/Makefile +++ b/x11-drivers/xf86-input-keyboard/Makefile @@ -1,17 +1,15 @@ PORTNAME= xf86-input-keyboard PORTVERSION= 1.9.0 PORTREVISION= 6 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org keyboard input driver WWW= https://www.x.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USES= tar:bz2 xorg-cat:driver .include diff --git a/x11-drivers/xf86-input-mouse/Makefile b/x11-drivers/xf86-input-mouse/Makefile index fc40474a2a7a..8ce523d21fff 100644 --- a/x11-drivers/xf86-input-mouse/Makefile +++ b/x11-drivers/xf86-input-mouse/Makefile @@ -1,17 +1,15 @@ PORTNAME= xf86-input-mouse PORTVERSION= 1.9.3 PORTREVISION= 5 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mouse input driver WWW= https://www.x.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= pathfix xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USES= pathfix tar:bz2 xorg-cat:driver .include diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86-input-synaptics/Makefile index e3dfd8ea42e6..dc758d4cac7b 100644 --- a/x11-drivers/xf86-input-synaptics/Makefile +++ b/x11-drivers/xf86-input-synaptics/Makefile @@ -1,27 +1,25 @@ PORTNAME= xf86-input-synaptics PORTVERSION= 1.9.1 PORTREVISION= 11 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org synaptics input driver WWW= https://www.x.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= pathfix xorg xorg-cat:driver +USES= pathfix tar:bz2 xorg xorg-cat:driver USE_XORG= x11 xtst -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share - OPTIONS_DEFINE= EVDEV OPTIONS_DEFAULT_FreeBSD= EVDEV OPTIONS_DEFAULT=${OPTIONS_DEFAULT_${OPSYS}} EVDEV_DESC= Use evdev for input events (requires kernel support) EVDEV_CONFIGURE_ENV= BUILD_EVENTCOMM=yes EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev .include diff --git a/x11-drivers/xf86-input-vmmouse/Makefile b/x11-drivers/xf86-input-vmmouse/Makefile index 7da9f108ed30..68e74966e0d1 100644 --- a/x11-drivers/xf86-input-vmmouse/Makefile +++ b/x11-drivers/xf86-input-vmmouse/Makefile @@ -1,17 +1,15 @@ PORTNAME= xf86-input-vmmouse PORTVERSION= 13.1.0 PORTREVISION= 7 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org vmmouse input driver WWW= https://www.x.org/ -USES= gmake xorg-cat:driver - -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USES= gmake tar:bz2 xorg-cat:driver ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= vmmouse protocol is only supported on x86-compatible architectures .include diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile index 521732624ac2..7b22fa00bce0 100644 --- a/x11-drivers/xf86-input-wacom/Makefile +++ b/x11-drivers/xf86-input-wacom/Makefile @@ -1,45 +1,44 @@ PORTNAME= xf86-input-wacom PORTVERSION= 0.39.0 PORTREVISION= 4 CATEGORIES= x11-drivers MASTER_SITES= https://github.com/linuxwacom/${PORTNAME}/releases/download/${DISTNAME}/ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org legacy Wacom tablet driver WWW= https://linuxwacom.github.io/ LICENSE= GPLv2+ BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto RUN_DEPENDS= webcamd>=3.1.0.1:multimedia/webcamd -USES= gmake pathfix xorg xorg-cat:driver +USES= gmake pathfix tar:bz2 xorg xorg-cat:driver USE_XORG= x11 xext xinerama xrandr LDFLAGS+= -Wl,--as-needed # Xext USE_RC_SUBR= wacom SUB_FILES= pkg-message -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share CONFIGURE_ENV= UDEV_CFLAGS=" " UDEV_LIBS=" " CONFIGURE_ARGS= --without-systemd-unit-dir \ --without-udev-rules-dir \ --without-doxygen OPTIONS_DEFINE= DEBUG TEST DEBUG_CONFIGURE_ENABLE=debug TEST_CONFIGURE_ENABLE=unit-tests TEST_ALL_TARGET=check post-patch: @${REINPLACE_CMD} \ -e 's/dir=.*xorg-server/& \ --define-variable prefix="$$prefix"/' \ ${WRKSRC}/configure post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d ${INSTALL_DATA} ${FILESDIR}/wacom.conf.sample \ ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d .include diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index eca8f6929661..bd1f4f716b80 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -1,25 +1,25 @@ PORTNAME= libXfont PORTVERSION= 1.5.4 PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X font library WWW= https://www.freedesktop.org/wiki/Software/xlibs/ LICENSE= MIT BSD2CLAUSE BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= cpe xorg xorg-cat:lib +USES= cpe tar:bz2 xorg xorg-cat:lib USE_XORG= xorgproto xtrans fontenc INSTALL_TARGET= install-strip CPE_PRODUCT= libxfont CPE_VENDOR= x CONFIGURE_ARGS= --without-xmlto --disable-devel-docs .include diff --git a/x11/scripts/Makefile b/x11/scripts/Makefile index 10ad1dc8e8ce..6f39160f95a0 100644 --- a/x11/scripts/Makefile +++ b/x11/scripts/Makefile @@ -1,21 +1,18 @@ PORTNAME= scripts PORTVERSION= 1.0.1 PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Various X related scripts WWW= https://cgit.freedesktop.org/xorg/app/scripts RUN_DEPENDS= ksh:shells/pdksh -USES= shebangfix xorg xorg-cat:app +USES= shebangfix tar:bz2 xorg xorg-cat:app USE_XORG= x11 -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share - post-patch: @${REINPLACE_CMD} -e 's|XCOMM!/bin/ksh|XCOMM!${ksh_CMD}|' ${WRKSRC}/xauth_switch_to_sun-des-1.cpp .include diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile index 6e232b2d3703..d28dd53796ab 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -1,20 +1,17 @@ PORTNAME= xcb-proto PORTVERSION= 1.17.0 CATEGORIES= x11 python -MASTER_SITES= XORG/individual/proto MAINTAINER= x11@FreeBSD.org COMMENT= The X protocol C-language Binding (XCB) protocol WWW= https://xcb.freedesktop.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE= yes -USES= gnome python tar:xz +USES= gnome python xorg-cat:proto USE_GNOME= libxml2:build -NO_ARCH= yes DATADIR= ${PREFIX}/share/xcb .include diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo index e75a3f68397f..1d73d3de6152 100644 --- a/x11/xcb-proto/distinfo +++ b/x11/xcb-proto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753269668 -SHA256 (xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c -SIZE (xcb-proto-1.17.0.tar.xz) = 151748 +TIMESTAMP = 1788234495 +SHA256 (xorg/proto/xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c +SIZE (xorg/proto/xcb-proto-1.17.0.tar.xz) = 151748 diff --git a/x11/xf86dga/Makefile b/x11/xf86dga/Makefile index 3b9577807ee2..6eb4a4e6c36c 100644 --- a/x11/xf86dga/Makefile +++ b/x11/xf86dga/Makefile @@ -1,17 +1,20 @@ PORTNAME= xf86dga -PORTVERSION= 1.0.3 -PORTREVISION= 2 +DISTVERSION= 1.0.3 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Test program for the XFree86-DGA extension +WWW= https://gitlab.freedesktop.org/xorg/app/xf86dga -LICENSE= MIT +LICENSE= UNKNOWN +LICENSE_NAME= unknown +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= xorg xorg-cat:app +USES= tar:bz2 xorg xorg-cat:app USE_XORG= x11 xxf86dga xt xaw7 xmu PLIST_FILES= bin/dga share/man/man1/dga.1.gz -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share .include diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile index 16a625d6615e..d01130b4e316 100644 --- a/x11/xorgproto/Makefile +++ b/x11/xorgproto/Makefile @@ -1,27 +1,23 @@ PORTNAME= xorgproto DISTVERSION= 2025.1 CATEGORIES= x11 -MASTER_SITES= XORG/individual/proto MAINTAINER= x11@FreeBSD.org COMMENT= X Window System unified protocol definitions WWW= https://gitlab.freedesktop.org/xorg/proto/xorgproto LICENSE= MIT -USES= pkgconfig tar:xz +USES= xorg-cat:proto -NO_ARCH= yes - -GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-fop \ --without-xmlto \ --without-xsltproc \ --disable-specs OPTIONS_DEFINE= DOCS pre-patch: @${MKDIR} ${WRKSRC}/man .include diff --git a/x11/xorgproto/distinfo b/x11/xorgproto/distinfo index 2db302afb2f9..16ed257a85df 100644 --- a/x11/xorgproto/distinfo +++ b/x11/xorgproto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1766302438 -SHA256 (xorgproto-2025.1.tar.xz) = 56898c716c0578df8a2d828c9c3e5c528277705c0484381a81960fe1a67668e8 -SIZE (xorgproto-2025.1.tar.xz) = 766932 +TIMESTAMP = 1788234326 +SHA256 (xorg/proto/xorgproto-2025.1.tar.xz) = 56898c716c0578df8a2d828c9c3e5c528277705c0484381a81960fe1a67668e8 +SIZE (xorg/proto/xorgproto-2025.1.tar.xz) = 766932