From owner-dev-commits-ports-main@freebsd.org Fri Aug 6 14:30:03 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 F3C57657947; Fri, 6 Aug 2021 14:30:02 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Gh7DB6HS9z4ggZ; Fri, 6 Aug 2021 14:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BFE8C769F; Fri, 6 Aug 2021 14:30:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 176EU24c046089; Fri, 6 Aug 2021 14:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 176EU2ne046086; Fri, 6 Aug 2021 14:30:02 GMT (envelope-from git) Date: Fri, 6 Aug 2021 14:30:02 GMT Message-Id: <202108061430.176EU2ne046086@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 950ca76de36a - main - games/ponscripter-sekai: prepare for freetype2 update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 950ca76de36ae7b413c90eacd787bf6a2978aff5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Aug 2021 14:30:03 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=950ca76de36ae7b413c90eacd787bf6a2978aff5 commit 950ca76de36ae7b413c90eacd787bf6a2978aff5 Author: Tobias C. Berner AuthorDate: 2021-08-06 14:27:54 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-06 14:29:54 +0000 games/ponscripter-sekai: prepare for freetype2 update - freetype2 will no longer ship freetype-config (which was a pkg-config wrapper) in the near future -- use pkg-config to gather the required flags. PR: 251512 --- games/ponscripter-sekai/Makefile | 2 +- games/ponscripter-sekai/files/patch-configure | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/games/ponscripter-sekai/Makefile b/games/ponscripter-sekai/Makefile index 8860a051b270..3349d6855b0b 100644 --- a/games/ponscripter-sekai/Makefile +++ b/games/ponscripter-sekai/Makefile @@ -21,7 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= sekaiproject GH_PROJECT= ${PORTNAME:S/sekai/fork/} -USES= compiler:c++11-lang gmake sdl shebangfix +USES= compiler:c++11-lang gmake pkgconfig sdl shebangfix USE_SDL= image2 mixer2 EXTRACT_AFTER_ARGS=--exclude src/extlib SHEBANG_FILES= util/xml-template diff --git a/games/ponscripter-sekai/files/patch-configure b/games/ponscripter-sekai/files/patch-configure index f019ce7692d0..3b7dc5733174 100644 --- a/games/ponscripter-sekai/files/patch-configure +++ b/games/ponscripter-sekai/files/patch-configure @@ -1,5 +1,14 @@ ---- configure.orig 2019-02-08 19:59:55 UTC +--- configure.orig 2021-08-06 14:18:09 UTC +++ configure +@@ -53,7 +53,7 @@ EXPLICIT_OGGLIBS=false + + SDL_CONFIG=sdl2-config + SMPEG_CONFIG=smpeg2-config +-FREETYPE_CONFIG=freetype-config ++FREETYPE_CONFIG="pkg-config freetype2" + EXTLIB=./extlib + SRC=src + MAKEFILE=$SRC/Makefile @@ -606,7 +606,7 @@ then _EOF INTERNAL_SDL_MIXER=true @@ -9,3 +18,12 @@ case $? in 0) echo "yes"; INTERNAL_SDL_MIXER=false ;; 1) echo "no MP3" ;; 2) echo "no Ogg" ;; 3) echo "no Ogg or MP3" ;; +@@ -694,7 +694,7 @@ then + FREETYPE_CONFIG=$EXTLIB/bin/freetype-config + else + $echo_n "Checking for system Freetype... ${nobr}" +- VER=`($FREETYPE_CONFIG --ftversion) 2>/dev/null` ++ VER=2 + if [ -z "$VER" ]; then + FREETYPE_CONFIG=freetype2-config + VER=`($FREETYPE_CONFIG --ftversion) 2>/dev/null`