CVS commit: pkgsrc/devel/m17n-lib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 11 09:33:27 UTC 2018

Modified Files:
        pkgsrc/devel/m17n-lib: distinfo
        pkgsrc/devel/m17n-lib/patches: patch-ab

Log Message:
m17n-lib: hack freetype detection to handle freetype>=2.9.1 without freetype-config


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/m17n-lib/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/m17n-lib/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/m17n-lib/distinfo
diff -u pkgsrc/devel/m17n-lib/distinfo:1.12 pkgsrc/devel/m17n-lib/distinfo:1.13
--- pkgsrc/devel/m17n-lib/distinfo:1.12 Sun Mar 11 19:47:27 2018
+++ pkgsrc/devel/m17n-lib/distinfo      Fri May 11 09:33:26 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2018/03/11 19:47:27 wiz Exp $
+$NetBSD: distinfo,v 1.13 2018/05/11 09:33:26 wiz Exp $
 
 SHA1 (m17n-lib-1.8.0.tar.gz) = 298923e2f7f6b8763769b74c8b2da8fe4d13ecce
 RMD160 (m17n-lib-1.8.0.tar.gz) = c62706566c32d830ae2993c93af61377ad948758
 SHA512 (m17n-lib-1.8.0.tar.gz) = 8aba862888393232172c03cdf52531e29ea969c4327e6f69879ecf7438eafee32782f509ec292b3e1b7cd3202e2764984d7a59e85cdb87a7c8bfcbac5b0ee6fd
 Size (m17n-lib-1.8.0.tar.gz) = 1091731 bytes
 SHA1 (patch-aa) = 412b0cd68241e334c7d5a9d0e98c672089e4f19d
-SHA1 (patch-ab) = 9069402aa83fe6248914363eadfa917cda6d607e
+SHA1 (patch-ab) = ed60bb8e1a44c950e2a4cd685081e3c1d4942c20
 SHA1 (patch-ac) = 56e719f3c7fb6fb1018c66cff9261d31d7c3c329
 SHA1 (patch-ad) = 92ab488679a65618389528ddc3e02e31ec3a8026
 SHA1 (patch-ae) = 94eaee7662cdba55c227712ecfdb45b41df60bb3

Index: pkgsrc/devel/m17n-lib/patches/patch-ab
diff -u pkgsrc/devel/m17n-lib/patches/patch-ab:1.6 pkgsrc/devel/m17n-lib/patches/patch-ab:1.7
--- pkgsrc/devel/m17n-lib/patches/patch-ab:1.6  Sun Dec 14 07:53:54 2014
+++ pkgsrc/devel/m17n-lib/patches/patch-ab      Fri May 11 09:33:26 2018
@@ -1,10 +1,39 @@
-$NetBSD: patch-ab,v 1.6 2014/12/14 07:53:54 obache Exp $
+$NetBSD: patch-ab,v 1.7 2018/05/11 09:33:26 wiz Exp $
 
-* portability fix
+* hack freetype detection to handle freetype>=2.9.1 without
+  freetype-config
+* fix unportable test(1) operator
 
---- configure.orig     2010-04-14 05:13:26.000000000 +0000
+--- configure.orig     2018-02-08 14:00:27.000000000 +0000
 +++ configure
-@@ -18650,7 +18650,7 @@ $as_echo "yes" >&6; }
+@@ -20043,7 +20043,7 @@ IFS=$as_save_IFS
+ 
+ fi
+ fi
+-HAVE_FREETYPE_CONFIG=$ac_cv_prog_HAVE_FREETYPE_CONFIG
++HAVE_FREETYPE_CONFIG=yes
+ if test -n "$HAVE_FREETYPE_CONFIG"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_FREETYPE_CONFIG" >&5
+ $as_echo "$HAVE_FREETYPE_CONFIG" >&6; }
+@@ -20054,7 +20054,7 @@ fi
+ 
+ 
+ if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
+-  FREETYPE_INC=`freetype-config --cflags`
++  FREETYPE_INC="`freetype-config --cflags` `pkg-config freetype2 --cflags`"
+   save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
+   ac_fn_c_check_header_mongrel "$LINENO" "ft2build.h" "ac_cv_header_ft2build_h" "$ac_includes_default"
+@@ -20067,7 +20067,7 @@ fi
+ 
+   if test "x$HAVE_FREETYPE" = "xyes" ; then
+     save_LIBS="$LIBS"
+-    LIBS="$LIBS `freetype-config --libs`"
++    LIBS="$LIBS `freetype-config --libs` `pkg-config freetype2 --libs`"
+     { $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; }
+ if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then :
+@@ -20953,7 +20953,7 @@ $as_echo "yes" >&6; }
        HAVE_WORDCUT=yes
  fi