update PEACE to 0.0.20050609

 - support for recent NetBSD kernel
 - fix some bugs

5 files changed, 8 insertions, 77 deletions

diff --git a/emulators/peace/Makefile b/emulators/peace/Makefile
index 717a5e31b55..3366414e035 100644
--- a/emulators/peace/Makefile
+++ b/emulators/peace/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2004/06/11 12:59:27 kent Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/09 14:25:49 kent Exp $
 #
-PEACE_VERSION=	0.0.20040611
+PEACE_VERSION=	0.0.20050609
 DISTNAME=	peace-${PEACE_VERSION}
-SITES_peace-0.0.20040611.tar.gz=http://chiharu.hauN.org/peace/dist/
+SITES_peace-0.0.20050609.tar.gz=http://chiharu.hauN.org/peace/dist/
 CATEGORIES=	emulators
 
-MAINTAINER=	peace-sacrifice@hauN.org
+MAINTAINER=	kent@NetBSD.org
 HOMEPAGE=	http://chiharu.hauN.org/peace/
 COMMENT=	Enable to run Win32 executables
 
diff --git a/emulators/peace/distinfo b/emulators/peace/distinfo
index 36d52a4d461..73e521ed076 100644
--- a/emulators/peace/distinfo
+++ b/emulators/peace/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/06/09 07:01:59 kent Exp $
+$NetBSD: distinfo,v 1.9 2005/06/09 14:25:49 kent Exp $
 
-SHA1 (peace-0.0.20040611.tar.gz) = ea7423a11b909f19cf523dc75b630eb832bbe9ca
-RMD160 (peace-0.0.20040611.tar.gz) = ac4f794e51576e7f173efa63cdbf7cd1c105d66a
-Size (peace-0.0.20040611.tar.gz) = 572332 bytes
-SHA1 (patch-aa) = 6b6283103de3ee763f944c1b1d9446f5128ffd1d
-SHA1 (patch-ab) = 6184eae1411c703ab60896c5f7cc61015f64dab3
-SHA1 (patch-ac) = 7c113202197a6bab9a3bcc643fd56694296d3fde
+SHA1 (peace-0.0.20050609.tar.gz) = d5caabe54bbe9c98ec833c519b2a6b7eca898075
+RMD160 (peace-0.0.20050609.tar.gz) = dc71e80c6cf12e874dd69e1b02f2ebd70aaabea3
+Size (peace-0.0.20050609.tar.gz) = 580007 bytes
diff --git a/emulators/peace/patches/patch-aa b/emulators/peace/patches/patch-aa
deleted file mode 100644
index e582594ccdb..00000000000
--- a/emulators/peace/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/06/09 07:01:59 kent Exp $
-
---- dll/Makefile.inc.~1.64.~	2004-03-09 11:45:44.000000000 +0900
-+++ dll/Makefile.inc
-@@ -24,6 +24,7 @@ ICUINC=		-I${LOCALBASE}/include
- X11INC=		-I/usr/X11R6/include
- FREETYPEINC=	${X11INC}/freetype2
- CFLAGS+=	-I../common -Wall
-+CXXFLAGS=	${CFLAGS}
- LDFLAGS+=	-mdll -nostartfiles -Wl,--image-base,${IBASE}
- #LDFLAGS+=	-Wl,--verbose
- #LDFLAGS+=	-Wl,--enable-extra-pe-debug
diff --git a/emulators/peace/patches/patch-ab b/emulators/peace/patches/patch-ab
deleted file mode 100644
index d842c2a1e66..00000000000
--- a/emulators/peace/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/06/09 07:01:59 kent Exp $
-
---- dll/advapi32/Makefile.~1.16.~	2003-11-29 19:32:12.000000000 +0900
-+++ dll/advapi32/Makefile
-@@ -3,8 +3,7 @@
- DLL=	advapi32
- SRCS=	crt0.c winbase.c winsvc.c wincrypt.c ntsecapi.c \
- 	reg.cc RegistryKey.cc combase.cc handle.c
--CFLAGS+=	${ICUINC}
--CXXFLAGS+=	-I../kernel32
-+CFLAGS+=	${ICUINC} -I../kernel32
- IBASE=		0x89000000
- DLLDEPS= 	kernel32
- LDADD+=		${ICULDADD} ${GUIDLDADD}
diff --git a/emulators/peace/patches/patch-ac b/emulators/peace/patches/patch-ac
deleted file mode 100644
index 1fc6efdfa6e..00000000000
--- a/emulators/peace/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/06/09 07:01:59 kent Exp $
-
---- dll/ui.so/string.cc.~1.9.~	2003-12-01 01:11:04.000000000 +0900
-+++ dll/ui.so/string.cc
-@@ -43,7 +43,7 @@ CharLowerA(LPSTR str)
- 		/*
- 		 * 1 character.
- 		 */
--		return (LPSTR)tolower(str);
-+		return (LPSTR)tolower(LOWORD(str));
- 	} else {
- 		CharLowerBuffA(str, strlen(str));
- 	}
-@@ -60,7 +60,7 @@ CharLowerW(LPWSTR str)
- 		/*
- 		 * 1 character.
- 		 */
--		return (LPWSTR)tolower(str);
-+		return (LPWSTR)tolower(LOWORD(str));
- 	} else {
- 		CharLowerBuffW(str, lstrlenW(str));
- 	}
-@@ -223,7 +223,7 @@ CharUpperA(LPSTR str)
- 		/*
- 		 * 1 character.
- 		 */
--		return (LPSTR)toupper(str);
-+		return (LPSTR)toupper(LOWORD(str));
- 	} else {
- 		CharUpperBuffA(str, strlen(str));
- 	}
-@@ -240,7 +240,7 @@ CharUpperW(LPWSTR str)
- 		/*
- 		 * 1 character.
- 		 */
--		return (LPWSTR)toupper(str);
-+		return (LPWSTR)toupper(LOWORD(str));
- 	} else {
- 		CharUpperBuffW(str, lstrlenW(str));
- 	}