[pkgsrc/trunk]: pkgsrc/emulators/peace fix a build problem

[kent <kent%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fcac34ecac5f
branches:  trunk
changeset: 495420:fcac34ecac5f
user:      kent <kent%pkgsrc.org@localhost>
date:      Thu Jun 09 07:01:59 2005 +0000

description:
fix a build problem

diffstat:

 emulators/peace/distinfo         |   5 ++++-
 emulators/peace/patches/patch-aa |  12 ++++++++++++
 emulators/peace/patches/patch-ab |  14 ++++++++++++++
 emulators/peace/patches/patch-ac |  40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 1 deletions(-)

diffs (91 lines):

diff -r bcee5fbe0b8d -r fcac34ecac5f emulators/peace/distinfo
--- a/emulators/peace/distinfo  Thu Jun 09 06:07:29 2005 +0000
+++ b/emulators/peace/distinfo  Thu Jun 09 07:01:59 2005 +0000
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 18:49:19 agc Exp $
+$NetBSD: distinfo,v 1.8 2005/06/09 07:01:59 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
diff -r bcee5fbe0b8d -r fcac34ecac5f emulators/peace/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/peace/patches/patch-aa  Thu Jun 09 07:01:59 2005 +0000
@@ -0,0 +1,12 @@
+$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 -r bcee5fbe0b8d -r fcac34ecac5f emulators/peace/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/peace/patches/patch-ab  Thu Jun 09 07:01:59 2005 +0000
@@ -0,0 +1,14 @@
+$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 -r bcee5fbe0b8d -r fcac34ecac5f emulators/peace/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/peace/patches/patch-ac  Thu Jun 09 07:01:59 2005 +0000
@@ -0,0 +1,40 @@
+$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));
+       }