svn commit: r418260 - head/net/tigervnc-devel

[Cy Schubert]

Author: cy
Date: Sat Jul  9 04:20:22 2016
New Revision: 418260
URL: https://svnweb.freebsd.org/changeset/ports/418260

Log:
  Fix conflicts and sort USES & USE_XORG.
  
  PR:		210909
  Submitted by:	Koichiro IWAO <meta+ports at vmeta.jp> (maintainer)

Modified:
  head/net/tigervnc-devel/Makefile

Modified: head/net/tigervnc-devel/Makefile
==============================================================================
--- head/net/tigervnc-devel/Makefile	Sat Jul  9 04:16:28 2016	(r418259)
+++ head/net/tigervnc-devel/Makefile	Sat Jul  9 04:20:22 2016	(r418260)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tigervnc
 PORTVERSION=	1.6.90
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net x11-servers
 PKGNAMESUFFIX=	-devel
@@ -21,23 +22,23 @@ 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-[0-9]* \
 		tightvnc-[0-9]* \
- 		tigervnc-devel-[0-9]* \
+		tridiavnc-[0-9]* \
 		vnc-[0-9]*
 
-USES=		autoreconf:build cmake cpe gmake jpeg libtool pkgconfig \
-		python ssl iconv
+USES=		autoreconf:build cmake cpe gmake 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 \
-		inputproto kbproto pixman randrproto renderproto resourceproto \
-		scrnsaverproto videoproto xau xdmcp xext xkbfile xcmiscproto xextproto \
-		xfont xproto xrandr xtrans xtst xorg-macros presentproto \
-		x11 sm ice xrender xdamage
+		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 \