Index: head/net/Makefile =================================================================== --- head/net/Makefile +++ head/net/Makefile @@ -1436,6 +1436,8 @@ SUBDIR += thcrut SUBDIR += throttled SUBDIR += tigervnc + SUBDIR += tigervnc-server + SUBDIR += tigervnc-viewer SUBDIR += tightvnc SUBDIR += timed SUBDIR += tintin++ Index: head/net/tigervnc-server/Makefile =================================================================== --- head/net/tigervnc-server/Makefile +++ head/net/tigervnc-server/Makefile @@ -0,0 +1,90 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -server +CATEGORIES= net x11-servers + +COMMENT= TigerVNC Server + +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/FL/Fl.H:x11-toolkits/fltk \ + bash:shells/bash +LIB_DEPENDS= libxshmfence.so:x11/libxshmfence +# 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 gl jpeg libtool pkgconfig ssl +USE_LDCONFIG= yes +USE_GL+= gl +USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont xkbfile \ + xorg-macros xorgproto xrandr xrender xtrans xtst + +OPTIONS_DEFINE= DOCS 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=${PREFIX}/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-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \ + --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 + +# 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/ + +post-patch: + @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/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash + +post-install: + @cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/Xvnc ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libvnc.so + +MASTERDIR= ${.CURDIR}/../tigervnc +.include "${MASTERDIR}/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} == amd64 || ${ARCH} == i386) +LIB_DEPENDS+= libunwind.so:devel/libunwind +.endif Index: head/net/tigervnc-server/pkg-descr =================================================================== --- head/net/tigervnc-server/pkg-descr +++ head/net/tigervnc-server/pkg-descr @@ -0,0 +1,7 @@ +This port provides server components of TigerVNC. + +TigerVNC is a high-performance, platform-neutral implementation of VNC, +a client/server application that allows users to launch and interact with +graphical applications on remote machines. + +WWW: https://tigervnc.org/ Index: head/net/tigervnc-server/pkg-plist =================================================================== --- head/net/tigervnc-server/pkg-plist +++ head/net/tigervnc-server/pkg-plist @@ -0,0 +1,13 @@ +bin/Xvnc +bin/vncconfig +bin/vncpasswd +bin/vncserver +bin/x0vncserver +lib/xorg/modules/extensions/libvnc.so +man/man1/Xvnc.1.gz +man/man1/vncconfig.1.gz +man/man1/vncpasswd.1.gz +man/man1/vncserver.1.gz +man/man1/x0vncserver.1.gz +%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT +%%PORTDOCS%%%%DOCSDIR%%/README.rst Index: head/net/tigervnc-viewer/Makefile =================================================================== --- head/net/tigervnc-viewer/Makefile +++ head/net/tigervnc-viewer/Makefile @@ -0,0 +1,36 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -viewer +CATEGORIES= net + +COMMENT= TigerVNC Viewer + +USES+= gnome iconv jpeg +USE_XORG+= ice sm x11 xcursor xext xfixes xft xinerama xrender + +BUILD_DEPENDS+= convert:graphics/ImageMagick7 # to generate icons during build +LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig \ + libpng.so:graphics/png \ + libfltk.so:x11-toolkits/fltk + +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= libtasn1.so:security/libtasn1 \ + libgcrypt.so:security/libgcrypt \ + libgpg-error.so:security/libgpg-error \ + libgnutls.so:security/gnutls + +INSTALLS_ICONS= yes +DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \ + "${PORTNAME}" "vncviewer" "Network;" false + +post-patch: + # do not build server components + @${REINPLACE_CMD} -e 's|add_subdirectory(unix)||' ${WRKSRC}/CMakeLists.txt + +MASTERDIR= ${.CURDIR}/../tigervnc +.include "${MASTERDIR}/Makefile.common.mk" Index: head/net/tigervnc-viewer/pkg-descr =================================================================== --- head/net/tigervnc-viewer/pkg-descr +++ head/net/tigervnc-viewer/pkg-descr @@ -0,0 +1,7 @@ +This port provides client(viewer) compornents of TigerVNC. + +TigerVNC is a high-performance, platform-neutral implementation of VNC, +a client/server application that allows users to launch and interact with +graphical applications on remote machines. + +WWW: https://tigervnc.org/ Index: head/net/tigervnc-viewer/pkg-plist =================================================================== --- head/net/tigervnc-viewer/pkg-plist +++ head/net/tigervnc-viewer/pkg-plist @@ -0,0 +1,34 @@ +bin/vncviewer +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/scalable/apps/tigervnc.svg +%%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/hu/LC_MESSAGES/tigervnc.mo +%%NLS%%share/locale/id/LC_MESSAGES/tigervnc.mo +%%NLS%%share/locale/it/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/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 +%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT +%%PORTDOCS%%%%DOCSDIR%%/README.rst Index: head/net/tigervnc/Makefile =================================================================== --- head/net/tigervnc/Makefile +++ head/net/tigervnc/Makefile @@ -1,116 +1,22 @@ # $FreeBSD$ PORTNAME= tigervnc -PORTVERSION= 1.9.0 DISTVERSIONPREFIX= v -PORTREVISION= 3 -CATEGORIES= net x11-servers +DISTVERSION= 1.9.0 +PORTREVISION= 4 +CATEGORIES= net MAINTAINER= meta@FreeBSD.org -COMMENT= High-performance, platform-neutral implementation of VNC +COMMENT= High-performance, platform-neutral implementation of VNC (meta port) -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/LICENCE.TXT +USES= metaport -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/FL/Fl.H:x11-toolkits/fltk \ - bash:shells/bash -LIB_DEPENDS= libxshmfence.so:x11/libxshmfence \ - libfontconfig.so:x11-fonts/fontconfig -# almost equivalent to x11-servers/xorg-server's -RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ - xkbcomp:x11/xkbcomp +OPTIONS_DEFINE= SERVER VIEWER +OPTIONS_DEFAULT= SERVER +SERVER_RUN_DEPENDS= vncserver:net/tigervnc-server +VIEWER_RUN_DEPENDS= vncviewer:net/tigervnc-viewer -USES= autoreconf:build cmake:insource,noninja cpe gl iconv jpeg libtool \ - pkgconfig python ssl -USE_GL= gl -USE_LDCONFIG= yes -USE_GITHUB= yes +do-patch: # noop +do-install: # noop -CONFLICTS= tightvnc-[0-9]* - -GH_ACCOUNT= TigerVNC - -USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont xkbfile \ - xorg-macros xorgproto xrandr xrender xtrans xtst - -OPTIONS_DEFINE= GNUTLS NLS PAM VIEWER DOCS -OPTIONS_DEFAULT= GNUTLS PAM VIEWER -OPTIONS_SUB= yes -VIEWER_DESC= Build vncviewer - -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 -VIEWER_CMAKE_BOOL= BUILD_VIEWER -VIEWER_BUILD_DEPENDS= convert:graphics/ImageMagick7 # to generate icons during build -VIEWER_LIB_DEPENDS= libpng.so:graphics/png \ - libfltk.so:x11-toolkits/fltk -VIEWER_INSTALLS_ICONS= yes -VIEWER_DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \ - "${PORTNAME}" "vncviewer" "Network;" false -VIEWER_USE= xorg=xcursor,xfixes,xft,xinerama -NLS_CMAKE_BOOL= ENABLE_NLS -NLS_USES= gettext - -CMAKE_ARGS+= -G "Unix Makefiles" -MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC} -CONFIGURE_ARGS+= \ - --prefix=${PREFIX} --mandir=${PREFIX}/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-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \ - --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 - -.include - -# keep in sync with all platforms where libunwind is available -.if (${ARCH} == amd64 || ${ARCH} == i386) -LIB_DEPENDS+= libunwind.so:devel/libunwind -.endif - -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 - -# 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 - -pre-patch: - @${CP} -R $$(${XORG_WRKSRC})/ ${WRKSRC}/unix/xserver/ - -post-patch: - @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/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash - -post-install: - @cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/Xvnc ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libvnc.so - -.include +.include Index: head/net/tigervnc/Makefile.common.mk =================================================================== --- head/net/tigervnc/Makefile.common.mk +++ head/net/tigervnc/Makefile.common.mk @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTNAME= tigervnc +DISTVERSIONPREFIX= v +DISTVERSION= 1.9.0 +CATEGORIES= net x11-servers + +MAINTAINER?= meta@FreeBSD.org + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENCE.TXT + +USES+= cmake:insource,noninja +USE_GITHUB= yes + +GH_ACCOUNT= TigerVNC + +CONFLICTS= tightvnc-[0-9]* + +CMAKE_ARGS+= -G "Unix Makefiles" +MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC} + +.include + +PLIST= ${.CURDIR}/pkg-plist + +.include Index: head/net/tigervnc/pkg-descr =================================================================== --- head/net/tigervnc/pkg-descr +++ head/net/tigervnc/pkg-descr @@ -1,5 +1,7 @@ +This is a metaport for TigerVNC. + TigerVNC is a high-performance, platform-neutral implementation of VNC, a client/server application that allows users to launch and interact with graphical applications on remote machines. -WWW: http://tigervnc.org/ +WWW: https://tigervnc.org/ Index: head/net/tigervnc/pkg-plist =================================================================== --- head/net/tigervnc/pkg-plist +++ head/net/tigervnc/pkg-plist @@ -1,45 +0,0 @@ -bin/Xvnc -bin/vncconfig -bin/vncpasswd -bin/vncserver -%%VIEWER%%bin/vncviewer -bin/x0vncserver -lib/xorg/modules/extensions/libvnc.so -man/man1/vncpasswd.1.gz -man/man1/x0vncserver.1.gz -man/man1/vncserver.1.gz -man/man1/vncconfig.1.gz -man/man1/Xvnc.1.gz -%%VIEWER%%man/man1/vncviewer.1.gz -%%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/hu/LC_MESSAGES/tigervnc.mo -%%NLS%%share/locale/id/LC_MESSAGES/tigervnc.mo -%%NLS%%share/locale/it/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/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 -%%PORTDOCS%%%%DOCSDIR%%/README.rst -%%PORTDOCS%%%%DOCSDIR%%/LICENCE.TXT -%%VIEWER%%share/icons/hicolor/16x16/apps/tigervnc.png -%%VIEWER%%share/icons/hicolor/22x22/apps/tigervnc.png -%%VIEWER%%share/icons/hicolor/24x24/apps/tigervnc.png -%%VIEWER%%share/icons/hicolor/32x32/apps/tigervnc.png -%%VIEWER%%share/icons/hicolor/48x48/apps/tigervnc.png -%%VIEWER%%share/icons/hicolor/scalable/apps/tigervnc.svg