svn commit: r441817 - in head/net/tigervnc: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Fri May 26 22:59:54 UTC 2017
Author: cpm
Date: Fri May 26 22:59:52 2017
New Revision: 441817
URL: https://svnweb.freebsd.org/changeset/ports/441817
Log:
net/tigervnc: update to 1.8.0
- Remove CONFLICST with vnc as net/vnc no longer exists
- Pet portlint, move LIB_DEPENDS up and regenerate patches with make makepatch
Changes: https://github.com/TigerVNC/tigervnc/releases/tag/v1.8.0
PR: 219566
Submitted by: Koichiro IWAO <meta+ports at vmeta.jp> (maintainer)
Deleted:
head/net/tigervnc/files/patch-unix_xserver118.patch
Modified:
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/files/patch-unix_vncserver
head/net/tigervnc/pkg-plist
Modified: head/net/tigervnc/Makefile
==============================================================================
--- head/net/tigervnc/Makefile Fri May 26 22:06:10 2017 (r441816)
+++ head/net/tigervnc/Makefile Fri May 26 22:59:52 2017 (r441817)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tigervnc
-PORTVERSION= 1.7.1
-PORTREVISION= 2
+PORTVERSION= 1.8.0
DISTVERSIONPREFIX= v
CATEGORIES= net x11-servers
@@ -16,15 +15,18 @@ 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]* \
- vnc-[0-9]*
+ tridiavnc-[0-9]*
USES= autoreconf:build cmake cpe iconv jpeg libtool pkgconfig \
python ssl
@@ -39,10 +41,6 @@ USE_XORG+= bigreqsproto compositeproto d
xdmcp xext xextproto xfont xkbfile xorg-macros xproto xrandr xrender \
xtrans xtst
-LIB_DEPENDS= libunwind.so:devel/libunwind \
- libxshmfence.so:x11/libxshmfence \
- libfontconfig.so:x11-fonts/fontconfig
-
CFLAGS+= -fPIC
OPTIONS_DEFINE= GNUTLS NLS PAM VIEWER DOCS
Modified: head/net/tigervnc/distinfo
==============================================================================
--- head/net/tigervnc/distinfo Fri May 26 22:06:10 2017 (r441816)
+++ head/net/tigervnc/distinfo Fri May 26 22:59:52 2017 (r441817)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485135437
-SHA256 (TigerVNC-tigervnc-v1.7.1_GH0.tar.gz) = 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc
-SIZE (TigerVNC-tigervnc-v1.7.1_GH0.tar.gz) = 1406032
+TIMESTAMP = 1495786956
+SHA256 (TigerVNC-tigervnc-v1.8.0_GH0.tar.gz) = 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8
+SIZE (TigerVNC-tigervnc-v1.8.0_GH0.tar.gz) = 1433830
Modified: head/net/tigervnc/files/patch-CMakeLists.txt
==============================================================================
--- head/net/tigervnc/files/patch-CMakeLists.txt Fri May 26 22:06:10 2017 (r441816)
+++ head/net/tigervnc/files/patch-CMakeLists.txt Fri May 26 22:59:52 2017 (r441817)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2013-07-21 16:21:37.028241067 +0000
-+++ CMakeLists.txt 2013-07-21 16:21:59.310260222 +0000
-@@ -26,7 +26,7 @@
+--- CMakeLists.txt.orig 2017-05-16 13:53:28 UTC
++++ CMakeLists.txt
+@@ -29,7 +29,7 @@ set(RCVERSION 1,8,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 May 26 22:06:10 2017 (r441816)
+++ head/net/tigervnc/files/patch-cmake_BuildPackages.cmake Fri May 26 22:59:52 2017 (r441817)
@@ -1,10 +1,10 @@
---- cmake/BuildPackages.cmake.orig 2012-05-28 00:21:51.000000000 +0900
-+++ cmake/BuildPackages.cmake 2012-05-28 00:22:15.000000000 +0900
-@@ -86,5 +86,5 @@
+--- cmake/BuildPackages.cmake.orig 2017-05-16 13:53:28 UTC
++++ cmake/BuildPackages.cmake
+@@ -86,5 +86,5 @@ endif() #UNIX
# Common
#
--install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION doc)
--install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION doc)
+-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}/LICENCE.TXT DESTINATION share/doc/tigervnc)
+install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/tigervnc)
Modified: head/net/tigervnc/files/patch-unix_vncserver
==============================================================================
--- head/net/tigervnc/files/patch-unix_vncserver Fri May 26 22:06:10 2017 (r441816)
+++ head/net/tigervnc/files/patch-unix_vncserver Fri May 26 22:59:52 2017 (r441817)
@@ -1,20 +1,6 @@
---- unix/vncserver.orig 2016-09-08 10:31:18 UTC
+--- unix/vncserver.orig 2017-05-16 13:53:28 UTC
+++ unix/vncserver
-@@ -240,7 +240,13 @@ unlink($desktopLog);
-
- # Make an X server cookie and set up the Xauthority file
-
-+# mcookie is a part of util-linux, usually only GNU/Linux systems have it.
- $cookie = `mcookie`;
-+# Alternative method for cookie. For non GNU/Linux operating systems.
-+$cookie ||= `dd if=/dev/urandom bs=16 count=1 2>/dev/null| od -x -An | tr -d ' '`;
-+if ($cookie eq '') {
-+ die "couldn't generate magic cookie.\n";
-+}
-
- open(XAUTH, "|xauth -f $xauthorityFile source -");
- print XAUTH "add $host:$displayNumber . $cookie\n";
-@@ -470,7 +476,7 @@ sub CheckDisplayNumber
+@@ -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))';
@@ -23,7 +9,7 @@
close(S);
return 0;
}
-@@ -478,7 +484,7 @@ sub CheckDisplayNumber
+@@ -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))';
@@ -32,12 +18,3 @@
close(S);
return 0;
}
-@@ -778,7 +784,7 @@ sub SanityCheck
- #
-
- cmd:
-- foreach $cmd ("uname","mcookie","xauth") {
-+ foreach $cmd ("uname","xauth") {
- for (split(/:/,$ENV{PATH})) {
- if (-x "$_/$cmd") {
- next cmd;
Modified: head/net/tigervnc/pkg-plist
==============================================================================
--- head/net/tigervnc/pkg-plist Fri May 26 22:06:10 2017 (r441816)
+++ head/net/tigervnc/pkg-plist Fri May 26 22:59:52 2017 (r441817)
@@ -19,6 +19,8 @@ man/man1/Xvnc.1.gz
%%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/it/LC_MESSAGES/tigervnc.mo
%%NLS%%share/locale/nl/LC_MESSAGES/tigervnc.mo
%%NLS%%share/locale/pl/LC_MESSAGES/tigervnc.mo
More information about the svn-ports-head
mailing list