From 770f814ebe6de13485dd332fa2cb4a0d7a2ee7d8 Mon Sep 17 00:00:00 2001 From: kent Date: Sun, 21 Oct 2001 12:39:05 +0000 Subject: Sync with PEACE repositry. * Upgrade base distribution: w32api-0.4 -> w32api-1.1 * Create static libraries for UUID definitions. * Modify typedefs to avoid a bug of gcc. --- devel/w32api/Makefile | 35 ++++++++++++++++++++++++----------- devel/w32api/distinfo | 12 ++++++------ devel/w32api/patches/patch-aa | 11 ----------- devel/w32api/patches/patch-ab | 11 ----------- devel/w32api/patches/patch-ac | 13 ------------- devel/w32api/patches/patch-ag | 14 ++++++++++++++ devel/w32api/patches/patch-ah | 12 ++++++++++++ devel/w32api/patches/patch-ai | 13 +++++++++++++ devel/w32api/pkg/PLIST | 23 ++++++++++++++++++++++- 9 files changed, 91 insertions(+), 53 deletions(-) delete mode 100644 devel/w32api/patches/patch-aa delete mode 100644 devel/w32api/patches/patch-ab delete mode 100644 devel/w32api/patches/patch-ac create mode 100644 devel/w32api/patches/patch-ag create mode 100644 devel/w32api/patches/patch-ah create mode 100644 devel/w32api/patches/patch-ai (limited to 'devel') diff --git a/devel/w32api/Makefile b/devel/w32api/Makefile index 8f0e70a639c..7ceebc61393 100644 --- a/devel/w32api/Makefile +++ b/devel/w32api/Makefile @@ -1,17 +1,20 @@ -# $NetBSD: Makefile,v 1.5 2001/03/27 03:19:53 hubertf Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/21 12:39:05 kent Exp $ +# $PEACE: Makefile,v 1.15 2001/10/20 03:00:07 kent Exp $ -DISTNAME= w32api-0.4-20001122-bjy -PKGNAME= w32api-0.4nb2 -WRKSRC= ${WRKDIR}/${DISTNAME:S/-bjy//} +DISTNAME= w32api-1.1-src +PKGNAME= w32api-1.1nb1 +WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} CATEGORIES= devel -MASTER_SITES= http://my.dreamwiz.com/bangjy/ +MASTER_SITES= http://prdownloads.sourceforge.net/mingw/ -MAINTAINER= oki@yha.att.ne.jp -HOMEPAGE= http://www.acc.umu.se/~anorland/gnu-win32/ +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.1.4:../../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" @@ -20,11 +23,21 @@ BUILD_DEPENDS+= cross-i386-netbsdpe-1.1.4:../../cross/i386-netbsdpe #USE_GMAKE= yes -# currently, don't build import libraries. +# Building no import libraries but two static libraries. do-build: + cd ${WRKSRC}/lib \ + && ${PE_CC} -c -o dxguid.o dxguid.c \ + && ${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 + 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 do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/cross/i386-netbsdpe/include - ${CP} ${WRKSRC}/include/*.h ${PREFIX}/cross/i386-netbsdpe/include + ${INSTALL_DATA_DIR} ${CROSSBASE}/i386-netbsdpe/include + ${INSTALL_DATA} ${WRKDIR}/include/*.h ${CROSSBASE}/i386-netbsdpe/include + ${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${CROSSBASE}/i386-netbsdpe/lib .include "../../mk/bsd.pkg.mk" diff --git a/devel/w32api/distinfo b/devel/w32api/distinfo index 682ced2bcf7..0ce326ef289 100644 --- a/devel/w32api/distinfo +++ b/devel/w32api/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 00:44:49 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/10/21 12:39:05 kent Exp $ -SHA1 (w32api-0.4-20001122-bjy.tar.gz) = 818593ac21e119cdbba60af1107c58e72bd8e82a -Size (w32api-0.4-20001122-bjy.tar.gz) = 445135 bytes -SHA1 (patch-aa) = 559c3f5329c7f47a9ac608bf35ee22c8e3c6107f -SHA1 (patch-ab) = 20515bd313bdea562986d7a5844af6764a837e15 -SHA1 (patch-ac) = 7f78088c85bf2ca377d26e83a737f11f4b64a52c +SHA1 (w32api-1.1-src.tar.gz) = 8b2391d94c18839b245313e5d30c1f38576b3954 +Size (w32api-1.1-src.tar.gz) = 483745 bytes +SHA1 (patch-ag) = 03b48ea8781815c5a170d9e80fe706dc50d07b04 +SHA1 (patch-ah) = 4768a485524455dc16a573f78ce36941177afa6d +SHA1 (patch-ai) = 2ea74a51180e05ae3fde354ad8b0f535c39619ab diff --git a/devel/w32api/patches/patch-aa b/devel/w32api/patches/patch-aa deleted file mode 100644 index f205828b3a0..00000000000 --- a/devel/w32api/patches/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/01/30 03:20:51 minoura Exp $ ---- lib/dinput.c.orig Mon May 15 01:20:35 2000 -+++ lib/dinput.c Mon Nov 20 05:55:28 2000 -@@ -23,6 +23,7 @@ - - #if defined(__LCC__) || defined(__GNUC__) - #include -+#undef _BSD_WCHAR_T_ - #include - #else - #include diff --git a/devel/w32api/patches/patch-ab b/devel/w32api/patches/patch-ab deleted file mode 100644 index 64ebe38574c..00000000000 --- a/devel/w32api/patches/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/01/30 03:20:51 minoura Exp $ ---- lib/dxguid.c.orig Mon May 15 01:20:35 2000 -+++ lib/dxguid.c Mon Nov 20 05:57:28 2000 -@@ -25,6 +25,7 @@ - #if defined(__LCC__) || defined(__GNUC__) - #define INITGUID 1 - #include -+#undef _BSD_WCHAR_T_ - #include - #else - #include diff --git a/devel/w32api/patches/patch-ac b/devel/w32api/patches/patch-ac deleted file mode 100644 index 279a05c7028..00000000000 --- a/devel/w32api/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/01/30 03:20:51 minoura Exp $ - ---- include/shellapi.h.orig Thu Oct 19 04:35:30 2000 -+++ include/shellapi.h -@@ -183,7 +183,7 @@ - WCHAR szTypeName[80]; - } SHFILEINFOW; - --LPWSTR *CommandLineToArgvW(LPCWSTR,int*); -+LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*); - void WINAPI DragAcceptFiles(HWND,BOOL); - void WINAPI DragFinish(HDROP); - UINT WINAPI DragQueryFileA(HDROP,UINT,LPSTR,UINT); diff --git a/devel/w32api/patches/patch-ag b/devel/w32api/patches/patch-ag new file mode 100644 index 00000000000..60bf4a2b54b --- /dev/null +++ b/devel/w32api/patches/patch-ag @@ -0,0 +1,14 @@ +$NetBSD: patch-ag,v 1.1 2001/10/21 12:39:06 kent Exp $ + +--- include/winuser.h.orig Sun Jul 15 23:53:24 2001 ++++ include/winuser.h +@@ -7,6 +7,9 @@ + #define FALT 16 + #define FCONTROL 8 + #define FNOINVERT 2 ++#ifdef FSHIFT ++# error FSHIFT is already defined!!! ++#endif + #define FSHIFT 4 + #define FVIRTKEY 1 + #define ATF_TIMEOUTON 1 diff --git a/devel/w32api/patches/patch-ah b/devel/w32api/patches/patch-ah new file mode 100644 index 00000000000..5fd99b5c985 --- /dev/null +++ b/devel/w32api/patches/patch-ah @@ -0,0 +1,12 @@ +$NetBSD: patch-ah,v 1.1 2001/10/21 12:39:06 kent Exp $ + +--- include/winnt.h.orig Mon Jul 16 01:01:27 2001 ++++ include/winnt.h +@@ -53,6 +53,7 @@ + + #ifndef _WCHAR_T_DEFINED + #define _WCHAR_T_DEFINED ++#undef _BSD_WCHAR_T_ + #ifndef _WCHAR_T_ + #define _WCHAR_T_ + #undef __need_wchar_t diff --git a/devel/w32api/patches/patch-ai b/devel/w32api/patches/patch-ai new file mode 100644 index 00000000000..ce9b2d015ab --- /dev/null +++ b/devel/w32api/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2001/10/21 12:39:07 kent Exp $ + +--- include/windows.h.orig Thu Aug 30 13:25:59 2001 ++++ include/windows.h +@@ -142,7 +142,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) + #include + /* diff --git a/devel/w32api/pkg/PLIST b/devel/w32api/pkg/PLIST index 45a92d8bef4..f5a584d7fc5 100644 --- a/devel/w32api/pkg/PLIST +++ b/devel/w32api/pkg/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/30 03:20:52 minoura Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/10/21 12:39:07 kent Exp $ +cross/i386-netbsdpe/include/basetsd.h cross/i386-netbsdpe/include/basetyps.h cross/i386-netbsdpe/include/cderr.h cross/i386-netbsdpe/include/cguid.h @@ -17,6 +18,11 @@ cross/i386-netbsdpe/include/imagehlp.h cross/i386-netbsdpe/include/imm.h cross/i386-netbsdpe/include/initguid.h cross/i386-netbsdpe/include/intshcut.h +cross/i386-netbsdpe/include/ipexport.h +cross/i386-netbsdpe/include/iphlpapi.h +cross/i386-netbsdpe/include/ipifcons.h +cross/i386-netbsdpe/include/iprtrmib.h +cross/i386-netbsdpe/include/iptypes.h cross/i386-netbsdpe/include/isguids.h cross/i386-netbsdpe/include/largeint.h cross/i386-netbsdpe/include/lm.h @@ -46,14 +52,18 @@ cross/i386-netbsdpe/include/lzexpand.h cross/i386-netbsdpe/include/mciavi.h cross/i386-netbsdpe/include/mcx.h cross/i386-netbsdpe/include/mmsystem.h +cross/i386-netbsdpe/include/mswsock.h cross/i386-netbsdpe/include/nb30.h 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/oaidl.h cross/i386-netbsdpe/include/objbase.h cross/i386-netbsdpe/include/objfwd.h cross/i386-netbsdpe/include/objidl.h cross/i386-netbsdpe/include/ocidl.h +cross/i386-netbsdpe/include/odbcinst.h cross/i386-netbsdpe/include/ole.h cross/i386-netbsdpe/include/ole2.h cross/i386-netbsdpe/include/ole2ver.h @@ -71,6 +81,9 @@ cross/i386-netbsdpe/include/pshpack2.h cross/i386-netbsdpe/include/pshpack4.h cross/i386-netbsdpe/include/pshpack8.h cross/i386-netbsdpe/include/rapi.h +cross/i386-netbsdpe/include/ras.h +cross/i386-netbsdpe/include/raserror.h +cross/i386-netbsdpe/include/rassapi.h cross/i386-netbsdpe/include/regstr.h cross/i386-netbsdpe/include/richedit.h cross/i386-netbsdpe/include/richole.h @@ -84,14 +97,19 @@ cross/i386-netbsdpe/include/rpcnsip.h cross/i386-netbsdpe/include/rpcnterr.h cross/i386-netbsdpe/include/rpcproxy.h cross/i386-netbsdpe/include/scrnsave.h +cross/i386-netbsdpe/include/setupapi.h cross/i386-netbsdpe/include/shellapi.h cross/i386-netbsdpe/include/shlguid.h cross/i386-netbsdpe/include/shlobj.h 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/subauth.h cross/i386-netbsdpe/include/tlhelp32.h cross/i386-netbsdpe/include/unknwn.h +cross/i386-netbsdpe/include/userenv.h +cross/i386-netbsdpe/include/w32api.h cross/i386-netbsdpe/include/winbase.h cross/i386-netbsdpe/include/wincon.h cross/i386-netbsdpe/include/wincrypt.h @@ -114,5 +132,8 @@ cross/i386-netbsdpe/include/winspool.h 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/wtypes.h cross/i386-netbsdpe/include/zmouse.h +cross/i386-netbsdpe/lib/libdxguid.a +cross/i386-netbsdpe/lib/libuuid.a -- cgit v1.2.3