git: 56dd31264460 - main - x11-fonts/otf2bdf: prepare for freetype2 update

Tobias C. Berner tcberner at FreeBSD.org
Sat Aug 7 10:19:03 UTC 2021


The branch main has been updated by tcberner:

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

commit 56dd3126446012f781e2bd39f0e5092ee89ac4c7
Author:     Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-08-07 10:17:53 +0000
Commit:     Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-08-07 10:18:09 +0000

    x11-fonts/otf2bdf: 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
---
 x11-fonts/otf2bdf/Makefile                 |  2 +-
 x11-fonts/otf2bdf/files/patch-configure.in | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/x11-fonts/otf2bdf/Makefile b/x11-fonts/otf2bdf/Makefile
index 2f0d2029f5c9..70f7ef2f4c1c 100644
--- a/x11-fonts/otf2bdf/Makefile
+++ b/x11-fonts/otf2bdf/Makefile
@@ -14,7 +14,7 @@ LICENSE=	MIT
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-USES=		autoreconf tar:tgz
+USES=		autoreconf pkgconfig tar:tgz
 
 GNU_CONFIGURE=	yes
 
diff --git a/x11-fonts/otf2bdf/files/patch-configure.in b/x11-fonts/otf2bdf/files/patch-configure.in
new file mode 100644
index 000000000000..b44d091bb626
--- /dev/null
+++ b/x11-fonts/otf2bdf/files/patch-configure.in
@@ -0,0 +1,13 @@
+--- configure.in.orig	2021-08-07 10:16:18 UTC
++++ configure.in
+@@ -5,8 +5,8 @@ AC_INIT(otf2bdf.c)
+ AC_PROG_CC
+ 
+ OLDLIBS=$LIBS
+-LIBS="$LIBS `freetype-config --libs`"
+-CPPFLAGS="$CPPFLAGS `freetype-config --cflags`"
++LIBS="$LIBS `pkg-config freetype2 --libs`"
++CPPFLAGS="$CPPFLAGS `pkg-config freetype2 --cflags`"
+ AC_CHECK_LIB(freetype, FT_Init_FreeType, LIBS="$LIBS -lfreetype",[
+              AC_MSG_ERROR([Can't find Freetype library! Compile FreeType first.])])
+ AC_SUBST(LIBS)


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