Stop using wchar_t.

Bump PKGREVISION.

8 files changed, 71 insertions, 37 deletions

diff --git a/devel/w32api/DEINSTALL b/devel/w32api/DEINSTALL
index 88e30a1318b..52d4de69964 100644
--- a/devel/w32api/DEINSTALL
+++ b/devel/w32api/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2002/08/21 12:59:17 kent Exp $
+# $NetBSD: DEINSTALL,v 1.2 2003/04/10 15:25:45 kent Exp $
 # $PEACE: DEINSTALL,v 1.1 2002/08/21 02:02:26 kent Exp $
 
 PKGNAME=$1
@@ -20,9 +20,9 @@ POST-DEINSTALL)
 	${RM} ${CROSSINC}/stdlib.h
 	${RM} ${CROSSINC}/time.h
 	${RM} ${CROSSINC}/unistd.h
-	${RM} ${CROSSINC}/i386/ansi.h
-	${RMDIR} ${CROSSINC}/i386
-	${RM} ${CROSSINC}/machine
+#	${RM} ${CROSSINC}/i386/ansi.h
+#	${RMDIR} ${CROSSINC}/i386
+#	${RM} ${CROSSINC}/machine
 	${RM} ${CROSSINC}/sys/param.h
 	${RMDIR} ${CROSSINC}/sys
 	;;
diff --git a/devel/w32api/INSTALL b/devel/w32api/INSTALL
index 546dfe3782c..e76f33245fd 100644
--- a/devel/w32api/INSTALL
+++ b/devel/w32api/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2002/08/21 12:59:17 kent Exp $
+# $NetBSD: INSTALL,v 1.2 2003/04/10 15:25:45 kent Exp $
 # $PEACE: INSTALL,v 1.1 2002/08/21 02:02:27 kent Exp $
 
 PKGNAME=$1
@@ -21,9 +21,9 @@ POST-INSTALL)
 	${SED} "s/^extern size_t __mb_cur_max/__declspec(dllimport) extern size_t __mb_cur_max/" /usr/include/stdlib.h > ${CROSSINC}/stdlib.h
 	${SED} "s/^extern __aconst char/__declspec(dllimport) extern __aconst char/" /usr/include/time.h > ${CROSSINC}/time.h
 	${SED} "s/^extern/__declspec(dllimport) extern/g" /usr/include/unistd.h > ${CROSSINC}/unistd.h
-	${MKDIR} ${CROSSINC}/i386
-	${SED} "s/_BSD_WCHAR_T_[	 ]*int/_BSD_WCHAR_T_ unsigned short/" /usr/include/i386/ansi.h > ${CROSSINC}/i386/ansi.h
-	cd ${CROSSINC} && ${LN} -sf i386 machine
+#	${MKDIR} ${CROSSINC}/i386
+#	${SED} "s/_BSD_WCHAR_T_[	 ]*int/_BSD_WCHAR_T_ unsigned short/" /usr/include/i386/ansi.h > ${CROSSINC}/i386/ansi.h
+#	cd ${CROSSINC} && ${LN} -sf i386 machine
 	${MKDIR} ${CROSSINC}/sys
 	${SED} "s/FSHIFT/SYS_PARAM_FSHIFT/g" /usr/include/sys/param.h > ${CROSSINC}/sys/param.h
 	;;
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 72fc5378ded..a48711a60e9 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2002/08/21 12:59:17 kent Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 15:25:45 kent Exp $
 # $PEACE: Makefile,v 1.21 2002/08/21 02:02:27 kent Exp $
 
 DISTNAME=	w32api-1.5-src
 PKGNAME=	w32api-1.5
-PKGREVISION=	1
+PKGREVISION=	2
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mingw/}
diff --git a/devel/w32api/distinfo b/devel/w32api/distinfo
index 95dccd79633..a593e2d271b 100644
--- a/devel/w32api/distinfo
+++ b/devel/w32api/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.5 2002/08/21 12:59:17 kent Exp $
+$NetBSD: distinfo,v 1.6 2003/04/10 15:25:45 kent Exp $
 
 SHA1 (w32api-1.5-src.tar.gz) = 8bbfd451f55e0df2d4bca00af1e22a41f7ee5311
 Size (w32api-1.5-src.tar.gz) = 514129 bytes
 SHA1 (pe-crt-1.2.tar.gz) = b242b836921dba919a9ce6ecefd1a160cb6ef2a6
 Size (pe-crt-1.2.tar.gz) = 4339 bytes
+SHA1 (patch-aa) = 681fa944e43558fa905615f240c26bb8d657eeae
+SHA1 (patch-ab) = 618a2b5adda9f0093c90e9418e69f7ac6d811457
+SHA1 (patch-ac) = b565080d6ce53b98902e659a325d5549203741e8
 SHA1 (patch-ag) = 03b48ea8781815c5a170d9e80fe706dc50d07b04
-SHA1 (patch-ah) = 1829e9f6d5f243b98cc97132e840a7d6165290ca
+SHA1 (patch-ah) = 4d8258d263c512ff4e9e040e60f68878fb59928d
 SHA1 (patch-ai) = 45129bc82dda126fdefbe1c857e14acaeedd7c5c
diff --git a/devel/w32api/patches/patch-aa b/devel/w32api/patches/patch-aa
new file mode 100644
index 00000000000..dd6c3f7df52
--- /dev/null
+++ b/devel/w32api/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2003/04/10 15:25:45 kent Exp $
+
+--- include/rpcndr.h~	2002-04-10 06:15:17.000000000 +0900
++++ include/rpcndr.h
+@@ -124,8 +124,8 @@ void RPC_ENTRY NDRSContextMarshall(NDR_S
+ NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshall(void*pBuff,unsigned long);
+ void RPC_ENTRY RpcSsDestroyClientContext(void**);
+ void RPC_ENTRY NDRcopy(void*,void*,unsigned int);
+-unsigned int RPC_ENTRY MIDL_wchar_strlen(wchar_t*);
+-void RPC_ENTRY MIDL_wchar_strcpy(void*,wchar_t*);
++unsigned int RPC_ENTRY MIDL_wchar_strlen(WCHAR*);
++void RPC_ENTRY MIDL_wchar_strcpy(void*,WCHAR*);
+ void RPC_ENTRY char_from_ndr(PRPC_MESSAGE,unsigned char*);
+ void RPC_ENTRY char_array_from_ndr(PRPC_MESSAGE,unsigned long,unsigned long,unsigned char*);
+ void RPC_ENTRY short_from_ndr(PRPC_MESSAGE,unsigned short*);
diff --git a/devel/w32api/patches/patch-ab b/devel/w32api/patches/patch-ab
new file mode 100644
index 00000000000..c5a7fe24c60
--- /dev/null
+++ b/devel/w32api/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2003/04/10 15:25:45 kent Exp $
+
+--- include/security.h~	2002-04-10 06:15:17.000000000 +0900
++++ include/security.h
+@@ -31,7 +31,7 @@
+ 
+ /* always a char */
+ typedef char SEC_CHAR;
+-typedef wchar_t SEC_WCHAR;
++typedef WCHAR SEC_WCHAR;
+ typedef long SECURITY_STATUS;
+ #define SEC_FAR
+ 
diff --git a/devel/w32api/patches/patch-ac b/devel/w32api/patches/patch-ac
new file mode 100644
index 00000000000..41389f2af91
--- /dev/null
+++ b/devel/w32api/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2003/04/10 15:25:45 kent Exp $
+
+--- include/sqltypes.h~	2002-04-10 06:15:17.000000000 +0900
++++ include/sqltypes.h
+@@ -64,7 +64,7 @@ typedef unsigned long SQLSETPOSIROW;
+ #define SQLTRANSID DWORD
+ #define SQLSETPOSIROW SQLUSMALLINT
+ #endif
+-typedef wchar_t SQLWCHAR;
++typedef WCHAR SQLWCHAR;
+ #ifdef UNICODE
+ typedef SQLWCHAR        SQLTCHAR;
+ #else
diff --git a/devel/w32api/patches/patch-ah b/devel/w32api/patches/patch-ah
index 56035fc54de..58b73b73d45 100644
--- a/devel/w32api/patches/patch-ah
+++ b/devel/w32api/patches/patch-ah
@@ -1,33 +1,23 @@
-$NetBSD: patch-ah,v 1.2 2002/03/18 03:25:47 kent Exp $
+$NetBSD: patch-ah,v 1.3 2003/04/10 15:25:46 kent Exp $
 
---- include/winnt.h.orig	Tue Dec  4 22:10:28 2001
+--- include/winnt.h~	2002-06-14 20:42:27.000000000 +0900
 +++ include/winnt.h
-@@ -52,15 +52,19 @@
+@@ -55,6 +55,10 @@ typedef unsigned short USHORT,*PUSHORT;
+ typedef unsigned long ULONG,*PULONG;
  typedef char *PSZ;
  
++#ifdef __NetBSDPE__
++#include <stdint.h>
++typedef uint16_t WCHAR;
++#else
  #ifndef _WCHAR_T_DEFINED
--#define _WCHAR_T_DEFINED
--#ifndef _WCHAR_T_
--#define _WCHAR_T_
--#undef __need_wchar_t
--#ifndef __cplusplus
--typedef unsigned short wchar_t;
--#endif
--#endif
--#endif
-+# define _WCHAR_T_DEFINED
-+# ifndef _WCHAR_T_
-+#  define _WCHAR_T_
-+#  undef __need_wchar_t
-+#  ifndef __cplusplus
-+#   include <machine/ansi.h>
-+#   ifdef _BSD_WCHAR_T_
-+typedef _BSD_WCHAR_T_ wchar_t;
-+#    undef _BSD_WCHAR_T_
-+#   endif /* _BSD_WCHAR_T_ */
-+#  endif /* !__cplusplus */
-+# endif /* !_WCHAR_T_ */
-+#endif /* !_WCHAR_T_DEFINED */
+ #define _WCHAR_T_DEFINED
+ #ifndef _WCHAR_T_
+@@ -67,6 +71,7 @@ typedef unsigned short wchar_t;
+ #endif
  
  typedef wchar_t WCHAR;
++#endif
  typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR;
+ typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR;
+ typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR;