Update to w32api-2.5

4 files changed, 33 insertions, 26 deletions

diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile
index 787a4709d56..5034501102c 100644
--- a/devel/w32api/Makefile
+++ b/devel/w32api/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/01/20 12:13:30 agc Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/09 12:21:58 kent Exp $
 
-DISTNAME=	w32api-2.4-src
-PKGNAME=	w32api-2.4
+DISTNAME=	w32api-2.5-src
+PKGNAME=	w32api-2.5
+#PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mingw/}
 DISTFILES+=	${DISTNAME}.tar.gz pe-crt-1.2.1.tar.gz
@@ -11,15 +12,14 @@ MAINTAINER=	peace-sacrifice@hauN.org
 HOMEPAGE=	http://www.mingw.org/
 COMMENT=	Free headers and libraries for the Win32 API
 
-BUILD_DEPENDS+=	cross-i386-netbsdpe>=1.3:../../cross/i386-netbsdpe
+BUILD_DEPENDS+=	cross-i386-netbsdpe>=3.3:../../cross/i386-netbsdpe
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 PE_CC=		${CROSSBASE}/bin/i386-netbsdpe-cc -I${WRKSRC}/include
 PE_AR=		${CROSSBASE}/bin/i386-netbsdpe-ar
 CRTWRKSRC=	${WRKDIR}/pe-crt-1.2.1
-PE_CPPFLAGS+=	-I${WRKDIR}/include
+PE_CPPFLAGS+=	-I${WRKSRC}/include
 MAKE_FLAGS+=	PE_CPPFLAGS="${PE_CPPFLAGS}"
-FIXPATTERN=	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
 
 USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
@@ -32,27 +32,14 @@ do-build:
 		&& ${PE_CC} -c -o uuid.o uuid.c \
 		&& ${PE_AR} r libdxguid.a dxguid.o \
 		&& ${PE_AR} r libuuid.a uuid.o
-	${MKDIR} ${WRKDIR}/include
-	${MKDIR} ${WRKDIR}/include/GL
-	${MKDIR} ${WRKDIR}/include/ddk
-	for i in ${WRKSRC}/include/*.h; do \
-		${SED} "${FIXPATTERN}" $$i > ${WRKDIR}/include/`basename $$i`; \
-	done
-	for i in ${WRKSRC}/include/GL/*.h; do \
-		${SED} "${FIXPATTERN}" $$i > ${WRKDIR}/include/GL/`basename $$i`; \
-	done
-	for i in ${WRKSRC}/include/ddk/*.h; do \
-		${SED} "${FIXPATTERN}" $$i > ${WRKDIR}/include/ddk/`basename $$i`; \
-	done
 	${_PKG_SILENT}cd ${CRTWRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
 
 do-install:
-	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/include
-	${INSTALL_DATA} ${WRKDIR}/include/*.h ${CROSSBASE}/i386-netbsdpe/include
+	${INSTALL_DATA} ${WRKSRC}/include/*.h ${CROSSBASE}/i386-netbsdpe/include
 	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/include/GL
-	${INSTALL_DATA} ${WRKDIR}/include/GL/*.h ${CROSSBASE}/i386-netbsdpe/include/GL
+	${INSTALL_DATA} ${WRKSRC}/include/GL/*.h ${CROSSBASE}/i386-netbsdpe/include/GL
 	${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/include/ddk
-	${INSTALL_DATA} ${WRKDIR}/include/ddk/*.h ${CROSSBASE}/i386-netbsdpe/include/ddk
+	${INSTALL_DATA} ${WRKSRC}/include/ddk/*.h ${CROSSBASE}/i386-netbsdpe/include/ddk
 	${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
diff --git a/devel/w32api/PLIST b/devel/w32api/PLIST
index 2854547f3b5..d13f559fcee 100644
--- a/devel/w32api/PLIST
+++ b/devel/w32api/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/21 16:03:39 kent Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/03/09 12:21:58 kent Exp $
 cross/i386-netbsdpe/include/GL/gl.h
 cross/i386-netbsdpe/include/GL/glext.h
 cross/i386-netbsdpe/include/GL/glu.h
 cross/i386-netbsdpe/include/accctrl.h
 cross/i386-netbsdpe/include/aclapi.h
+cross/i386-netbsdpe/include/afxres.h
 cross/i386-netbsdpe/include/basetsd.h
 cross/i386-netbsdpe/include/basetyps.h
 cross/i386-netbsdpe/include/cderr.h
@@ -94,8 +95,10 @@ cross/i386-netbsdpe/include/ddk/winnt4.h
 cross/i386-netbsdpe/include/ddk/winxp.h
 cross/i386-netbsdpe/include/ddk/ws2san.h
 cross/i386-netbsdpe/include/ddk/xfilter.h
+cross/i386-netbsdpe/include/dhcpcsdk.h
 cross/i386-netbsdpe/include/dlgs.h
 cross/i386-netbsdpe/include/docobj.h
+cross/i386-netbsdpe/include/errorrep.h
 cross/i386-netbsdpe/include/exdisp.h
 cross/i386-netbsdpe/include/exdispid.h
 cross/i386-netbsdpe/include/httpext.h
@@ -211,8 +214,10 @@ cross/i386-netbsdpe/include/sspi.h
 cross/i386-netbsdpe/include/subauth.h
 cross/i386-netbsdpe/include/svcguid.h
 cross/i386-netbsdpe/include/tlhelp32.h
+cross/i386-netbsdpe/include/tmschema.h
 cross/i386-netbsdpe/include/unknwn.h
 cross/i386-netbsdpe/include/userenv.h
+cross/i386-netbsdpe/include/uxtheme.h
 cross/i386-netbsdpe/include/vfw.h
 cross/i386-netbsdpe/include/w32api.h
 cross/i386-netbsdpe/include/winable.h
@@ -221,6 +226,7 @@ cross/i386-netbsdpe/include/winber.h
 cross/i386-netbsdpe/include/wincon.h
 cross/i386-netbsdpe/include/wincrypt.h
 cross/i386-netbsdpe/include/windef.h
+cross/i386-netbsdpe/include/windns.h
 cross/i386-netbsdpe/include/windows.h
 cross/i386-netbsdpe/include/windowsx.h
 cross/i386-netbsdpe/include/winerror.h
diff --git a/devel/w32api/distinfo b/devel/w32api/distinfo
index c9601e194de..4491d5e2d76 100644
--- a/devel/w32api/distinfo
+++ b/devel/w32api/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2003/09/21 16:03:40 kent Exp $
+$NetBSD: distinfo,v 1.8 2004/03/09 12:21:58 kent Exp $
 
-SHA1 (w32api-2.4-src.tar.gz) = 008bf1b468bedf8a6c538f1e61d8003b0116c84e
-Size (w32api-2.4-src.tar.gz) = 946314 bytes
+SHA1 (w32api-2.5-src.tar.gz) = 7018e446e6e3e550e3a74aa7a9efdcde97b87d43
+Size (w32api-2.5-src.tar.gz) = 980189 bytes
 SHA1 (pe-crt-1.2.1.tar.gz) = 3468a498cf8e8fa1daf7b437b5c9e88471c1cc6e
 Size (pe-crt-1.2.1.tar.gz) = 4394 bytes
 SHA1 (patch-aa) = 681fa944e43558fa905615f240c26bb8d657eeae
@@ -10,3 +10,4 @@ SHA1 (patch-ac) = b565080d6ce53b98902e659a325d5549203741e8
 SHA1 (patch-ag) = 03b48ea8781815c5a170d9e80fe706dc50d07b04
 SHA1 (patch-ah) = 0f2a3a062fbd2505a2c26457e448bd104dd3e7ef
 SHA1 (patch-ai) = 45129bc82dda126fdefbe1c857e14acaeedd7c5c
+SHA1 (patch-aj) = a18c36ff8e33fa5d7e5eb33133343cc5eca93304
diff --git a/devel/w32api/patches/patch-aj b/devel/w32api/patches/patch-aj
new file mode 100644
index 00000000000..ea77dd9de72
--- /dev/null
+++ b/devel/w32api/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/03/09 12:21:58 kent Exp $
+
+--- include/ocidl.h.orig	2004-03-08 02:27:16.000000000 +0900
++++ include/ocidl.h
+@@ -59,7 +59,7 @@ typedef struct tagPROPBAG2
+ 	LPOLESTR pstrName;
+ 	CLSID clsid;
+ } PROPBAG2;
+-enum tagQACONTAINERFLAGS
++typedef enum tagQACONTAINERFLAGS
+ {
+ 	QACONTAINER_SHOWHATCHING = 1,
+ 	QACONTAINER_SHOWGRABHANDLES = 2,