svn commit: r441818 - in head/net/tigervnc-devel: . files
Carlos J. Puga Medina
cpm at FreeBSD.org
Fri May 26 23:03:55 UTC 2017
Author: cpm
Date: Fri May 26 23:03:53 2017
New Revision: 441818
URL: https://svnweb.freebsd.org/changeset/ports/441818
Log:
- Mark tigervnc-devel ignore because no development version available right now
- Remove CONFLICTS with vnc as net/vnc port no longer exists
- Pet portlint, move LIB_DEPENDS up and regenerate patches with make makepatch
PR: 219566
Submitted by: Koichiro IWAO <meta+ports at vmeta.jp> (maintainer)
Modified:
head/net/tigervnc-devel/Makefile
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
Modified: head/net/tigervnc-devel/Makefile
==============================================================================
--- head/net/tigervnc-devel/Makefile Fri May 26 22:59:52 2017 (r441817)
+++ head/net/tigervnc-devel/Makefile Fri May 26 23:03:53 2017 (r441818)
@@ -18,14 +18,16 @@ BUILD_DEPENDS= ${LOCALBASE}/include/GL/i
${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
@@ -40,12 +42,10 @@ 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
+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
Modified: head/net/tigervnc-devel/files/patch-CMakeLists.txt
==============================================================================
--- head/net/tigervnc-devel/files/patch-CMakeLists.txt Fri May 26 22:59:52 2017 (r441817)
+++ head/net/tigervnc-devel/files/patch-CMakeLists.txt Fri May 26 23:03:53 2017 (r441818)
@@ -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-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")
Modified: head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake
==============================================================================
--- head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake Fri May 26 22:59:52 2017 (r441817)
+++ head/net/tigervnc-devel/files/patch-cmake_BuildPackages.cmake Fri May 26 23:03:53 2017 (r441818)
@@ -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)
Modified: head/net/tigervnc-devel/files/patch-unix_vncserver
==============================================================================
--- head/net/tigervnc-devel/files/patch-unix_vncserver Fri May 26 22:59:52 2017 (r441817)
+++ head/net/tigervnc-devel/files/patch-unix_vncserver Fri May 26 23:03:53 2017 (r441818)
@@ -1,6 +1,4 @@
-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
More information about the svn-ports-head
mailing list