Index: head/net/tigervnc-server/Makefile
===================================================================
--- head/net/tigervnc-server/Makefile	(revision 550390)
+++ head/net/tigervnc-server/Makefile	(revision 550391)
@@ -1,95 +1,97 @@
 # $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 \
 		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 compiler:c11 gl jpeg libtool pkgconfig ssl xorg
+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_LANG=	bash
+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=${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
 
 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/
 
 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/ && ${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 "${.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} == amd64 || ${ARCH} == i386)
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
Index: head/net/tigervnc-server/Makefile.common.mk
===================================================================
--- head/net/tigervnc-server/Makefile.common.mk	(revision 550390)
+++ head/net/tigervnc-server/Makefile.common.mk	(revision 550391)
@@ -1,36 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	tigervnc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.10.1
-PORTREVISION=	1
+DISTVERSION=	1.11.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]*
 PLIST_SUB+=	TIGERVNC_COMPONENT=${PORTNAME}${PKGNAMESUFFIX}-
 
-CMAKE_ARGS+=	-G "Unix Makefiles"
+CMAKE_ARGS+=	-G "Unix Makefiles" -DINSTALL_SYSTEMD_UNITS:BOOL=false
 MAKE_ARGS+=	TIGERVNC_SRCDIR=${WRKSRC}
 
 DOCS=	LICENCE.TXT README.rst
 
 .include <bsd.port.pre.mk>
 
 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 <bsd.port.post.mk>
Index: head/net/tigervnc-server/distinfo
===================================================================
--- head/net/tigervnc-server/distinfo	(revision 550390)
+++ head/net/tigervnc-server/distinfo	(revision 550391)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577061858
-SHA256 (TigerVNC-tigervnc-v1.10.1_GH0.tar.gz) = 19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
-SIZE (TigerVNC-tigervnc-v1.10.1_GH0.tar.gz) = 1408105
+TIMESTAMP = 1600214302
+SHA256 (TigerVNC-tigervnc-v1.11.0_GH0.tar.gz) = 3648eca472a92a4e8fe55b27cd397b1bf16bad0b24a3a1988661f44553f5e2c3
+SIZE (TigerVNC-tigervnc-v1.11.0_GH0.tar.gz) = 1346992
Index: head/net/tigervnc-server/files/patch-CMakeLists.txt
===================================================================
--- head/net/tigervnc-server/files/patch-CMakeLists.txt	(revision 550390)
+++ head/net/tigervnc-server/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2018-07-16 14:08:55 UTC
-+++ CMakeLists.txt
-@@ -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}")
- 

Property changes on: head/net/tigervnc-server/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/tigervnc-server/files/patch-cmake_BuildPackages.cmake
===================================================================
--- head/net/tigervnc-server/files/patch-cmake_BuildPackages.cmake	(revision 550390)
+++ head/net/tigervnc-server/files/patch-cmake_BuildPackages.cmake	(nonexistent)
@@ -1,8 +0,0 @@
---- cmake/BuildPackages.cmake.orig	2018-07-16 14:08:55 UTC
-+++ cmake/BuildPackages.cmake
-@@ -86,5 +86,3 @@ endif() #UNIX
- # Common
- #
- 
--install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${DOC_DIR})
--install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION ${DOC_DIR})

Property changes on: head/net/tigervnc-server/files/patch-cmake_BuildPackages.cmake
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/tigervnc-server/files/patch-unix_vncserver
===================================================================
--- head/net/tigervnc-server/files/patch-unix_vncserver	(revision 550390)
+++ head/net/tigervnc-server/files/patch-unix_vncserver	(nonexistent)
@@ -1,20 +0,0 @@
---- 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;
-     }

Property changes on: head/net/tigervnc-server/files/patch-unix_vncserver
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net/tigervnc-server/files/patch-release_CMakeLists.txt
===================================================================
--- head/net/tigervnc-server/files/patch-release_CMakeLists.txt	(nonexistent)
+++ head/net/tigervnc-server/files/patch-release_CMakeLists.txt	(revision 550391)
@@ -0,0 +1,8 @@
+--- release/CMakeLists.txt.orig	2018-07-16 14:08:55 UTC
++++ release/CMakeLists.txt
+@@ -86,5 +86,3 @@ endif() #UNIX
+ # Common
+ #
+ 
+-install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR})
+-install(FILES ${CMAKE_SOURCE_DIR}/README.rst DESTINATION ${CMAKE_INSTALL_FULL_DOCDIR})

Property changes on: head/net/tigervnc-server/files/patch-release_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/tigervnc-server/files/patch-unix_vncserver_vncsession.c
===================================================================
--- head/net/tigervnc-server/files/patch-unix_vncserver_vncsession.c	(nonexistent)
+++ head/net/tigervnc-server/files/patch-unix_vncserver_vncsession.c	(revision 550391)
@@ -0,0 +1,13 @@
+diff --git unix/vncserver/vncsession.c unix/vncserver/vncsession.c
+index 3e0c98f0..cdac9d1a 100644
+--- unix/vncserver/vncsession.c
++++ unix/vncserver/vncsession.c
+@@ -339,7 +339,7 @@ static void
+ redir_stdio(const char *homedir, const char *display)
+ {
+     int fd;
+-    char hostname[HOST_NAME_MAX+1];
++    char hostname[_SC_HOST_NAME_MAX+1];
+     char logfile[PATH_MAX];
+ 
+     fd = open("/dev/null", O_RDONLY);

Property changes on: head/net/tigervnc-server/files/patch-unix_vncserver_vncsession.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/tigervnc-server/pkg-plist
===================================================================
--- head/net/tigervnc-server/pkg-plist	(revision 550390)
+++ head/net/tigervnc-server/pkg-plist	(revision 550391)
@@ -1,13 +1,19 @@
 bin/Xvnc
 bin/vncconfig
 bin/vncpasswd
-bin/vncserver
 bin/x0vncserver
+sbin/vncsession
+etc/pam.d/tigervnc
+%%ETCDIR%%/vncserver-config-defaults
+%%ETCDIR%%/vncserver-config-mandatory
+%%ETCDIR%%/vncserver.users
 lib/xorg/modules/extensions/libvnc.so
+libexec/vncserver
 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
+man/man8/vncserver.8.gz
+man/man8/vncsession.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/%%TIGERVNC_COMPONENT%%LICENCE.TXT
 %%PORTDOCS%%%%DOCSDIR%%/%%TIGERVNC_COMPONENT%%README.rst
Index: head/net/tigervnc-viewer/Makefile
===================================================================
--- head/net/tigervnc-viewer/Makefile	(revision 550390)
+++ head/net/tigervnc-viewer/Makefile	(revision 550391)
@@ -1,40 +1,40 @@
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-viewer
 CATEGORIES=	net
 
 COMMENT=	TigerVNC Viewer
 
 USES+=		gnome iconv jpeg xorg
-USE_XORG+=	ice sm x11 xcursor xext xfixes xft xinerama xrender
+USE_XORG+=	ice pixman sm x11 xcursor xext xfixes xft xi 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
 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"