From owner-dev-commits-ports-main@freebsd.org Fri Aug 6 14:09:57 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 060C06570F5; Fri, 6 Aug 2021 14:09:57 +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 4Gh6n06jJVz4f5J; Fri, 6 Aug 2021 14:09:56 +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 CE9796E61; Fri, 6 Aug 2021 14:09:56 +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 176E9uMR017145; Fri, 6 Aug 2021 14:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 176E9u5A017144; Fri, 6 Aug 2021 14:09:56 GMT (envelope-from git) Date: Fri, 6 Aug 2021 14:09:56 GMT Message-Id: <202108061409.176E9u5A017144@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: 197e928ffb54 - main - games/critterding: 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: 197e928ffb54ae1da12fdda26dc45a8713409730 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:09:57 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=197e928ffb54ae1da12fdda26dc45a8713409730 commit 197e928ffb54ae1da12fdda26dc45a8713409730 Author: Tobias C. Berner AuthorDate: 2021-08-06 12:43:41 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-06 14:09:30 +0000 games/critterding: 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. - while here, convert to USES=localbase PR: 251512 --- games/critterding/Makefile | 6 +++--- games/critterding/files/patch-configure.in | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/games/critterding/Makefile b/games/critterding/Makefile index a54a8b802a0e..01d9796d3beb 100644 --- a/games/critterding/Makefile +++ b/games/critterding/Makefile @@ -9,12 +9,10 @@ COMMENT= Evolving Artificial Life LIB_DEPENDS= libfreetype.so:print/freetype2 -USES= autoreconf gl libtool ncurses pkgconfig sdl tar:bzip2 +USES= autoreconf gl libtool localbase:ldflags ncurses pkgconfig sdl tar:bzip2 GNU_CONFIGURE= yes USE_SDL= sdl USE_GL= gl -CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-system-ftgl USE_GCC= yes @@ -24,6 +22,8 @@ PORTDOCS= README AUTHORS Changelog OPTIONS_DEFINE= DOCS +BINARY_ALIAS= freetype-config=true + post-patch: @${REINPLACE_CMD} -e 's|../share/critterding|${DATADIR}|' \ ${WRKSRC}/src/gui/textprinter.cpp ${WRKSRC}/src/gl/glwindow.cpp diff --git a/games/critterding/files/patch-configure.in b/games/critterding/files/patch-configure.in new file mode 100644 index 000000000000..d987b10eea05 --- /dev/null +++ b/games/critterding/files/patch-configure.in @@ -0,0 +1,24 @@ +--- configure.in.orig 2010-02-19 13:26:47 UTC ++++ configure.in +@@ -77,8 +77,8 @@ AC_SUBST(SDLMAIN) + AC_MSG_CHECKING(for Freetype) + AC_CHECK_PROG([FREETYPE_CONFIG],[freetype-config],yes,no) + if test "$FREETYPE_CONFIG" = yes; then +- FT2_CFLAGS=`freetype-config --cflags` +- FT2_LIBS=`freetype-config --libs` ++ FT2_CFLAGS=`pkg-config freetype2 --cflags` ++ FT2_LIBS=`pkg-config freetype2 --libs` + AC_MSG_RESULT($FT2_CFLAGS) + CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" + HOST_LIBS="$HOST_LIBS $FT2_LIBS" +@@ -94,8 +94,8 @@ AC_SUBST(SDLMAIN) + AC_MSG_CHECKING(for Freetype) + AC_CHECK_PROG([FREETYPE_CONFIG],[freetype-config],yes,no) + if test "$FREETYPE_CONFIG" = yes; then +- FT2_CFLAGS=`freetype-config --cflags` +- FT2_LIBS=`freetype-config --libs` ++ FT2_CFLAGS=`pkg-config freetype2 --cflags` ++ FT2_LIBS=`pkg-config freetype2 --libs` + AC_MSG_RESULT($FT2_CFLAGS) + CPPFLAGS="$CPPFLAGS $FT2_CFLAGS" + HOST_LIBS="$HOST_LIBS $FT2_LIBS"