diff options
| -rw-r--r-- | emulators/wine/Makefile | 18 | ||||
| -rw-r--r-- | emulators/wine/PLIST | 21 | ||||
| -rw-r--r-- | emulators/wine/distinfo | 9 | ||||
| -rw-r--r-- | emulators/wine/patches/patch-ac | 8 | ||||
| -rw-r--r-- | emulators/wine/patches/patch-af | 55 |
5 files changed, 91 insertions, 20 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 6a0481d59bb..262cc616412 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.77 2005/01/17 15:35:41 adam Exp $ +# $NetBSD: Makefile,v 1.78 2005/02/16 12:22:11 adam Exp $ -DISTNAME= Wine-20050111 +DISTNAME= Wine-20050211 PKGNAME= ${DISTNAME:S/W/w/} CATEGORIES= emulators -MASTER_SITES= http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \ - ${MASTER_SITE_SOURCEFORGE:=wine/} \ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wine/} \ + http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \ ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/} MAINTAINER= adam@NetBSD.org @@ -22,12 +22,11 @@ ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 ONLY_FOR_PLATFORM+= FreeBSD*-i386 Linux*-i386 SunOS*-i386 WRKSRC= ${WRKDIR}/${DISTNAME:S/W/w/} -USE_BUILDLINK3= YES -USE_X11= YES +USE_BUILDLINK3= yes USE_GNU_TOOLS+= make -USE_LIBTOOL= YES - -GNU_CONFIGURE= YES +USE_LIBTOOL= yes +USE_X11= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-curses #--disable-debug --disable-trace CONFIGURE_ENV+= ac_cv_path_ARTSCCONFIG=${TRUE} CONFIGURE_ENV+= ac_cv_prog_sane_devel=no @@ -62,6 +61,7 @@ post-install: .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../mk/ossaudio.buildlink3.mk" diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index fb11e705d95..dbb2d7998b8 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.28 2005/01/17 15:35:41 adam Exp $ +@comment $NetBSD: PLIST,v 1.29 2005/02/16 12:22:11 adam Exp $ bin/function_grep.pl bin/notepad bin/progman @@ -106,6 +106,7 @@ include/wine/windows/d3d9caps.h include/wine/windows/d3d9types.h include/wine/windows/d3dcaps.h include/wine/windows/d3dhal.h +include/wine/windows/d3drm.h include/wine/windows/d3dtypes.h include/wine/windows/d3dvec.inl include/wine/windows/d3dx8core.h @@ -181,6 +182,7 @@ include/wine/windows/lmapibuf.h include/wine/windows/lmbrowsr.h include/wine/windows/lmcons.h include/wine/windows/lmerr.h +include/wine/windows/lmjoin.h include/wine/windows/lmserver.h include/wine/windows/lmshare.h include/wine/windows/lmstats.h @@ -215,11 +217,11 @@ include/wine/windows/mshtmdid.h include/wine/windows/mshtml.h include/wine/windows/mshtml.idl include/wine/windows/msi.h +include/wine/windows/msidefs.h include/wine/windows/msiquery.h include/wine/windows/mssip.h include/wine/windows/mswsock.h include/wine/windows/nb30.h -include/wine/windows/netspi.h include/wine/windows/npapi.h include/wine/windows/nspapi.h include/wine/windows/ntddcdrm.h @@ -268,6 +270,9 @@ include/wine/windows/rpcproxy.h include/wine/windows/schemadef.h include/wine/windows/sddl.h include/wine/windows/secext.h +include/wine/windows/sensapi.h +include/wine/windows/sensevts.h +include/wine/windows/sensevts.idl include/wine/windows/servprov.h include/wine/windows/servprov.idl include/wine/windows/setupapi.h @@ -336,6 +341,7 @@ include/wine/windows/ws2tcpip.h include/wine/windows/wshisotp.h include/wine/windows/wsipx.h include/wine/windows/wsnwlink.h +include/wine/windows/wtsapi32.h include/wine/windows/wtypes.h include/wine/windows/wtypes.idl include/wine/windows/xcmc.h @@ -361,12 +367,13 @@ lib/wine/clock.exe.so lib/wine/comcat.dll.so lib/wine/comctl32.dll.so lib/wine/comdlg32.dll.so -lib/wine/commdlg.dll.so lib/wine/comm.drv.so +lib/wine/commdlg.dll.so lib/wine/compobj.dll.so lib/wine/control.exe.so lib/wine/crtdll.dll.so lib/wine/crypt32.dll.so +lib/wine/cryptdll.dll.so lib/wine/ctl3d.dll.so lib/wine/ctl3d32.dll.so lib/wine/ctl3dv2.dll.so @@ -436,6 +443,7 @@ lib/wine/libcomctl32.def lib/wine/libcomdlg32.def lib/wine/libcrtdll.def lib/wine/libcrypt32.def +lib/wine/libcryptdll.def lib/wine/libctl3d32.def lib/wine/libd3d8.def lib/wine/libd3d9.def @@ -518,6 +526,7 @@ lib/wine/librpcrt4.def lib/wine/librsabase.def lib/wine/librsaenh.def lib/wine/libsecur32.def +lib/wine/libsensapi.def lib/wine/libserialui.def lib/wine/libsetupapi.def lib/wine/libshdocvw.def @@ -552,6 +561,7 @@ lib/wine/libwnaspi32.def lib/wine/libwow32.def lib/wine/libws2_32.def lib/wine/libwsock32.def +lib/wine/libwtsapi32.def lib/wine/libx11drv.def lib/wine/lz32.dll.so lib/wine/lzexpand.dll.so @@ -626,6 +636,7 @@ lib/wine/rsabase.dll.so lib/wine/rsaenh.dll.so lib/wine/rundll32.exe.so lib/wine/secur32.dll.so +lib/wine/sensapi.dll.so lib/wine/serialui.dll.so lib/wine/setupapi.dll.so lib/wine/setupx.dll.so @@ -637,6 +648,7 @@ lib/wine/shlwapi.dll.so lib/wine/snmpapi.dll.so lib/wine/sound.dll.so lib/wine/start.exe.so +lib/wine/stdole32.tlb.so lib/wine/sti.dll.so lib/wine/storage.dll.so lib/wine/stress.dll.so @@ -710,12 +722,15 @@ lib/wine/wow32.dll.so lib/wine/wprocs.dll.so lib/wine/ws2_32.dll.so lib/wine/wsock32.dll.so +lib/wine/wtsapi32.dll.so lib/wine/x11drv.dll.so man/man1/widl.1 man/man1/wine.1 man/man1/winebuild.1 man/man1/winedbg.1 man/man1/winedump.1 +man/man1/wineg++.1 +man/man1/winegcc.1 man/man1/winemaker.1 man/man1/wmc.1 man/man1/wrc.1 diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 681ca8ccd7a..5504b833b6f 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.27 2005/01/14 13:00:05 adam Exp $ +$NetBSD: distinfo,v 1.28 2005/02/16 12:22:11 adam Exp $ -SHA1 (Wine-20050111.tar.gz) = 797aedd455bee27095543f5f9895f2e09732ce8f -Size (Wine-20050111.tar.gz) = 11477802 bytes +SHA1 (Wine-20050211.tar.gz) = 6c1b7397d653e5a053e03923db55dfd8209a2566 +Size (Wine-20050211.tar.gz) = 11626818 bytes SHA1 (patch-aa) = 951e96ae5e09c7579249bbb1266fc70a2b13f8c2 SHA1 (patch-ab) = 7feb8eaad0005ea3b501967ca070a4b397d707c2 -SHA1 (patch-ac) = 95749cc7b7c898d5ec3eb1f323ffa73c27090dbd +SHA1 (patch-ac) = 8c909b1683185e0ac12f2be6024e26da40addf1c SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a SHA1 (patch-ae) = a18b1c01d61d26fbe1a82dca82ea0d76df0c8bcd +SHA1 (patch-af) = c2bb6dd2b208b5d176f6303d62b2f00aec8897a5 diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac index 36907a5d173..652af11ee14 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.16 2005/01/14 13:00:05 adam Exp $ +$NetBSD: patch-ac,v 1.17 2005/02/16 12:22:11 adam Exp $ ---- configure.orig 2005-01-11 19:08:58.000000000 +0000 +--- configure.orig 2005-02-11 13:34:18.000000000 +0000 +++ configure -@@ -17810,7 +17810,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -17811,7 +17811,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.16 2005/01/14 13:00:05 adam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -19480,7 +19480,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -19481,7 +19481,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af new file mode 100644 index 00000000000..a6a0b99e45a --- /dev/null +++ b/emulators/wine/patches/patch-af @@ -0,0 +1,55 @@ +$NetBSD: patch-af,v 1.10 2005/02/16 12:22:11 adam Exp $ + +--- dlls/ntdll/signal_i386.c.orig 2005-02-16 10:30:28.000000000 +0000 ++++ dlls/ntdll/signal_i386.c +@@ -206,7 +206,7 @@ typedef struct trapframe SIGCONTEXT; + + #endif /* bsdi */ + +-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) + + typedef struct sigcontext SIGCONTEXT; + +@@ -306,7 +306,40 @@ typedef struct ucontext SIGCONTEXT; + + #endif /* __APPLE__ */ + +-#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) ||\ ++#if defined(__NetBSD__) ++# include <sys/ucontext.h> ++# include <sys/types.h> ++# include <signal.h> ++ ++typedef struct __ucontext SIGCONTEXT; ++ ++#define HANDLER_DEF(name) void name( int __signal, int code, SIGCONTEXT *__context ) ++#define HANDLER_CONTEXT __context ++ ++#define EAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EAX]) ++#define EBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBX]) ++#define ECX_sig(context) ((context)->uc_mcontext.__gregs[_REG_ECX]) ++#define EDX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EDX]) ++#define ESI_sig(context) ((context)->uc_mcontext.__gregs[_REG_ESI]) ++#define EDI_sig(context) ((context)->uc_mcontext.__gregs[_REG_EDI]) ++#define EBP_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBP]) ++ ++#define CS_sig(context) ((context)->uc_mcontext.__gregs[_REG_CS]) ++#define DS_sig(context) ((context)->uc_mcontext.__gregs[_REG_DS]) ++#define ES_sig(context) ((context)->uc_mcontext.__gregs[_REG_ES]) ++#define FS_sig(context) ((context)->uc_mcontext.__gregs[_REG_FS]) ++#define GS_sig(context) ((context)->uc_mcontext.__gregs[_REG_GS]) ++#define SS_sig(context) ((context)->uc_mcontext.__gregs[_REG_SS]) ++ ++#define EFL_sig(context) ((context)->uc_mcontext.__gregs[_REG_EFL]) ++ ++#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP])) ++#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP])) ++ ++#endif /* NetBSD */ ++ ++ ++#if defined(linux) || defined(__FreeBSD__) ||\ + defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__) + + #define EAX_sig(context) ((context)->sc_eax) |