From owner-dev-commits-ports-main@freebsd.org Fri Aug 6 10:18:14 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 ACFD06532E0; Fri, 6 Aug 2021 10:18:14 +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 4Gh1df4VJ3z3vTm; Fri, 6 Aug 2021 10:18:14 +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 825083CDE; Fri, 6 Aug 2021 10:18:14 +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 176AIEJh004516; Fri, 6 Aug 2021 10:18:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 176AIEUi004515; Fri, 6 Aug 2021 10:18:14 GMT (envelope-from git) Date: Fri, 6 Aug 2021 10:18:14 GMT Message-Id: <202108061018.176AIEUi004515@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: cac0eef97139 - main - devel/clanlib: 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: cac0eef9713917709999c5107729103d312e2ba0 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 10:18:14 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=cac0eef9713917709999c5107729103d312e2ba0 commit cac0eef9713917709999c5107729103d312e2ba0 Author: Tobias C. Berner AuthorDate: 2021-08-06 10:08:48 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-06 10:18:04 +0000 devel/clanlib: 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, mark as abandonware. PR: 251512 --- devel/clanlib/Makefile | 3 +++ devel/clanlib/files/patch-configure | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile index 83343a2d6486..a4ba82a76065 100644 --- a/devel/clanlib/Makefile +++ b/devel/clanlib/Makefile @@ -17,6 +17,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_i386= typedef redefinition with different types ('ptrdiff_t' (aka 'int') vs 'khronos_intptr_t' (aka 'long')) BROKEN_powerpc= typedef redefinition with different types ('ptrdiff_t' (aka 'int') vs 'khronos_intptr_t' (aka 'long')) +DEPRECATED= Upstream no longer maintained +EXPIRATION_DATE= 2021-10-31 + LIB_DEPENDS= libpng.so:graphics/png \ libmikmod.so:audio/libmikmod \ libvorbis.so:audio/libvorbis \ diff --git a/devel/clanlib/files/patch-configure b/devel/clanlib/files/patch-configure new file mode 100644 index 000000000000..a2847092b988 --- /dev/null +++ b/devel/clanlib/files/patch-configure @@ -0,0 +1,16 @@ +Freetype no longer ships freetype-config -- use pkg-config directly. + +--- configure.orig 2021-08-06 10:05:39 UTC ++++ configure +@@ -15925,9 +15925,9 @@ fi + LIBS="$OLDLIBS" + fi + if test "$enable_clanDisplay" != "no"; then +- OLDLIBS="$LIBS"; LIBS="`freetype-config --libs` "; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ttf" >&5 ++ OLDLIBS="$LIBS"; LIBS="`pkg-config freetype2 --libs` "; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ttf" >&5 + $as_echo_n "checking for ttf... " >&6; } +- OLD_CXXFLAGS="$CXXFLAGS"; CXXFLAGS=" `freetype-config --cflags`"; ++ OLD_CXXFLAGS="$CXXFLAGS"; CXXFLAGS=" `pkg-config freetype2 --cflags`"; + if test "$cross_compiling" = yes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */