diff options
| author | dholland <dholland@pkgsrc.org> | 2018-05-07 07:55:33 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2018-05-07 07:55:33 +0000 |
| commit | bfaaba5afae43c298329cf9dd4ac7e1c994d252f (patch) | |
| tree | 17b80a7aa1bdc0f19dc6eef8919ee08c69ce293a /graphics/libotf | |
| parent | 821ed5fc3101d011b613a56087e9d1a7b55dafd8 (diff) | |
| download | pkgsrc-bfaaba5afae43c298329cf9dd4ac7e1c994d252f.tar.gz | |
Use pkg-config instead of freetype-config; should fix PR 53264.
Diffstat (limited to 'graphics/libotf')
| -rw-r--r-- | graphics/libotf/Makefile | 3 | ||||
| -rw-r--r-- | graphics/libotf/distinfo | 3 | ||||
| -rw-r--r-- | graphics/libotf/patches/patch-configure | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/graphics/libotf/Makefile b/graphics/libotf/Makefile index fbfb607bdbf..7aba30b5940 100644 --- a/graphics/libotf/Makefile +++ b/graphics/libotf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2018/02/11 16:16:54 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2018/05/07 07:55:33 dholland Exp $ DISTNAME= libotf-0.9.16 CATEGORIES= graphics @@ -14,6 +14,7 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config PKGCONFIG_OVERRIDE+= libotf.pc.in +CONFIGURE_ENV+= HAVE_FREETYPE_CONFIG=yes # actually uses pkg-config now .include "options.mk" diff --git a/graphics/libotf/distinfo b/graphics/libotf/distinfo index 89fa88b09cf..8e3799d7859 100644 --- a/graphics/libotf/distinfo +++ b/graphics/libotf/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.9 2018/02/11 16:16:54 wiz Exp $ +$NetBSD: distinfo,v 1.10 2018/05/07 07:55:33 dholland Exp $ SHA1 (libotf-0.9.16.tar.gz) = ee3037f468a5381de89846ee1c78320964cfbf78 RMD160 (libotf-0.9.16.tar.gz) = ddea1124409fa97a58386251aa70b961c11b9374 SHA512 (libotf-0.9.16.tar.gz) = 0f68c45c1224f02dc0f1a8e9915dd9c1c70d71259b4e2f7bbd4fbec6426e58d4a26e4cbf28dbb8ed051ba6f532f99fc4e74b4ddf97a93ec947fa6260c875d0b4 Size (libotf-0.9.16.tar.gz) = 423979 bytes +SHA1 (patch-configure) = 5d43a445f6950ac14e5a91f37b25601d951868c2 diff --git a/graphics/libotf/patches/patch-configure b/graphics/libotf/patches/patch-configure new file mode 100644 index 00000000000..321d5c84cee --- /dev/null +++ b/graphics/libotf/patches/patch-configure @@ -0,0 +1,25 @@ +$NetBSD: patch-configure,v 1.1 2018/05/07 07:55:33 dholland Exp $ + +Use pkg-config instead of the freetype-config script, as the latte +has gone away. + +--- configure~ 2018-01-24 15:08:23.000000000 +0000 ++++ configure +@@ -13172,7 +13172,7 @@ fi + + + if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then +- FREETYPE_INC=`freetype-config --cflags` ++ FREETYPE_INC=`pkg-config --cflags freetype2` + CPPFLAGS="$CPPFLAGS $FREETYPE_INC" + ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default" + if test "x$ac_cv_header_ft2build_h" = xyes; then : +@@ -13183,7 +13183,7 @@ fi + + + if test "x$HAVE_FREETYPE" = "xyes" ; then +- FREETYPE_LD_FLAGS=`freetype-config --libs`; ++ FREETYPE_LD_FLAGS=`pkg-config --libs freetype2`; + LIBS="$LIBS $FREETYPE_LD_FLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 + $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } |