summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2004-09-18 07:55:31 +0000
committerminskim <minskim@pkgsrc.org>2004-09-18 07:55:31 +0000
commitfb6241371425832cc25fbb43a02d3c4565c1eb51 (patch)
treeb1ed5e0b8d109325bcd015ca44eeb478bfcd4c85
parente124fffcba56027e181f99daab54f1b2c81be357 (diff)
downloadpkgsrc-fb6241371425832cc25fbb43a02d3c4565c1eb51.tar.gz
Honor CPPFLAGS.
-rw-r--r--fonts/ttmkfdir2/distinfo4
-rw-r--r--fonts/ttmkfdir2/patches/patch-aa14
2 files changed, 12 insertions, 6 deletions
diff --git a/fonts/ttmkfdir2/distinfo b/fonts/ttmkfdir2/distinfo
index ed543215b5a..c85ea3aa016 100644
--- a/fonts/ttmkfdir2/distinfo
+++ b/fonts/ttmkfdir2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2004/04/28 00:10:04 recht Exp $
+$NetBSD: distinfo,v 1.6 2004/09/18 07:55:31 minskim Exp $
SHA1 (ttmkfdir2.20021109.tar.bz2) = bee1944ce3e5b6c4503a14e6429737cc558a24c0
Size (ttmkfdir2.20021109.tar.bz2) = 701900 bytes
-SHA1 (patch-aa) = b87eb0d1076674e18ac80840b97e73bfb265d9cb
+SHA1 (patch-aa) = ae2cb207635678d68d010e54de6ad6905fc3e38b
SHA1 (patch-ab) = 5c7e936fead9551b2b206abb512a9bbdcaadd101
SHA1 (patch-ac) = c29cd845647d67102a89476d931e5ee6bae63078
SHA1 (patch-ad) = 0c328908ffae3397293ff6b00094444e23164788
diff --git a/fonts/ttmkfdir2/patches/patch-aa b/fonts/ttmkfdir2/patches/patch-aa
index 058cd0b60a8..99decd29e75 100644
--- a/fonts/ttmkfdir2/patches/patch-aa
+++ b/fonts/ttmkfdir2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2004/04/03 11:31:02 recht Exp $
+$NetBSD: patch-aa,v 1.3 2004/09/18 07:55:31 minskim Exp $
---- Makefile.orig 2002-11-07 06:28:44.000000000 +0100
+--- Makefile.orig Wed Nov 6 23:28:44 2002
+++ Makefile
-@@ -1,12 +1,9 @@
+@@ -1,25 +1,22 @@
-FREETYPE_BASE=/usr/include/freetype2
-FREETYPE_INCL=-I$(FREETYPE_BASE)/.
-FREETYPE_LIB=/usr/lib/libfreetype.so
@@ -20,7 +20,13 @@ $NetBSD: patch-aa,v 1.2 2004/04/03 11:31:02 recht Exp $
.PHONY: clean
-@@ -19,7 +16,7 @@ ttmkfdir: ttmkfdir.o directory.o command
+ all: ttmkfdir
+
+ .cpp.o:
+- libtool --mode=compile $(CXX) $(CXXFLAGS) -o $@ -c $^
++ libtool --mode=compile $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $^
+
+ ttmkfdir: ttmkfdir.o directory.o commandline.o ttf.o encoding.o parser.o builtin.o
libtool --mode=link $(CXX) -o $@ $^ $(LDFLAGS)
parser.cpp: encoding.l