Sync with PEACE repositry.

	http://cvs.kshosen.ac.jp/cvsweb.cgi/peace/pkgsrc/devel/w32api/

Update the base w32api to 1.2.
 - Add accctrl.h and aclapi.h
 - Many bug fixes and new symbols

 - Improve WCHAR handling for netbsdpe

4 files changed, 50 insertions, 34 deletions

diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 2352729c824..de62cc339ab 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,28 +1,21 @@
-# $NetBSD: Makefile,v 1.8 2001/11/29 01:12:30 hubertf Exp $
-# $PEACE: Makefile,v 1.15 2001/10/20 03:00:07 kent Exp $
+# $NetBSD: Makefile,v 1.9 2002/03/18 03:25:46 kent Exp $
+# $PEACE: Makefile,v 1.18 2001/12/16 16:23:38 kent Exp $
 
-DISTNAME=		w32api-1.1-src
-PKGNAME=		w32api-1.1
-PKGREVISION=		1
-WRKSRC=			${WRKDIR}/${DISTNAME:S/-src//}
-CATEGORIES=		devel
-MASTER_SITES=		http://prdownloads.sourceforge.net/mingw/
+DISTNAME=	w32api-1.2-src
+PKGNAME=	w32api-1.2
+PKGREVISION=	2
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+CATEGORIES=	devel
+MASTER_SITES=	http://prdownloads.sourceforge.net/mingw/
 
-MAINTAINER=		peace-sacrifice@hauN.org
-HOMEPAGE=		http://www.mingw.org/
-COMMENT=		Free headers and libraries for the Win32 API
+MAINTAINER=	peace-sacrifice@hauN.org
+HOMEPAGE=	http://www.mingw.org/
+COMMENT=	Free headers and libraries for the Win32 API
 
-BUILD_DEPENDS+=		cross-i386-netbsdpe:../../cross/i386-netbsdpe
+BUILD_DEPENDS+=	cross-i386-netbsdpe:../../cross/i386-netbsdpe
 
-PE_CC=			${CROSSBASE}/bin/i386-netbsdpe-cc -I${WRKSRC}/include
-PE_AR=			${CROSSBASE}/bin/i386-netbsdpe-ar
-#HAS_CONFIGURE=		yes
-#CONFIGURE_ARGS+=	"--prefix=${PREFIX}/cross/i386-netbsdpe"
-#CONFIGURE_ENV+=		CC="${PREFIX}/cross/i386-netbsdpe/bin/gcc -I/usr/include"
-#CONFIGURE_ENV+=		AS="${PREFIX}/cross/i386-netbsdpe/bin/as"
-#CONFIGURE_ENV+=		DLLTOOL="${PREFIX}/cross/i386-netbsdpe/bin/dlltool"
-
-#USE_GMAKE=		yes
+PE_CC=		${CROSSBASE}/bin/i386-netbsdpe-cc -I${WRKSRC}/include
+PE_AR=		${CROSSBASE}/bin/i386-netbsdpe-ar
 
 # Building no import libraries but two static libraries.
 do-build:
diff --git a/devel/w32api/PLIST b/devel/w32api/PLIST
index 99dadc9208d..4d9fb70efc3 100644
--- a/devel/w32api/PLIST
+++ b/devel/w32api/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:27:16 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/18 03:25:46 kent Exp $
+cross/i386-netbsdpe/include/accctrl.h
+cross/i386-netbsdpe/include/aclapi.h
 cross/i386-netbsdpe/include/basetsd.h
 cross/i386-netbsdpe/include/basetyps.h
 cross/i386-netbsdpe/include/cderr.h
diff --git a/devel/w32api/distinfo b/devel/w32api/distinfo
index 0ce326ef289..84fc7402688 100644
--- a/devel/w32api/distinfo
+++ b/devel/w32api/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/10/21 12:39:05 kent Exp $
+$NetBSD: distinfo,v 1.4 2002/03/18 03:25:46 kent Exp $
 
-SHA1 (w32api-1.1-src.tar.gz) = 8b2391d94c18839b245313e5d30c1f38576b3954
-Size (w32api-1.1-src.tar.gz) = 483745 bytes
+SHA1 (w32api-1.2-src.tar.gz) = 4862ee2372ea962651a315eba836c2e04cd1fa4c
+Size (w32api-1.2-src.tar.gz) = 493336 bytes
 SHA1 (patch-ag) = 03b48ea8781815c5a170d9e80fe706dc50d07b04
-SHA1 (patch-ah) = 4768a485524455dc16a573f78ce36941177afa6d
+SHA1 (patch-ah) = 1829e9f6d5f243b98cc97132e840a7d6165290ca
 SHA1 (patch-ai) = 2ea74a51180e05ae3fde354ad8b0f535c39619ab
diff --git a/devel/w32api/patches/patch-ah b/devel/w32api/patches/patch-ah
index 5fd99b5c985..56035fc54de 100644
--- a/devel/w32api/patches/patch-ah
+++ b/devel/w32api/patches/patch-ah
@@ -1,12 +1,33 @@
-$NetBSD: patch-ah,v 1.1 2001/10/21 12:39:06 kent Exp $
+$NetBSD: patch-ah,v 1.2 2002/03/18 03:25:47 kent Exp $
 
---- include/winnt.h.orig	Mon Jul 16 01:01:27 2001
+--- include/winnt.h.orig	Tue Dec  4 22:10:28 2001
 +++ include/winnt.h
-@@ -53,6 +53,7 @@
+@@ -52,15 +52,19 @@
+ typedef char *PSZ;
  
  #ifndef _WCHAR_T_DEFINED
- #define _WCHAR_T_DEFINED
-+#undef _BSD_WCHAR_T_
- #ifndef _WCHAR_T_
- #define _WCHAR_T_
- #undef __need_wchar_t
+-#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 */
+ 
+ typedef wchar_t WCHAR;
+ typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR;