From owner-svn-ports-all@freebsd.org Sat Jun 13 17:25:13 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6499533E2B4; Sat, 13 Jun 2020 17:25:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49kkxj1yLnz4JdH; Sat, 13 Jun 2020 17:25:13 +0000 (UTC) (envelope-from tcberner@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 3E6D81E7C2; Sat, 13 Jun 2020 17:25:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05DHPDds019532; Sat, 13 Jun 2020 17:25:13 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05DHPCXP019530; Sat, 13 Jun 2020 17:25:12 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202006131725.05DHPCXP019530@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 13 Jun 2020 17:25:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538691 - in head/textproc/highlight: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/textproc/highlight: . files X-SVN-Commit-Revision: 538691 X-SVN-Commit-Repository: ports 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.33 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, 13 Jun 2020 17:25:13 -0000 Author: tcberner Date: Sat Jun 13 17:25:12 2020 New Revision: 538691 URL: https://svnweb.freebsd.org/changeset/ports/538691 Log: textproc/highlight: replace hardcoded dependency from lua-5.2 to lua from DEFAULT_VERSIONS PR: 246874 Submitted by: VVD Approved by: kwm (timeout) Modified: head/textproc/highlight/Makefile head/textproc/highlight/files/patch-src_makefile Modified: head/textproc/highlight/Makefile ============================================================================== --- head/textproc/highlight/Makefile Sat Jun 13 17:22:55 2020 (r538690) +++ head/textproc/highlight/Makefile Sat Jun 13 17:25:12 2020 (r538691) @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>0:devel/boost-libs -USES= compiler:c++11-lib gmake lua:52 pkgconfig tar:bzip2 +USES= compiler:c++11-lib gmake lua pkgconfig tar:bzip2 USE_CXXSTD= c++11 MAKEFILE= makefile MAKE_ARGS= CXX="${CXX}" \ Modified: head/textproc/highlight/files/patch-src_makefile ============================================================================== --- head/textproc/highlight/files/patch-src_makefile Sat Jun 13 17:22:55 2020 (r538690) +++ head/textproc/highlight/files/patch-src_makefile Sat Jun 13 17:25:12 2020 (r538691) @@ -14,11 +14,11 @@ # use lua5.1 in the pkg-config calls -LUA_CFLAGS=$(shell pkg-config --cflags lua) -+LUA_CFLAGS=$(shell pkg-config --cflags lua-5.2) ++LUA_CFLAGS=$(shell pkg-config --cflags lua-$(LUA_VER)) # default lua lib -LUA_LIBS=$(shell pkg-config --libs lua) -+LUA_LIBS=$(shell pkg-config --libs lua-5.2) ++LUA_LIBS=$(shell pkg-config --libs lua-$(LUA_VER)) # luajit lib # LUA_LIBS=$(shell pkg-config --libs luajit)