Index: head/net/tigervnc/Makefile
===================================================================
--- head/net/tigervnc/Makefile (revision 474992)
+++ head/net/tigervnc/Makefile (revision 474993)
@@ -1,145 +1,143 @@
-# Created by: Koichiro IWAO
# $FreeBSD$
PORTNAME= tigervnc
-PORTVERSION= 1.8.0
+PORTVERSION= 1.9.0
DISTVERSIONPREFIX= v
CATEGORIES= net x11-servers
MAINTAINER= meta@FreeBSD.org
COMMENT= High-performance, platform-neutral implementation of VNC
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENCE.TXT
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= libunwind.so:devel/libunwind \
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
CONFLICTS= tigervnc-devel-[0-9]* \
- tightvnc-[0-9]* \
- tridiavnc-[0-9]*
+ tightvnc-[0-9]*
-USES= autoreconf:build cmake:noninja cpe iconv jpeg libtool pkgconfig \
- python ssl
+USES= autoreconf:build cmake:noninja cpe iconv jpeg libtool \
+ pkgconfig python ssl
USE_GL= gl
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= TigerVNC
USE_XORG+= bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
ice inputproto kbproto pixman presentproto randrproto renderproto \
resourceproto scrnsaverproto sm videoproto x11 xau xcmiscproto xdamage \
- xdmcp xext xextproto xfont xkbfile xorg-macros xproto xrandr xrender \
- xtrans xtst
+ xdmcp xext xextproto xfixes xfont xkbfile xorg-macros xproto xrandr \
+ xrender xtrans xtst
CFLAGS+= -fPIC
OPTIONS_DEFINE= GNUTLS NLS PAM VIEWER DOCS
OPTIONS_DEFAULT= GNUTLS PAM VIEWER
VIEWER_DESC= Build vncviewer
.include
CMAKE_ARGS= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX}
.if ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS+= libtasn1.so:security/libtasn1 \
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error \
libgnutls.so:security/gnutls
CONFIGURE_ARGS+= --enable-glx-tls
CMAKE_ARGS+= -DENABLE_GNUTLS=1
.else
CMAKE_ARGS+= -DENABLE_GNUTLS=0
.endif
.if ${PORT_OPTIONS:MNLS}
USES+= gettext
CMAKE_ARGS+= -DENABLE_NLS=1
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DENABLE_NLS=0
PLIST_SUB+= NLS="@comment "
.endif
.if ${PORT_OPTIONS:MPAM}
CMAKE_ARGS+= -DENABLE_PAM=1
.else
CMAKE_ARGS+= -DENABLE_PAM=0
.endif
.if ${PORT_OPTIONS:MVIEWER}
CMAKE_ARGS+= -DBUILD_VIEWER=1
LIB_DEPENDS+= libpng.so:graphics/png \
libfltk.so:x11-toolkits/fltk
# ImageMagick is required to generate icons during build process
BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick
USE_XORG+= xcursor xfixes xft xinerama
PLIST_SUB+= VIEWER=""
INSTALLS_ICONS= yes
DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \
"${PORTNAME}" "vncviewer" "Network;" false
.else
CMAKE_ARGS+= -DBUILD_VIEWER=0
PLIST_SUB+= VIEWER="@comment "
.endif
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
TIGERVNC_XORG_PATCH_VER= 118
# 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
XORG_WRKDIR= ${MAKE} -C ${PORTSDIR}/x11-servers/xorg-server -VWRKSRC
pre-patch:
@${CP} -R `${XORG_WRKDIR}`/ ${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
Index: head/net/tigervnc/distinfo
===================================================================
--- head/net/tigervnc/distinfo (revision 474992)
+++ head/net/tigervnc/distinfo (revision 474993)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495786956
-SHA256 (TigerVNC-tigervnc-v1.8.0_GH0.tar.gz) = 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8
-SIZE (TigerVNC-tigervnc-v1.8.0_GH0.tar.gz) = 1433830
+TIMESTAMP = 1531884562
+SHA256 (TigerVNC-tigervnc-v1.9.0_GH0.tar.gz) = f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740
+SIZE (TigerVNC-tigervnc-v1.9.0_GH0.tar.gz) = 1506520
Index: head/net/tigervnc/files/patch-CMakeLists.txt
===================================================================
--- head/net/tigervnc/files/patch-CMakeLists.txt (revision 474992)
+++ head/net/tigervnc/files/patch-CMakeLists.txt (revision 474993)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig 2017-05-16 13:53:28 UTC
+--- CMakeLists.txt.orig 2018-07-16 14:08:55 UTC
+++ CMakeLists.txt
-@@ -29,7 +29,7 @@ set(RCVERSION 1,8,0,0)
+@@ -29,7 +29,7 @@ set(RCVERSION 1,9,0,0)
# Installation paths
set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
-set(MAN_DIR "${DATA_DIR}/man")
+set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/man")
set(LOCALE_DIR "${DATA_DIR}/locale")
set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
Index: head/net/tigervnc/files/patch-cmake_BuildPackages.cmake
===================================================================
--- head/net/tigervnc/files/patch-cmake_BuildPackages.cmake (revision 474992)
+++ head/net/tigervnc/files/patch-cmake_BuildPackages.cmake (revision 474993)
@@ -1,10 +1,10 @@
---- cmake/BuildPackages.cmake.orig 2017-05-16 13:53:28 UTC
+--- cmake/BuildPackages.cmake.orig 2017-04-19 13:27:31 UTC
+++ cmake/BuildPackages.cmake
@@ -86,5 +86,5 @@ endif() #UNIX
# Common
#
-install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${DOC_DIR})
--install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${DOC_DIR})
+-install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION ${DOC_DIR})
+install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION share/doc/tigervnc)
-+install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/tigervnc)
++install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION share/doc/tigervnc)
Index: head/net/tigervnc/pkg-plist
===================================================================
--- head/net/tigervnc/pkg-plist (revision 474992)
+++ head/net/tigervnc/pkg-plist (revision 474993)
@@ -1,43 +1,45 @@
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.txt
+%%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
Index: head/net/tigervnc-devel/Makefile
===================================================================
--- head/net/tigervnc-devel/Makefile (revision 474992)
+++ head/net/tigervnc-devel/Makefile (revision 474993)
@@ -1,148 +1,146 @@
-# Created by: Koichiro IWAO
# $FreeBSD$
PORTNAME= tigervnc
-PORTVERSION= 1.7.90
+PORTVERSION= 1.9.0
DISTVERSIONPREFIX= v
CATEGORIES= net x11-servers
PKGNAMESUFFIX= -devel
MAINTAINER= meta@FreeBSD.org
COMMENT= High-performance, platform-neutral implementation of VNC
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENCE.TXT
+IGNORE= no development version available right now. Please use net/tigervnc instead
+
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= libunwind.so:devel/libunwind \
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
CONFLICTS= tigervnc-[0-9]* \
- tightvnc-[0-9]* \
- tridiavnc-[0-9]*
+ tightvnc-[0-9]*
-USES= autoreconf:build cmake cpe iconv jpeg libtool pkgconfig \
- python ssl
+USES= autoreconf:build cmake:noninja cpe iconv jpeg libtool \
+ pkgconfig python ssl
USE_GL= gl
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= TigerVNC
USE_XORG+= bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
ice inputproto kbproto pixman presentproto randrproto renderproto \
resourceproto scrnsaverproto sm videoproto x11 xau xcmiscproto xdamage \
- xdmcp xext xextproto xfont xkbfile xorg-macros xproto xrandr xrender \
- xtrans xtst
+ xdmcp xext xextproto xfixes xfont xkbfile xorg-macros xproto xrandr \
+ xrender xtrans xtst
CFLAGS+= -fPIC
-
-IGNORE= no development version available right now. Please use net/tigervnc instead
OPTIONS_DEFINE= GNUTLS NLS PAM VIEWER DOCS
OPTIONS_DEFAULT= GNUTLS PAM VIEWER
VIEWER_DESC= Build vncviewer
.include
CMAKE_ARGS= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX}
.if ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS+= libtasn1.so:security/libtasn1 \
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error \
libgnutls.so:security/gnutls
CONFIGURE_ARGS+= --enable-glx-tls
CMAKE_ARGS+= -DENABLE_GNUTLS=1
.else
CMAKE_ARGS+= -DENABLE_GNUTLS=0
.endif
.if ${PORT_OPTIONS:MNLS}
USES+= gettext
CMAKE_ARGS+= -DENABLE_NLS=1
PLIST_SUB+= NLS=""
.else
CMAKE_ARGS+= -DENABLE_NLS=0
PLIST_SUB+= NLS="@comment "
.endif
.if ${PORT_OPTIONS:MPAM}
CMAKE_ARGS+= -DENABLE_PAM=1
.else
CMAKE_ARGS+= -DENABLE_PAM=0
.endif
.if ${PORT_OPTIONS:MVIEWER}
CMAKE_ARGS+= -DBUILD_VIEWER=1
LIB_DEPENDS+= libpng.so:graphics/png \
libfltk.so:x11-toolkits/fltk
# ImageMagick is required to generate icons during build process
BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick
USE_XORG+= xcursor xfixes xft xinerama
PLIST_SUB+= VIEWER=""
INSTALLS_ICONS= yes
DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \
"${PORTNAME}" "vncviewer" "Network;" false
.else
CMAKE_ARGS+= -DBUILD_VIEWER=0
PLIST_SUB+= VIEWER="@comment "
.endif
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
TIGERVNC_XORG_PATCH_VER= 118
# 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
XORG_WRKDIR= ${MAKE} -C ${PORTSDIR}/x11-servers/xorg-server -VWRKSRC
pre-patch:
@${CP} -R `${XORG_WRKDIR}`/ ${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
Index: head/net/tigervnc-devel/distinfo
===================================================================
--- head/net/tigervnc-devel/distinfo (revision 474992)
+++ head/net/tigervnc-devel/distinfo (revision 474993)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494395713
-SHA256 (TigerVNC-tigervnc-v1.7.90_GH0.tar.gz) = 0ddc43366b8399f591a24b35163a973bad129a1a7c1fcea7295fbfd8870c0a5f
-SIZE (TigerVNC-tigervnc-v1.7.90_GH0.tar.gz) = 1431708
+TIMESTAMP = 1531884562
+SHA256 (TigerVNC-tigervnc-v1.9.0_GH0.tar.gz) = f15ced8500ec56356c3bf271f52e58ed83729118361c7103eab64a618441f740
+SIZE (TigerVNC-tigervnc-v1.9.0_GH0.tar.gz) = 1506520
Index: head/net/tigervnc-devel/files/patch-CMakeLists.txt
===================================================================
--- head/net/tigervnc-devel/files/patch-CMakeLists.txt (revision 474992)
+++ head/net/tigervnc-devel/files/patch-CMakeLists.txt (revision 474993)
@@ -1,11 +1,11 @@
---- CMakeLists.txt.orig 2017-04-19 13:27:31 UTC
+--- CMakeLists.txt.orig 2018-07-16 14:08:55 UTC
+++ CMakeLists.txt
-@@ -29,7 +29,7 @@ set(RCVERSION 1,7,90,0)
+@@ -29,7 +29,7 @@ set(RCVERSION 1,9,0,0)
# Installation paths
set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
-set(MAN_DIR "${DATA_DIR}/man")
+set(MAN_DIR "${CMAKE_INSTALL_PREFIX}/man")
set(LOCALE_DIR "${DATA_DIR}/locale")
set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
Index: head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake
===================================================================
--- head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake (revision 474992)
+++ head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake (revision 474993)
@@ -1,10 +1,10 @@
--- cmake/BuildPackages.cmake.orig 2017-04-19 13:27:31 UTC
+++ cmake/BuildPackages.cmake
@@ -86,5 +86,5 @@ endif() #UNIX
# Common
#
-install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${DOC_DIR})
--install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${DOC_DIR})
+-install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION ${DOC_DIR})
+install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION share/doc/tigervnc)
-+install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/tigervnc)
++install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION share/doc/tigervnc)
Index: head/net/tigervnc-devel/files/patch-unix_vncserver
===================================================================
--- head/net/tigervnc-devel/files/patch-unix_vncserver (revision 474992)
+++ head/net/tigervnc-devel/files/patch-unix_vncserver (revision 474993)
@@ -1,20 +1,20 @@
---- unix/vncserver.orig 2017-04-19 13:27:31 UTC
+--- unix/vncserver.orig 2017-05-16 13:53:28 UTC
+++ unix/vncserver
@@ -532,7 +532,7 @@ sub CheckDisplayNumber
socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
- if (!bind(S, pack('S n x12', $AF_INET, 6000 + $n))) {
+ if (!bind(S, sockaddr_in(6000 + $n, &INADDR_ANY))) {
close(S);
return 0;
}
@@ -540,7 +540,7 @@ sub CheckDisplayNumber
socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
- if (!bind(S, pack('S n x12', $AF_INET, 5900 + $n))) {
+ if (!bind(S, sockaddr_in(5900 + $n, &INADDR_ANY))) {
close(S);
return 0;
}
Index: head/net/tigervnc-devel/pkg-plist
===================================================================
--- head/net/tigervnc-devel/pkg-plist (revision 474992)
+++ head/net/tigervnc-devel/pkg-plist (revision 474993)
@@ -1,42 +1,45 @@
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.txt
+%%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