Sync with PEACE repositry

http://cvs.kshosen.ac.jp/cvsweb.cgi/peace/pkgsrc/devel/w32api/
 * Update w32api to 1.5
   - Add comcat.h, mapi.h, ntsecpkg.h, schannel.h, schnlsp.h,
     security.h, sspi.h, wsnetbs.h,
   - Many bug fixes
 * Add crt files for PEACE

6 files changed, 106 insertions, 15 deletions

diff --git a/devel/w32api/DEINSTALL b/devel/w32api/DEINSTALL
new file mode 100644
index 00000000000..88e30a1318b
--- /dev/null
+++ b/devel/w32api/DEINSTALL
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2002/08/21 12:59:17 kent Exp $
+# $PEACE: DEINSTALL,v 1.1 2002/08/21 02:02:26 kent Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+RM=/bin/rm
+RMDIR=/bin/rmdir
+
+CROSSINC=${PKG_PREFIX}/cross/i386-netbsdpe/include
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	${RM} ${CROSSINC}/ctype.h
+	${RM} ${CROSSINC}/stdio.h
+	${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}/sys/param.h
+	${RMDIR} ${CROSSINC}/sys
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/devel/w32api/INSTALL b/devel/w32api/INSTALL
new file mode 100644
index 00000000000..546dfe3782c
--- /dev/null
+++ b/devel/w32api/INSTALL
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2002/08/21 12:59:17 kent Exp $
+# $PEACE: INSTALL,v 1.1 2002/08/21 02:02:27 kent Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+SED=/usr/bin/sed
+LN=/bin/ln
+MKDIR=/bin/mkdir
+
+CROSSINC=${PKG_PREFIX}/cross/i386-netbsdpe/include
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	${SED} "s/^extern const/__declspec(dllimport) extern const/g" /usr/include/ctype.h > ${CROSSINC}/ctype.h
+	${SED} "s/^extern FILE/__declspec(dllimport) extern FILE/" /usr/include/stdio.h > ${CROSSINC}/stdio.h
+	${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}/sys
+	${SED} "s/FSHIFT/SYS_PARAM_FSHIFT/g" /usr/include/sys/param.h > ${CROSSINC}/sys/param.h
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 54eaf36e079..72fc5378ded 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,12 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2002/05/12 10:16:46 abs Exp $
-# $PEACE: Makefile,v 1.18 2001/12/16 16:23:38 kent Exp $
+# $NetBSD: Makefile,v 1.11 2002/08/21 12:59:17 kent Exp $
+# $PEACE: Makefile,v 1.21 2002/08/21 02:02:27 kent Exp $
 
-DISTNAME=	w32api-1.2-src
-PKGNAME=	w32api-1.2
-PKGREVISION=	2
+DISTNAME=	w32api-1.5-src
+PKGNAME=	w32api-1.5
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mingw/}
+DISTFILES+=	${DISTNAME}.tar.gz pe-crt-1.2.tar.gz
+SITES_pe-crt-1.2.tar.gz=http://www.hauN.org/kent/
 
 MAINTAINER=	peace-sacrifice@hauN.org
 HOMEPAGE=	http://www.mingw.org/
@@ -16,6 +18,8 @@ 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
+CRTWRKSRC=	${WRKDIR}/pe-crt-1.2
+CFLAGS+=	-I${WRKDIR}/include
 
 # Building no import libraries but two static libraries.
 do-build:
@@ -28,11 +32,15 @@ do-build:
 	for i in ${WRKSRC}/include/*.h; do \
 		${SED} 's/(CALLBACK/ CALLBACK (/g; s/typedef \(.*\)(NTAPI/typedef \1 NTAPI (/g; s/typedef \(.*\)(WINAPI/typedef \1 WINAPI (/g; s/typedef \(.*\)(STDAPICALLTYPE/typedef \1 STDAPICALLTYPE (/g; s/typedef \(.*\)(APIENTRY/typedef \1 APIENTRY (/g; s/typedef \(.*\)(PASCAL/typedef \1 PASCAL (/g; s/typedef \(.*\)(STDCALL/typedef \1 STDCALL (/g; s/typedef \(.*\)(__RPC_API/typedef \1 __RPC_API (/g; s/typedef \(.*\)(__RPC_USER/typedef \1 __RPC_USER (/g; s/typedef \(.*\)(__stdcall/typedef \1 __stdcall (/g; s/typedef \(.*\)(__RPC_STUB/typedef \1 __RPC_STUB (/g' $$i > ${WRKDIR}/include/`basename $$i`; \
 	done
+	${_PKG_SILENT}cd ${CRTWRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
 
 do-install:
 	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/include
 	${INSTALL_DATA} ${WRKDIR}/include/*.h ${CROSSBASE}/i386-netbsdpe/include
 	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${CROSSBASE}/i386-netbsdpe/lib
+	${_PKG_SILENT}cd ${CRTWRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install
+post-install:
+	PKG_PREFIX=${LOCALBASE} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/w32api/PLIST b/devel/w32api/PLIST
index 4d9fb70efc3..d3c12998282 100644
--- a/devel/w32api/PLIST
+++ b/devel/w32api/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/18 03:25:46 kent Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/21 12:59:17 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
 cross/i386-netbsdpe/include/cguid.h
+cross/i386-netbsdpe/include/comcat.h
 cross/i386-netbsdpe/include/commctrl.h
 cross/i386-netbsdpe/include/commdlg.h
 cross/i386-netbsdpe/include/cpl.h
@@ -14,7 +15,6 @@ cross/i386-netbsdpe/include/dbt.h
 cross/i386-netbsdpe/include/dde.h
 cross/i386-netbsdpe/include/ddeml.h
 cross/i386-netbsdpe/include/dlgs.h
-cross/i386-netbsdpe/include/excpt.h
 cross/i386-netbsdpe/include/httpext.h
 cross/i386-netbsdpe/include/imagehlp.h
 cross/i386-netbsdpe/include/imm.h
@@ -51,6 +51,7 @@ cross/i386-netbsdpe/include/lmuse.h
 cross/i386-netbsdpe/include/lmuseflg.h
 cross/i386-netbsdpe/include/lmwksta.h
 cross/i386-netbsdpe/include/lzexpand.h
+cross/i386-netbsdpe/include/mapi.h
 cross/i386-netbsdpe/include/mciavi.h
 cross/i386-netbsdpe/include/mcx.h
 cross/i386-netbsdpe/include/mmsystem.h
@@ -60,6 +61,7 @@ cross/i386-netbsdpe/include/nddeapi.h
 cross/i386-netbsdpe/include/nspapi.h
 cross/i386-netbsdpe/include/ntdef.h
 cross/i386-netbsdpe/include/ntsecapi.h
+cross/i386-netbsdpe/include/ntsecpkg.h
 cross/i386-netbsdpe/include/oaidl.h
 cross/i386-netbsdpe/include/objbase.h
 cross/i386-netbsdpe/include/objfwd.h
@@ -98,7 +100,10 @@ cross/i386-netbsdpe/include/rpcnsi.h
 cross/i386-netbsdpe/include/rpcnsip.h
 cross/i386-netbsdpe/include/rpcnterr.h
 cross/i386-netbsdpe/include/rpcproxy.h
+cross/i386-netbsdpe/include/schannel.h
+cross/i386-netbsdpe/include/schnlsp.h
 cross/i386-netbsdpe/include/scrnsave.h
+cross/i386-netbsdpe/include/security.h
 cross/i386-netbsdpe/include/setupapi.h
 cross/i386-netbsdpe/include/shellapi.h
 cross/i386-netbsdpe/include/shlguid.h
@@ -107,6 +112,7 @@ cross/i386-netbsdpe/include/sql.h
 cross/i386-netbsdpe/include/sqlext.h
 cross/i386-netbsdpe/include/sqltypes.h
 cross/i386-netbsdpe/include/sqlucode.h
+cross/i386-netbsdpe/include/sspi.h
 cross/i386-netbsdpe/include/subauth.h
 cross/i386-netbsdpe/include/tlhelp32.h
 cross/i386-netbsdpe/include/unknwn.h
@@ -135,7 +141,13 @@ cross/i386-netbsdpe/include/winsvc.h
 cross/i386-netbsdpe/include/winuser.h
 cross/i386-netbsdpe/include/winver.h
 cross/i386-netbsdpe/include/ws2tcpip.h
+cross/i386-netbsdpe/include/wsnetbs.h
 cross/i386-netbsdpe/include/wtypes.h
 cross/i386-netbsdpe/include/zmouse.h
+cross/i386-netbsdpe/lib/crt0.o
+cross/i386-netbsdpe/lib/crt0dll.o
+cross/i386-netbsdpe/lib/crt0libc.o
+cross/i386-netbsdpe/lib/crt0win.o
 cross/i386-netbsdpe/lib/libdxguid.a
+cross/i386-netbsdpe/lib/libpeasu.a
 cross/i386-netbsdpe/lib/libuuid.a
diff --git a/devel/w32api/distinfo b/devel/w32api/distinfo
index 84fc7402688..95dccd79633 100644
--- a/devel/w32api/distinfo
+++ b/devel/w32api/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/03/18 03:25:46 kent Exp $
+$NetBSD: distinfo,v 1.5 2002/08/21 12:59:17 kent Exp $
 
-SHA1 (w32api-1.2-src.tar.gz) = 4862ee2372ea962651a315eba836c2e04cd1fa4c
-Size (w32api-1.2-src.tar.gz) = 493336 bytes
+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-ag) = 03b48ea8781815c5a170d9e80fe706dc50d07b04
 SHA1 (patch-ah) = 1829e9f6d5f243b98cc97132e840a7d6165290ca
-SHA1 (patch-ai) = 2ea74a51180e05ae3fde354ad8b0f535c39619ab
+SHA1 (patch-ai) = 45129bc82dda126fdefbe1c857e14acaeedd7c5c
diff --git a/devel/w32api/patches/patch-ai b/devel/w32api/patches/patch-ai
index ce9b2d015ab..9a73c8f8bd9 100644
--- a/devel/w32api/patches/patch-ai
+++ b/devel/w32api/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1 2001/10/21 12:39:07 kent Exp $
+$NetBSD: patch-ai,v 1.2 2002/08/21 12:59:17 kent Exp $
 
---- include/windows.h.orig	Thu Aug 30 13:25:59 2001
+--- include/windows.h.orig	Thu Apr 11 10:18:59 2002
 +++ include/windows.h
-@@ -142,7 +142,7 @@
+@@ -149,7 +149,7 @@
  #define __USE_W32_SOCKETS
  #endif
  #endif
 -#if defined(__USE_W32_SOCKETS) || !(defined(__CYGWIN__) || defined(__MSYS__) || defined(_UWIN))
 +#if defined(__USE_W32_SOCKETS) || !(defined(__CYGWIN__) || defined(__MSYS__) || defined(_UWIN) || defined(__NetBSDPE__))
- #if (_WIN32_WINNT >= 0x0400)  && (__W32API_MAJOR_VERSION > 0)
+ #if (_WIN32_WINNT >= 0x0400)
  #include <winsock2.h>
  /*