CVS commit: pkgsrc/print/xetex

["Min Sik Kim" <minskim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   minskim
Date:           Sat May  5 12:22:47 UTC 2018

Modified Files:
        pkgsrc/print/xetex: Makefile distinfo
Added Files:
        pkgsrc/print/xetex/patches: patch-texk_web2c_configure

Log Message:
print/xetex: Make this build with freetype2-2.9.1

freetype2 no longer installs freetype-config. Use pkg-config instead.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 pkgsrc/print/xetex/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/print/xetex/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/print/xetex/patches/patch-texk_web2c_configure

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

Modified files:

Index: pkgsrc/print/xetex/Makefile
diff -u pkgsrc/print/xetex/Makefile:1.74 pkgsrc/print/xetex/Makefile:1.75
--- pkgsrc/print/xetex/Makefile:1.74    Sat Apr 28 20:19:12 2018
+++ pkgsrc/print/xetex/Makefile Sat May  5 12:22:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2018/04/28 20:19:12 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2018/05/05 12:22:46 minskim Exp $
 
 DISTNAME=      texlive-20170524-source
 PKGNAME=       xetex-0.99997
@@ -45,6 +45,8 @@ CONFIGURE_ARGS+=      --with-system-libpng
 CONFIGURE_ARGS+=       --with-system-freetype2
 CONFIGURE_ARGS+=       --with-system-teckit
 CONFIGURE_ARGS+=       --with-system-icu
+CONFIGURE_ENV+=                FT2_CONFIG=pkg-config \
+                       PKG_CONFIG=${TOOLS_CMD.pkg-config}
 
 CONFIGURE_DIRS=                libs/graphite2
 CONFIGURE_DIRS+=       libs/harfbuzz

Index: pkgsrc/print/xetex/distinfo
diff -u pkgsrc/print/xetex/distinfo:1.19 pkgsrc/print/xetex/distinfo:1.20
--- pkgsrc/print/xetex/distinfo:1.19    Tue Jun 20 20:50:50 2017
+++ pkgsrc/print/xetex/distinfo Sat May  5 12:22:46 2018
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2017/06/20 20:50:50 markd Exp $
+$NetBSD: distinfo,v 1.20 2018/05/05 12:22:46 minskim Exp $
 
 SHA1 (texlive-20170524-source.tar.xz) = 1c1383ddb1b871c6b8ce49a4ae3c1a33d454a7b6
 RMD160 (texlive-20170524-source.tar.xz) = a8430c19fe1727cf308fe03e5838105260c0d71e
 SHA512 (texlive-20170524-source.tar.xz) = 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 Size (texlive-20170524-source.tar.xz) = 63483372 bytes
+SHA1 (patch-texk_web2c_configure) = a6a4554f956d429a3142dbf8f85ba54a55ecaf05
 SHA1 (patch-texk_web2c_xetexdir_XeTeX__ext.c) = a83e842b567db6acb35cfab5303a7e96845fa953

Added files:

Index: pkgsrc/print/xetex/patches/patch-texk_web2c_configure
diff -u /dev/null pkgsrc/print/xetex/patches/patch-texk_web2c_configure:1.1
--- /dev/null   Sat May  5 12:22:47 2018
+++ pkgsrc/print/xetex/patches/patch-texk_web2c_configure       Sat May  5 12:22:47 2018
@@ -0,0 +1,26 @@
+$NetBSD: patch-texk_web2c_configure,v 1.1 2018/05/05 12:22:47 minskim Exp $
+
+--- texk/web2c/configure.orig  2017-03-18 22:50:15.000000000 +0000
++++ texk/web2c/configure
+@@ -1786,7 +1786,7 @@ Optional Packages:
+   --with-system-libpng    use installed libpng headers and library (requires
+                           pkg-config)
+   --with-system-freetype2 use installed freetype2 headers and library
+-                          (requires freetype-config)
++                          (requires pkg-config)
+   --with-system-pixman    use installed pixman headers and library (requires
+                           pkg-config)
+   --with-system-cairo     use installed cairo headers and library (requires
+@@ -23968,9 +23968,9 @@ esac
+ else
+   FT2_CONFIG="$ac_cv_prog_FT2_CONFIG"
+ fi
+-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
+-  FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
+-  FREETYPE2_LIBS=`$FT2_CONFIG --libs`
++if $PKG_CONFIG --version >/dev/null 2>&1; then
++  FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2`
++  FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2`
+ elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
+   as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5
+ fi