lilypond-git: hack the configure script until it accepts tex-gyre.

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

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Jan 8 15:05:17 2016 +0100
Changeset:	eca55cfb303d5aeb3684031f1336afbe28924338

Modified Files:
	lilypond-git/Makefile
	lilypond-git/distinfo
	lilypond-git/patches/patch-configure.ac

Log Message:
lilypond-git: hack the configure script until it accepts tex-gyre.

I don't know why the official configure argument doesn't -- hints
welcome!

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eca55cfb303d5aeb3684031f1336afbe28924338

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

diffstat:
 lilypond-git/Makefile                   | 10 ++++++++++
 lilypond-git/distinfo                   |  2 +-
 lilypond-git/patches/patch-configure.ac | 12 ++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs:
diff --git a/lilypond-git/Makefile b/lilypond-git/Makefile
index 5c7c443..341a27b 100644
--- a/lilypond-git/Makefile
+++ b/lilypond-git/Makefile
@@ -25,6 +25,7 @@ BUILD_DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
 BUILD_DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 DEPENDS+=	tex-cyrillic-[0-9]*:../../print/tex-cyrillic
+DEPENDS+=	tex-tex-gyre-[0-9]*:../../fonts/tex-tex-gyre
 DEPENDS+=	tex-lh-[0-9]*:../../fonts/tex-lh
 DEPENDS+=	tex-psnfss-[0-9]*:../../fonts/tex-psnfss
 DEPENDS+=	tex-epsf-[0-9]*:../../print/tex-epsf
@@ -53,6 +54,15 @@ GNU_CONFIGURE_INFODIR=	${PREFIX}/${PKGINFODIR}
 INFO_DIR=		${GNU_CONFIGURE_INFODIR}
 INFO_FILES=		YES
 
+# this doesn't work, and I don't know why
+CONFIGURE_ARGS+=	--with-texgyre-dir=${PREFIX}/share/texmf-dist/fonts/opentype/public/tex-gyre/
+# so manually fix it (see also configure.ac patch)
+SUBST_CLASSES+=		gyre
+SUBST_SED.gyre+=	-e "s,@@PREFIX@@,${PREFIX},"
+SUBST_FILES.gyre+=	configure.ac
+SUBST_STAGE.gyre+=	pre-configure
+SUBST_MESSAGE.gyre+=	Help configure find tex-gyre.
+
 CONFIGURE_ARGS+=	--disable-optimising
 CONFIGURE_ARGS+=	--with-ncsb-dir=${PREFIX}/share/fonts/urw
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}
diff --git a/lilypond-git/distinfo b/lilypond-git/distinfo
index 209a2ff..9cadeaa 100644
--- a/lilypond-git/distinfo
+++ b/lilypond-git/distinfo
@@ -5,4 +5,4 @@ RMD160 (lilypond-2.17.95.tar.gz) = 651d91cf5f9b9a35458cbd5e07657f62cae3ccf2
 Size (lilypond-2.17.95.tar.gz) = 15960245 bytes
 SHA1 (patch-ab) = dde89081b612df1b21c47cb19206c83ef18a8b66
 SHA1 (patch-aclocal.m4) = b076271b3bf0920c6f49399773f59655a3cbe4d2
-SHA1 (patch-configure.ac) = 9f92335b0c28bc9fd4db99a7617b16990c1c5289
+SHA1 (patch-configure.ac) = 80100981ff2e2282131b1324d6f21d0bca4c5845
diff --git a/lilypond-git/patches/patch-configure.ac b/lilypond-git/patches/patch-configure.ac
index b24f440..538caed 100644
--- a/lilypond-git/patches/patch-configure.ac
+++ b/lilypond-git/patches/patch-configure.ac
@@ -2,9 +2,17 @@ $NetBSD: patch-configure.ac,v 1.2 2014/04/06 14:17:45 thomasklausner Exp $
 
 Disable c/c++ version check; it fails e.g. with clang emulating gcc.
 
---- configure.ac.orig	2014-04-06 12:44:15.000000000 +0000
+--- configure.ac.orig	2016-01-08 12:43:22.000000000 +0000
 +++ configure.ac
-@@ -109,10 +109,10 @@ STEPMAKE_PYTHON(REQUIRED, 2.4, 3.0)
+@@ -37,6 +37,7 @@ AC_ARG_WITH(texgyre-dir,
+ 		    [location of TeX Gyre fonts.])],
+     [TEXGYRE_DIR=$withval],
+     [TEXGYRE_DIR=""])
++TEXGYRE_DIR=@@PREFIX@@/share/texmf-dist/fonts/opentype/public/tex-gyre/
+ 
+ reloc_b=no
+ AC_ARG_ENABLE(relocation,
+@@ -111,10 +112,10 @@ STEPMAKE_PYTHON(REQUIRED, 2.4, 3.0)
  # __GNUC__, but that macro now unofficially means "the compiler
  # supports the GNU C extensions" -- the intel C compiler and clang
  # both support __GNUC__!