diff --git a/Mk/Uses/xorg-cat.mk b/Mk/Uses/xorg-cat.mk index 0853fd6b3e3c..b81972b4ae5f 100644 --- a/Mk/Uses/xorg-cat.mk +++ b/Mk/Uses/xorg-cat.mk @@ -1,174 +1,169 @@ # 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, needs pathfix, most only needed at -# build time. # * util no particular notes # # These categories has to match upstream categories. Don't invent # your own. # # builsystem is one of: # * autotools (default) # * meson (experimental) # # # 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 proto util +_XORG_CATEGORIES= app data doc driver font lib 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 . 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 # Nothing at the moment. . 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" . endif . elif ${_XORG_CAT} == lib CFLAGS+= -Werror=uninitialized .include "${USESDIR}/pathfix.mk" . if ${_XORG_BUILDSYS} == meson # put meson stuff here . else libtool_ARGS?= # empty .include "${USESDIR}/libtool.mk" USE_LDCONFIG= yes CONFIGURE_ARGS+=--enable-malloc0returnsnull . endif -. elif ${_XORG_CAT} == proto -.include "${USESDIR}/pathfix.mk" - . 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/xcb-proto/Makefile b/x11/xcb-proto/Makefile index 8a03571772e2..6e232b2d3703 100644 --- a/x11/xcb-proto/Makefile +++ b/x11/xcb-proto/Makefile @@ -1,19 +1,20 @@ 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 -USES= gnome python tar:xz xorg-cat:proto +GNU_CONFIGURE= yes +USES= gnome python tar:xz USE_GNOME= libxml2:build NO_ARCH= yes -MAKE_ARGS= pkgconfigdir=${PREFIX}/libdata/pkgconfig DATADIR= ${PREFIX}/share/xcb .include diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo index 0a6e99c81a30..e75a3f68397f 100644 --- a/x11/xcb-proto/distinfo +++ b/x11/xcb-proto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713255468 -SHA256 (xorg/proto/xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c -SIZE (xorg/proto/xcb-proto-1.17.0.tar.xz) = 151748 +TIMESTAMP = 1753269668 +SHA256 (xcb-proto-1.17.0.tar.xz) = 2c1bacd2110f4799f74de6ebb714b94cf6f80fb112316b1219480fd22562148c +SIZE (xcb-proto-1.17.0.tar.xz) = 151748 diff --git a/x11/xcb-proto/pkg-plist b/x11/xcb-proto/pkg-plist index 10db9e7288d2..de8ab93d2518 100644 --- a/x11/xcb-proto/pkg-plist +++ b/x11/xcb-proto/pkg-plist @@ -1,62 +1,62 @@ -libdata/pkgconfig/xcb-proto.pc +share/pkgconfig/xcb-proto.pc %%DATADIR%%/bigreq.xml %%DATADIR%%/composite.xml %%DATADIR%%/damage.xml %%DATADIR%%/dbe.xml %%DATADIR%%/dpms.xml %%DATADIR%%/dri2.xml %%DATADIR%%/dri3.xml %%DATADIR%%/ge.xml %%DATADIR%%/glx.xml %%DATADIR%%/present.xml %%DATADIR%%/randr.xml %%DATADIR%%/record.xml %%DATADIR%%/render.xml %%DATADIR%%/res.xml %%DATADIR%%/screensaver.xml %%DATADIR%%/shape.xml %%DATADIR%%/shm.xml %%DATADIR%%/sync.xml %%DATADIR%%/xc_misc.xml %%DATADIR%%/xcb.xsd %%DATADIR%%/xevie.xml %%DATADIR%%/xf86dri.xml %%DATADIR%%/xf86vidmode.xml %%DATADIR%%/xfixes.xml %%DATADIR%%/xinerama.xml %%DATADIR%%/xinput.xml %%DATADIR%%/xkb.xml %%DATADIR%%/xprint.xml %%DATADIR%%/xproto.xml %%DATADIR%%/xselinux.xml %%DATADIR%%/xtest.xml %%DATADIR%%/xv.xml %%DATADIR%%/xvmc.xml %%PYTHON_SITELIBDIR%%/xcbgen/__init__.py %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/__init__%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/align%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/align%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/align%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/error%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/expr%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/matcher%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/state%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes%%PYTHON_TAG%%.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes%%PYTHON_TAG%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/xcbgen/__pycache__/xtypes%%PYTHON_TAG%%.opt-2.pyc %%PYTHON_SITELIBDIR%%/xcbgen/align.py %%PYTHON_SITELIBDIR%%/xcbgen/error.py %%PYTHON_SITELIBDIR%%/xcbgen/expr.py %%PYTHON_SITELIBDIR%%/xcbgen/matcher.py %%PYTHON_SITELIBDIR%%/xcbgen/state.py %%PYTHON_SITELIBDIR%%/xcbgen/xtypes.py diff --git a/x11/xorgproto/Makefile b/x11/xorgproto/Makefile index 50ab69358a11..057745dc40d2 100644 --- a/x11/xorgproto/Makefile +++ b/x11/xorgproto/Makefile @@ -1,25 +1,27 @@ PORTNAME= xorgproto DISTVERSION= 2024.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= tar:xz xorg-cat:proto +USES= tar:xz 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 fe87b2b0eba8..d965a0e2d162 100644 --- a/x11/xorgproto/distinfo +++ b/x11/xorgproto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711437392 -SHA256 (xorg/proto/xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59 -SIZE (xorg/proto/xorgproto-2024.1.tar.xz) = 760500 +TIMESTAMP = 1753269244 +SHA256 (xorgproto-2024.1.tar.xz) = 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59 +SIZE (xorgproto-2024.1.tar.xz) = 760500 diff --git a/x11/xorgproto/pkg-plist b/x11/xorgproto/pkg-plist index cfe2fdaa2618..c94ee5e6fd55 100644 --- a/x11/xorgproto/pkg-plist +++ b/x11/xorgproto/pkg-plist @@ -1,169 +1,169 @@ include/GL/glxint.h include/GL/glxmd.h include/GL/glxproto.h include/GL/glxtokens.h include/GL/internal/glcore.h include/X11/DECkeysym.h include/X11/HPkeysym.h include/X11/Sunkeysym.h include/X11/X.h include/X11/XF86keysym.h include/X11/XWDFile.h include/X11/Xalloca.h include/X11/Xarch.h include/X11/Xatom.h include/X11/Xdefs.h include/X11/Xfuncproto.h include/X11/Xfuncs.h include/X11/Xmd.h include/X11/Xos.h include/X11/Xos_r.h include/X11/Xosdefs.h include/X11/Xpoll.h include/X11/Xproto.h include/X11/Xprotostr.h include/X11/Xthreads.h include/X11/Xw32defs.h include/X11/Xwindows.h include/X11/Xwinsock.h include/X11/ap_keysym.h include/X11/dri/xf86dri.h include/X11/dri/xf86driproto.h include/X11/dri/xf86dristr.h include/X11/extensions/EVI.h include/X11/extensions/EVIproto.h include/X11/extensions/XI.h include/X11/extensions/XI2.h include/X11/extensions/XI2proto.h include/X11/extensions/XIproto.h include/X11/extensions/XKB.h include/X11/extensions/XKBproto.h include/X11/extensions/XKBsrv.h include/X11/extensions/XKBstr.h include/X11/extensions/XResproto.h include/X11/extensions/Xv.h include/X11/extensions/XvMC.h include/X11/extensions/XvMCproto.h include/X11/extensions/Xvproto.h include/X11/extensions/ag.h include/X11/extensions/agproto.h include/X11/extensions/applewmconst.h include/X11/extensions/applewmproto.h include/X11/extensions/bigreqsproto.h include/X11/extensions/bigreqstr.h include/X11/extensions/composite.h include/X11/extensions/compositeproto.h include/X11/extensions/cup.h include/X11/extensions/cupproto.h include/X11/extensions/damageproto.h include/X11/extensions/damagewire.h include/X11/extensions/dbe.h include/X11/extensions/dbeproto.h include/X11/extensions/dmx.h include/X11/extensions/dmxproto.h include/X11/extensions/dpmsconst.h include/X11/extensions/dpmsproto.h include/X11/extensions/dri2proto.h include/X11/extensions/dri2tokens.h include/X11/extensions/dri3proto.h include/X11/extensions/ge.h include/X11/extensions/geproto.h include/X11/extensions/lbx.h include/X11/extensions/lbxproto.h include/X11/extensions/mitmiscconst.h include/X11/extensions/mitmiscproto.h include/X11/extensions/multibufconst.h include/X11/extensions/multibufproto.h include/X11/extensions/panoramiXproto.h include/X11/extensions/presentproto.h include/X11/extensions/presenttokens.h include/X11/extensions/randr.h include/X11/extensions/randrproto.h include/X11/extensions/recordconst.h include/X11/extensions/recordproto.h include/X11/extensions/recordstr.h include/X11/extensions/render.h include/X11/extensions/renderproto.h include/X11/extensions/saver.h include/X11/extensions/saverproto.h include/X11/extensions/secur.h include/X11/extensions/securproto.h include/X11/extensions/shapeconst.h include/X11/extensions/shapeproto.h include/X11/extensions/shapestr.h include/X11/extensions/shm.h include/X11/extensions/shmproto.h include/X11/extensions/shmstr.h include/X11/extensions/syncconst.h include/X11/extensions/syncproto.h include/X11/extensions/syncstr.h include/X11/extensions/xcmiscproto.h include/X11/extensions/xcmiscstr.h include/X11/extensions/xf86bigfont.h include/X11/extensions/xf86bigfproto.h include/X11/extensions/xf86bigfstr.h include/X11/extensions/xf86dga.h include/X11/extensions/xf86dga1const.h include/X11/extensions/xf86dga1proto.h include/X11/extensions/xf86dga1str.h include/X11/extensions/xf86dgaconst.h include/X11/extensions/xf86dgaproto.h include/X11/extensions/xf86dgastr.h include/X11/extensions/xf86vm.h include/X11/extensions/xf86vmproto.h include/X11/extensions/xf86vmstr.h include/X11/extensions/xfixesproto.h include/X11/extensions/xfixeswire.h include/X11/extensions/xtestconst.h include/X11/extensions/xtestext1const.h include/X11/extensions/xtestext1proto.h include/X11/extensions/xtestproto.h include/X11/extensions/xwaylandproto.h include/X11/fonts/FS.h include/X11/fonts/FSproto.h include/X11/fonts/font.h include/X11/fonts/fontproto.h include/X11/fonts/fontstruct.h include/X11/fonts/fsmasks.h include/X11/keysym.h include/X11/keysymdef.h -libdata/pkgconfig/applewmproto.pc -libdata/pkgconfig/bigreqsproto.pc -libdata/pkgconfig/compositeproto.pc -libdata/pkgconfig/damageproto.pc -libdata/pkgconfig/dmxproto.pc -libdata/pkgconfig/dpmsproto.pc -libdata/pkgconfig/dri2proto.pc -libdata/pkgconfig/dri3proto.pc -libdata/pkgconfig/fixesproto.pc -libdata/pkgconfig/fontsproto.pc -libdata/pkgconfig/glproto.pc -libdata/pkgconfig/inputproto.pc -libdata/pkgconfig/kbproto.pc -libdata/pkgconfig/presentproto.pc -libdata/pkgconfig/randrproto.pc -libdata/pkgconfig/recordproto.pc -libdata/pkgconfig/renderproto.pc -libdata/pkgconfig/resourceproto.pc -libdata/pkgconfig/scrnsaverproto.pc -libdata/pkgconfig/videoproto.pc -libdata/pkgconfig/xcmiscproto.pc -libdata/pkgconfig/xextproto.pc -libdata/pkgconfig/xf86bigfontproto.pc -libdata/pkgconfig/xf86dgaproto.pc -libdata/pkgconfig/xf86driproto.pc -libdata/pkgconfig/xf86vidmodeproto.pc -libdata/pkgconfig/xineramaproto.pc -libdata/pkgconfig/xproto.pc -libdata/pkgconfig/xwaylandproto.pc +share/pkgconfig/applewmproto.pc +share/pkgconfig/bigreqsproto.pc +share/pkgconfig/compositeproto.pc +share/pkgconfig/damageproto.pc +share/pkgconfig/dmxproto.pc +share/pkgconfig/dpmsproto.pc +share/pkgconfig/dri2proto.pc +share/pkgconfig/dri3proto.pc +share/pkgconfig/fixesproto.pc +share/pkgconfig/fontsproto.pc +share/pkgconfig/glproto.pc +share/pkgconfig/inputproto.pc +share/pkgconfig/kbproto.pc +share/pkgconfig/presentproto.pc +share/pkgconfig/randrproto.pc +share/pkgconfig/recordproto.pc +share/pkgconfig/renderproto.pc +share/pkgconfig/resourceproto.pc +share/pkgconfig/scrnsaverproto.pc +share/pkgconfig/videoproto.pc +share/pkgconfig/xcmiscproto.pc +share/pkgconfig/xextproto.pc +share/pkgconfig/xf86bigfontproto.pc +share/pkgconfig/xf86dgaproto.pc +share/pkgconfig/xf86driproto.pc +share/pkgconfig/xf86vidmodeproto.pc +share/pkgconfig/xineramaproto.pc +share/pkgconfig/xproto.pc +share/pkgconfig/xwaylandproto.pc %%PORTDOCS%%%%DOCSDIR%%/compositeproto.txt %%PORTDOCS%%%%DOCSDIR%%/damageproto.txt %%PORTDOCS%%%%DOCSDIR%%/dri2proto.txt %%PORTDOCS%%%%DOCSDIR%%/dri3proto.txt %%PORTDOCS%%%%DOCSDIR%%/fixesproto.txt %%PORTDOCS%%%%DOCSDIR%%/presentproto.txt %%PORTDOCS%%%%DOCSDIR%%/randrproto.txt %%PORTDOCS%%%%DOCSDIR%%/renderproto.txt %%PORTDOCS%%%%DOCSDIR%%/resproto.txt %%PORTDOCS%%%%DOCSDIR%%/xv-protocol-v2.txt %%PORTDOCS%%%%DOCSDIR%%/xwaylandproto.txt