From owner-svn-ports-all@freebsd.org Sat Jul 9 04:20:23 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61694B83C96; Sat, 9 Jul 2016 04:20:23 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30D7A1F3D; Sat, 9 Jul 2016 04:20:23 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u694KM1P028296; Sat, 9 Jul 2016 04:20:22 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u694KMMT028295; Sat, 9 Jul 2016 04:20:22 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201607090420.u694KMMT028295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sat, 9 Jul 2016 04:20:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418260 - head/net/tigervnc-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2016 04:20:23 -0000 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 (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 \