From owner-svn-ports-all@freebsd.org Thu Nov 8 05:08:18 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B3EB1110D8A2; Thu, 8 Nov 2018 05:08:18 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2BA816E559; Thu, 8 Nov 2018 05:08:18 +0000 (UTC) (envelope-from meta@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 077E720034; Thu, 8 Nov 2018 05:08:18 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wA858HnM073250; Thu, 8 Nov 2018 05:08:17 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wA858HQA073249; Thu, 8 Nov 2018 05:08:17 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201811080508.wA858HQA073249@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Thu, 8 Nov 2018 05:08:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484427 - head/net/tigervnc X-SVN-Group: ports-head X-SVN-Commit-Author: meta X-SVN-Commit-Paths: head/net/tigervnc X-SVN-Commit-Revision: 484427 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2BA816E559 X-Spamd-Result: default: False [-103.09 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Thu, 08 Nov 2018 05:08:19 -0000 Author: meta Date: Thu Nov 8 05:08:17 2018 New Revision: 484427 URL: https://svnweb.freebsd.org/changeset/ports/484427 Log: net/tigervnc: Auto detect xorg-server version to patch While here, pet portlint, etc. - add USES=gl - adjust CONFLICTS - put DISTVERSIONPREFIX the right place PR: 233044 Submitted by: rozhuk.im@gmail.com Approved by: mentors (implicit) Sponsored by: HAW International, Inc. Modified: head/net/tigervnc/Makefile Modified: head/net/tigervnc/Makefile ============================================================================== --- head/net/tigervnc/Makefile Wed Nov 7 23:52:10 2018 (r484426) +++ head/net/tigervnc/Makefile Thu Nov 8 05:08:17 2018 (r484427) @@ -2,8 +2,8 @@ PORTNAME= tigervnc PORTVERSION= 1.9.0 -PORTREVISION= 2 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= net x11-servers MAINTAINER= meta@FreeBSD.org @@ -24,14 +24,14 @@ LIB_DEPENDS= libunwind.so:devel/libunwind \ RUN_DEPENDS= ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \ xkbcomp:x11/xkbcomp -CONFLICTS= tigervnc-devel-[0-9]* \ - tightvnc-[0-9]* - -USES= autoreconf:build cmake:noninja cpe iconv jpeg libtool \ +USES= autoreconf:build cmake:noninja cpe gl iconv jpeg libtool \ pkgconfig python ssl USE_GL= gl USE_LDCONFIG= yes USE_GITHUB= yes + +CONFLICTS= tightvnc-[0-9]* + GH_ACCOUNT= TigerVNC USE_XORG+= ice pixman sm x11 xau xdamage xdmcp xext xfixes xfont xkbfile \ @@ -108,7 +108,7 @@ CONFIGURE_ARGS+= \ .include -TIGERVNC_XORG_PATCH_VER= 118 +TIGERVNC_XORG_PATCH_VER= ${MAKE} -C "${PORTSDIR}/x11-servers/xorg-server" -V PORTVERSION:R:S,\.,,g # import from x11-server/xorg-server/Makefile .if ${SSL_DEFAULT} == base @@ -125,7 +125,7 @@ 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 + @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