summaryrefslogtreecommitdiff
path: root/fonts/monafonts
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2007-01-24 15:23:26 +0000
committerjoerg <joerg@pkgsrc.org>2007-01-24 15:23:26 +0000
commit2d9744be79a28bcdfbfc13461852782d25adb455 (patch)
treebf5c4319cbde33c17f56bd39faa5164a850b170b /fonts/monafonts
parentab53404c312a7e7669e08fb7e96df9483453f49c (diff)
downloadpkgsrc-2d9744be79a28bcdfbfc13461852782d25adb455.tar.gz
Don't expect tools to be created in the tools directory -- at least for
modular Xorg bdftopcf isn't. Just expect them to be in path. There's no need to set USE_X11BASE here now. XXX Why isn't the TrueType version installed?
Diffstat (limited to 'fonts/monafonts')
-rw-r--r--fonts/monafonts/Makefile6
-rw-r--r--fonts/monafonts/distinfo3
-rw-r--r--fonts/monafonts/patches/patch-aa17
3 files changed, 20 insertions, 6 deletions
diff --git a/fonts/monafonts/Makefile b/fonts/monafonts/Makefile
index 34ee9701b80..216e2ca56b0 100644
--- a/fonts/monafonts/Makefile
+++ b/fonts/monafonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:09:10 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2007/01/24 15:23:26 joerg Exp $
DISTNAME= monafont-2.90
PKGNAME= ${DISTNAME:S/font/fonts/}
@@ -11,13 +11,9 @@ MAINTAINER= uebayasi@NetBSD.org
HOMEPAGE= http://monafont.sourceforge.net/
COMMENT= Japanese fonts for "Mona" seen at 2ch.net
-USE_X11BASE= yes
BUILD_TARGET= bdf
USE_TOOLS+= bdftopcf gzip mkdirhier mkfontdir perl sed
-# X11BINDIR is just the path to the X11 tools listed above.
-MAKE_FLAGS+= X11BINDIR=${TOOLS_DIR:Q}/bin
-
MAKE_FLAGS+= X11FONTDIR=${PREFIX:Q}/${FONTS_SUBDIR:Q}
MAKE_FLAGS+= SED_CMD=${SED:Q}
MAKE_FLAGS+= PERL_CMD=${PERL5:Q}
diff --git a/fonts/monafonts/distinfo b/fonts/monafonts/distinfo
index 58eb7633eeb..7a4c8a481af 100644
--- a/fonts/monafonts/distinfo
+++ b/fonts/monafonts/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/12/29 22:20:00 jlam Exp $
+$NetBSD: distinfo,v 1.7 2007/01/24 15:23:26 joerg Exp $
SHA1 (monafont-2.90.tar.bz2) = 6106097a74afed072b3c49555356c5cb88cec172
RMD160 (monafont-2.90.tar.bz2) = 1b5dbd521581f05bd26e8339b316e0207be3c7a1
Size (monafont-2.90.tar.bz2) = 808897 bytes
+SHA1 (patch-aa) = 24d568ec79884eb643e45c5c192d64a308cec3ba
diff --git a/fonts/monafonts/patches/patch-aa b/fonts/monafonts/patches/patch-aa
new file mode 100644
index 00000000000..910dadffbd4
--- /dev/null
+++ b/fonts/monafonts/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.4 2007/01/24 15:23:26 joerg Exp $
+
+--- Makefile.orig 2007-01-24 15:00:08.000000000 +0000
++++ Makefile
+@@ -20,9 +20,9 @@ GZIP_SUFFIX = gz
+ DESTDIR =
+ X11BINDIR = /usr/X11R6/bin
+ X11FONTDIR = $(DESTDIR)/usr/X11R6/lib/X11/fonts/local
+-BDFTOPCF = $(X11BINDIR)/bdftopcf
+-MKDIRHIER = $(X11BINDIR)/mkdirhier # 'mkdir -p' may also work.
+-MKFONTDIR = $(X11BINDIR)/mkfontdir
++BDFTOPCF = bdftopcf
++MKDIRHIER = mkdirhier # 'mkdir -p' may also work.
++MKFONTDIR = mkfontdir
+
+ MY_RPM_ROOT = /tmp/rpm-root
+