11 files changed, 37 insertions, 36 deletions

diff --git a/net/tigervnc-devel/Makefile b/net/tigervnc-devel/Makefile
index 583ef8eab78e..c644b8126a89 100644
--- a/net/tigervnc-devel/Makefile
+++ b/net/tigervnc-devel/Makefile
@@ -1,8 +1,7 @@
-# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
 # $FreeBSD$
 
 PORTNAME=	tigervnc
-PORTVERSION=	1.7.90
+PORTVERSION=	1.9.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net x11-servers
 PKGNAMESUFFIX=	-devel
@@ -13,6 +12,8 @@ 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 \
@@ -26,11 +27,10 @@ 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
@@ -39,13 +39,11 @@ 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
diff --git a/net/tigervnc-devel/distinfo b/net/tigervnc-devel/distinfo
index 975437bb9d22..a42d46382ea4 100644
--- a/net/tigervnc-devel/distinfo
+++ b/net/tigervnc-devel/distinfo
@@ -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
diff --git a/net/tigervnc-devel/files/patch-CMakeLists.txt b/net/tigervnc-devel/files/patch-CMakeLists.txt
index 54b000d82582..c1e2c6ba7fec 100644
--- a/net/tigervnc-devel/files/patch-CMakeLists.txt
+++ b/net/tigervnc-devel/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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")
diff --git a/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake b/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake
index 0945ce653f4d..fee548480892 100644
--- a/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake
+++ b/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake
@@ -5,6 +5,6 @@
  #
  
 -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)
diff --git a/net/tigervnc-devel/files/patch-unix_vncserver b/net/tigervnc-devel/files/patch-unix_vncserver
index f7eed0e6c7e2..ed513542e04e 100644
--- a/net/tigervnc-devel/files/patch-unix_vncserver
+++ b/net/tigervnc-devel/files/patch-unix_vncserver
@@ -1,4 +1,4 @@
---- 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
  
diff --git a/net/tigervnc-devel/pkg-plist b/net/tigervnc-devel/pkg-plist
index 244e569e48f7..ca9b62cbf112 100644
--- a/net/tigervnc-devel/pkg-plist
+++ b/net/tigervnc-devel/pkg-plist
@@ -12,6 +12,7 @@ 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
@@ -20,6 +21,8 @@ man/man1/Xvnc.1.gz
 %%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
@@ -32,7 +35,7 @@ man/man1/Xvnc.1.gz
 %%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
diff --git a/net/tigervnc/Makefile b/net/tigervnc/Makefile
index 2ba80de01232..b7a62ab1652a 100644
--- a/net/tigervnc/Makefile
+++ b/net/tigervnc/Makefile
@@ -1,8 +1,7 @@
-# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
 # $FreeBSD$
 
 PORTNAME=	tigervnc
-PORTVERSION=	1.8.0
+PORTVERSION=	1.9.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net x11-servers
 
@@ -25,11 +24,10 @@ 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
@@ -38,8 +36,8 @@ 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
 
diff --git a/net/tigervnc/distinfo b/net/tigervnc/distinfo
index 203d3a12dbd0..a42d46382ea4 100644
--- a/net/tigervnc/distinfo
+++ b/net/tigervnc/distinfo
@@ -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
diff --git a/net/tigervnc/files/patch-CMakeLists.txt b/net/tigervnc/files/patch-CMakeLists.txt
index a12ec803c0e6..c1e2c6ba7fec 100644
--- a/net/tigervnc/files/patch-CMakeLists.txt
+++ b/net/tigervnc/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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")
diff --git a/net/tigervnc/files/patch-cmake_BuildPackages.cmake b/net/tigervnc/files/patch-cmake_BuildPackages.cmake
index 36427ee811fb..fee548480892 100644
--- a/net/tigervnc/files/patch-cmake_BuildPackages.cmake
+++ b/net/tigervnc/files/patch-cmake_BuildPackages.cmake
@@ -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)
diff --git a/net/tigervnc/pkg-plist b/net/tigervnc/pkg-plist
index fa23778458b0..ca9b62cbf112 100644
--- a/net/tigervnc/pkg-plist
+++ b/net/tigervnc/pkg-plist
@@ -12,6 +12,7 @@ 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
@@ -21,6 +22,7 @@ man/man1/Xvnc.1.gz
 %%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
@@ -33,7 +35,7 @@ man/man1/Xvnc.1.gz
 %%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