Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Jul 2018 08:17:06 +0000 (UTC)
From:      Koichiro Iwao <meta@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r474993 - in head/net: tigervnc tigervnc-devel tigervnc-devel/files tigervnc/files
Message-ID:  <201807200817.w6K8H649010142@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: meta
Date: Fri Jul 20 08:17:05 2018
New Revision: 474993
URL: https://svnweb.freebsd.org/changeset/ports/474993

Log:
  net/tigervnc: update 1.8.0 -> 1.9.0
  
  While here,
  * adjust USE_XORG
  * bring IGNORE line earlier (-devel port)
  * remove tridiavnc from CONFLICTS since it no longer exists
  * some cosmetic changes on Makefile
  
  Approved by:	pi (mentor)
  Relnotes:	https://github.com/TigerVNC/tigervnc/releases/tag/v1.9.0
  Differential Revision:	https://reviews.freebsd.org/D16340

Modified:
  head/net/tigervnc-devel/Makefile
  head/net/tigervnc-devel/distinfo
  head/net/tigervnc-devel/files/patch-CMakeLists.txt
  head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake
  head/net/tigervnc-devel/files/patch-unix_vncserver
  head/net/tigervnc-devel/pkg-plist
  head/net/tigervnc/Makefile
  head/net/tigervnc/distinfo
  head/net/tigervnc/files/patch-CMakeLists.txt
  head/net/tigervnc/files/patch-cmake_BuildPackages.cmake
  head/net/tigervnc/pkg-plist

Modified: head/net/tigervnc-devel/Makefile
==============================================================================
--- head/net/tigervnc-devel/Makefile	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc-devel/Makefile	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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 implementa
 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
 		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,12 +39,10 @@ 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

Modified: head/net/tigervnc-devel/distinfo
==============================================================================
--- head/net/tigervnc-devel/distinfo	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc-devel/distinfo	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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

Modified: head/net/tigervnc-devel/files/patch-CMakeLists.txt
==============================================================================
--- head/net/tigervnc-devel/files/patch-CMakeLists.txt	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc-devel/files/patch-CMakeLists.txt	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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")

Modified: head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake
==============================================================================
--- head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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)

Modified: head/net/tigervnc-devel/files/patch-unix_vncserver
==============================================================================
--- head/net/tigervnc-devel/files/patch-unix_vncserver	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc-devel/files/patch-unix_vncserver	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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
  

Modified: head/net/tigervnc-devel/pkg-plist
==============================================================================
--- head/net/tigervnc-devel/pkg-plist	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc-devel/pkg-plist	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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

Modified: head/net/tigervnc/Makefile
==============================================================================
--- head/net/tigervnc/Makefile	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc/Makefile	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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
 		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
 

Modified: head/net/tigervnc/distinfo
==============================================================================
--- head/net/tigervnc/distinfo	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc/distinfo	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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

Modified: head/net/tigervnc/files/patch-CMakeLists.txt
==============================================================================
--- head/net/tigervnc/files/patch-CMakeLists.txt	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc/files/patch-CMakeLists.txt	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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")

Modified: head/net/tigervnc/files/patch-cmake_BuildPackages.cmake
==============================================================================
--- head/net/tigervnc/files/patch-cmake_BuildPackages.cmake	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc/files/patch-cmake_BuildPackages.cmake	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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)

Modified: head/net/tigervnc/pkg-plist
==============================================================================
--- head/net/tigervnc/pkg-plist	Fri Jul 20 07:20:24 2018	(r474992)
+++ head/net/tigervnc/pkg-plist	Fri Jul 20 08:17:05 2018	(r474993)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807200817.w6K8H649010142>