summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2002-05-30 11:30:42 +0000
committertron <tron@pkgsrc.org>2002-05-30 11:30:42 +0000
commitc0436f544360df8bce468c357c16c5f54037e386 (patch)
tree9018f2d745d9e9c41aa4b4fc49ef7bf253803f1f
parent3f94f058953b7f411db28827732e738d44e00f37 (diff)
downloadpkgsrc-c0436f544360df8bce468c357c16c5f54037e386.tar.gz
Fix incorrect "Imakefile" which causes build failures on XFree86 4.2.0
systems without "xpkwedge" installed.
-rw-r--r--fonts/mkfontscale/distinfo4
-rw-r--r--fonts/mkfontscale/patches/patch-aa17
2 files changed, 16 insertions, 5 deletions
diff --git a/fonts/mkfontscale/distinfo b/fonts/mkfontscale/distinfo
index 7e38b93e76c..e3cd702eea6 100644
--- a/fonts/mkfontscale/distinfo
+++ b/fonts/mkfontscale/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/05/20 12:30:29 wiz Exp $
+$NetBSD: distinfo,v 1.2 2002/05/30 11:30:42 tron Exp $
SHA1 (mkfontscale-20020418.tar.gz) = 9eca49458f8f503f6332242d5427700ab1474d95
Size (mkfontscale-20020418.tar.gz) = 7784 bytes
-SHA1 (patch-aa) = 5806e53c9637ee8adc6e74819f13c26d6c3e32f7
+SHA1 (patch-aa) = 759f60cca2f29a4537a1b9576ddce76a3db45e27
SHA1 (patch-ab) = 86ed788a0372fdeb436ff22a5bd292dc1ee5b118
diff --git a/fonts/mkfontscale/patches/patch-aa b/fonts/mkfontscale/patches/patch-aa
index 0f5d3ccf5a5..d06a67296e9 100644
--- a/fonts/mkfontscale/patches/patch-aa
+++ b/fonts/mkfontscale/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/20 12:30:29 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2002/05/30 11:30:44 tron Exp $
---- Imakefile.orig Thu May 9 19:06:14 2002
-+++ Imakefile
+--- Imakefile.orig Thu Apr 4 14:25:46 2002
++++ Imakefile Thu May 30 13:28:44 2002
@@ -1,5 +1,5 @@
XTOP = /usr/local/src/XFree86/xc
-XFONTENCLIB = $(XTOP)/exports/lib/libfontenc.a
@@ -9,3 +9,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/20 12:30:29 wiz Exp $
LOCAL_LIBRARIES = $(XFONTENCLIB) $(FREETYPE2LIB)
+@@ -9,8 +9,8 @@
+
+ OBJS = mkfontscale.o list.o
+
+-INCLUDES = $(FREETYPE2INCLUDES) -I$(XTOP)/exports/include
+-DEFINES = $(FREETYPE2DEFINES)
++EXTRA_INCLUDES = $(FREETYPE2INCLUDES) -I$(XTOP)/exports/include
++EXTRA_DEFINES = $(FREETYPE2DEFINES)
+
+ ComplexProgramTarget(mkfontscale)
+