Date: Sat, 20 May 2017 10:07:20 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441303 - in head/net/tigervnc-devel: . files Message-ID: <201705201007.v4KA7KDJ045251@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat May 20 10:07:19 2017 New Revision: 441303 URL: https://svnweb.freebsd.org/changeset/ports/441303 Log: Update to 1.8.0 Beta (a.k.a 1.7.90) PR: 219229 Submitted by: meta+ports@vmeta.jp (maintainer) Deleted: head/net/tigervnc-devel/files/patch-unix_xserver117.patch Modified: head/net/tigervnc-devel/Makefile head/net/tigervnc-devel/distinfo head/net/tigervnc-devel/files/patch-unix_vncserver head/net/tigervnc-devel/pkg-plist Modified: head/net/tigervnc-devel/Makefile ============================================================================== --- head/net/tigervnc-devel/Makefile Sat May 20 10:04:06 2017 (r441302) +++ head/net/tigervnc-devel/Makefile Sat May 20 10:07:19 2017 (r441303) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tigervnc -PORTVERSION= 1.6.90 -PORTREVISION= 2 +PORTVERSION= 1.7.90 DISTVERSIONPREFIX= v CATEGORIES= net x11-servers PKGNAMESUFFIX= -devel @@ -17,6 +16,7 @@ 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 # almost equivalent to x11-servers/xorg-server's RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ @@ -46,8 +46,6 @@ LIB_DEPENDS= libunwind.so:devel/libunwin 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 @@ -112,11 +110,12 @@ CONFIGURE_ARGS+= \ --with-xkb-bin-directory=${LOCALBASE}/bin \ --with-serverconfig-path=${LOCALBASE}/lib/X11 \ --disable-selective-werror \ + --disable-xwayland \ --with-fontrootdir=${LOCALBASE}/share/fonts .include <bsd.port.pre.mk> -TIGERVNC_XORG_PATCH_VER= 117 +TIGERVNC_XORG_PATCH_VER= 118 # import from x11-server/xorg-server/Makefile .if ${SSL_DEFAULT} == base Modified: head/net/tigervnc-devel/distinfo ============================================================================== --- head/net/tigervnc-devel/distinfo Sat May 20 10:04:06 2017 (r441302) +++ head/net/tigervnc-devel/distinfo Sat May 20 10:07:19 2017 (r441303) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467937482 -SHA256 (TigerVNC-tigervnc-v1.6.90_GH0.tar.gz) = df11dd48d5c360dbe6c505a5a3cec3f12589fac759a0726f2f358c1aee36a5a9 -SIZE (TigerVNC-tigervnc-v1.6.90_GH0.tar.gz) = 1401599 +TIMESTAMP = 1494395713 +SHA256 (TigerVNC-tigervnc-v1.7.90_GH0.tar.gz) = 0ddc43366b8399f591a24b35163a973bad129a1a7c1fcea7295fbfd8870c0a5f +SIZE (TigerVNC-tigervnc-v1.7.90_GH0.tar.gz) = 1431708 Modified: head/net/tigervnc-devel/files/patch-unix_vncserver ============================================================================== --- head/net/tigervnc-devel/files/patch-unix_vncserver Sat May 20 10:04:06 2017 (r441302) +++ head/net/tigervnc-devel/files/patch-unix_vncserver Sat May 20 10:07:19 2017 (r441303) @@ -1,20 +1,8 @@ ---- unix/vncserver.orig 2016-10-04 13:33:57.420501000 +0900 -+++ unix/vncserver 2016-10-04 13:18:49.398064000 +0900 -@@ -240,7 +240,13 @@ - - # 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 @@ +diff --git unix/vncserver unix/vncserver +index 2ef436a7..dac27520 100755 +--- unix/vncserver ++++ 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))'; @@ -23,7 +11,7 @@ close(S); return 0; } -@@ -478,7 +484,7 @@ +@@ -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 +20,3 @@ close(S); return 0; } -@@ -778,7 +784,7 @@ - # - - cmd: -- foreach $cmd ("uname","mcookie","xauth") { -+ foreach $cmd ("uname","xauth") { - for (split(/:/,$ENV{PATH})) { - if (-x "$_/$cmd") { - next cmd; Modified: head/net/tigervnc-devel/pkg-plist ============================================================================== --- head/net/tigervnc-devel/pkg-plist Sat May 20 10:04:06 2017 (r441302) +++ head/net/tigervnc-devel/pkg-plist Sat May 20 10:07:19 2017 (r441303) @@ -19,6 +19,7 @@ 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/it/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/nl/LC_MESSAGES/tigervnc.mo %%NLS%%share/locale/pl/LC_MESSAGES/tigervnc.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705201007.v4KA7KDJ045251>