Fix build on amd64. Mark as DESTDIR ready.

4 files changed, 45 insertions, 2 deletions

diff --git a/fonts/mminstance/Makefile b/fonts/mminstance/Makefile
index b4302723e33..0ab0443e71f 100644
--- a/fonts/mminstance/Makefile
+++ b/fonts/mminstance/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/11/22 21:13:03 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2008/09/19 23:59:52 joerg Exp $
 #
 
 DISTNAME=	mminstance-1.20
@@ -12,4 +12,6 @@ COMMENT=	Utility programs for creating instances of multiple master fonts
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/mminstance/distinfo b/fonts/mminstance/distinfo
index 61466609cec..d2b2181d316 100644
--- a/fonts/mminstance/distinfo
+++ b/fonts/mminstance/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 19:18:28 agc Exp $
+$NetBSD: distinfo,v 1.4 2008/09/19 23:59:52 joerg Exp $
 
 SHA1 (mminstance-1.20.tar.gz) = 599cace92339e4120d30db40dfd157e400c745c8
 RMD160 (mminstance-1.20.tar.gz) = 6e5d190a8459d8c737782eeec8a7a7d9bf676d8a
 Size (mminstance-1.20.tar.gz) = 191723 bytes
+SHA1 (patch-aa) = d601f1bdaec7de91d64d0b7b9ccabf85522dada2
+SHA1 (patch-ab) = 8c73881e0c9f08eebd8c0ea2ff6e358469faefba
diff --git a/fonts/mminstance/patches/patch-aa b/fonts/mminstance/patches/patch-aa
new file mode 100644
index 00000000000..7ba5401fb71
--- /dev/null
+++ b/fonts/mminstance/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2008/09/19 23:59:52 joerg Exp $
+
+--- include/lcdf/permstr.hh.orig	2008-09-20 01:51:20.000000000 +0200
++++ include/lcdf/permstr.hh
+@@ -5,6 +5,10 @@
+ #include <cstddef>
+ #include <cstdarg>
+ 
++class PermString;
++
++PermString permprintf(const char *, ...);
++
+ class PermString { struct Doodad; public:
+   
+     typedef Doodad *Capsule;
+@@ -91,7 +95,7 @@ operator!=(const char *a, PermString b)
+ inline int
+ hashcode(PermString s)
+ {
+-    return (int)(s.cc());
++    return (int)(size_t)(s.cc());
+ }
+ 
+ #endif
diff --git a/fonts/mminstance/patches/patch-ab b/fonts/mminstance/patches/patch-ab
new file mode 100644
index 00000000000..1abdfb63b44
--- /dev/null
+++ b/fonts/mminstance/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2008/09/19 23:59:52 joerg Exp $
+
+--- liblcdf/vectorv.cc.orig	2008-09-20 01:54:16.000000000 +0200
++++ liblcdf/vectorv.cc
+@@ -15,6 +15,10 @@
+  * legally binding.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <lcdf/vector.hh>
+ #include <cstring>
+