git: cac0eef97139 - main - devel/clanlib: prepare for freetype2 update

Tobias C. Berner tcberner at FreeBSD.org
Fri Aug 6 10:18:14 UTC 2021


The branch main has been updated by tcberner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=cac0eef9713917709999c5107729103d312e2ba0

commit cac0eef9713917709999c5107729103d312e2ba0
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-08-06 10:08:48 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
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.  */


More information about the dev-commits-ports-main mailing list