Fix errno. Don't define strerror on BSDs, they have it. Uses bdftopcf

and mkfontdir.

4 files changed, 24 insertions, 10 deletions

diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 6590e5c56b9..3b7d7bf17f1 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/01/04 04:29:06 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2006/01/12 19:48:02 joerg Exp $
 
 DISTNAME=	pcemu1.01alpha
 PKGNAME=	pcemu-1.01a
@@ -10,6 +10,8 @@ MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/ \
 MAINTAINER=	eric@fox.phoenix.az.us
 COMMENT=	8086 PC emulator, by David Hedley
 
+USE_TOOLS+=	bdftopcf mkfontdir
+
 BROKEN_IN=	pkgsrc-2005Q4
 
 MAKE_ENV+=	FILESDIR=${FILESDIR:Q}
diff --git a/emulators/pcemu/distinfo b/emulators/pcemu/distinfo
index 7848377a45a..3273f9d8f11 100644
--- a/emulators/pcemu/distinfo
+++ b/emulators/pcemu/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.7 2005/09/06 08:10:58 abs Exp $
+$NetBSD: distinfo,v 1.8 2006/01/12 19:48:02 joerg Exp $
 
 SHA1 (pcemu1.01alpha.tar.gz) = 4c0cf9b3b197e890fbc85dc85ca0d7c75eb145b3
 RMD160 (pcemu1.01alpha.tar.gz) = 2eb3ba91138d08946728a6dc1dee6482416c3a01
 Size (pcemu1.01alpha.tar.gz) = 316257 bytes
 SHA1 (patch-aa) = f53e918695b8929688b375c1af6f003b02ffa4ca
 SHA1 (patch-ab) = 6636736f76b956a2beb6490785b63f4a131c9c25
-SHA1 (patch-ac) = ba75ebd170b9847f982b045a3a618daaaa94f179
+SHA1 (patch-ac) = c2d7971e269305db2e2a9a487cb3169ecb259173
 SHA1 (patch-ad) = 5b4c50d591eb5060276015e8b178475de38293fd
 SHA1 (patch-ae) = c641955b80afabb688739fca411f3c31c2aa16a7
 SHA1 (patch-af) = d36be5e25896ebc66bb2cc11135d61053a7e57ff
 SHA1 (patch-ag) = 95ee8354783af38e43eb966a991c7a87823b7ce7
 SHA1 (patch-ah) = 37e8e4af38a4a66e4c5f3e57e682ca793b735732
-SHA1 (patch-ai) = 797d2d6b03f4c4b4e014bb1f8931313fddafd3a8
+SHA1 (patch-ai) = 80a0467b181e2850ebf44a84462130b6542ae78d
 SHA1 (patch-aj) = 6df6fb6fc9b8f9a9c551f5152325fde7aab986c6
 SHA1 (patch-ak) = e04ac57d8a51016bd1e449141a33a7c793b6aab0
diff --git a/emulators/pcemu/patches/patch-ac b/emulators/pcemu/patches/patch-ac
index 2127ce91e7b..8d4d83f366a 100644
--- a/emulators/pcemu/patches/patch-ac
+++ b/emulators/pcemu/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.5 2005/09/06 08:10:58 abs Exp $
+$NetBSD: patch-ac,v 1.6 2006/01/12 19:48:02 joerg Exp $
 
---- mfs.c.orig	1994-06-22 09:24:51.000000000 -0500
+--- mfs.c.orig	1994-06-22 14:24:51.000000000 +0000
 +++ mfs.c
 @@ -319,17 +319,24 @@ TODO:
  #include <errno.h>
@@ -39,3 +39,12 @@ $NetBSD: patch-ac,v 1.5 2005/09/06 08:10:58 abs Exp $
      struct statvfs fsbuf;
      if (statvfs(cwd, &fsbuf) >= 0)
  #else
+@@ -1182,8 +1189,6 @@ _get_dir(char *name, char *mname, char *
+   (void) find_file(name, &sbuf);
+ 
+   if ((cur_dir = opendir(name)) == NULL) {
+-    extern int errno;
+-
+     Debug0((dbg_fd, "get_dir(): couldn't open '%s' errno = %s\n", name, strerror(errno)));
+     return (NULL);
+   }
diff --git a/emulators/pcemu/patches/patch-ai b/emulators/pcemu/patches/patch-ai
index 25e4257abf1..4abc4abd1af 100644
--- a/emulators/pcemu/patches/patch-ai
+++ b/emulators/pcemu/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1 2004/07/09 12:45:03 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2006/01/12 19:48:02 joerg Exp $
 
---- mfs.h.orig	1994-06-22 16:24:51.000000000 +0200
+--- mfs.h.orig	1994-06-22 14:24:51.000000000 +0000
 +++ mfs.h
-@@ -45,7 +45,9 @@ typedef unsigned char boolean_t;
+@@ -45,9 +45,11 @@ typedef unsigned char boolean_t;
  
  #include "mfs_link.h"
  
@@ -10,5 +10,8 @@ $NetBSD: patch-ai,v 1.1 2004/07/09 12:45:03 wiz Exp $
  extern char *sys_errlist[];
 +#endif
  
- #if !defined(__hpux) && !defined(SOLARIS) && !defined(SGI) && !defined(RS6000)
+-#if !defined(__hpux) && !defined(SOLARIS) && !defined(SGI) && !defined(RS6000)
++#if !defined(__hpux) && !defined(SOLARIS) && !defined(SGI) && !defined(RS6000) && !defined(BSD)
  #define strerror(x) sys_errlist[x]
+ #endif
+