summaryrefslogtreecommitdiff
path: root/fonts/ttmkfdir2
diff options
context:
space:
mode:
authorrecht <recht@pkgsrc.org>2004-04-03 11:31:02 +0000
committerrecht <recht@pkgsrc.org>2004-04-03 11:31:02 +0000
commitff9d117965637d14e35b1f16fc82dd16ca3687ed (patch)
tree72774a7d82d221c107a597837a7f0b14df3d1d19 /fonts/ttmkfdir2
parent59dc20ae2f8ddc1083f97a8b79c9f0a017568d33 (diff)
downloadpkgsrc-ff9d117965637d14e35b1f16fc82dd16ca3687ed.tar.gz
Set FREETYPE_CONFIG in MAKE_ENV and use it instead of just freetype-config.
Diffstat (limited to 'fonts/ttmkfdir2')
-rw-r--r--fonts/ttmkfdir2/Makefile4
-rw-r--r--fonts/ttmkfdir2/distinfo8
-rw-r--r--fonts/ttmkfdir2/patches/patch-aa6
-rw-r--r--fonts/ttmkfdir2/patches/patch-ab4
-rw-r--r--fonts/ttmkfdir2/patches/patch-ac2
5 files changed, 12 insertions, 12 deletions
diff --git a/fonts/ttmkfdir2/Makefile b/fonts/ttmkfdir2/Makefile
index c74ff1c5d9c..86536e9b82a 100644
--- a/fonts/ttmkfdir2/Makefile
+++ b/fonts/ttmkfdir2/Makefile
@@ -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_BUILDLINK3= yes
USE_GNU_TOOLS+= make
USE_LANGUAGES= c c++
+MAKE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG}
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ttmkfdir ${PREFIX}/bin
diff --git a/fonts/ttmkfdir2/distinfo b/fonts/ttmkfdir2/distinfo
index 89f5817265c..deb1cf7f65a 100644
--- a/fonts/ttmkfdir2/distinfo
+++ b/fonts/ttmkfdir2/distinfo
@@ -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 --git a/fonts/ttmkfdir2/patches/patch-aa b/fonts/ttmkfdir2/patches/patch-aa
index 5e76f7e586c..058cd0b60a8 100644
--- a/fonts/ttmkfdir2/patches/patch-aa
+++ b/fonts/ttmkfdir2/patches/patch-aa
@@ -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 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/03/29 22:04:09 recht Exp $
-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 --git a/fonts/ttmkfdir2/patches/patch-ab b/fonts/ttmkfdir2/patches/patch-ab
index 8e69c926b95..4b1219f332d 100644
--- a/fonts/ttmkfdir2/patches/patch-ab
+++ b/fonts/ttmkfdir2/patches/patch-ab
@@ -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 --git a/fonts/ttmkfdir2/patches/patch-ac b/fonts/ttmkfdir2/patches/patch-ac
index f0bb08df748..a77bf0c229d 100644
--- a/fonts/ttmkfdir2/patches/patch-ac
+++ b/fonts/ttmkfdir2/patches/patch-ac
@@ -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