[pkgsrc/trunk]: pkgsrc/fonts/ttmkfdir2 Set FREETYPE_CONFIG in MAKE_ENV and us...

[recht <recht%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c3f7ad7d81f
branches:  trunk
changeset: 472069:2c3f7ad7d81f
user:      recht <recht%pkgsrc.org@localhost>
date:      Sat Apr 03 11:31:02 2004 +0000

description:
Set FREETYPE_CONFIG in MAKE_ENV and use it instead of just freetype-config.

diffstat:

 fonts/ttmkfdir2/Makefile         |  4 +++-
 fonts/ttmkfdir2/distinfo         |  8 +++-----
 fonts/ttmkfdir2/patches/patch-aa |  6 +++---
 fonts/ttmkfdir2/patches/patch-ab |  4 ++--
 fonts/ttmkfdir2/patches/patch-ac |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diffs (74 lines):

diff -r 83607f911067 -r 2c3f7ad7d81f fonts/ttmkfdir2/Makefile
--- a/fonts/ttmkfdir2/Makefile  Sat Apr 03 11:28:53 2004 +0000
+++ b/fonts/ttmkfdir2/Makefile  Sat Apr 03 11:31:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/03/30 11:56:48 recht Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/03 11:31:02 recht Exp $
 #
 
 DISTNAME=      ttmkfdir2.20021109
@@ -20,6 +20,8 @@
 USE_GNU_TOOLS+=        make
 USE_LANGUAGES= c c++
 
+MAKE_ENV+=     FREETYPE_CONFIG=${FREETYPE_CONFIG}
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
 
diff -r 83607f911067 -r 2c3f7ad7d81f fonts/ttmkfdir2/distinfo
--- a/fonts/ttmkfdir2/distinfo  Sat Apr 03 11:28:53 2004 +0000
+++ b/fonts/ttmkfdir2/distinfo  Sat Apr 03 11:31:02 2004 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2004/04/03 11:28:53 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/04/03 11:31:02 recht Exp $
 
-SHA1 (ttmkfdir2.20021109.tar.bz2) = bee1944ce3e5b6c4503a14e6429737cc558a24c0
-Size (ttmkfdir2.20021109.tar.bz2) = 701900 bytes
-SHA1 (patch-aa) = 513c6922cfa60a6c2dbf332a5d65e0277bd89929
-SHA1 (patch-ab) = d22b1eb7de9c2ba622583bb2e2fe6c4ccd4b26d2
+SHA1 (patch-aa) = b87eb0d1076674e18ac80840b97e73bfb265d9cb
+SHA1 (patch-ab) = 5c7e936fead9551b2b206abb512a9bbdcaadd101
 SHA1 (patch-ac) = 23eb6e500522a1ce826a9b0899d7afff6017d096
 SHA1 (patch-ad) = 0c328908ffae3397293ff6b00094444e23164788
diff -r 83607f911067 -r 2c3f7ad7d81f fonts/ttmkfdir2/patches/patch-aa
--- a/fonts/ttmkfdir2/patches/patch-aa  Sat Apr 03 11:28:53 2004 +0000
+++ b/fonts/ttmkfdir2/patches/patch-aa  Sat Apr 03 11:31:02 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/03 11:31:02 recht Exp $
 
 --- Makefile.orig      2002-11-07 06:28:44.000000000 +0100
 +++ Makefile
@@ -10,8 +10,8 @@
 -DEBUG=-ggdb
 -CXX=g++
 -CXXFLAGS=-Wall -pedantic $(FREETYPE_INCL) $(DEBUG)
-+FREETYPE_INCL=`freetype-config --cflags`
-+FREETYPE_LIB=`freetype-config --libs`
++FREETYPE_INCL=`$(FREETYPE_CONFIG) --cflags`
++FREETYPE_LIB=`$(FREETYPE_CONFIG) --libs`
  
 -LDFLAGS=$(FREETYPE_LIB) $(DEBUG)
 +CXXFLAGS+=$(FREETYPE_INCL)
diff -r 83607f911067 -r 2c3f7ad7d81f fonts/ttmkfdir2/patches/patch-ab
--- a/fonts/ttmkfdir2/patches/patch-ab  Sat Apr 03 11:28:53 2004 +0000
+++ b/fonts/ttmkfdir2/patches/patch-ab  Sat Apr 03 11:31:02 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/03 11:31:02 recht Exp $
 
---- ttf.cpp.orig       2004-03-29 12:46:48.000000000 +0200
+--- ttf.cpp.orig       2002-11-07 06:30:04.000000000 +0100
 +++ ttf.cpp
 @@ -226,7 +226,7 @@ Face::FontFamilyName (void) const
        for (i = 0; i < n; i++) {
diff -r 83607f911067 -r 2c3f7ad7d81f fonts/ttmkfdir2/patches/patch-ac
--- a/fonts/ttmkfdir2/patches/patch-ac  Sat Apr 03 11:28:53 2004 +0000
+++ b/fonts/ttmkfdir2/patches/patch-ac  Sat Apr 03 11:31:02 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
+$NetBSD: patch-ac,v 1.2 2004/04/03 11:31:02 recht Exp $
 
 --- ttf.h.orig 2002-11-07 06:28:44.000000000 +0100
 +++ ttf.h