diff --git a/Mk/Uses/xorg.mk b/Mk/Uses/xorg.mk index bf4e78b9a5de..32abba3b030b 100644 --- a/Mk/Uses/xorg.mk +++ b/Mk/Uses/xorg.mk @@ -1,155 +1,155 @@ # Originally from bsd.xorg.mk # # Feature: xorg # Usage: USES=xorg # USE_XORG= # # Not specifying USE_XORG with USES=xorg is an error. # # Components can be found in the XORG_MODULES list below. # # # If you feel something is missing from the list, please let us know. # # MAINTAINER: x11@FreeBSD.org .if !defined(_INCLUDE_USES_XORG_MK) _INCLUDE_USES_XORG_MK= yes _USES_POST+= xorg .endif # Set up things after bsd.port.post.mk. # This way ports can add things to USE_XORG even after bsd.port.pre.mk is # included. .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XORG_POST_MK) _INCLUDE_USES_XORG_POST_MK= yes . if !empty(xorg_ARGS) IGNORE= USES=xorg takes no arguments . endif . if !defined(USE_XORG) IGNORE= need to specify xorg modules with USE_XORG . endif # List of xorg modules XORG_MODULES= fontenc \ fontutil \ ice \ libfs \ pciaccess \ pixman \ sm \ x11 \ xau \ xaw \ xaw6 \ xaw7 \ xbitmaps \ xcb \ xcomposite \ xcursor \ xdamage \ xdmcp \ xext \ xfixes \ xfont \ xfont2 \ xft \ xi \ xinerama \ xkbfile \ xmu \ xmuu \ xorg-macros \ xorg-server \ xorgproto \ xpm \ xpresent \ xrandr \ xrender \ xres \ xscrnsaver \ xshmfence \ xt \ xtrans \ xtst \ xv \ xvmc \ xxf86dga \ xxf86vm # Register all xorg .pc files here. # foo_LIB_PC_DEPENDS means it should go to BUILD_DEPENDS *and* RUN_DEPENDS. fontenc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontenc.pc:x11-fonts/libfontenc fontutil_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util ice_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ice.pc:x11/libICE libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libfs.pc:x11-fonts/libFS pciaccess_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:devel/libpciaccess pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:x11/pixman sm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/sm.pc:x11/libSM x11_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 xau_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xau.pc:x11/libXau xaw_LIB_PC_DEPENDS= ${xaw7_LIB_PC_DEPENDS} xaw6_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw6.pc:x11-toolkits/libXaw xaw7_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xaw7.pc:x11-toolkits/libXaw -xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps +xbitmaps_LIB_PC_DEPENDS= ${LOCALBASE}/share/pkgconfig/xbitmaps.pc:x11/xbitmaps xcb_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:x11/libxcb xcomposite_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:x11/libXcomposite xcursor_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xcursor.pc:x11/libXcursor xdamage_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdamage.pc:x11/libXdamage xdmcp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:x11/libXdmcp xext_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext xfixes_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfixes.pc:x11/libXfixes xfont_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfont.pc:x11-fonts/libXfont xfont2_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xfont2.pc:x11-fonts/libXfont2 xft_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xft.pc:x11-fonts/libXft xi_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xi.pc:x11/libXi xinerama_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xinerama.pc:x11/libXinerama xkbfile_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:x11/libxkbfile xmu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmu.pc:x11-toolkits/libXmu xmuu_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xmuu.pc:x11-toolkits/libXmu xorg-macros_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-macros.pc:devel/xorg-macros xorg-server_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xorg-server.pc:x11-servers/xorg-server xorgproto_BUILD_DEPENDS= xorgproto>=0:x11/xorgproto xp_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xp.pc:x11/libXp xpm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xpm.pc:x11/libXpm xpresent_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xpresent.pc:x11/libXpresent xrandr_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:x11/libXrandr xrender_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender xres_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xres.pc:x11/libXres xscrnsaver_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:x11/libXScrnSaver xt_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt xshmfence_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xshmfence.pc:x11/libxshmfence xtrans_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:x11/xtrans xtst_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtst.pc:x11/libXtst xv_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xv.pc:x11/libXv xvmc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xvmc.pc:x11/libXvMC xxf86dga_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:x11/libXxf86dga xxf86misc_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:x11/libXxf86misc xxf86vm_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:x11/libXxf86vm # Add explicit X options to avoid problems with false positives in configure . if defined(GNU_CONFIGURE) CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include . endif . for _module in ${USE_XORG:M*\:both:C/\:.*//g} . if ${XORG_MODULES:M${_module}} == "" IGNORE= requires unknown xorg module (${_module}) . endif RUN_DEPENDS+= ${${_module}_BUILD_DEPENDS} . endfor . for _module in ${USE_XORG:C/\:both$//g} . if ${XORG_MODULES:M${_module}} == "" IGNORE= requires unknown xorg module (${_module}) . endif LIB_PC_DEPENDS+=${${_module}_LIB_PC_DEPENDS} BUILD_DEPENDS+= ${${_module}_BUILD_DEPENDS} . endfor RUN_DEPENDS+= ${LIB_PC_DEPENDS} BUILD_DEPENDS+= ${LIB_PC_DEPENDS} .endif diff --git a/x11/xbitmaps/Makefile b/x11/xbitmaps/Makefile index 07dd1eb767e2..d5c029608c6b 100644 --- a/x11/xbitmaps/Makefile +++ b/x11/xbitmaps/Makefile @@ -1,16 +1,16 @@ PORTNAME= xbitmaps -DISTVERSION= 1.1.3 +DISTVERSION= 1.1.4 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org bitmaps data WWW= https://gitlab.freedesktop.org/xorg/data/bitmaps LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= pathfix tar:xz xorg-cat:data +USES= tar:xz xorg-cat:data NO_ARCH= yes .include diff --git a/x11/xbitmaps/distinfo b/x11/xbitmaps/distinfo index c05615ec2e29..bb3fff38be21 100644 --- a/x11/xbitmaps/distinfo +++ b/x11/xbitmaps/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747086459 -SHA256 (xorg/data/xbitmaps-1.1.3.tar.xz) = ad6cad54887832a17d86c2ccfc5e52a1dfab090f8307b152c78b0e1529cd0f7a -SIZE (xorg/data/xbitmaps-1.1.3.tar.xz) = 109772 +TIMESTAMP = 1781042404 +SHA256 (xorg/data/xbitmaps-1.1.4.tar.xz) = 895722f136e21e728c52f2d99fd2dae95018b9ddad1bac1f29d61bcd6593721d +SIZE (xorg/data/xbitmaps-1.1.4.tar.xz) = 114616 diff --git a/x11/xbitmaps/pkg-plist b/x11/xbitmaps/pkg-plist index 4237bca1239c..0603e7f7059c 100644 --- a/x11/xbitmaps/pkg-plist +++ b/x11/xbitmaps/pkg-plist @@ -1,72 +1,72 @@ include/X11/bitmaps/1x1 include/X11/bitmaps/2x2 include/X11/bitmaps/black include/X11/bitmaps/black6 include/X11/bitmaps/box6 include/X11/bitmaps/boxes include/X11/bitmaps/calculator include/X11/bitmaps/cntr_ptr include/X11/bitmaps/cntr_ptrmsk include/X11/bitmaps/cross_weave include/X11/bitmaps/dimple1 include/X11/bitmaps/dimple3 include/X11/bitmaps/dot include/X11/bitmaps/dropbar7 include/X11/bitmaps/dropbar8 include/X11/bitmaps/escherknot include/X11/bitmaps/flagdown include/X11/bitmaps/flagup include/X11/bitmaps/flipped_gray include/X11/bitmaps/gray include/X11/bitmaps/gray1 include/X11/bitmaps/gray3 include/X11/bitmaps/grid16 include/X11/bitmaps/grid2 include/X11/bitmaps/grid4 include/X11/bitmaps/grid8 include/X11/bitmaps/hlines2 include/X11/bitmaps/hlines3 include/X11/bitmaps/icon include/X11/bitmaps/keyboard16 include/X11/bitmaps/left_ptr include/X11/bitmaps/left_ptrmsk include/X11/bitmaps/letters include/X11/bitmaps/light_gray include/X11/bitmaps/mailempty include/X11/bitmaps/mailemptymsk include/X11/bitmaps/mailfull include/X11/bitmaps/mailfullmsk include/X11/bitmaps/mensetmanus include/X11/bitmaps/menu10 include/X11/bitmaps/menu12 include/X11/bitmaps/menu16 include/X11/bitmaps/menu6 include/X11/bitmaps/menu8 include/X11/bitmaps/noletters include/X11/bitmaps/opendot include/X11/bitmaps/opendotMask include/X11/bitmaps/plaid include/X11/bitmaps/right_ptr include/X11/bitmaps/right_ptrmsk include/X11/bitmaps/root_weave include/X11/bitmaps/scales include/X11/bitmaps/sipb include/X11/bitmaps/star include/X11/bitmaps/starMask include/X11/bitmaps/stipple include/X11/bitmaps/target include/X11/bitmaps/terminal include/X11/bitmaps/tie_fighter include/X11/bitmaps/vlines2 include/X11/bitmaps/vlines3 include/X11/bitmaps/weird_size include/X11/bitmaps/wide_weave include/X11/bitmaps/wingdogs include/X11/bitmaps/woman include/X11/bitmaps/xfd_icon include/X11/bitmaps/xlogo11 include/X11/bitmaps/xlogo16 include/X11/bitmaps/xlogo32 include/X11/bitmaps/xlogo64 include/X11/bitmaps/xsnow -libdata/pkgconfig/xbitmaps.pc +share/pkgconfig/xbitmaps.pc diff --git a/x11/xlibre/Makefile b/x11/xlibre/Makefile index 1562a0f88ac4..ab37eb944a4a 100644 --- a/x11/xlibre/Makefile +++ b/x11/xlibre/Makefile @@ -1,28 +1,28 @@ PORTNAME= xlibre PORTVERSION= 1.0 CATEGORIES= x11 MAINTAINER= xlibre@FreeBSD.org COMMENT= XLibre + X.Org complete distribution metaport WWW= https://github.com/X11Libre/ \ https://www.x.org/ USES= metaport RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs # data -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps \ +RUN_DEPENDS+= ${LOCALBASE}/share/pkgconfig/xbitmaps.pc:x11/xbitmaps \ ${LOCALBASE}/share/icons/handhelds/cursors/X_cursor:x11-themes/xcursor-themes OPTIONS_DEFINE= DOCS DOCS_RUN_DEPENDS+= ${LOCALBASE}/share/doc/xorg-docs/README.xml:x11/xorg-docs # app, lib, font, driver RUN_DEPENDS+= xorg-apps>0:x11/xorg-apps \ xorg-libraries>0:x11/xorg-libraries \ xorg-fonts>0:x11-fonts/xorg-fonts \ xlibre-drivers>0:x11-drivers/xlibre-drivers .include diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile index 0effe0bc6f72..22ab0d8748a8 100644 --- a/x11/xorg/Makefile +++ b/x11/xorg/Makefile @@ -1,33 +1,33 @@ PORTNAME= xorg PORTVERSION= 7.7 PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X.Org complete distribution metaport WWW= https://www.x.org/ USES= metaport RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-libs # data -RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:x11/xbitmaps \ +RUN_DEPENDS+= ${LOCALBASE}/share/pkgconfig/xbitmaps.pc:x11/xbitmaps \ ${LOCALBASE}/share/icons/handhelds/cursors/X_cursor:x11-themes/xcursor-themes OPTIONS_DEFINE= DOCS DOCS_RUN_DEPENDS+= ${LOCALBASE}/share/doc/xorg-docs/README.xml:x11/xorg-docs # app, lib, font, driver RUN_DEPENDS+= xorg-apps>0:x11/xorg-apps \ xorg-libraries>0:x11/xorg-libraries \ xorg-fonts>0:x11-fonts/xorg-fonts \ xorg-drivers>0:x11-drivers/xorg-drivers .if defined(XORG_COMPLETE) RUN_DEPENDS+= Xnest:x11-servers/xorg-server@xnest \ Xvfb:x11-servers/xorg-server@xvfb .endif .include