From owner-svn-ports-head@FreeBSD.ORG Wed Sep 11 13:20:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B1E8272D; Wed, 11 Sep 2013 13:20:03 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F8F02B75; Wed, 11 Sep 2013 13:20:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8BDK3PQ087307; Wed, 11 Sep 2013 13:20:03 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8BDK2fC087295; Wed, 11 Sep 2013 13:20:02 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201309111320.r8BDK2fC087295@svn.freebsd.org> From: William Grzybowski Date: Wed, 11 Sep 2013 13:20:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326978 - in head/net/tigervnc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Sep 2013 13:20:03 -0000 Author: wg Date: Wed Sep 11 13:20:02 2013 New Revision: 326978 URL: http://svnweb.freebsd.org/changeset/ports/326978 Log: net/tigervnc: update to 1.3.0 - Update to 1.3.0 [1] - Add BUILD_DEPENDS on bash [1] - Adjust CONFIGURE_ARGS for two different versions of xorg [1] - Normalize COMMENT [1] - USES gmake - Convert lib depends to new syntax Changes: http://sourceforge.net/mailarchive/message.php?msg_id=31144665 PR: ports/180911 [1] Submitted by: Koichiro IWAO (maintainer) Added: head/net/tigervnc/files/patch-hw-vnc-off-by-one-error (contents, props changed) Deleted: head/net/tigervnc/files/extra-patch-common_rdr.patch head/net/tigervnc/files/extra-patch-common_rfb.patch head/net/tigervnc/files/extra-patch-unix_hw_vnc.patch head/net/tigervnc/files/patch-hw_vnc_Makefile.am head/net/tigervnc/files/xserver112.patch Modified: head/net/tigervnc/Makefile head/net/tigervnc/distinfo head/net/tigervnc/files/patch-CMakeLists.txt (contents, props changed) Directory Properties: head/net/tigervnc/files/patch-cmake_BuildPackages.cmake (props changed) head/net/tigervnc/files/patch-unix_vncserver (props changed) Modified: head/net/tigervnc/Makefile ============================================================================== --- head/net/tigervnc/Makefile Wed Sep 11 13:15:46 2013 (r326977) +++ head/net/tigervnc/Makefile Wed Sep 11 13:20:02 2013 (r326978) @@ -2,22 +2,21 @@ # $FreeBSD$ PORTNAME= tigervnc -PORTVERSION= 1.2.0 -PORTREVISION= 3 +PORTVERSION= 1.3.0 CATEGORIES= net x11-servers MASTER_SITES= SF:tigervnc MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz:tigervnc +DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.bz2:tigervnc MAINTAINER= meta+ports@vmeta.jp -COMMENT= TigerVNC is an advanced VNC implementation +COMMENT= High-performance, platform-neutral implementation of VNC LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENCE.TXT PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-servers/xorg-server:patch BUILD_DEPENDS= ${LOCALBASE}/include/GL/internal/dri_interface.h:${PORTSDIR}/graphics/dri \ - ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util + ${LOCALBASE}/libdata/pkgconfig/fontutil.pc:${PORTSDIR}/x11-fonts/font-util \ + bash:${PORTSDIR}/shells/bash # almost equivalent to x11-servers/xorg-server's RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp @@ -26,10 +25,7 @@ CONFLICTS= tridiavnc-[0-9]* \ tightvnc-[0-9]* \ vnc-[0-9]* -MAKE_JOBS_UNSAFE= yes - -USES= cmake pkgconfig -USE_GMAKE= yes +USES= cmake gmake pkgconfig USE_GL= gl USE_AUTOTOOLS+= autoconf:env automake:env libtool:env USE_PYTHON= yes @@ -58,10 +54,10 @@ HPJPG_DESC= Build with High-Performance CMAKE_ARGS= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${PREFIX} .if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= tasn1:${PORTSDIR}/security/libtasn1 \ - gcrypt:${PORTSDIR}/security/libgcrypt \ - gpg-error:${PORTSDIR}/security/libgpg-error \ - gnutls:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= libtasn1.so:${PORTSDIR}/security/libtasn1 \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt \ + libgpg-error.so:${PORTSDIR}/security/libgpg-error \ + libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --enable-glx-tls CMAKE_ARGS+= -DENABLE_GNUTLS=1 .else @@ -85,8 +81,8 @@ CMAKE_ARGS+= -DENABLE_PAM=0 .if ${PORT_OPTIONS:MVIEWER} CMAKE_ARGS+= -DENABLE_VIEWER=1 -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ - fltk:${PORTSDIR}/x11-toolkits/fltk +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \ + libfltk.so:${PORTSDIR}/x11-toolkits/fltk USE_XORG+= xcursor xfixes xft xinerama MAN1+= vncviewer.1 PLIST_SUB+= VIEWER="" @@ -99,9 +95,9 @@ PLIST_SUB+= VIEWER="@comment " .endif .if ${PORT_OPTIONS:MHPJPG} -LIB_DEPENDS+= turbojpeg:${PORTSDIR}/graphics/libjpeg-turbo +LIB_DEPENDS+= libturbojpeg.so:${PORTSDIR}/graphics/libjpeg-turbo .else -LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/graphics/jpeg .endif MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC} @@ -114,20 +110,21 @@ CONFIGURE_ARGS+= \ --disable-config-dbus --disable-config-hal \ --disable-dri2 --enable-install-libxf86config --enable-glx \ --with-default-font-path="catalogue:${PREFIX}/share/fonts,built-ins" \ - --with-fontdir=${PREFIX}/share/fonts \ --with-xkb-path=${PREFIX}/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --with-xkb-bin-directory=${PREFIX}/bin \ --with-serverconfig-path=${PREFIX}/lib/X11 \ --disable-selective-werror +.ifdef WITH_NEW_XORG +CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts +.else +CONFIGURE_ARGS+= --with-fontdir=${PREFIX}/share/fonts +.endif .include .ifdef WITH_NEW_XORG TIGERVNC_XORG_PATCH_VER= 112 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-unix_hw_vnc.patch \ - ${FILESDIR}/extra-patch-common_rdr.patch \ - ${FILESDIR}/extra-patch-common_rfb.patch .else TIGERVNC_XORG_PATCH_VER= 17 .endif @@ -146,7 +143,6 @@ pre-patch: @${CP} -R `${XORG_WRKDIR}`/ ${WRKSRC}/unix/xserver/ post-patch: - @${CP} ${FILESDIR}/xserver*.patch ${WRKSRC}/unix/ @cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver${TIGERVNC_XORG_PATCH_VER}.patch post-configure: @@ -154,7 +150,7 @@ post-configure: @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS} post-build: - @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} + @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash post-install: @cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install Modified: head/net/tigervnc/distinfo ============================================================================== --- head/net/tigervnc/distinfo Wed Sep 11 13:15:46 2013 (r326977) +++ head/net/tigervnc/distinfo Wed Sep 11 13:20:02 2013 (r326978) @@ -1,6 +1,2 @@ -SHA256 (tigervnc-1.2.0.tar.gz) = 6e0910f1ff1681bc8b52e7ea805e586b88b352c88f66e4c2cc31aa39c4a32f53 -SIZE (tigervnc-1.2.0.tar.gz) = 2487050 -SHA256 (xorg-server-1.10.6.tar.bz2) = c4da5a97b6986688efe74bc9bff6a38795977019ac032dd6d787abad32c50682 -SIZE (xorg-server-1.10.6.tar.bz2) = 5406712 -SHA256 (xorg-server-1.7.7.tar.bz2) = 54c4d32bfeb8852adbea3ddae6981f3bc2eadb330124d9b35226c617c01926ff -SIZE (xorg-server-1.7.7.tar.bz2) = 4939257 +SHA256 (tigervnc-1.3.0.tar.bz2) = 61e5a78118c3a4adbc3b3026615a1068aed43839c2ad62815832bbc780f38c5a +SIZE (tigervnc-1.3.0.tar.bz2) = 1069481 Modified: head/net/tigervnc/files/patch-CMakeLists.txt ============================================================================== --- head/net/tigervnc/files/patch-CMakeLists.txt Wed Sep 11 13:15:46 2013 (r326977) +++ head/net/tigervnc/files/patch-CMakeLists.txt Wed Sep 11 13:20:02 2013 (r326978) @@ -1,68 +1,11 @@ ---- CMakeLists.txt.orig 2012-03-10 05:34:29.000000000 +0900 -+++ CMakeLists.txt 2012-10-25 19:02:36.642061425 +0900 -@@ -237,6 +237,7 @@ - endif() - - # Check for FLTK -+if(ENABLE_VIEWER) - set(FLTK_SKIP_FLUID TRUE) - set(FLTK_SKIP_OPENGL TRUE) - set(FLTK_SKIP_IMAGES TRUE) -@@ -282,44 +283,7 @@ - set(CMAKE_REQUIRED_LIBRARIES) - endif() - --option(USE_INCLUDED_FLTK -- "Force the use of the FLTK library bundled with the TigerVNC source") --if(NOT FLTK_FOUND OR NOT HAVE_FLTK_DEAD_KEYS OR NOT HAVE_FLTK_CLIPBOARD -- OR NOT HAVE_FLTK_MEDIAKEYS OR NOT HAVE_FLTK_FULLSCREEN -- OR NOT HAVE_FLTK_CURSOR) -- set(USE_INCLUDED_FLTK 1) --endif() --if(USE_INCLUDED_FLTK) -- # Check that we have the proper dependencies -- if(UNIX AND NOT APPLE) -- if(NOT X11_Xft_FOUND) -- message(FATAL_ERROR "Xft headers/libraries not found (needed by FLTK.)") -- endif() -- if(NOT X11_Xinerama_FOUND) -- message(FATAL_ERROR "Xinerama headers/libraries not found (needed by FLTK.)") -- endif() -- if(NOT X11_Xfixes_FOUND) -- message(FATAL_ERROR "Xfixes headers/libraries not found (needed by FLTK.)") -- endif() -- if(NOT X11_Xcursor_FOUND) -- message(FATAL_ERROR "Xcursor headers/libraries not found (needed by FLTK.)") -- endif() -- endif() -- -- set(HAVE_FLTK_DEAD_KEYS 1) -- set(HAVE_FLTK_CLIPBOARD 1) -- set(HAVE_FLTK_MEDIAKEYS 1) -- set(HAVE_FLTK_FULLSCREEN 1) -- set(HAVE_FLTK_CURSOR 1) -- set(FLTK_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/common/fltk) -- set(FLTK_LIBRARIES) -- if(APPLE) -- set(FLTK_LIBRARIES "-framework Carbon -framework Cocoa -framework ApplicationServices") -- elseif(NOT WIN32) -- set(FLTK_LIBRARIES "-ldl") -- endif() -- message(STATUS "Using included FLTK library") --endif() -+endif() # ENABLE_VIEWER - - # Check for GNUTLS library - option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON) -@@ -409,7 +373,10 @@ - if(ENABLE_NLS) - add_subdirectory(po) - endif() --add_subdirectory(vncviewer) -+ -+if(ENABLE_VIEWER) -+ add_subdirectory(vncviewer) -+endif() - - include(cmake/BuildPackages.cmake) +--- 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 @@ + # 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}") Added: head/net/tigervnc/files/patch-hw-vnc-off-by-one-error ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/tigervnc/files/patch-hw-vnc-off-by-one-error Wed Sep 11 13:20:02 2013 (r326978) @@ -0,0 +1,65 @@ +--- unix/xserver/hw/vnc/vncHooks.cc.orig 2013-07-01 12:41:24.000000000 +0000 ++++ unix/xserver/hw/vnc/vncHooks.cc 2013-07-20 13:38:14.424240970 +0000 +@@ -119,7 +119,7 @@ + + // screen functions + +-#if XORG < 112 ++#if XORG <= 112 + static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen); + #else + static Bool vncHooksCloseScreen(ScreenPtr pScreen); +@@ -140,7 +140,7 @@ + DeviceIntPtr pDev, + #endif + ScreenPtr pScreen, CursorPtr cursor); +-#if XORG < 112 ++#if XORG <= 112 + static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, + pointer pReadmask); + #else +@@ -367,7 +367,7 @@ + // CloseScreen - unwrap the screen functions and call the original CloseScreen + // function + +-#if XORG < 112 ++#if XORG <= 112 + static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_) + #else + static Bool vncHooksCloseScreen(ScreenPtr pScreen_) +@@ -405,7 +405,7 @@ + + DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n")); + +-#if XORG < 112 ++#if XORG <= 112 + return (*pScreen->CloseScreen)(i, pScreen); + #else + return (*pScreen->CloseScreen)(pScreen); +@@ -574,7 +574,7 @@ + // BlockHandler - ignore any changes during the block handler - it's likely + // these are just drawing the cursor. + +-#if XORG < 112 ++#if XORG <= 112 + static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, + pointer pReadmask) + #else +@@ -582,7 +582,7 @@ + pointer pReadmask) + #endif + { +-#if XORG < 112 ++#if XORG <= 112 + SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler); + #else + SCREEN_UNWRAP(pScreen_, BlockHandler); +@@ -590,7 +590,7 @@ + + vncHooksScreen->desktop->ignoreHooks(true); + +-#if XORG < 112 ++#if XORG <= 112 + (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); + #else + (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);