diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile index 49aedad1e729..58521dc70fc0 100644 --- a/net/tigervnc-server/Makefile +++ b/net/tigervnc-server/Makefile @@ -1,118 +1,118 @@ -PORTREVISION= 1 +PORTREVISION= 2 PKGNAMESUFFIX= -server COMMENT= TigerVNC Server WWW= https://tigervnc.org/ PATCH_DEPENDS+= ${NONEXISTENT}:x11-servers/xorg-server:patch BUILD_DEPENDS+= ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \ ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:x11-fonts/font-util \ bash:shells/bash LIB_DEPENDS= libxshmfence.so:x11/libxshmfence \ libxcvt.so:x11/libxcvt \ libnettle.so:security/nettle \ libgmp.so:math/gmp # almost equivalent to x11-servers/xorg-server's RUN_DEPENDS+= ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp USES+= autoreconf:build compiler:c11 gl jpeg libtool pkgconfig ssl shebangfix xorg USE_LDCONFIG= yes USE_GL+= gl USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont2 \ xkbfile xorg-macros xorgproto xrandr xrender xtrans xtst SHEBANG_FILES= unix/vncserver/vncsession-start.in BINARY_WRAPPERS= gm4 OPTIONS_DEFINE= DOCS GNUTLS PAM OPTIONS_DEFAULT= GNUTLS PAM OPTIONS_SUB= yes GNUTLS_CMAKE_BOOL= ENABLE_GNUTLS GNUTLS_CONFIGURE_ARGS= --enable-glx-tls GNUTLS_LIB_DEPENDS= libtasn1.so:security/libtasn1 \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libgnutls.so:security/gnutls PAM_CMAKE_BOOL= ENABLE_PAM CONFIGURE_ARGS+= \ --prefix=${PREFIX} --mandir=${MANPREFIX}/share/man \ --docdir=${PREFIX}/share/doc/${PORTNAME}/ --with-pic --without-dtrace \ --disable-static --disable-dri --disable-unit-tests \ --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ --disable-config-dbus --disable-config-hal \ --disable-dri2 --enable-install-libxf86config --enable-glx \ --with-xkb-path=${LOCALBASE}/share/X11/xkb \ --with-xkb-bin-directory=${LOCALBASE}/bin \ --with-serverconfig-path=${LOCALBASE}/lib/X11 \ --disable-selective-werror \ --disable-xwayland \ --with-fontrootdir=${LOCALBASE}/share/fonts FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} CONFIGURE_ARGS+= --with-default-font-path="${DEFAULT_FONTPATH_LIST:ts,}" CFLAGS+= -I${LOCALBASE}/include/libdrm # This is server port, disabling some features # - disable vncviewer # - server is not internationalized CMAKE_ARGS+= -DBUILD_VIEWER:BOOL=false -DENABLE_NLS:BOOL=false TIGERVNC_XORG_PATCH_VER= ${MAKE} -C "${.CURDIR}/../../x11-servers/xorg-server" -V PORTVERSION:R:S,\.,,g XORG_WRKSRC= ${MAKE} -C ${.CURDIR}/../../x11-servers/xorg-server -VWRKSRC pre-patch: ${CP} -R $$(${XORG_WRKSRC})/ ${WRKSRC}/unix/xserver/ # workaround: upstream changed patch naming ${LN} -sf ${WRKSRC}/unix/xserver21.1.1.patch ${WRKSRC}/unix/xserver211.patch post-patch: # do not build tests ${REINPLACE_CMD} -e 's|add_subdirectory(tests)||' ${WRKSRC}/CMakeLists.txt cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver$$(${TIGERVNC_XORG_PATCH_VER}).patch post-configure: cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${AUTORECONF} -fiv cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure ${CONFIGURE_ARGS} post-build: cd ${WRKSRC}/unix/xserver/ && \ ${DO_MAKE_BUILD} SHELL=${LOCALBASE}/bin/bash ${ALL_TARGET} post-stage: # Install v1.10.0 vncserver script and manpage. # See: https://cgit.freebsd.org/ports/commit/net/tigervnc-server?id=e6d3d07 ${INSTALL_SCRIPT} ${FILESDIR}/v1.10.0-vncserver ${STAGEDIR}${PREFIX}/bin/vncserver ${INSTALL_MAN} ${FILESDIR}/v1.10.0-vncserver.man ${STAGEDIR}${MANPREFIX}/share/man/man8/vncserver.8 post-install: cd ${WRKSRC}/unix/xserver/hw/vnc/ && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-strip .include "${.CURDIR}/Makefile.common.mk" # import from x11-server/xorg-server/Makefile .if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't # install a .pc file and configure will fail trying to find it. # Setting both of those variables to a *non-empty* value by-passes # the pkg-config check. CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif # keep in sync with all platforms where libunwind is available .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le LIB_DEPENDS+= libunwind.so:devel/libunwind .endif diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile index c51f826175da..48b0c392b09c 100644 --- a/x11-fonts/libFS/Makefile +++ b/x11-fonts/libFS/Makefile @@ -1,19 +1,20 @@ PORTNAME= libFS PORTVERSION= 1.0.8 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= The FS library WWW= https://www.x.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe xorg xorg-cat:lib USE_XORG= xorgproto xtrans CPE_VENDOR= x CPE_PRODUCT= libfs INSTALL_TARGET= install-strip .include diff --git a/x11-fonts/libXfont/Makefile b/x11-fonts/libXfont/Makefile index e0750c7e4f5e..eca8f6929661 100644 --- a/x11-fonts/libXfont/Makefile +++ b/x11-fonts/libXfont/Makefile @@ -1,25 +1,25 @@ PORTNAME= libXfont PORTVERSION= 1.5.4 -PORTREVISION= 2 +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 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-fonts/libXfont2/Makefile b/x11-fonts/libXfont2/Makefile index d10550abf555..68af160d2f22 100644 --- a/x11-fonts/libXfont2/Makefile +++ b/x11-fonts/libXfont2/Makefile @@ -1,24 +1,25 @@ PORTNAME= libXfont2 PORTVERSION= 2.0.5 +PORTREVISION= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X font library WWW= https://www.freedesktop.org/Software/xlibs LICENSE= MIT BSD3CLAUSE LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libfreetype.so:print/freetype2 USES= xorg xorg-cat:lib USE_XORG= xorgproto xtrans fontenc INSTALL_TARGET= install-strip #USES+= cpe #CPE_PRODUCT= libxfont #CPE_VENDOR= x CONFIGURE_ARGS=--without-xmlto --disable-devel-docs --without-fop .include diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile index b6a4235e631a..f0878131eef1 100644 --- a/x11-fonts/xfs/Makefile +++ b/x11-fonts/xfs/Makefile @@ -1,31 +1,32 @@ PORTNAME= xfs PORTVERSION= 1.2.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-fonts MAINTAINER= x11@FreeBSD.org COMMENT= X.Org font server WWW= https://www.x.org/ USES= cpe gmake xorg xorg-cat:app CPE_VENDOR= x.org CPE_PRODUCT= x_font_server USE_XORG= libfs xfont2 xorgproto xtrans USE_RC_SUBR= xfs CONFIGURE_ARGS= --without-xmlto --without-fop post-patch: ${REINPLACE_CMD} '/^config_DATA/d' ${WRKSRC}/config/Makefile.in .if defined(WITHOUT_XFS_CACHE) ${REINPLACE_CMD} -e 's|^cache|XCOMM &|' ${WRKSRC}/config.cpp .endif post-build: @cd ${WRKSRC}/config/ && ${MAKE_CMD} config post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/fs ${INSTALL_SCRIPT} ${WRKSRC}/config/config \ ${STAGEDIR}${PREFIX}/etc/X11/fs/config.sample .include diff --git a/x11-servers/xarcan/Makefile b/x11-servers/xarcan/Makefile index 29b5becd63f1..8457c41e322e 100644 --- a/x11-servers/xarcan/Makefile +++ b/x11-servers/xarcan/Makefile @@ -1,54 +1,54 @@ PORTNAME= xarcan DISTVERSION= 0.6.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-servers PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 2be9063af666.patch:-p1 # https://github.com/letoram/xarcan/pull/8 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Arcan client WWW= https://arcan-fe.com/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri LIB_DEPENDS= libepoxy.so:graphics/libepoxy \ libarcan_shmif_ext.so:multimedia/arcan RUN_DEPENDS= xkbcomp:x11/xkbcomp \ xkeyboard-config>0:x11/xkeyboard-config USES= compiler:c11 gl meson pkgconfig xorg USE_GITHUB= yes USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GH_ACCOUNT= letoram MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ -Dxvfb=false \ -Dxwayland=false \ -Dudev=false \ -Dudev_kms=false \ -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" PLIST_FILES= bin/Xarcan # Keep in sync with xorg-server FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} do-install: # XXX Prevent Meson from installing unrelated files ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/kdrive/arcan/Xarcan \ ${STAGEDIR}${PREFIX}/bin .include diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 06ab654918b0..089fe72c7c99 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -1,147 +1,147 @@ PORTNAME= xorg PORTVERSION= 21.1.8 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= XORG/individual/xserver DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT= X.Org X server and related programs WWW= https://www.freedesktop.org/Software/xorg LICENSE= MIT FLAVORS= xorg xnest xephyr xvfb FLAVOR?= ${FLAVORS:[1]} EXTRA_PATCHES= ${FILESDIR}/0002-xephyr_Dont_check_for_SeatId_anymore.patch:-p1 USES= compiler:c11 cpe gl meson pkgconfig tar:xz xorg USE_GL= gl .if ${FLAVOR} == xephyr PORTNAME= xephyr .elif ${FLAVOR} == xorg PKGNAMESUFFIX= -server .elif ${FLAVOR} == xnest PORTEPOCH= 2 PKGNAMESUFFIX= -nestserver .elif ${FLAVOR} == xvfb PKGNAMESUFFIX= -vfbserver .endif .if ${FLAVOR} != xorg PLIST= PKGMESSAGE= BINARY_NAME= ${FLAVOR:C/^(.).*/\1/:tu}${FLAVOR:C/^.//} PLIST_FILES= bin/${BINARY_NAME} \ man/man1/${BINARY_NAME}.1.gz PLIST_DIRS= /var/lib/xkb /var/lib .endif DESCR= ${.CURDIR}/pkg-descr-${FLAVOR} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri RUN_DEPENDS+= xkeyboard-config>=2.5:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp \ ${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri MESON_ARGS+= -Dxwin=false \ -Dxquartz=false \ -Ddtrace=false \ -Dhal=false \ -Dsystemd_logind=false \ -Dxselinux=false \ -Dfallback_input_driver=libinput \ -Ddocs=false \ -Dxcsecurity=true \ -Dxkb_dir=${LOCALBASE}/share/X11/xkb \ -Dxkb_output_dir=/var/lib/xkb \ -D${FLAVOR}=true .for f in ${FLAVORS:N${FLAVOR}} MESON_ARGS+= -D${f}=false .endfor .if ${FLAVOR} == xorg LIB_DEPENDS+= libudev.so:devel/libudev-devd \ libxcvt.so:x11/libxcvt MESON_ARGS+= -Dudev=true \ -Dudev_kms=true \ -Dlog_dir=/var/log \ -Dsuid_wrapper=true .else MESON_ARGS+= -Dudev=false \ -Dudev_kms=false .endif .if ${FLAVOR} == xorg || ${FLAVOR} == xephyr MESON_ARGS+= -Ddrm=true LIB_DEPENDS+= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy .endif .if ${FLAVOR} == xephyr LIB_DEPENDS+= libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-image.so:x11/xcb-util-image \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-keysyms.so:x11/xcb-util-keysyms .endif FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} MESON_ARGS+= -Ddefault_font_path=${DEFAULT_FONTPATH_LIST:ts,} PLIST_SUB+= FONTPATHD="${FONTPATHD:S,^${PREFIX}/,,}" USE_GL+= gl USE_XORG+= pixman xau xdmcp xfont2 xkbfile xorgproto xshmfence xtrans CPE_VENDOR= x.org CPE_PRODUCT= xorg-server .if ${FLAVOR} == xorg USE_GL+= gbm USE_XORG+= pciaccess .endif .include .if ${OPSYS} == FreeBSD MESON_ARGS+= -Dsha1=libmd .endif .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le LIB_DEPENDS+= libunwind.so:devel/libunwind .endif .if ${ARCH} == "sparc64" PLIST_SUB+= SPARC64="" .else PLIST_SUB+= SPARC64="@comment " .endif .if ${FLAVOR} == xorg post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d @${MKDIR} ${STAGEDIR}${FONTPATHD} @${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d @${INSTALL_DATA} ${FILESDIR}/20-evdev-kbd.conf \ ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d ${MKDIR} -p ${STAGEDIR}/var/lib/xkb .else post-install: ${RM} -r ${STAGEDIR}${PREFIX}/lib/xorg/protocol.txt ${RMDIR} ${STAGEDIR}${PREFIX}/lib/xorg ${RM} ${STAGEDIR}${PREFIX}/man/man1/Xserver.1 ${MKDIR} -p ${STAGEDIR}/var/lib/xkb .endif .include diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 9523a1dce2d9..da21ae5d9f50 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -1,92 +1,93 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-511 DISTVERSIONSUFFIX= -g8128a2155 +PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel PATCH_SITES+= https://github.com/mirror/${GL_PROJECT}/commit/:github PATCHFILES+= cd6c9c1246af.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 3930d00746b0.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 3b0d1a3a2296.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 459f07e344fd.patch:-p1:github # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/844 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ PATCHFILES+= 8b9bf0a22640.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1047 PATCHFILES+= 0c90fb305e9b.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1051 MAINTAINER= jbeich@FreeBSD.org COMMENT= X11 server as Wayland client (development snapshot) WWW= https://wayland.freedesktop.org/xserver.html LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ ${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \ wayland-protocols>=1.30:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libwayland-client.so:graphics/wayland \ libxcvt.so:x11/libxcvt RUN_DEPENDS= xkbcomp:x11/xkbcomp \ xkeyboard-config>0:x11/xkeyboard-config CONFLICTS_INSTALL= ${PORTNAME} USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm gl USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= xorg GL_PROJECT= xserver GL_TUPLE= xorg/proto:xorgproto:xorgproto-2023.2:xorgproto/subprojects/xorgproto MESON_ARGS= -D${PORTNAME}=true \ -Dxorg=false \ -Dxnest=false \ -Dxvfb=false \ -Dudev=false \ -Dudev_kms=false \ -Dxcsecurity=true \ -Ddefault_font_path="${DEFAULT_FONTPATH_LIST:ts,}" PLIST_FILES= bin/Xwayland \ "@comment lib/xorg/protocol.txt" \ libdata/pkgconfig/xwayland.pc \ "@comment man/man1/Xserver.1.gz" \ man/man1/Xwayland.1.gz \ share/applications/org.freedesktop.Xwayland.desktop # Keep in sync with xorg-server FONTPATH_ROOT?= ${LOCALBASE}/share/fonts FONTPATHD?= ${PREFIX}/etc/X11/fontpath.d DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/misc/ \ ${FONTPATH_ROOT}/TTF/ \ ${FONTPATH_ROOT}/OTF/ \ ${FONTPATH_ROOT}/Type1/ \ ${FONTPATH_ROOT}/100dpi/ \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} OPTIONS_DEFINE= CSD EI NVIDIA OPTIONS_DEFAULT=CSD EI CSD_DESC= Client-side decorations via libdecor CSD_LIB_DEPENDS= libdecor-0.so:x11-toolkits/libdecor CSD_MESON_TRUE= libdecor EI_DESC= Emulated input via libei EI_LIB_DEPENDS= libei.so:x11/libei EI_MESON_OFF= -Dxwayland_ei=false NVIDIA_DESC= EGLStream support for glamor on Xwayland NVIDIA_BUILD_DEPENDS= egl-wayland>0:graphics/egl-wayland NVIDIA_MESON_TRUE= xwayland_eglstream .ifdef GL_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif .include diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile index 5323fe2e906e..ac7b0a1c80a2 100644 --- a/x11/cinnamon-session/Makefile +++ b/x11/cinnamon-session/Makefile @@ -1,37 +1,37 @@ PORTNAME= cinnamon-session PORTVERSION= 5.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Session component for the cinnamon desktop WWW= https://github.com/linuxmint/cinnamon-session LICENSE= GPLv2 LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libxapp.so:x11/xapp \ libcanberra.so:audio/libcanberra RUN_DEPENDS= console-kit-daemon:sysutils/consolekit2 USES= gl gnome meson pkgconfig python:build shebangfix xorg USE_GITHUB= yes GH_ACCOUNT= linuxmint SHEBANG_FILES= data/meson_install_schemas.py USE_GNOME= cairo gdkpixbuf2 gtk30 USE_XORG= ice sm x11 xau xcomposite xext xrender xtrans xtst USE_GL= gl GLIB_SCHEMAS= org.cinnamon.SessionManager.gschema.xml OPTIONS_DEFINE= IPV6 OPTIONS_DEFAULT= IPV6 IPV6_MESON_TRUE= ipv6 .include diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 34803627a6d7..19c81b255980 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -1,37 +1,37 @@ PORTNAME= gnome-session PORTVERSION= 42.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Session component for the GNOME desktop WWW= https://www.gnome.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xmlto:textproc/xmlto LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libdbus-glib-1.so:devel/dbus-glib \ libepoxy.so:graphics/libepoxy RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit2 \ dbus-daemon:devel/dbus PORTSCOUT= limitw:1,even USES= compiler:c11 gettext gl gnome localbase:ldflags meson \ pkgconfig python:build tar:xz xorg USE_GNOME= gnomedesktop3 gtk30 USE_XORG= ice sm x11 xcomposite xtrans USE_GL= egl gl glesv2 MESON_ARGS= -Dsystemd=false \ -Dsystemd_session=disable \ -Dsystemd_journal=false \ -Dconsolekit=true BINARY_ALIAS= python3=${PYTHON_VERSION} GLIB_SCHEMAS= org.gnome.SessionManager.gschema.xml .include diff --git a/x11/libICE/Makefile b/x11/libICE/Makefile index f9eb9aecd771..2c1f6d44bd98 100644 --- a/x11/libICE/Makefile +++ b/x11/libICE/Makefile @@ -1,19 +1,19 @@ PORTNAME= libICE PORTVERSION= 1.1.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Inter Client Exchange library for X11 WWW= https://www.freedesktop.org/wiki/Software/xlibs/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING USES= cpe tar:xz xorg xorg-cat:lib USE_XORG= xorgproto xtrans INSTALL_TARGET= install-strip CPE_VENDOR= freedesktop .include diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index a6bc98b9ea45..2123c493af6e 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -1,21 +1,22 @@ PORTNAME= libSM PORTVERSION= 1.2.3 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Session Management library for X11 WWW= https://www.freedesktop.org/Software/xlibs LICENSE= MIT USES= pathfix xorg xorg-cat:lib USE_XORG= ice xorgproto xtrans CONFIGURE_ARGS+=--disable-docs --without-xmlto post-patch: @${REINPLACE_CMD} '/^SUBDIRS/,/^$$/ \ s/doc//' ${WRKSRC}/Makefile.in .include diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 98834ffca38f..f75b3c0ee12d 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -1,27 +1,28 @@ PORTNAME= libX11 DISTVERSION= 1.8.6 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= X11 library WWW= https://www.freedesktop.org/Software/xlibs LICENSE= MIT USES= cpe tar:xz xorg xorg-cat:lib USE_XORG= xcb xtrans xorgproto CPE_VENDOR= x CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \ --without-xmlto \ --with-perl=no \ --disable-specs CONFIGURE_ENV+= ac_cv_path_PS2PDF="" INSTALL_TARGET= install-strip post-patch: @${REINPLACE_CMD} 's/test.*-traditional.*;/true;/' \ ${WRKSRC}/configure .include diff --git a/x11/mate-session-manager/Makefile b/x11/mate-session-manager/Makefile index a145ce00de3b..0a7e2e19768d 100644 --- a/x11/mate-session-manager/Makefile +++ b/x11/mate-session-manager/Makefile @@ -1,36 +1,36 @@ PORTNAME= mate-session-manager PORTVERSION= 1.26.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 mate MASTER_SITES= MATE DIST_SUBDIR= mate MAINTAINER= gnome@FreeBSD.org COMMENT= Session component for the MATE desktop WWW= https://mate-desktop.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus \ libupower-glib.so:sysutils/upower RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit2 \ ${LOCALBASE}/bin/xdpyinfo:x11/xdpyinfo PORTSCOUT= limitw:1,even USES= gettext gmake gnome libtool localbase mate pathfix pkgconfig \ tar:xz xorg USE_MATE= desktop USE_XORG= ice sm x11 xau xext xrandr xrender xtrans xtst USE_GNOME= cairo gtk30 intlhack librsvg2 libxslt pango GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-docbook-docs \ --with-default-wm=mate-wm \ --enable-upower \ --with-systemd=no GLIB_SCHEMAS= org.mate.session.gschema.xml .include diff --git a/x11/xtrans/Makefile b/x11/xtrans/Makefile index b6de999676f2..7454a2c7b6db 100644 --- a/x11/xtrans/Makefile +++ b/x11/xtrans/Makefile @@ -1,15 +1,19 @@ PORTNAME= xtrans PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= x11 +PATCH_SITES= https://gitlab.freedesktop.org/xorg/lib/libxtrans/-/commit/ +PATCHFILES+= 4e6763a5914c.patch:-p1 # https://gitlab.freedesktop.org/xorg/lib/libxtrans/-/merge_requests/8 + MAINTAINER= x11@FreeBSD.org COMMENT= Abstract network code for X LICENSE= MIT USES= xorg-cat:lib CONFIGURE_ARGS+=--disable-docs --without-xmlto NO_ARCH= yes .include diff --git a/x11/xtrans/distinfo b/x11/xtrans/distinfo index 6f07674e064e..7ea1167b4c8d 100644 --- a/x11/xtrans/distinfo +++ b/x11/xtrans/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1553322927 SHA256 (xorg/lib/xtrans-1.4.0.tar.bz2) = 377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773 SIZE (xorg/lib/xtrans-1.4.0.tar.bz2) = 185371 +SHA256 (xorg/lib/4e6763a5914c.patch) = cd4b2f8f98b43ae04eb3e4046668d9aa1374e065b836ea6a51f029e0658794ae +SIZE (xorg/lib/4e6763a5914c.patch) = 1347