From owner-dev-commits-ports-all@freebsd.org Tue Aug 10 14:42:42 2021 Return-Path: Delivered-To: dev-commits-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 2307B669C5C; Tue, 10 Aug 2021 14:42:42 +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 4GkbJy0Cdfz4hWJ; Tue, 10 Aug 2021 14:42:42 +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 D92DB1D6F8; Tue, 10 Aug 2021 14:42:41 +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 17AEgfiF084279; Tue, 10 Aug 2021 14:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17AEgfjZ084278; Tue, 10 Aug 2021 14:42:41 GMT (envelope-from git) Date: Tue, 10 Aug 2021 14:42:41 GMT Message-Id: <202108101442.17AEgfjZ084278@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: de9dca2f7487 - main - emulators/advancemess: 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: de9dca2f74876bafe44d20b9bd39cf1327f0ace5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Aug 2021 14:42:42 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=de9dca2f74876bafe44d20b9bd39cf1327f0ace5 commit de9dca2f74876bafe44d20b9bd39cf1327f0ace5 Author: Tobias C. Berner AuthorDate: 2021-08-10 14:20:37 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-10 14:42:34 +0000 emulators/advancemess: 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 --- emulators/advancemess/Makefile | 4 +++- emulators/advancemess/files/patch-configure | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile index 84065957f732..fe2c9449b0bb 100644 --- a/emulators/advancemess/Makefile +++ b/emulators/advancemess/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libexpat.so:textproc/expat2 RUN_DEPENDS= advancemame>=1.4:emulators/advancemame -USES= gmake ncurses sdl +USES= gmake ncurses pkgconfig sdl USE_SDL= sdl GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-svgalib --disable-fb --disable-alsa --enable-oss \ @@ -47,6 +47,8 @@ SLANG_LDFLAGS= -lncurses BROKEN_powerpc= Does not compile on powerpc +BINARY_ALIAS= freetype-config=true + post-patch: @${REINPLACE_CMD} -e \ 's|@@|@|' ${WRKSRC}/Makefile.in diff --git a/emulators/advancemess/files/patch-configure b/emulators/advancemess/files/patch-configure new file mode 100644 index 000000000000..a73f075c6c65 --- /dev/null +++ b/emulators/advancemess/files/patch-configure @@ -0,0 +1,24 @@ +--- configure.orig 2021-08-10 14:17:55 UTC ++++ configure +@@ -8269,8 +8269,8 @@ done + else + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" +- FREETYPECFLAGS=`$ac_lib_freetype_config $ac_lib_freetype_args --cflags` +- FREETYPELIBS=`$ac_lib_freetype_config $ac_lib_freetype_args --libs` ++ FREETYPECFLAGS=`pkg-config freetype2 --cflags` ++ FREETYPELIBS=`pkg-config freetype2 --libs` + CFLAGS="$FREETYPECFLAGS $CFLAGS" + LIBS="$FREETYPELIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType2" >&5 +@@ -8359,8 +8359,8 @@ done + else + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" +- FREETYPECFLAGS=`$ac_lib_freetype_config $ac_lib_freetype_args --cflags` +- FREETYPELIBS=`$ac_lib_freetype_config $ac_lib_freetype_args --libs` ++ FREETYPECFLAGS=`pkg-config freetype2 --cflags` ++ FREETYPELIBS=`pkg-config freetype2 --libs` + CFLAGS="$FREETYPECFLAGS $CFLAGS" + LIBS="$FREETYPELIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeType2" >&5