Index: head/net/tigervnc-devel/Makefile =================================================================== --- head/net/tigervnc-devel/Makefile (revision 441817) +++ head/net/tigervnc-devel/Makefile (revision 441818) @@ -1,148 +1,148 @@ # Created by: Koichiro IWAO # $FreeBSD$ PORTNAME= tigervnc PORTVERSION= 1.7.90 DISTVERSIONPREFIX= v CATEGORIES= net x11-servers PKGNAMESUFFIX= -devel MAINTAINER= meta+ports@vmeta.jp COMMENT= High-performance, platform-neutral implementation of VNC LICENSE= GPLv2+ 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-[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 USE_GL= gl USE_LDCONFIG= yes USE_GITHUB= yes 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 -LIB_DEPENDS= libunwind.so:devel/libunwind \ - libxshmfence.so:x11/libxshmfence \ - libfontconfig.so:x11-fonts/fontconfig - 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 .include CMAKE_ARGS= -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=${STAGE}${PREFIX} .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= libtasn1.so:security/libtasn1 \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libgnutls.so:security/gnutls CONFIGURE_ARGS+= --enable-glx-tls CMAKE_ARGS+= -DENABLE_GNUTLS=1 .else CMAKE_ARGS+= -DENABLE_GNUTLS=0 .endif .if ${PORT_OPTIONS:MNLS} USES+= gettext CMAKE_ARGS+= -DENABLE_NLS=1 PLIST_SUB+= NLS="" .else CMAKE_ARGS+= -DENABLE_NLS=0 PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MPAM} CMAKE_ARGS+= -DENABLE_PAM=1 .else CMAKE_ARGS+= -DENABLE_PAM=0 .endif .if ${PORT_OPTIONS:MVIEWER} CMAKE_ARGS+= -DBUILD_VIEWER=1 LIB_DEPENDS+= libpng.so:graphics/png \ libfltk.so:x11-toolkits/fltk # ImageMagick is required to generate icons during build process BUILD_DEPENDS+= ${LOCALBASE}/bin/convert:graphics/ImageMagick USE_XORG+= xcursor xfixes xft xinerama PLIST_SUB+= VIEWER="" INSTALLS_ICONS= yes DESKTOP_ENTRIES= "TigerVNC viewer" "Connect to VNC server and display remote desktop" \ "${PORTNAME}" "vncviewer" "Network;" false .else CMAKE_ARGS+= -DBUILD_VIEWER=0 PLIST_SUB+= VIEWER="@comment " .endif MAKE_ARGS+= TIGERVNC_SRCDIR=${WRKSRC} CONFIGURE_ARGS+= \ --prefix=${PREFIX} --mandir=${PREFIX}/man/ \ --docdir=${PREFIX}/share/doc/${PORTNAME}/ --with-pic --without-dtrace \ --disable-static --disable-dri --disable-unit-tests \ --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \ --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ --disable-config-dbus --disable-config-hal \ --disable-dri2 --enable-install-libxf86config --enable-glx \ --with-default-font-path="catalogue:${LOCALBASE}/share/fonts,built-ins" \ --with-xkb-path=${LOCALBASE}/share/X11/xkb \ --with-xkb-bin-directory=${LOCALBASE}/bin \ --with-serverconfig-path=${LOCALBASE}/lib/X11 \ --disable-selective-werror \ --disable-xwayland \ --with-fontrootdir=${LOCALBASE}/share/fonts .include TIGERVNC_XORG_PATCH_VER= 118 # import from x11-server/xorg-server/Makefile .if ${SSL_DEFAULT} == base # The reason why I use this is cause openssl from base doesn't # install a .pc file and configure will fail trying to find it. # Setting both of those variables to a *non-empty* value by-passes # the pkg-config check. CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif XORG_WRKDIR= ${MAKE} -C ${PORTSDIR}/x11-servers/xorg-server -VWRKSRC pre-patch: @${CP} -R `${XORG_WRKDIR}`/ ${WRKSRC}/unix/xserver/ post-patch: @cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver${TIGERVNC_XORG_PATCH_VER}.patch post-configure: @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${AUTORECONF} -fiv @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure ${CONFIGURE_ARGS} post-build: @cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} SHELL=${LOCALBASE}/bin/bash post-install: @cd ${WRKSRC}/unix/xserver/hw/vnc/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/Xvnc ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libvnc.so .include Index: head/net/tigervnc-devel/files/patch-CMakeLists.txt =================================================================== --- head/net/tigervnc-devel/files/patch-CMakeLists.txt (revision 441817) +++ head/net/tigervnc-devel/files/patch-CMakeLists.txt (revision 441818) @@ -1,11 +1,11 @@ ---- 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-04-19 13:27:31 UTC ++++ CMakeLists.txt +@@ -29,7 +29,7 @@ set(RCVERSION 1,7,90,0) # 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}") Index: head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake =================================================================== --- head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake (revision 441817) +++ head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake (revision 441818) @@ -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-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) --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) Index: head/net/tigervnc-devel/files/patch-unix_vncserver =================================================================== --- head/net/tigervnc-devel/files/patch-unix_vncserver (revision 441817) +++ head/net/tigervnc-devel/files/patch-unix_vncserver (revision 441818) @@ -1,22 +1,20 @@ -diff --git unix/vncserver unix/vncserver -index 2ef436a7..dac27520 100755 ---- unix/vncserver +--- unix/vncserver.orig 2017-04-19 13:27:31 UTC +++ 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))'; - if (!bind(S, pack('S n x12', $AF_INET, 6000 + $n))) { + if (!bind(S, sockaddr_in(6000 + $n, &INADDR_ANY))) { close(S); return 0; } @@ -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))'; - if (!bind(S, pack('S n x12', $AF_INET, 5900 + $n))) { + if (!bind(S, sockaddr_in(5900 + $n, &INADDR_ANY))) { close(S); return 0; }