svn commit: r418258 - head/net/tigervnc

[Cy Schubert]

Author: cy
Date: Sat Jul  9 04:13:28 2016
New Revision: 418258
URL: https://svnweb.freebsd.org/changeset/ports/418258

Log:
  Include fixes from net/tigervnc-devel.
  
  PR:		210908
  Submitted by:	Koichiro IWAO <meta+ports at vmeta.jp> (maintainer)
  Suggested by:	cy@

Modified:
  head/net/tigervnc/Makefile

Modified: head/net/tigervnc/Makefile
==============================================================================
--- head/net/tigervnc/Makefile	Sat Jul  9 03:58:43 2016	(r418257)
+++ head/net/tigervnc/Makefile	Sat Jul  9 04:13:28 2016	(r418258)
@@ -4,7 +4,7 @@
 PORTNAME=	tigervnc
 PORTVERSION=	1.6.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net x11-servers
 
 MAINTAINER=	meta+ports at vmeta.jp
@@ -21,21 +21,27 @@ BUILD_DEPENDS=	${LOCALBASE}/include/GL/i
 RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
 		xkbcomp:x11/xkbcomp
 
-CONFLICTS=	tridiavnc-[0-9]* \
+CONFLICTS=	tigervnc-devel-[0-9]* \
 		tightvnc-[0-9]* \
+		tridiavnc-[0-9]* \
 		vnc-[0-9]*
 
-USES=		autoreconf:build cmake cpe gmake jpeg libtool pkgconfig python
+USES=		autoreconf:build cmake cpe gmake iconv jpeg libtool pkgconfig \
+		python ssl
 USE_GL=		gl
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	TigerVNC
 
 USE_XORG+=	bigreqsproto compositeproto damageproto fixesproto fontsproto glproto \
-		inputproto kbproto pixman randrproto renderproto resourceproto \
-		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
-		xfont xproto xrandr xtrans xtst xorg-macros presentproto
+		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