diff --git a/net/tigervnc-server/Makefile b/net/tigervnc-server/Makefile index fa869a9d7e04..834b261a8f64 100644 --- a/net/tigervnc-server/Makefile +++ b/net/tigervnc-server/Makefile @@ -1,116 +1,114 @@ -PORTREVISION= 1 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 \ ${LOCALBASE}/include/libxcvt/libxcvt.h:x11/libxcvt \ bash:shells/bash LIB_DEPENDS= libxshmfence.so:x11/libxshmfence \ libnettle.so:security/nettle \ libgmp.so:math/gmp \ libavcodec.so:multimedia/ffmpeg \ libxcvt.so:x11/libxcvt # 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 perl5 pkgconfig ssl shebangfix xorg USE_LDCONFIG= yes USE_GL+= gbm 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= libgnutls.so:security/gnutls PAM_CMAKE_BOOL= ENABLE_PAM -CONFIGURE_ARGS+= \ +XORG_CONFIGURE_ARGS+= \ --prefix=${PREFIX} --mandir=${PREFIX}/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,}" +XORG_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_XOG_PATCH_VER will be 21 when xorg-server 21.1.13 TIGERVNC_XORG_PATCH_VER= ${MAKE} -C "${.CURDIR}/../../x11-servers/xorg-server" -V PORTVERSION:R:R XORG_WRKSRC= ${MAKE} -C ${.CURDIR}/../../x11-servers/xorg-server -VWRKSRC pre-patch: ${CP} -R $$(${XORG_WRKSRC})/ ${WRKSRC}/unix/xserver/ 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} + cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure ${XORG_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}${PREFIX}/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/net/tigervnc-server/Makefile.common.mk b/net/tigervnc-server/Makefile.common.mk index b20bcc374d2e..365bb33be11c 100644 --- a/net/tigervnc-server/Makefile.common.mk +++ b/net/tigervnc-server/Makefile.common.mk @@ -1,33 +1,33 @@ PORTNAME= tigervnc DISTVERSIONPREFIX= v -DISTVERSION= 1.15.0 +DISTVERSION= 1.16.0 CATEGORIES= net x11-servers MAINTAINER?= meta@FreeBSD.org LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENCE.TXT -USES+= cmake:insource,noninja cpe +USES+= cmake:insource,noninja cpe gmake USE_GITHUB= yes GH_ACCOUNT= TigerVNC CONFLICTS= tightvnc PLIST_SUB+= TIGERVNC_COMPONENT=${PORTNAME}${PKGNAMESUFFIX}- CMAKE_ARGS+= -G "Unix Makefiles" -DINSTALL_SYSTEMD_UNITS:BOOL=false MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC} DOCS= LICENCE.TXT README.rst .include PLIST= ${.CURDIR}/pkg-plist do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOCS} (cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${STAGEDIR}${DOCSDIR}/${PORTNAME}${PKGNAMESUFFIX}-${f}) .endfor .include diff --git a/net/tigervnc-server/distinfo b/net/tigervnc-server/distinfo index 3f0b787aac7d..98daa72770a7 100644 --- a/net/tigervnc-server/distinfo +++ b/net/tigervnc-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740632342 -SHA256 (TigerVNC-tigervnc-v1.15.0_GH0.tar.gz) = 7f231906801e89f09a212e86701f3df1722e36767d6055a4e619390570548537 -SIZE (TigerVNC-tigervnc-v1.15.0_GH0.tar.gz) = 2126369 +TIMESTAMP = 1770032375 +SHA256 (TigerVNC-tigervnc-v1.16.0_GH0.tar.gz) = 10512fc0254ae3bde41c19d18c15f7ebd8cd476261afe0611c41965d635d46e8 +SIZE (TigerVNC-tigervnc-v1.16.0_GH0.tar.gz) = 2221043 diff --git a/net/tigervnc-viewer/Makefile b/net/tigervnc-viewer/Makefile index bf7e9e49952c..cab00fdaccf9 100644 --- a/net/tigervnc-viewer/Makefile +++ b/net/tigervnc-viewer/Makefile @@ -1,38 +1,37 @@ PKGNAMESUFFIX= -viewer -PORTREVISION= 2 CATEGORIES= net COMMENT= TigerVNC Viewer WWW= https://tigervnc.org/ USES+= gnome iconv jpeg magick:7,build xorg USE_XORG+= ice pixman sm x11 xcursor xext xfixes xft xi xinerama xrender xrandr LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \ libfltk.so:x11-toolkits/fltk \ libnettle.so:security/nettle \ libgmp.so:math/gmp \ libavcodec.so:multimedia/ffmpeg OPTIONS_DEFINE= DOCS GNUTLS NLS OPTIONS_DEFAULT= GNUTLS OPTIONS_SUB= yes NLS_CMAKE_BOOL= ENABLE_NLS NLS_USES= gettext GNUTLS_CMAKE_BOOL= ENABLE_GNUTLS GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \ "${PORTNAME}" "vncviewer" "Network;" false DESCR= ${.CURDIR}/pkg-descr post-patch: # do not build server components and tests @${REINPLACE_CMD} \ -e 's|add_subdirectory(unix)||' \ -e 's|add_subdirectory(tests)||' \ ${WRKSRC}/CMakeLists.txt MASTERDIR= ${.CURDIR}/../tigervnc-server .include "${MASTERDIR}/Makefile.common.mk" diff --git a/net/tigervnc-viewer/pkg-plist b/net/tigervnc-viewer/pkg-plist index 26a8350ab9d5..1a3f8960ec00 100644 --- a/net/tigervnc-viewer/pkg-plist +++ b/net/tigervnc-viewer/pkg-plist @@ -1,42 +1,43 @@ bin/vncviewer share/man/man1/vncviewer.1.gz share/icons/hicolor/16x16/apps/tigervnc.png share/icons/hicolor/22x22/apps/tigervnc.png share/icons/hicolor/24x24/apps/tigervnc.png share/icons/hicolor/32x32/apps/tigervnc.png share/icons/hicolor/48x48/apps/tigervnc.png share/icons/hicolor/64x64/apps/tigervnc.png share/icons/hicolor/128x128/apps/tigervnc.png share/icons/hicolor/scalable/apps/tigervnc.svg share/metainfo/org.tigervnc.vncviewer.metainfo.xml +%%NLS%%share/locale/ar/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/bg/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/cs/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/da/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/de/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/el/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/eo/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/es/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/fi/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/fr/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/fur/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/he/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/hu/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/id/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/it/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/ka/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/ko/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/nl/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/pl/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/ro/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/ru/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/sk/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/sr/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/sv/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/tr/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/uk/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/vi/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/tigervnc.mo %%PORTDOCS%%%%DOCSDIR%%/%%TIGERVNC_COMPONENT%%LICENCE.TXT %%PORTDOCS%%%%DOCSDIR%%/%%TIGERVNC_COMPONENT%%README.rst