svn commit: r559849 - in head/print/libotf: . files
Kurt Jaeger
pi at FreeBSD.org
Fri Jan 1 16:33:22 UTC 2021
Author: pi
Date: Fri Jan 1 16:33:21 2021
New Revision: 559849
URL: https://svnweb.freebsd.org/changeset/ports/559849
Log:
print/libotf: Don't use freetype-config
- freetype-config is deprecated and shouldn't be used to detect freetype(2)
Import patch from Archlinux to fix this issue
PR: 252112
Submitted by: daniel.engberg.lists at pyret.net
Approved by: nikola.lecic at anthesphoria.net (maintainer)
Added:
head/print/libotf/files/
head/print/libotf/files/patch-configure.ac (contents, props changed)
Modified:
head/print/libotf/Makefile
Modified: head/print/libotf/Makefile
==============================================================================
--- head/print/libotf/Makefile Fri Jan 1 16:30:38 2021 (r559848)
+++ head/print/libotf/Makefile Fri Jan 1 16:33:21 2021 (r559849)
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:print/freetype2
-USES= pathfix pkgconfig libtool:keepla xorg
+USES= autoreconf pathfix pkgconfig libtool:keepla xorg
GNU_CONFIGURE= yes
USE_XORG= ice sm x11 xaw xt xmu
INSTALL_TARGET= install-strip
Added: head/print/libotf/files/patch-configure.ac
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/libotf/files/patch-configure.ac Fri Jan 1 16:33:21 2021 (r559849)
@@ -0,0 +1,33 @@
+--- configure.ac.orig 2018-01-23 23:01:37 UTC
++++ configure.ac
+@@ -48,23 +48,24 @@ AM_CONDITIONAL([X11_UNAVAILABLE], [test x$no_x = xyes]
+ AC_FUNC_ALLOCA
+ AC_FUNC_MALLOC
+
++PKG_PROG_PKG_CONFIG
++
+ # Check for Freetype2 usability.
+-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
+-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+- FREETYPE_INC=`freetype-config --cflags`
++PKG_CHECK_MODULES(FREETYPE, freetype2, [
++ FREETYPE_INC="$FREETYPE_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+ AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
+ HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS)
+ if test "x$HAVE_FREETYPE" = "xyes" ; then
+- FREETYPE_LD_FLAGS=`freetype-config --libs`;
++ FREETYPE_LD_FLAGS="$FREETYPE_LIBS"
+ LIBS="$LIBS $FREETYPE_LD_FLAGS"
+ AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
+ HAVE_FREETYPE=no)
+ fi
+-fi
++])
+
+ if test "x$HAVE_FREETYPE" != "xyes" ; then
+- echo "Freetype library wan't found in your system!"
++ echo "Freetype library not found in your system!"
+ exit 1
+ fi
+ AC_SUBST(FREETYPE_INC)
More information about the svn-ports-all
mailing list