diff options
| author | adam <adam@pkgsrc.org> | 2011-05-04 20:31:39 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2011-05-04 20:31:39 +0000 |
| commit | 330b09f272bfc3d0be784fe801ec3aa8c3784b7b (patch) | |
| tree | 2062780b5f7010f68af052c3df1181d6450883c9 /emulators/wine | |
| parent | 644fe43e869e29170e0a7f739f5207bd37fc6201 (diff) | |
| download | pkgsrc-330b09f272bfc3d0be784fe801ec3aa8c3784b7b.tar.gz | |
Changes 1.2.3:
* Translation updates
* Various bug fixes
Diffstat (limited to 'emulators/wine')
27 files changed, 911 insertions, 374 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index c0efbb32777..bb5e9d4a370 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.160 2011/04/22 13:43:30 obache Exp $ +# $NetBSD: Makefile,v 1.161 2011/05/04 20:31:39 adam Exp $ -DISTNAME= wine-1.0.1 -PKGREVISION= 8 +DISTNAME= wine-1.2.3 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} @@ -10,14 +9,12 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.winehq.com/ COMMENT= Free implementation of Windows on Unix +LICENSE= gnu-lgpl-v2.1 BUILD_DEPENDS+= fontforge-[0-9]*:../../fonts/fontforge -ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386 -ONLY_FOR_PLATFORM+= FreeBSD-*-i386 Linux-*-i386 SunOS-*-i386 Darwin-*-i386 -ONLY_FOR_PLATFORM+= *-*-x86_64 - -NOT_FOR_PLATFORM+= NetBSD-*-x86_64 +ONLY_FOR_PLATFORM+= *-*-i386 +#ONLY_FOR_PLATFORM+= *-*-x86_64 PKG_DESTDIR_SUPPORT= user-destdir @@ -33,22 +30,26 @@ REPLACE_PERL+= tools/winemaker tools/winedump/function_grep.pl # The Wine configure script has problems locating the libraries in the # buildlink directory, so prepend all of the LDFLAGS necessary to link # against the libraries. -# CONFIGURE_ENV+= X_LIBS=${LDFLAGS:M*:Q} CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" CONFIGURE_ENV+= LDD=${LDD:Q} LIBS+= ${LDFLAGS} -# If we're doing a 32-bit build, make sure that the appropriate -# multilib options are passed through as these values are used -# with winegcc (which wrapper doesn't handle). +# If we're doing a 32-bit build, make sure that the appropriate multilib +# options are passed through as these values are used with winegcc +# (which wrapper doesn't handle). .include "../../mk/bsd.prefs.mk" -.if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Darwin" -CONFIGURE_ENV+= ac_cv_prog_CC=${CC}\ -m32 -CONFIGURE_ENV+= ac_cv_prog_CXX=${CXX}\ -m32 -CONFIGURE_ENV+= ac_cv_prog_AS=${AS}\ --32 -CONFIGURE_ENV+= ac_cv_prog_LD=${LD}\ -m\ elf_i386 +.if !empty(MACHINE_ARCH:Mi386) +CONFIGURE_ENV+= ac_cv_prog_CC=${CC:Q}\ -m32 +CONFIGURE_ENV+= ac_cv_prog_CXX=${CXX:Q}\ -m32 +CONFIGURE_ENV+= ac_cv_prog_AS=${AS:Q}\ --32 +CONFIGURE_ENV+= ac_cv_prog_LD=${LD:Q}\ -m\ elf_i386 .endif +# Needs GCC >= 4.4 +#.if !empty(MACHINE_ARCH:Mx86_64) +#CONFIGURE_ARGS+= --disable-win16 +#CONFIGURE_ARGS+= --enable-win64 +#.endif .include "options.mk" @@ -58,14 +59,16 @@ post-install: ${DESTDIR}${PREFIX}/bin .endfor -.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" -.include "../../mk/giflib.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../security/gnutls/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" +.include "../../mk/giflib.buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/oss.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/wine/PLIST.FreeBSD b/emulators/wine/PLIST.FreeBSD deleted file mode 100644 index f2bbdb7d395..00000000000 --- a/emulators/wine/PLIST.FreeBSD +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.FreeBSD,v 1.1 2008/06/22 23:38:18 dholland Exp $ -bin/wine-pthread diff --git a/emulators/wine/PLIST.Linux b/emulators/wine/PLIST.Linux index dde748ab1ed..b16cb1c7ee3 100644 --- a/emulators/wine/PLIST.Linux +++ b/emulators/wine/PLIST.Linux @@ -1,4 +1,2 @@ -@comment $NetBSD: PLIST.Linux,v 1.2 2008/10/18 11:55:27 adam Exp $ -bin/wine-kthread +@comment $NetBSD: PLIST.Linux,v 1.3 2011/05/04 20:31:39 adam Exp $ bin/wine-preloader -bin/wine-pthread diff --git a/emulators/wine/PLIST.NetBSD b/emulators/wine/PLIST.NetBSD deleted file mode 100644 index fad2a0c017f..00000000000 --- a/emulators/wine/PLIST.NetBSD +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.NetBSD,v 1.1 2008/06/26 19:46:56 jmcneill Exp $ -bin/wine-pthread diff --git a/emulators/wine/PLIST.common b/emulators/wine/PLIST.common index 0cd97cb434c..4276193bd77 100644 --- a/emulators/wine/PLIST.common +++ b/emulators/wine/PLIST.common @@ -1,16 +1,13 @@ -@comment $NetBSD: PLIST.common,v 1.3 2009/04/20 18:55:42 adam Exp $ +@comment $NetBSD: PLIST.common,v 1.4 2011/05/04 20:31:39 adam Exp $ bin/fnt2bdf bin/function_grep.pl bin/msiexec bin/notepad -bin/progman bin/regedit bin/regsvr32 -bin/uninstaller bin/widl bin/wine bin/wineboot -bin/winebrowser bin/winebuild bin/winecfg bin/wineconsole @@ -23,9 +20,7 @@ bin/winegcc bin/winemaker bin/winemine bin/winepath -bin/wineprefixcreate bin/wineserver -bin/wineshelllink bin/wmc bin/wrc include/wine/debug.h @@ -35,6 +30,7 @@ include/wine/itss.idl include/wine/library.h include/wine/msvcrt/conio.h include/wine/msvcrt/crtdbg.h +include/wine/msvcrt/crtdefs.h include/wine/msvcrt/ctype.h include/wine/msvcrt/direct.h include/wine/msvcrt/dirent.h @@ -50,6 +46,7 @@ include/wine/msvcrt/malloc.h include/wine/msvcrt/math.h include/wine/msvcrt/mbctype.h include/wine/msvcrt/mbstring.h +include/wine/msvcrt/memory.h include/wine/msvcrt/process.h include/wine/msvcrt/search.h include/wine/msvcrt/setjmp.h @@ -73,7 +70,9 @@ include/wine/svcctl.h include/wine/svcctl.idl include/wine/unicode.h include/wine/windows/accctrl.h +include/wine/windows/access.idl include/wine/windows/aclapi.h +include/wine/windows/aclui.h include/wine/windows/activaut.h include/wine/windows/activaut.idl include/wine/windows/activdbg.h @@ -82,20 +81,33 @@ include/wine/windows/activscp.h include/wine/windows/activscp.idl include/wine/windows/adshlp.h include/wine/windows/advpub.h +include/wine/windows/af_irda.h +include/wine/windows/amaudio.h include/wine/windows/amstream.h include/wine/windows/amstream.idl include/wine/windows/amvideo.h include/wine/windows/amvideo.idl include/wine/windows/appmgmt.h +include/wine/windows/asptlb.h +include/wine/windows/asptlb.idl +include/wine/windows/asynot.idl +include/wine/windows/asysta.idl include/wine/windows/audevcod.h +include/wine/windows/audioclient.h +include/wine/windows/audioclient.idl +include/wine/windows/audiopolicy.h +include/wine/windows/audiopolicy.idl +include/wine/windows/audiosessiontypes.h include/wine/windows/austream.h include/wine/windows/austream.idl include/wine/windows/aviriff.h +include/wine/windows/avrt.h include/wine/windows/axcore.idl include/wine/windows/axextend.idl include/wine/windows/basetsd.h include/wine/windows/basetyps.h include/wine/windows/bcrypt.h +include/wine/windows/binres.idl include/wine/windows/bits.h include/wine/windows/bits.idl include/wine/windows/bits1_5.h @@ -106,21 +118,37 @@ include/wine/windows/cfgmgr32.h include/wine/windows/cguid.h include/wine/windows/cierror.h include/wine/windows/clusapi.h +include/wine/windows/cmdbas.idl +include/wine/windows/cmdtxt.idl include/wine/windows/comcat.h include/wine/windows/comcat.idl include/wine/windows/commctrl.h +include/wine/windows/commctrl.rh include/wine/windows/commdlg.h +include/wine/windows/commoncontrols.h +include/wine/windows/commoncontrols.idl include/wine/windows/compobj.h include/wine/windows/control.h include/wine/windows/control.idl include/wine/windows/cor.h include/wine/windows/corerror.h +include/wine/windows/corhdr.h include/wine/windows/cpl.h +include/wine/windows/crtrow.idl +include/wine/windows/cryptdlg.h +include/wine/windows/cryptuiapi.h +include/wine/windows/ctfutb.h +include/wine/windows/ctfutb.idl +include/wine/windows/ctxtcall.h +include/wine/windows/ctxtcall.idl include/wine/windows/custcntl.h include/wine/windows/cvconst.h include/wine/windows/d3d.h include/wine/windows/d3d10.h include/wine/windows/d3d10.idl +include/wine/windows/d3d10effect.h +include/wine/windows/d3d10misc.h +include/wine/windows/d3d10shader.h include/wine/windows/d3d8.h include/wine/windows/d3d8caps.h include/wine/windows/d3d8types.h @@ -131,18 +159,21 @@ include/wine/windows/d3dcaps.h include/wine/windows/d3dhal.h include/wine/windows/d3drm.h include/wine/windows/d3drmdef.h +include/wine/windows/d3drmobj.h include/wine/windows/d3dtypes.h include/wine/windows/d3dvec.inl -include/wine/windows/d3dx8.h -include/wine/windows/d3dx8core.h -include/wine/windows/d3dx8math.h -include/wine/windows/d3dx8math.inl -include/wine/windows/d3dx8mesh.h include/wine/windows/d3dx9.h include/wine/windows/d3dx9core.h +include/wine/windows/d3dx9effect.h include/wine/windows/d3dx9math.h include/wine/windows/d3dx9math.inl +include/wine/windows/d3dx9mesh.h +include/wine/windows/d3dx9shader.h +include/wine/windows/d3dx9shape.h include/wine/windows/d3dx9tex.h +include/wine/windows/dbccmd.idl +include/wine/windows/dbcses.idl +include/wine/windows/dbdsad.idl include/wine/windows/dbghelp.h include/wine/windows/dbinit.idl include/wine/windows/dbprop.idl @@ -160,15 +191,24 @@ include/wine/windows/ddk/ntddcdvd.h include/wine/windows/ddk/ntddk.h include/wine/windows/ddk/ntddser.h include/wine/windows/ddk/ntddtape.h +include/wine/windows/ddk/usb.h +include/wine/windows/ddk/usb100.h +include/wine/windows/ddk/usb200.h +include/wine/windows/ddk/usbdlib.h include/wine/windows/ddk/wdm.h include/wine/windows/ddk/winddiui.h include/wine/windows/ddk/winsplp.h include/wine/windows/ddraw.h +include/wine/windows/ddrawgdi.h include/wine/windows/ddrawi.h include/wine/windows/ddstream.h include/wine/windows/ddstream.idl include/wine/windows/devenum.idl include/wine/windows/devguid.h +include/wine/windows/devicetopology.h +include/wine/windows/devicetopology.idl +include/wine/windows/devpkey.h +include/wine/windows/devpropdef.h include/wine/windows/digitalv.h include/wine/windows/dimm.h include/wine/windows/dimm.idl @@ -217,6 +257,8 @@ include/wine/windows/dxgi.idl include/wine/windows/dxgitype.h include/wine/windows/dxgitype.idl include/wine/windows/dyngraph.idl +include/wine/windows/endpointvolume.h +include/wine/windows/endpointvolume.idl include/wine/windows/errorrep.h include/wine/windows/errors.h include/wine/windows/evcode.h @@ -229,6 +271,8 @@ include/wine/windows/fci.h include/wine/windows/fdi.h include/wine/windows/fusion.h include/wine/windows/fusion.idl +include/wine/windows/gameux.h +include/wine/windows/gameux.idl include/wine/windows/gdiplus.h include/wine/windows/gdipluscolor.h include/wine/windows/gdipluscolormatrix.h @@ -248,6 +292,7 @@ include/wine/windows/hlink.idl include/wine/windows/htiframe.h include/wine/windows/htiframe.idl include/wine/windows/htmlhelp.h +include/wine/windows/http.h include/wine/windows/i_cryptasn1tls.h include/wine/windows/iads.h include/wine/windows/iads.idl @@ -262,6 +307,7 @@ include/wine/windows/imnact.h include/wine/windows/imnact.idl include/wine/windows/imnxport.h include/wine/windows/imnxport.idl +include/wine/windows/in6addr.h include/wine/windows/indexsrv.h include/wine/windows/indexsrv.idl include/wine/windows/initguid.h @@ -289,6 +335,7 @@ include/wine/windows/lmstats.h include/wine/windows/lmuse.h include/wine/windows/lmuseflg.h include/wine/windows/lmwksta.h +include/wine/windows/loadperf.h include/wine/windows/lzexpand.h include/wine/windows/mapi.h include/wine/windows/mapicode.h @@ -313,6 +360,8 @@ include/wine/windows/minmax.h include/wine/windows/mlang.h include/wine/windows/mlang.idl include/wine/windows/mmddk.h +include/wine/windows/mmdeviceapi.h +include/wine/windows/mmdeviceapi.idl include/wine/windows/mmreg.h include/wine/windows/mmstream.h include/wine/windows/mmstream.idl @@ -324,6 +373,11 @@ include/wine/windows/msacmdrv.h include/wine/windows/mscat.h include/wine/windows/mscoree.h include/wine/windows/mscoree.idl +include/wine/windows/msctf.h +include/wine/windows/msctf.idl +include/wine/windows/msdadc.h +include/wine/windows/msdadc.idl +include/wine/windows/msdaguid.h include/wine/windows/mshtmcid.h include/wine/windows/mshtmdid.h include/wine/windows/mshtmhst.h @@ -336,6 +390,9 @@ include/wine/windows/msinkaut.h include/wine/windows/msinkaut.idl include/wine/windows/msiquery.h include/wine/windows/mssip.h +include/wine/windows/mstask.h +include/wine/windows/mstask.idl +include/wine/windows/mstcpip.h include/wine/windows/mswsock.h include/wine/windows/msxml.h include/wine/windows/msxml.idl @@ -345,11 +402,14 @@ include/wine/windows/msxml2did.h include/wine/windows/msxmldid.h include/wine/windows/nb30.h include/wine/windows/ndrtypes.h +include/wine/windows/netcon.h +include/wine/windows/netcon.idl include/wine/windows/netfw.h include/wine/windows/netfw.idl include/wine/windows/npapi.h include/wine/windows/nspapi.h include/wine/windows/ntddcdrm.h +include/wine/windows/ntddndis.h include/wine/windows/ntddscsi.h include/wine/windows/ntddstor.h include/wine/windows/ntdsapi.h @@ -378,19 +438,27 @@ include/wine/windows/oleauto.h include/wine/windows/olectl.h include/wine/windows/oledb.h include/wine/windows/oledb.idl +include/wine/windows/oledberr.h include/wine/windows/oledlg.h include/wine/windows/oleidl.h include/wine/windows/oleidl.idl +include/wine/windows/opnrst.idl include/wine/windows/optary.h include/wine/windows/optary.idl include/wine/windows/pdh.h include/wine/windows/pdhmsg.h +include/wine/windows/perhist.h +include/wine/windows/perhist.idl include/wine/windows/pktdef.h include/wine/windows/poppack.h include/wine/windows/powrprof.h include/wine/windows/profinfo.h include/wine/windows/propidl.h include/wine/windows/propidl.idl +include/wine/windows/propkey.h +include/wine/windows/propkeydef.h +include/wine/windows/propsys.h +include/wine/windows/propsys.idl include/wine/windows/propvarutil.h include/wine/windows/prsht.h include/wine/windows/psapi.h @@ -403,12 +471,16 @@ include/wine/windows/pstore.idl include/wine/windows/qedit.h include/wine/windows/qedit.idl include/wine/windows/ras.h +include/wine/windows/rasdlg.h +include/wine/windows/raserror.h include/wine/windows/reason.h include/wine/windows/regstr.h include/wine/windows/richedit.h include/wine/windows/richole.h include/wine/windows/richole.idl include/wine/windows/rmxfguid.h +include/wine/windows/row.idl +include/wine/windows/rowchg.idl include/wine/windows/rpc.h include/wine/windows/rpcasync.h include/wine/windows/rpcdce.h @@ -416,6 +488,10 @@ include/wine/windows/rpcdcep.h include/wine/windows/rpcndr.h include/wine/windows/rpcnterr.h include/wine/windows/rpcproxy.h +include/wine/windows/rstbas.idl +include/wine/windows/rstinf.idl +include/wine/windows/rstloc.idl +include/wine/windows/rtutils.h include/wine/windows/scarderr.h include/wine/windows/schannel.h include/wine/windows/schemadef.h @@ -428,8 +504,12 @@ include/wine/windows/sensevts.h include/wine/windows/sensevts.idl include/wine/windows/servprov.h include/wine/windows/servprov.idl +include/wine/windows/sesprp.idl include/wine/windows/setupapi.h include/wine/windows/sfc.h +include/wine/windows/shdeprecated.h +include/wine/windows/shdeprecated.idl +include/wine/windows/shdispid.h include/wine/windows/shellapi.h include/wine/windows/shldisp.h include/wine/windows/shldisp.idl @@ -448,20 +528,27 @@ include/wine/windows/softpub.h include/wine/windows/sql.h include/wine/windows/sqlext.h include/wine/windows/sqltypes.h +include/wine/windows/srrestoreptapi.h include/wine/windows/sspi.h include/wine/windows/stdole2.idl -include/wine/windows/stdole2.tlb +include/wine/windows/sti.h include/wine/windows/storage.h include/wine/windows/strmif.h include/wine/windows/strmif.idl +include/wine/windows/structuredquerycondition.h +include/wine/windows/structuredquerycondition.idl include/wine/windows/svrapi.h +include/wine/windows/t2embapi.h include/wine/windows/tapi.h include/wine/windows/tchar.h include/wine/windows/textserv.h +include/wine/windows/textstor.h +include/wine/windows/textstor.idl include/wine/windows/tlhelp32.h include/wine/windows/tmschema.h include/wine/windows/tom.h include/wine/windows/tom.idl +include/wine/windows/traffic.h include/wine/windows/twain.h include/wine/windows/unknwn.h include/wine/windows/unknwn.idl @@ -477,8 +564,20 @@ include/wine/windows/vdmdbg.h include/wine/windows/ver.h include/wine/windows/vfw.h include/wine/windows/vfwmsgs.h +include/wine/windows/vmr9.h +include/wine/windows/vmr9.idl +include/wine/windows/vmrender.idl +include/wine/windows/wbemcli.h +include/wine/windows/wbemcli.idl include/wine/windows/wfext.h +include/wine/windows/wia.h +include/wine/windows/wia_lh.h +include/wine/windows/wia_lh.idl +include/wine/windows/wia_xp.h +include/wine/windows/wia_xp.idl include/wine/windows/winbase.h +include/wine/windows/wincodec.h +include/wine/windows/wincodec.idl include/wine/windows/wincon.h include/wine/windows/wincred.h include/wine/windows/wincrypt.h @@ -500,6 +599,7 @@ include/wine/windows/winnt.h include/wine/windows/winperf.h include/wine/windows/winreg.h include/wine/windows/winresrc.h +include/wine/windows/winsafer.h include/wine/windows/winscard.h include/wine/windows/winsmcrd.h include/wine/windows/winsock.h @@ -511,10 +611,13 @@ include/wine/windows/wintabx.h include/wine/windows/winternl.h include/wine/windows/wintrust.h include/wine/windows/winuser.h +include/wine/windows/winuser.rh include/wine/windows/winver.h include/wine/windows/wmistr.h include/wine/windows/wnaspi32.h include/wine/windows/wownt32.h +include/wine/windows/ws2def.h +include/wine/windows/ws2ipdef.h include/wine/windows/ws2spi.h include/wine/windows/ws2tcpip.h include/wine/windows/wshisotp.h @@ -523,29 +626,41 @@ include/wine/windows/wsnwlink.h include/wine/windows/wtsapi32.h include/wine/windows/wtypes.h include/wine/windows/wtypes.idl +include/wine/windows/wuapi.h +include/wine/windows/wuapi.idl include/wine/windows/xcmc.h +include/wine/windows/xinput.h include/wine/windows/xmldom.h include/wine/windows/xmldom.idl include/wine/windows/xmldomdid.h include/wine/windows/xmldso.h include/wine/windows/xmldso.idl include/wine/windows/xmldsodid.h +include/wine/windows/xmllite.h +include/wine/windows/xmllite.idl include/wine/windows/zmouse.h lib/libwine.so lib/libwine.so.1 lib/libwine.so.1.0 lib/wine/acledit.dll.so +lib/wine/aclui.dll.so lib/wine/activeds.dll.so lib/wine/actxprxy.dll.so lib/wine/advapi32.dll.so lib/wine/advpack.dll.so lib/wine/amstream.dll.so +lib/wine/appwiz.cpl.so lib/wine/atl.dll.so +lib/wine/attrib.exe.so +lib/wine/authz.dll.so lib/wine/avicap32.dll.so lib/wine/avifil32.dll.so -lib/wine/avifile.dll16 +lib/wine/avifile.dll16.so +lib/wine/avrt.dll.so +lib/wine/bcrypt.dll.so lib/wine/browseui.dll.so lib/wine/cabinet.dll.so +lib/wine/cacls.exe.so lib/wine/capi2032.dll.so lib/wine/cards.dll.so lib/wine/cfgmgr32.dll.so @@ -555,9 +670,9 @@ lib/wine/cmd.exe.so lib/wine/comcat.dll.so lib/wine/comctl32.dll.so lib/wine/comdlg32.dll.so -lib/wine/comm.drv16 -lib/wine/commdlg.dll16 -lib/wine/compobj.dll16 +lib/wine/comm.drv16.so +lib/wine/commdlg.dll16.so +lib/wine/compobj.dll16.so lib/wine/compstui.dll.so lib/wine/control.exe.so lib/wine/credui.dll.so @@ -568,15 +683,15 @@ lib/wine/cryptdll.dll.so lib/wine/cryptnet.dll.so lib/wine/cryptui.dll.so lib/wine/ctapi32.dll.so -lib/wine/ctl3d.dll16 +lib/wine/ctl3d.dll16.so lib/wine/ctl3d32.dll.so -lib/wine/ctl3dv2.dll16 +lib/wine/ctl3dv2.dll16.so lib/wine/d3d10.dll.so +lib/wine/d3d10core.dll.so lib/wine/d3d8.dll.so lib/wine/d3d9.dll.so lib/wine/d3dim.dll.so lib/wine/d3drm.dll.so -lib/wine/d3dx8.dll.so lib/wine/d3dx9_24.dll.so lib/wine/d3dx9_25.dll.so lib/wine/d3dx9_26.dll.so @@ -591,17 +706,23 @@ lib/wine/d3dx9_34.dll.so lib/wine/d3dx9_35.dll.so lib/wine/d3dx9_36.dll.so lib/wine/d3dx9_37.dll.so +lib/wine/d3dx9_38.dll.so +lib/wine/d3dx9_39.dll.so +lib/wine/d3dx9_40.dll.so +lib/wine/d3dx9_41.dll.so +lib/wine/d3dx9_42.dll.so lib/wine/d3dxof.dll.so lib/wine/dbghelp.dll.so lib/wine/dciman32.dll.so -lib/wine/ddeml.dll16 +lib/wine/ddeml.dll16.so lib/wine/ddraw.dll.so lib/wine/ddrawex.dll.so lib/wine/devenum.dll.so lib/wine/dinput.dll.so lib/wine/dinput8.dll.so -lib/wine/dispdib.dll16 -lib/wine/display.drv16 +lib/wine/dispdib.dll16.so +lib/wine/dispex.dll.so +lib/wine/display.drv16.so lib/wine/dmband.dll.so lib/wine/dmcompos.dll.so lib/wine/dmime.dll.so @@ -618,17 +739,437 @@ lib/wine/dpnaddr.dll.so lib/wine/dpnet.dll.so lib/wine/dpnhpast.dll.so lib/wine/dpnlobby.dll.so +lib/wine/dpwsockx.dll.so +lib/wine/drmclien.dll.so lib/wine/dsound.dll.so lib/wine/dssenh.dll.so lib/wine/dswave.dll.so lib/wine/dwmapi.dll.so +lib/wine/dxdiag.exe.so lib/wine/dxdiagn.dll.so +lib/wine/dxgi.dll.so lib/wine/eject.exe.so lib/wine/expand.exe.so lib/wine/explorer.exe.so +lib/wine/extrac32.exe.so +lib/wine/fakedlls/acledit.dll +lib/wine/fakedlls/aclui.dll +lib/wine/fakedlls/activeds.dll +lib/wine/fakedlls/actxprxy.dll +lib/wine/fakedlls/advapi32.dll +lib/wine/fakedlls/advpack.dll +lib/wine/fakedlls/amstream.dll +lib/wine/fakedlls/appwiz.cpl +lib/wine/fakedlls/atl.dll +lib/wine/fakedlls/attrib.exe +lib/wine/fakedlls/authz.dll +lib/wine/fakedlls/avicap32.dll +lib/wine/fakedlls/avifil32.dll +lib/wine/fakedlls/avifile.dll16 +lib/wine/fakedlls/avrt.dll +lib/wine/fakedlls/bcrypt.dll +lib/wine/fakedlls/browseui.dll +lib/wine/fakedlls/cabinet.dll +lib/wine/fakedlls/cacls.exe +lib/wine/fakedlls/capi2032.dll +lib/wine/fakedlls/cards.dll +lib/wine/fakedlls/cfgmgr32.dll +lib/wine/fakedlls/clock.exe +lib/wine/fakedlls/clusapi.dll +lib/wine/fakedlls/cmd.exe +lib/wine/fakedlls/comcat.dll +lib/wine/fakedlls/comctl32.dll +lib/wine/fakedlls/comdlg32.dll +lib/wine/fakedlls/comm.drv16 +lib/wine/fakedlls/commdlg.dll16 +lib/wine/fakedlls/compobj.dll16 +lib/wine/fakedlls/compstui.dll +lib/wine/fakedlls/control.exe +lib/wine/fakedlls/credui.dll +lib/wine/fakedlls/crtdll.dll +lib/wine/fakedlls/crypt32.dll +lib/wine/fakedlls/cryptdlg.dll +lib/wine/fakedlls/cryptdll.dll +lib/wine/fakedlls/cryptnet.dll +lib/wine/fakedlls/cryptui.dll +lib/wine/fakedlls/ctapi32.dll +lib/wine/fakedlls/ctl3d.dll16 +lib/wine/fakedlls/ctl3d32.dll +lib/wine/fakedlls/ctl3dv2.dll16 +lib/wine/fakedlls/d3d10.dll +lib/wine/fakedlls/d3d10core.dll +lib/wine/fakedlls/d3d8.dll +lib/wine/fakedlls/d3d9.dll +lib/wine/fakedlls/d3dim.dll +lib/wine/fakedlls/d3drm.dll +lib/wine/fakedlls/d3dx9_24.dll +lib/wine/fakedlls/d3dx9_25.dll +lib/wine/fakedlls/d3dx9_26.dll +lib/wine/fakedlls/d3dx9_27.dll +lib/wine/fakedlls/d3dx9_28.dll +lib/wine/fakedlls/d3dx9_29.dll +lib/wine/fakedlls/d3dx9_30.dll +lib/wine/fakedlls/d3dx9_31.dll +lib/wine/fakedlls/d3dx9_32.dll +lib/wine/fakedlls/d3dx9_33.dll +lib/wine/fakedlls/d3dx9_34.dll +lib/wine/fakedlls/d3dx9_35.dll +lib/wine/fakedlls/d3dx9_36.dll +lib/wine/fakedlls/d3dx9_37.dll +lib/wine/fakedlls/d3dx9_38.dll +lib/wine/fakedlls/d3dx9_39.dll +lib/wine/fakedlls/d3dx9_40.dll +lib/wine/fakedlls/d3dx9_41.dll +lib/wine/fakedlls/d3dx9_42.dll +lib/wine/fakedlls/d3dxof.dll +lib/wine/fakedlls/dbghelp.dll +lib/wine/fakedlls/dciman32.dll +lib/wine/fakedlls/ddeml.dll16 +lib/wine/fakedlls/ddraw.dll +lib/wine/fakedlls/ddrawex.dll +lib/wine/fakedlls/devenum.dll +lib/wine/fakedlls/dinput.dll +lib/wine/fakedlls/dinput8.dll +lib/wine/fakedlls/dispdib.dll16 +lib/wine/fakedlls/dispex.dll +lib/wine/fakedlls/display.drv16 +lib/wine/fakedlls/dmband.dll +lib/wine/fakedlls/dmcompos.dll +lib/wine/fakedlls/dmime.dll +lib/wine/fakedlls/dmloader.dll +lib/wine/fakedlls/dmscript.dll +lib/wine/fakedlls/dmstyle.dll +lib/wine/fakedlls/dmsynth.dll +lib/wine/fakedlls/dmusic.dll +lib/wine/fakedlls/dmusic32.dll +lib/wine/fakedlls/dnsapi.dll +lib/wine/fakedlls/dplay.dll +lib/wine/fakedlls/dplayx.dll +lib/wine/fakedlls/dpnaddr.dll +lib/wine/fakedlls/dpnet.dll +lib/wine/fakedlls/dpnhpast.dll +lib/wine/fakedlls/dpnlobby.dll +lib/wine/fakedlls/dpwsockx.dll +lib/wine/fakedlls/drmclien.dll +lib/wine/fakedlls/dsound.dll +lib/wine/fakedlls/dssenh.dll +lib/wine/fakedlls/dswave.dll +lib/wine/fakedlls/dwmapi.dll +lib/wine/fakedlls/dxdiag.exe +lib/wine/fakedlls/dxdiagn.dll +lib/wine/fakedlls/dxgi.dll +lib/wine/fakedlls/eject.exe +lib/wine/fakedlls/expand.exe +lib/wine/fakedlls/explorer.exe +lib/wine/fakedlls/extrac32.exe +lib/wine/fakedlls/faultrep.dll +lib/wine/fakedlls/fltlib.dll +lib/wine/fakedlls/fusion.dll +lib/wine/fakedlls/fwpuclnt.dll +lib/wine/fakedlls/gdi.exe16 +lib/wine/fakedlls/gdi32.dll +lib/wine/fakedlls/gdiplus.dll +lib/wine/fakedlls/glu32.dll +lib/wine/fakedlls/gphoto2.ds +lib/wine/fakedlls/gpkcsp.dll +lib/wine/fakedlls/hal.dll +lib/wine/fakedlls/hh.exe +lib/wine/fakedlls/hhctrl.ocx +lib/wine/fakedlls/hid.dll +lib/wine/fakedlls/hlink.dll +lib/wine/fakedlls/hnetcfg.dll +lib/wine/fakedlls/httpapi.dll +lib/wine/fakedlls/iccvid.dll +lib/wine/fakedlls/icinfo.exe +lib/wine/fakedlls/icmp.dll +lib/wine/fakedlls/iexplore.exe +lib/wine/fakedlls/ifsmgr.vxd +lib/wine/fakedlls/imaadp32.acm +lib/wine/fakedlls/imagehlp.dll +lib/wine/fakedlls/imm.dll16 +lib/wine/fakedlls/imm32.dll +lib/wine/fakedlls/inetcomm.dll +lib/wine/fakedlls/inetmib1.dll +lib/wine/fakedlls/infosoft.dll +lib/wine/fakedlls/initpki.dll +lib/wine/fakedlls/inkobj.dll +lib/wine/fakedlls/inseng.dll +lib/wine/fakedlls/iphlpapi.dll +lib/wine/fakedlls/itircl.dll +lib/wine/fakedlls/itss.dll +lib/wine/fakedlls/jscript.dll +lib/wine/fakedlls/kernel32.dll +lib/wine/fakedlls/keyboard.drv16 +lib/wine/fakedlls/krnl386.exe16 +lib/wine/fakedlls/loadperf.dll +lib/wine/fakedlls/localspl.dll +lib/wine/fakedlls/localui.dll +lib/wine/fakedlls/lodctr.exe +lib/wine/fakedlls/lz32.dll +lib/wine/fakedlls/lzexpand.dll16 +lib/wine/fakedlls/mapi32.dll +lib/wine/fakedlls/mapistub.dll +lib/wine/fakedlls/mciavi32.dll +lib/wine/fakedlls/mcicda.dll +lib/wine/fakedlls/mciqtz32.dll +lib/wine/fakedlls/mciseq.dll +lib/wine/fakedlls/mciwave.dll +lib/wine/fakedlls/midimap.dll +lib/wine/fakedlls/mlang.dll +lib/wine/fakedlls/mmdevapi.dll +lib/wine/fakedlls/mmdevldr.vxd +lib/wine/fakedlls/mmsystem.dll16 +lib/wine/fakedlls/monodebg.vxd +lib/wine/fakedlls/mountmgr.sys +lib/wine/fakedlls/mouse.drv16 +lib/wine/fakedlls/mpr.dll +lib/wine/fakedlls/mprapi.dll +lib/wine/fakedlls/msacm.dll16 +lib/wine/fakedlls/msacm32.dll +lib/wine/fakedlls/msacm32.drv +lib/wine/fakedlls/msadp32.acm +lib/wine/fakedlls/mscat32.dll +lib/wine/fakedlls/mscms.dll +lib/wine/fakedlls/mscoree.dll +lib/wine/fakedlls/msctf.dll +lib/wine/fakedlls/msdaps.dll +lib/wine/fakedlls/msdmo.dll +lib/wine/fakedlls/msftedit.dll +lib/wine/fakedlls/msg711.acm +lib/wine/fakedlls/msgsm32.acm +lib/wine/fakedlls/mshta.exe +lib/wine/fakedlls/mshtml.dll +lib/wine/fakedlls/mshtml.tlb +lib/wine/fakedlls/msi.dll +lib/wine/fakedlls/msiexec.exe +lib/wine/fakedlls/msimg32.dll +lib/wine/fakedlls/msimtf.dll +lib/wine/fakedlls/msisip.dll +lib/wine/fakedlls/msisys.ocx +lib/wine/fakedlls/msnet32.dll +lib/wine/fakedlls/msrle32.dll +lib/wine/fakedlls/mssign32.dll +lib/wine/fakedlls/mssip32.dll +lib/wine/fakedlls/mstask.dll +lib/wine/fakedlls/msvcirt.dll +lib/wine/fakedlls/msvcr100.dll +lib/wine/fakedlls/msvcr70.dll +lib/wine/fakedlls/msvcr71.dll +lib/wine/fakedlls/msvcr80.dll +lib/wine/fakedlls/msvcr90.dll +lib/wine/fakedlls/msvcrt.dll +lib/wine/fakedlls/msvcrt20.dll +lib/wine/fakedlls/msvcrt40.dll +lib/wine/fakedlls/msvcrtd.dll +lib/wine/fakedlls/msvfw32.dll +lib/wine/fakedlls/msvidc32.dll +lib/wine/fakedlls/msvideo.dll16 +lib/wine/fakedlls/mswsock.dll +lib/wine/fakedlls/msxml3.dll +lib/wine/fakedlls/msxml4.dll +lib/wine/fakedlls/nddeapi.dll +lib/wine/fakedlls/net.exe +lib/wine/fakedlls/netapi32.dll +lib/wine/fakedlls/newdev.dll +lib/wine/fakedlls/ngen.exe +lib/wine/fakedlls/notepad.exe +lib/wine/fakedlls/ntdll.dll +lib/wine/fakedlls/ntdsapi.dll +lib/wine/fakedlls/ntoskrnl.exe +lib/wine/fakedlls/ntprint.dll +lib/wine/fakedlls/objsel.dll +lib/wine/fakedlls/odbc32.dll +lib/wine/fakedlls/odbccp32.dll +lib/wine/fakedlls/ole2.dll16 +lib/wine/fakedlls/ole2conv.dll16 +lib/wine/fakedlls/ole2disp.dll16 +lib/wine/fakedlls/ole2nls.dll16 +lib/wine/fakedlls/ole2prox.dll16 +lib/wine/fakedlls/ole2thk.dll16 +lib/wine/fakedlls/ole32.dll +lib/wine/fakedlls/oleacc.dll +lib/wine/fakedlls/oleaut32.dll +lib/wine/fakedlls/olecli.dll16 +lib/wine/fakedlls/olecli32.dll +lib/wine/fakedlls/oledb32.dll +lib/wine/fakedlls/oledlg.dll +lib/wine/fakedlls/olepro32.dll +lib/wine/fakedlls/olesvr.dll16 +lib/wine/fakedlls/olesvr32.dll +lib/wine/fakedlls/olethk32.dll +lib/wine/fakedlls/oleview.exe +lib/wine/fakedlls/opengl32.dll +lib/wine/fakedlls/pdh.dll +lib/wine/fakedlls/pidgen.dll +lib/wine/fakedlls/ping.exe +lib/wine/fakedlls/powrprof.dll +lib/wine/fakedlls/printui.dll +lib/wine/fakedlls/progman.exe +lib/wine/fakedlls/propsys.dll +lib/wine/fakedlls/psapi.dll +lib/wine/fakedlls/pstorec.dll +lib/wine/fakedlls/qcap.dll +lib/wine/fakedlls/qedit.dll +lib/wine/fakedlls/qmgr.dll +lib/wine/fakedlls/qmgrprxy.dll +lib/wine/fakedlls/quartz.dll +lib/wine/fakedlls/query.dll +lib/wine/fakedlls/rasapi16.dll16 +lib/wine/fakedlls/rasapi32.dll +lib/wine/fakedlls/rasdlg.dll +lib/wine/fakedlls/reg.exe +lib/wine/fakedlls/regedit.exe +lib/wine/fakedlls/regsvr32.exe +lib/wine/fakedlls/resutils.dll +lib/wine/fakedlls/riched20.dll +lib/wine/fakedlls/riched32.dll +lib/wine/fakedlls/rpcrt4.dll +lib/wine/fakedlls/rpcss.exe +lib/wine/fakedlls/rsabase.dll +lib/wine/fakedlls/rsaenh.dll +lib/wine/fakedlls/rtutils.dll +lib/wine/fakedlls/rundll32.exe +lib/wine/fakedlls/samlib.dll +lib/wine/fakedlls/sane.ds +lib/wine/fakedlls/sc.exe +lib/wine/fakedlls/sccbase.dll +lib/wine/fakedlls/schannel.dll +lib/wine/fakedlls/secedit.exe +lib/wine/fakedlls/secur32.dll +lib/wine/fakedlls/security.dll +lib/wine/fakedlls/sensapi.dll +lib/wine/fakedlls/serialui.dll +lib/wine/fakedlls/services.exe +lib/wine/fakedlls/setupapi.dll +lib/wine/fakedlls/setupx.dll16 +lib/wine/fakedlls/sfc.dll +lib/wine/fakedlls/sfc_os.dll +lib/wine/fakedlls/shdoclc.dll +lib/wine/fakedlls/shdocvw.dll +lib/wine/fakedlls/shell.dll16 +lib/wine/fakedlls/shell32.dll +lib/wine/fakedlls/shfolder.dll +lib/wine/fakedlls/shlwapi.dll +lib/wine/fakedlls/slbcsp.dll +lib/wine/fakedlls/slc.dll +lib/wine/fakedlls/snmpapi.dll +lib/wine/fakedlls/softpub.dll +lib/wine/fakedlls/sound.drv16 +lib/wine/fakedlls/spoolss.dll +lib/wine/fakedlls/spoolsv.exe +lib/wine/fakedlls/start.exe +lib/wine/fakedlls/stdole2.tlb +lib/wine/fakedlls/stdole32.tlb +lib/wine/fakedlls/sti.dll +lib/wine/fakedlls/storage.dll16 +lib/wine/fakedlls/stress.dll16 +lib/wine/fakedlls/svchost.exe +lib/wine/fakedlls/svrapi.dll +lib/wine/fakedlls/sxs.dll +lib/wine/fakedlls/system.drv16 +lib/wine/fakedlls/t2embed.dll +lib/wine/fakedlls/tapi32.dll +lib/wine/fakedlls/taskmgr.exe +lib/wine/fakedlls/termsv.exe +lib/wine/fakedlls/toolhelp.dll16 +lib/wine/fakedlls/traffic.dll +lib/wine/fakedlls/twain.dll16 +lib/wine/fakedlls/twain_32.dll +lib/wine/fakedlls/typelib.dll16 +lib/wine/fakedlls/unicows.dll +lib/wine/fakedlls/uninstaller.exe +lib/wine/fakedlls/unlodctr.exe +lib/wine/fakedlls/updspapi.dll +lib/wine/fakedlls/url.dll +lib/wine/fakedlls/urlmon.dll +lib/wine/fakedlls/usbd.sys +lib/wine/fakedlls/user.exe16 +lib/wine/fakedlls/user32.dll +lib/wine/fakedlls/userenv.dll +lib/wine/fakedlls/usp10.dll +lib/wine/fakedlls/uxtheme.dll +lib/wine/fakedlls/vdhcp.vxd +lib/wine/fakedlls/vdmdbg.dll +lib/wine/fakedlls/ver.dll16 +lib/wine/fakedlls/version.dll +lib/wine/fakedlls/vmm.vxd +lib/wine/fakedlls/vnbt.vxd +lib/wine/fakedlls/vnetbios.vxd +lib/wine/fakedlls/vtdapi.vxd +lib/wine/fakedlls/vwin32.vxd +lib/wine/fakedlls/w32skrnl.dll +lib/wine/fakedlls/w32sys.dll16 +lib/wine/fakedlls/wbemprox.dll +lib/wine/fakedlls/wiaservc.dll +lib/wine/fakedlls/win32s16.dll16 +lib/wine/fakedlls/win87em.dll16 +lib/wine/fakedlls/winaspi.dll16 +lib/wine/fakedlls/windebug.dll16 +lib/wine/fakedlls/windowscodecs.dll +lib/wine/fakedlls/winealsa.drv +lib/wine/fakedlls/wineaudioio.drv +lib/wine/fakedlls/wineboot.exe +lib/wine/fakedlls/winebrowser.exe +lib/wine/fakedlls/winecfg.exe +lib/wine/fakedlls/wineconsole.exe +lib/wine/fakedlls/winecoreaudio.drv +lib/wine/fakedlls/wined3d.dll +lib/wine/fakedlls/winedbg.exe +lib/wine/fakedlls/winedevice.exe +lib/wine/fakedlls/wineesd.drv +lib/wine/fakedlls/winefile.exe +lib/wine/fakedlls/winejack.drv +lib/wine/fakedlls/winejoystick.drv +lib/wine/fakedlls/winemapi.dll +lib/wine/fakedlls/winemenubuilder.exe +lib/wine/fakedlls/winemine.exe +lib/wine/fakedlls/winenas.drv +lib/wine/fakedlls/wineoss.drv +lib/wine/fakedlls/winepath.exe +lib/wine/fakedlls/wineps.drv +lib/wine/fakedlls/wineps16.drv16 +lib/wine/fakedlls/winevdm.exe +lib/wine/fakedlls/winex11.drv +lib/wine/fakedlls/wing.dll16 +lib/wine/fakedlls/wing32.dll +lib/wine/fakedlls/winhelp.exe16 +lib/wine/fakedlls/winhlp32.exe +lib/wine/fakedlls/winhttp.dll +lib/wine/fakedlls/wininet.dll +lib/wine/fakedlls/winmm.dll +lib/wine/fakedlls/winnls.dll16 +lib/wine/fakedlls/winnls32.dll +lib/wine/fakedlls/winoldap.mod16 +lib/wine/fakedlls/winscard.dll +lib/wine/fakedlls/winsock.dll16 +lib/wine/fakedlls/winspool.drv +lib/wine/fakedlls/wintab.dll16 +lib/wine/fakedlls/wintab32.dll +lib/wine/fakedlls/wintrust.dll +lib/wine/fakedlls/winver.exe +lib/wine/fakedlls/wldap32.dll +lib/wine/fakedlls/wmi.dll +lib/wine/fakedlls/wmiutils.dll +lib/wine/fakedlls/wnaspi32.dll +lib/wine/fakedlls/wordpad.exe +lib/wine/fakedlls/wow32.dll +lib/wine/fakedlls/write.exe +lib/wine/fakedlls/ws2_32.dll +lib/wine/fakedlls/wsock32.dll +lib/wine/fakedlls/wtsapi32.dll +lib/wine/fakedlls/wuapi.dll +lib/wine/fakedlls/wuaueng.dll +lib/wine/fakedlls/xcopy.exe +lib/wine/fakedlls/xinput1_1.dll +lib/wine/fakedlls/xinput1_2.dll +lib/wine/fakedlls/xinput1_3.dll +lib/wine/fakedlls/xinput9_1_0.dll +lib/wine/fakedlls/xmllite.dll lib/wine/faultrep.dll.so +lib/wine/fltlib.dll.so lib/wine/fusion.dll.so -lib/wine/gdi.exe16 +lib/wine/fwpuclnt.dll.so +lib/wine/gdi.exe16.so lib/wine/gdi32.dll.so lib/wine/gdiplus.dll.so ${PLIST.opengl}lib/wine/glu32.dll.so @@ -640,6 +1181,7 @@ lib/wine/hhctrl.ocx.so lib/wine/hid.dll.so lib/wine/hlink.dll.so lib/wine/hnetcfg.dll.so +lib/wine/httpapi.dll.so lib/wine/iccvid.dll.so lib/wine/icinfo.exe.so lib/wine/icmp.dll.so @@ -647,9 +1189,10 @@ lib/wine/iexplore.exe.so lib/wine/ifsmgr.vxd.so lib/wine/imaadp32.acm.so lib/wine/imagehlp.dll.so -lib/wine/imm.dll16 +lib/wine/imm.dll16.so lib/wine/imm32.dll.so lib/wine/inetcomm.dll.so +lib/wine/inetmib1.dll.so lib/wine/infosoft.dll.so lib/wine/initpki.dll.so lib/wine/inkobj.dll.so @@ -659,8 +1202,9 @@ lib/wine/itircl.dll.so lib/wine/itss.dll.so lib/wine/jscript.dll.so lib/wine/kernel32.dll.so -lib/wine/keyboard.drv16 -lib/wine/krnl386.exe16 +lib/wine/keyboard.drv16.so +lib/wine/krnl386.exe16.so +lib/wine/libaclui.def lib/wine/libactiveds.def lib/wine/libadsiid.a lib/wine/libadvapi32.def @@ -668,6 +1212,7 @@ lib/wine/libadvpack.def lib/wine/libatl.def lib/wine/libavicap32.def lib/wine/libavifil32.def +lib/wine/libavrt.def lib/wine/libcabinet.def lib/wine/libcapi2032.def lib/wine/libcards.def @@ -681,12 +1226,14 @@ lib/wine/libcrtdll.def lib/wine/libcrypt32.def lib/wine/libcryptdll.def lib/wine/libcryptnet.def +lib/wine/libcryptui.def lib/wine/libctl3d32.def +lib/wine/libd3d10.def +lib/wine/libd3d10core.def lib/wine/libd3d8.def lib/wine/libd3d9.def lib/wine/libd3dim.def lib/wine/libd3drm.def -lib/wine/libd3dx8.def lib/wine/libd3dx9.def lib/wine/libd3dxof.def lib/wine/libdbghelp.def @@ -704,18 +1251,20 @@ lib/wine/libdsound.def lib/wine/libdwmapi.def lib/wine/libdxerr8.a lib/wine/libdxerr9.a +lib/wine/libdxgi.def lib/wine/libdxguid.a lib/wine/libgdi32.def lib/wine/libgdiplus.def ${PLIST.opengl}lib/wine/libglu32.def lib/wine/libhid.def lib/wine/libhlink.def -lib/wine/libicmp.def lib/wine/libimagehlp.def lib/wine/libimm32.def lib/wine/libinetcomm.def lib/wine/libiphlpapi.def +lib/wine/libkernel.def lib/wine/libkernel32.def +lib/wine/libloadperf.def lib/wine/liblz32.def lib/wine/libmapi32.def lib/wine/libmlang.def @@ -727,6 +1276,7 @@ lib/wine/libmsdmo.def lib/wine/libmshtml.def lib/wine/libmsi.def lib/wine/libmsimg32.def +lib/wine/libmsvcr70.def lib/wine/libmsvcr71.def lib/wine/libmsvcrt.def lib/wine/libmsvcrt20.def @@ -755,10 +1305,12 @@ lib/wine/libpowrprof.def lib/wine/libpsapi.def lib/wine/libquartz.def lib/wine/librasapi32.def +lib/wine/librasdlg.def lib/wine/libresutils.def lib/wine/libriched20.def lib/wine/librpcrt4.def lib/wine/librsaenh.def +lib/wine/librtutils.def lib/wine/libsecur32.def lib/wine/libsensapi.def lib/wine/libserialui.def @@ -778,6 +1330,7 @@ lib/wine/libtapi32.def lib/wine/libunicows.def lib/wine/liburl.def lib/wine/liburlmon.def +lib/wine/libusbd.sys.def lib/wine/libuser32.def lib/wine/libuserenv.def lib/wine/libusp10.def @@ -785,9 +1338,10 @@ lib/wine/libuuid.a lib/wine/libuxtheme.def lib/wine/libvdmdbg.def lib/wine/libversion.def +lib/wine/libwindowscodecs.def lib/wine/libwinecrt0.a lib/wine/libwined3d.def -lib/wine/libwinedos.def +lib/wine/libwinhttp.def lib/wine/libwininet.def lib/wine/libwinmm.def lib/wine/libwinnls32.def @@ -801,59 +1355,78 @@ lib/wine/libwow32.def lib/wine/libws2_32.def lib/wine/libwsock32.def lib/wine/libwtsapi32.def +lib/wine/libxinput.def +lib/wine/loadperf.dll.so lib/wine/localspl.dll.so lib/wine/localui.dll.so +lib/wine/lodctr.exe.so lib/wine/lz32.dll.so -lib/wine/lzexpand.dll16 +lib/wine/lzexpand.dll16.so lib/wine/mapi32.dll.so +lib/wine/mapistub.dll.so lib/wine/mciavi32.dll.so lib/wine/mcicda.dll.so +lib/wine/mciqtz32.dll.so lib/wine/mciseq.dll.so lib/wine/mciwave.dll.so lib/wine/midimap.dll.so lib/wine/mlang.dll.so +lib/wine/mmdevapi.dll.so lib/wine/mmdevldr.vxd.so -lib/wine/mmsystem.dll16 +lib/wine/mmsystem.dll16.so lib/wine/monodebg.vxd.so lib/wine/mountmgr.sys.so -lib/wine/mouse.drv16 +lib/wine/mouse.drv16.so lib/wine/mpr.dll.so lib/wine/mprapi.dll.so -lib/wine/msacm.dll16 +lib/wine/msacm.dll16.so lib/wine/msacm32.dll.so lib/wine/msacm32.drv.so lib/wine/msadp32.acm.so lib/wine/mscat32.dll.so lib/wine/mscms.dll.so lib/wine/mscoree.dll.so +lib/wine/msctf.dll.so +lib/wine/msdaps.dll.so lib/wine/msdmo.dll.so lib/wine/msftedit.dll.so lib/wine/msg711.acm.so +lib/wine/msgsm32.acm.so +lib/wine/mshta.exe.so lib/wine/mshtml.dll.so lib/wine/mshtml.tlb.so lib/wine/msi.dll.so lib/wine/msiexec.exe.so lib/wine/msimg32.dll.so lib/wine/msimtf.dll.so +lib/wine/msisip.dll.so lib/wine/msisys.ocx.so lib/wine/msnet32.dll.so lib/wine/msrle32.dll.so +lib/wine/mssign32.dll.so lib/wine/mssip32.dll.so +lib/wine/mstask.dll.so lib/wine/msvcirt.dll.so +lib/wine/msvcr100.dll.so +lib/wine/msvcr70.dll.so lib/wine/msvcr71.dll.so +lib/wine/msvcr80.dll.so +lib/wine/msvcr90.dll.so lib/wine/msvcrt.dll.so lib/wine/msvcrt20.dll.so lib/wine/msvcrt40.dll.so lib/wine/msvcrtd.dll.so lib/wine/msvfw32.dll.so lib/wine/msvidc32.dll.so -lib/wine/msvideo.dll16 +lib/wine/msvideo.dll16.so lib/wine/mswsock.dll.so lib/wine/msxml3.dll.so +lib/wine/msxml4.dll.so lib/wine/nddeapi.dll.so lib/wine/net.exe.so lib/wine/netapi32.dll.so lib/wine/newdev.dll.so +lib/wine/ngen.exe.so lib/wine/notepad.exe.so lib/wine/ntdll.dll.so lib/wine/ntdsapi.dll.so @@ -862,25 +1435,28 @@ lib/wine/ntprint.dll.so lib/wine/objsel.dll.so lib/wine/odbc32.dll.so lib/wine/odbccp32.dll.so -lib/wine/ole2.dll16 -lib/wine/ole2conv.dll16 -lib/wine/ole2disp.dll16 -lib/wine/ole2nls.dll16 -lib/wine/ole2prox.dll16 -lib/wine/ole2thk.dll16 +lib/wine/ole2.dll16.so +lib/wine/ole2conv.dll16.so +lib/wine/ole2disp.dll16.so +lib/wine/ole2nls.dll16.so +lib/wine/ole2prox.dll16.so +lib/wine/ole2thk.dll16.so lib/wine/ole32.dll.so lib/wine/oleacc.dll.so lib/wine/oleaut32.dll.so -lib/wine/olecli.dll16 +lib/wine/olecli.dll16.so lib/wine/olecli32.dll.so +lib/wine/oledb32.dll.so lib/wine/oledlg.dll.so lib/wine/olepro32.dll.so -lib/wine/olesvr.dll16 +lib/wine/olesvr.dll16.so lib/wine/olesvr32.dll.so lib/wine/olethk32.dll.so lib/wine/oleview.exe.so ${PLIST.opengl}lib/wine/opengl32.dll.so lib/wine/pdh.dll.so +lib/wine/pidgen.dll.so +lib/wine/ping.exe.so lib/wine/powrprof.dll.so lib/wine/printui.dll.so lib/wine/progman.exe.so @@ -893,8 +1469,9 @@ lib/wine/qmgr.dll.so lib/wine/qmgrprxy.dll.so lib/wine/quartz.dll.so lib/wine/query.dll.so -lib/wine/rasapi16.dll16 +lib/wine/rasapi16.dll16.so lib/wine/rasapi32.dll.so +lib/wine/rasdlg.dll.so lib/wine/reg.exe.so lib/wine/regedit.exe.so lib/wine/regsvr32.exe.so @@ -905,8 +1482,11 @@ lib/wine/rpcrt4.dll.so lib/wine/rpcss.exe.so lib/wine/rsabase.dll.so lib/wine/rsaenh.dll.so +lib/wine/rtutils.dll.so lib/wine/rundll32.exe.so +lib/wine/samlib.dll.so lib/wine/sane.ds.so +lib/wine/sc.exe.so lib/wine/sccbase.dll.so lib/wine/schannel.dll.so lib/wine/secedit.exe.so @@ -916,12 +1496,12 @@ lib/wine/sensapi.dll.so lib/wine/serialui.dll.so lib/wine/services.exe.so lib/wine/setupapi.dll.so -lib/wine/setupx.dll16 +lib/wine/setupx.dll16.so lib/wine/sfc.dll.so lib/wine/sfc_os.dll.so lib/wine/shdoclc.dll.so lib/wine/shdocvw.dll.so -lib/wine/shell.dll16 +lib/wine/shell.dll16.so lib/wine/shell32.dll.so lib/wine/shfolder.dll.so lib/wine/shlwapi.dll.so @@ -929,37 +1509,43 @@ lib/wine/slbcsp.dll.so lib/wine/slc.dll.so lib/wine/snmpapi.dll.so lib/wine/softpub.dll.so -lib/wine/sound.drv16 +lib/wine/sound.drv16.so lib/wine/spoolss.dll.so lib/wine/spoolsv.exe.so lib/wine/start.exe.so lib/wine/stdole2.tlb.so lib/wine/stdole32.tlb.so lib/wine/sti.dll.so -lib/wine/storage.dll16 -lib/wine/stress.dll16 +lib/wine/storage.dll16.so +lib/wine/stress.dll16.so lib/wine/svchost.exe.so lib/wine/svrapi.dll.so lib/wine/sxs.dll.so -lib/wine/system.drv16 +lib/wine/system.drv16.so +lib/wine/t2embed.dll.so lib/wine/tapi32.dll.so lib/wine/taskmgr.exe.so -lib/wine/toolhelp.dll16 -lib/wine/twain.dll16 +lib/wine/termsv.exe.so +lib/wine/toolhelp.dll16.so +lib/wine/traffic.dll.so +lib/wine/twain.dll16.so lib/wine/twain_32.dll.so -lib/wine/typelib.dll16 +lib/wine/typelib.dll16.so lib/wine/unicows.dll.so lib/wine/uninstaller.exe.so +lib/wine/unlodctr.exe.so +lib/wine/updspapi.dll.so lib/wine/url.dll.so lib/wine/urlmon.dll.so -lib/wine/user.exe16 +lib/wine/usbd.sys.so +lib/wine/user.exe16.so lib/wine/user32.dll.so lib/wine/userenv.dll.so lib/wine/usp10.dll.so lib/wine/uxtheme.dll.so lib/wine/vdhcp.vxd.so lib/wine/vdmdbg.dll.so -lib/wine/ver.dll16 +lib/wine/ver.dll16.so lib/wine/version.dll.so lib/wine/vmm.vxd.so lib/wine/vnbt.vxd.so @@ -967,11 +1553,14 @@ lib/wine/vnetbios.vxd.so lib/wine/vtdapi.vxd.so lib/wine/vwin32.vxd.so lib/wine/w32skrnl.dll.so -lib/wine/w32sys.dll16 -lib/wine/win32s16.dll16 -lib/wine/win87em.dll16 -lib/wine/winaspi.dll16 -lib/wine/windebug.dll16 +lib/wine/w32sys.dll16.so +lib/wine/wbemprox.dll.so +lib/wine/wiaservc.dll.so +lib/wine/win32s16.dll16.so +lib/wine/win87em.dll16.so +lib/wine/winaspi.dll16.so +lib/wine/windebug.dll16.so +lib/wine/windowscodecs.dll.so lib/wine/winealsa.drv.so lib/wine/wineaudioio.drv.so lib/wine/wineboot.exe.so @@ -982,65 +1571,83 @@ lib/wine/winecoreaudio.drv.so lib/wine/wined3d.dll.so lib/wine/winedbg.exe.so lib/wine/winedevice.exe.so -lib/wine/winedos.dll.so lib/wine/wineesd.drv.so lib/wine/winefile.exe.so lib/wine/winejack.drv.so lib/wine/winejoystick.drv.so +lib/wine/winemapi.dll.so lib/wine/winemenubuilder.exe.so lib/wine/winemine.exe.so -lib/wine/winemp3.acm.so lib/wine/winenas.drv.so lib/wine/wineoss.drv.so lib/wine/winepath.exe.so lib/wine/wineps.drv.so -lib/wine/wineps16.drv16 +lib/wine/wineps16.drv16.so lib/wine/winevdm.exe.so ${PLIST.x11}lib/wine/winex11.drv.so -lib/wine/wing.dll16 +lib/wine/wing.dll16.so lib/wine/wing32.dll.so -lib/wine/winhelp.exe16 +lib/wine/winhelp.exe16.so lib/wine/winhlp32.exe.so lib/wine/winhttp.dll.so lib/wine/wininet.dll.so lib/wine/winmm.dll.so -lib/wine/winnls.dll16 +lib/wine/winnls.dll16.so lib/wine/winnls32.dll.so -lib/wine/winoldap.mod16 +lib/wine/winoldap.mod16.so lib/wine/winscard.dll.so -lib/wine/winsock.dll16 +lib/wine/winsock.dll16.so lib/wine/winspool.drv.so -lib/wine/wintab.dll16 +lib/wine/wintab.dll16.so lib/wine/wintab32.dll.so lib/wine/wintrust.dll.so lib/wine/winver.exe.so lib/wine/wldap32.dll.so lib/wine/wmi.dll.so +lib/wine/wmiutils.dll.so lib/wine/wnaspi32.dll.so lib/wine/wordpad.exe.so lib/wine/wow32.dll.so -lib/wine/wprocs.dll16 lib/wine/write.exe.so lib/wine/ws2_32.dll.so lib/wine/wsock32.dll.so lib/wine/wtsapi32.dll.so +lib/wine/wuapi.dll.so +lib/wine/wuaueng.dll.so lib/wine/xcopy.exe.so +lib/wine/xinput1_1.dll.so +lib/wine/xinput1_2.dll.so +lib/wine/xinput1_3.dll.so +lib/wine/xinput9_1_0.dll.so +lib/wine/xmllite.dll.so man/de.UTF-8/man1/wine.1 +man/de.UTF-8/man1/winemaker.1 +man/de.UTF-8/man1/wineserver.1 man/fr.UTF-8/man1/wine.1 +man/fr.UTF-8/man1/winemaker.1 man/fr.UTF-8/man1/wineserver.1 +man/man1/msiexec.1 +man/man1/notepad.1 +man/man1/regedit.1 +man/man1/regsvr32.1 man/man1/widl.1 man/man1/wine.1 +man/man1/wineboot.1 man/man1/winebuild.1 +man/man1/winecfg.1 +man/man1/wineconsole.1 +man/man1/winecpp.1 man/man1/winedbg.1 man/man1/winedump.1 +man/man1/winefile.1 man/man1/wineg++.1 man/man1/winegcc.1 man/man1/winemaker.1 -man/man1/wineprefixcreate.1 +man/man1/winemine.1 +man/man1/winepath.1 man/man1/wineserver.1 man/man1/wmc.1 man/man1/wrc.1 -share/aclocal/wine.m4 share/applications/wine.desktop ${PLIST.x11}share/wine/fonts/coue1255.fon ${PLIST.x11}share/wine/fonts/coue1256.fon @@ -1084,5 +1691,7 @@ ${PLIST.x11}share/wine/fonts/vgasyse.fon ${PLIST.x11}share/wine/fonts/vgasysg.fon ${PLIST.x11}share/wine/fonts/vgasysr.fon ${PLIST.x11}share/wine/fonts/vgasyst.fon +share/wine/fonts/symbol.ttf share/wine/generic.ppd +share/wine/l_intl.nls share/wine/wine.inf diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk index ca271ed035b..7dcc226d854 100644 --- a/emulators/wine/buildlink3.mk +++ b/emulators/wine/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.17 2010/12/23 11:44:30 dsainty Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2011/05/04 20:31:39 adam Exp $ BUILDLINK_TREE+= wine .if !defined(WINE_BUILDLINK3_MK) WINE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.wine+= wine>=0.9.6nb1 -BUILDLINK_ABI_DEPENDS.wine?= wine>=1.0.1nb4 +BUILDLINK_API_DEPENDS.wine+= wine>=1.2.0 +BUILDLINK_ABI_DEPENDS.wine+= wine>=1.2.0 BUILDLINK_PKGSRCDIR.wine?= ../../emulators/wine pkgbase:= wine @@ -17,8 +17,8 @@ pkgbase:= wine .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" .endif +.include "../../mk/giflib.buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/libungif/buildlink3.mk" .endif # WINE_BUILDLINK3_MK BUILDLINK_TREE+= -wine diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 58d8b73928b..89bedb32a0e 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,22 +1,21 @@ -$NetBSD: distinfo,v 1.87 2010/02/20 08:35:58 schwarz Exp $ +$NetBSD: distinfo,v 1.88 2011/05/04 20:31:39 adam Exp $ -SHA1 (wine-1.0.1.tar.bz2) = 0550b03bf7b314514a87b6abb2198da96ef83b22 -RMD160 (wine-1.0.1.tar.bz2) = fecd2bf970c51c80fc02ca39631034f066da145e -Size (wine-1.0.1.tar.bz2) = 13956805 bytes -SHA1 (patch-aa) = 906623f16ac87380c63f0c8e80d6490142380566 -SHA1 (patch-ab) = 4c8de3db4533519d9964f38cf3fa0462f9fb3d30 -SHA1 (patch-ac) = 3071363f511c9caad53e8b3e94df23fcee3472f4 -SHA1 (patch-ad) = f146f8b07c00890c9dfce824938f3b5abcf90b87 -SHA1 (patch-ae) = e5f62eabe1184ceec873ae2b4e993de5d02d2fca -SHA1 (patch-af) = 499aa5a82fce105128caff7ca0006e9c8975e905 -SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a +SHA1 (wine-1.2.3.tar.bz2) = 072184c492cc9d137138407732de3bb62ba6c091 +RMD160 (wine-1.2.3.tar.bz2) = 5bc41a4623ee087e57ebd424a15c6743d0874194 +Size (wine-1.2.3.tar.bz2) = 17651336 bytes +SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c +SHA1 (patch-ac) = c02f1ba14197efa109150850f47df19acb062cfb +SHA1 (patch-ad) = 54df859456f8f6efcddfcdbb5b3fd514e48e8045 +SHA1 (patch-ae) = 5edf543e7cb1614fe6393d5451d786a8ec70f4c7 +SHA1 (patch-af) = cb12614664d70d8393617590eb4cf2bbe111c0f1 +SHA1 (patch-ag) = 3bade676ea1229e35b671b00f75b08b441cf1814 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2 -SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09 -SHA1 (patch-ba) = 342564062296d316a20f1c0b3ad7aaa17e7e79be -SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda -SHA1 (patch-bc) = 1542a59718229a41e23aff93e4571bf7127a276b -SHA1 (patch-bd) = 46a7b8cc8e0793facf78876d26f24cd40ee1d097 -SHA1 (patch-be) = ce9d21a9716c79525239499c89fcf0bb3ef807a3 -SHA1 (patch-bf) = d31bcc193ffe6abc57700bcb43fea6ff5886c038 -SHA1 (patch-ca) = 1383c03cc83cefe6099b58340db2bc468c7524bb -SHA1 (patch-cb) = 260d3ba130a6d3fc4ad137354a2b9c5fe871ba7a +SHA1 (patch-ba) = 4daf9a6494e1a9398bc27300dd90a1d573e30b7e +SHA1 (patch-bc) = 461a46e413d8933c3a9ec317ff17a1014379857f +SHA1 (patch-bd) = 3c71ee87aa835062a3362d984133d3c010a28d89 +SHA1 (patch-be) = a63f40b3fd18bb49825b048abb39fc2e2e634410 +SHA1 (patch-bf) = 59bce6a706789afe8aa3a8a5ab9e19014e4b198c +SHA1 (patch-ca) = 40508e7eb2171ea321fb44a2285138a1a17d14f4 +SHA1 (patch-cd) = aec27ca5616625e80123e92b3db1abdd90d212a0 +SHA1 (patch-ce) = 23088aac01e74164ec6d4a42f96ab7fa34d002c3 +SHA1 (patch-cf) = 6a1c8ce2c77de0eebb9aad9cd5078cf18538d8d8 diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk index 803d4f213eb..245de5ff8b9 100644 --- a/emulators/wine/options.mk +++ b/emulators/wine/options.mk @@ -1,21 +1,28 @@ -# $NetBSD: options.mk,v 1.12 2009/04/20 18:55:42 adam Exp $ +# $NetBSD: options.mk,v 1.13 2011/05/04 20:31:39 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wine -PKG_SUPPORTED_OPTIONS= cups opengl sane esound ldap hal ssl x11 -PKG_SUGGESTED_OPTIONS= opengl esound ldap hal ssl x11 +PKG_SUPPORTED_OPTIONS= cups dbus esound hal ldap opengl sane ssl x11 +PKG_SUGGESTED_OPTIONS= opengl ssl x11 .include "../../mk/bsd.options.mk" -PLIST_VARS+= opengl x11 +PLIST_VARS+= esd opengl x11 -.if !empty(PKG_OPTIONS:Mesound) -.include "../../audio/esound/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mcups) +.include "../../print/cups/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-cups .endif -.if !empty(PKG_OPTIONS:Mldap) -.include "../../databases/openldap-client/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mdbus) +.include "../../sysutils/dbus/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-ldap +CONFIGURE_ARGS+= --without-dbus +.endif + +.if !empty(PKG_OPTIONS:Mesound) +PLIST.esd= yes +.include "../../audio/esound/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mhal) @@ -24,16 +31,16 @@ CONFIGURE_ARGS+= --without-ldap CONFIGURE_ARGS+= --without-hal .endif -.if !empty(PKG_OPTIONS:Mssl) -.include "../../security/openssl/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mldap) +.include "../../databases/openldap-client/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-openssl +CONFIGURE_ARGS+= --without-ldap .endif -.if !empty(PKG_OPTIONS:Mcups) -.include "../../print/cups/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mssl) +.include "../../security/openssl/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-cups +CONFIGURE_ARGS+= --without-openssl .endif .if !empty(PKG_OPTIONS:Mx11) @@ -43,6 +50,7 @@ PLIST.x11= yes .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXcomposite/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" @@ -57,10 +65,8 @@ CONFIGURE_ARGS+= --without-x .if !empty(PKG_OPTIONS:Mopengl) && !empty(PKG_OPTIONS:Mx11) PLIST.opengl= yes -. if ${OPSYS} != "Darwin" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" -. endif .else CONFIGURE_ARGS+= --without-opengl .endif diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa deleted file mode 100644 index c91b16a24b6..00000000000 --- a/emulators/wine/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.29 2008/06/22 23:38:18 dholland Exp $ - ---- Make.rules.in.orig 2008-06-17 10:07:31.000000000 -0400 -+++ Make.rules.in 2008-06-22 12:22:40.000000000 -0400 -@@ -120,7 +120,7 @@ - CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ - $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc) - --OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS) -+OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) - - RCOBJS = $(RC_SRCS:.rc=.res.o) - LINTS = $(C_SRCS:.c=.ln) diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab index ebd92dbda3f..a8ef392935a 100644 --- a/emulators/wine/patches/patch-ab +++ b/emulators/wine/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.20 2010/02/20 08:35:58 schwarz Exp $ +$NetBSD: patch-ab,v 1.21 2011/05/04 20:31:40 adam Exp $ ---- dlls/ntdll/cdrom.c.orig 2008-10-17 17:45:25.000000000 +0200 -+++ dlls/ntdll/cdrom.c 2010-02-19 23:38:02.000000000 +0100 +--- dlls/ntdll/cdrom.c.orig 2008-06-27 16:24:42.000000000 +0200 ++++ dlls/ntdll/cdrom.c @@ -65,6 +65,16 @@ #endif #ifdef HAVE_LINUX_CDROM_H diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac index 8ebede38b62..cca8580dcf5 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.39 2010/02/20 08:35:58 schwarz Exp $ +$NetBSD: patch-ac,v 1.40 2011/05/04 20:31:40 adam Exp $ --- dlls/ntdll/directory.c.orig 2008-10-17 17:45:25.000000000 +0200 +++ dlls/ntdll/directory.c 2010-02-19 23:38:56.000000000 +0100 -@@ -127,6 +127,20 @@ +@@ -131,6 +131,20 @@ #endif /* linux */ #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') diff --git a/emulators/wine/patches/patch-ad b/emulators/wine/patches/patch-ad index 472c9b7eba1..b131f313036 100644 --- a/emulators/wine/patches/patch-ad +++ b/emulators/wine/patches/patch-ad @@ -1,40 +1,60 @@ -$NetBSD: patch-ad,v 1.14 2010/02/20 08:35:58 schwarz Exp $ +$NetBSD: patch-ad,v 1.15 2011/05/04 20:31:40 adam Exp $ ---- dlls/iphlpapi/ipstats.c.orig 2008-10-17 17:45:25.000000000 +0200 -+++ dlls/iphlpapi/ipstats.c 2010-02-19 23:39:54.000000000 +0100 -@@ -28,6 +28,10 @@ - #include <stdlib.h> +--- dlls/iphlpapi/ipstats.c.orig 2010-12-10 22:33:07.000000000 +0300 ++++ dlls/iphlpapi/ipstats.c 2010-12-22 00:38:30.000000000 +0300 +@@ -27,6 +27,10 @@ #include <string.h> + #include <errno.h> #include <sys/types.h> +#if defined(__NetBSD__) +#include <sys/param.h> +#endif +#include <unistd.h> - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> + #ifdef HAVE_ALIAS_H + #include <alias.h> #endif -@@ -755,7 +759,11 @@ - - /* Ignore all entries except for gateway routes which aren't - multicast */ -+#if !defined(RTF_MULTICAST) -+ if (!(rtm->rtm_flags & RTF_GATEWAY)) -+#else - if (!(rtm->rtm_flags & RTF_GATEWAY) || (rtm->rtm_flags & RTF_MULTICAST)) -+#endif - continue; - - RouteCount++; -@@ -831,8 +839,12 @@ - - /* Ignore all entries except for gateway routes which aren't - multicast */ -+#if !defined(RTF_MULTICAST) -+ if (!(rtm->rtm_flags & RTF_GATEWAY)) -+#else - if (!(rtm->rtm_flags & RTF_GATEWAY) || - (rtm->rtm_flags & RTF_MULTICAST)) -+#endif - continue; - - memset (&table->table[table->dwNumEntries], 0, +@@ -489,7 +493,7 @@ + } + if (kc) kstat_close( kc ); + } +-#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) ++#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && !defined(__NetBSD__) + { + int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; + #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) +@@ -655,7 +659,7 @@ + } + if (kc) kstat_close( kc ); + } +-#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) ++#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && !defined(__NetBSD__) + { + int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; + #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) +@@ -804,7 +808,7 @@ + } + if (kc) kstat_close( kc ); + } +-#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) ++#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) + { + #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ + #define TCPTV_MIN 2 +@@ -915,7 +919,7 @@ + } + if (kc) kstat_close( kc ); + } +-#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) ++#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) + { + int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; + #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) +@@ -1347,7 +1351,7 @@ + } + else ret = ERROR_NOT_SUPPORTED; + } +-#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) ++#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__) + { + int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; + #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae index abb62f1f5e3..97d0fdeb45e 100644 --- a/emulators/wine/patches/patch-ae +++ b/emulators/wine/patches/patch-ae @@ -1,12 +1,12 @@ -$NetBSD: patch-ae,v 1.13 2010/02/20 08:35:58 schwarz Exp $ +$NetBSD: patch-ae,v 1.14 2011/05/04 20:31:40 adam Exp $ ---- dlls/winex11.drv/opengl.c.orig 2008-10-17 17:45:25.000000000 +0200 -+++ dlls/winex11.drv/opengl.c 2010-02-19 23:41:07.000000000 +0100 -@@ -47,6 +47,7 @@ +--- dlls/winex11.drv/opengl.c.orig 2011-04-08 17:09:51.000000000 +0000 ++++ dlls/winex11.drv/opengl.c +@@ -55,6 +55,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #endif #ifdef HAVE_GL_GLX_H # include <GL/glx.h> +# include <GL/glxext.h> #endif - #ifdef HAVE_GL_GLEXT_H - # include <GL/glext.h> + + #include "wine/wgl.h" diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af index 1275123ae53..d74bc9bfe14 100644 --- a/emulators/wine/patches/patch-af +++ b/emulators/wine/patches/patch-af @@ -1,57 +1,8 @@ -$NetBSD: patch-af,v 1.25 2008/06/28 00:12:40 jmcneill Exp $ +$NetBSD: patch-af,v 1.26 2011/05/04 20:31:40 adam Exp $ ---- dlls/ntdll/signal_i386.c.orig 2008-06-17 10:07:31.000000000 -0400 -+++ dlls/ntdll/signal_i386.c 2008-06-27 18:35:37.000000000 -0400 -@@ -199,7 +199,7 @@ - - #endif /* bsdi */ - --#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) -+#if (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) - - typedef struct sigcontext SIGCONTEXT; - -@@ -332,6 +332,39 @@ - - #endif /* __APPLE__ */ - -+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000) -+# include <sys/ucontext.h> -+# include <sys/types.h> -+# include <signal.h> -+ -+typedef ucontext_t SIGCONTEXT; -+ -+#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 ESP_sig(context) _UC_MACHINE_SP(context) -+ -+#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 SS_sig(context) ((context)->uc_mcontext.__gregs[_REG_SS]) -+#define FS_sig(context) ((context)->uc_mcontext.__gregs[_REG_FS]) -+#define GS_sig(context) ((context)->uc_mcontext.__gregs[_REG_GS]) -+ -+#define EFL_sig(context) ((context)->uc_mcontext.__gregs[_REG_EFL]) -+#define EIP_sig(context) _UC_MACHINE_PC(context) -+#define TRAP_sig(context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO]) -+#define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) -+ -+#define FPU_sig(context) NULL -+#define FPUX_sig(context) ((XMM_SAVE_AREA32 *)&((context)->uc_mcontext.__fpregs)) -+ -+#endif /* __NetBSD__ */ -+ - WINE_DEFAULT_DEBUG_CHANNEL(seh); - - typedef int (*wine_signal_handler)(unsigned int sig); -@@ -366,8 +399,13 @@ +--- dlls/ntdll/signal_i386.c.orig 2009-07-03 18:28:33.000000000 +0200 ++++ dlls/ntdll/signal_i386.c +@@ -446,8 +446,13 @@ enum i386_trap_code TRAP_x86_PAGEFLT = T_PAGEFLT, /* Page fault */ TRAP_x86_ARITHTRAP = T_ARITHTRAP, /* Floating point exception */ TRAP_x86_ALIGNFLT = T_ALIGNFLT, /* Alignment check exception */ @@ -65,15 +16,3 @@ $NetBSD: patch-af,v 1.25 2008/06/28 00:12:40 jmcneill Exp $ #else TRAP_x86_DIVIDE = 0, /* Division by zero exception */ TRAP_x86_TRCTRAP = 1, /* Single-step exception */ -@@ -1561,7 +1599,11 @@ - #endif /* HAVE_SIGALTSTACK */ - - sig_act.sa_mask = server_block_set; -+#if defined(__NetBSD__) && (__NetBSD_Version__ < 200000000) -+ sig_act.sa_flags = SA_RESTART; -+#else - sig_act.sa_flags = SA_SIGINFO | SA_RESTART; -+#endif - #ifdef SA_ONSTACK - sig_act.sa_flags |= SA_ONSTACK; - #endif diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag index 1728516714a..98ddaaaa4a4 100644 --- a/emulators/wine/patches/patch-ag +++ b/emulators/wine/patches/patch-ag @@ -1,10 +1,10 @@ -$NetBSD: patch-ag,v 1.7 2006/10/21 08:22:54 wiz Exp $ +$NetBSD: patch-ag,v 1.8 2011/05/04 20:31:40 adam Exp $ ---- dlls/ntdll/signal_x86_64.c.orig 2006-10-13 14:43:39.000000000 +0000 +--- dlls/ntdll/signal_x86_64.c.orig 2011-04-08 17:09:51.000000000 +0000 +++ dlls/ntdll/signal_x86_64.c -@@ -93,6 +93,53 @@ typedef struct ucontext SIGCONTEXT; - - #endif /* linux */ +@@ -212,6 +212,53 @@ extern int arch_prctl(int func, void *pt + #error You must define the signal context functions for your platform + #endif +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000) +# include <sys/ucontext.h> @@ -56,3 +56,12 @@ $NetBSD: patch-ag,v 1.7 2006/10/21 08:22:54 wiz Exp $ enum i386_trap_code { TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ +@@ -2338,7 +2338,7 @@ void signal_init_thread( TEB *teb ) + #elif defined __FreeBSD__ + amd64_set_gsbase( teb ); + #else +-# error Please define setting %gs for your architecture ++# warning Please define setting %gs for your architecture + #endif + + ss.ss_sp = (char *)teb + teb_size; diff --git a/emulators/wine/patches/patch-aj b/emulators/wine/patches/patch-aj deleted file mode 100644 index aafaa7f35d2..00000000000 --- a/emulators/wine/patches/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aj,v 1.6 2007/01/30 13:11:04 adam Exp $ - ---- dlls/wineoss.drv/oss.c.orig 2005-12-24 10:24:01.000000000 +0100 -+++ dlls/wineoss.drv/oss.c -@@ -42,7 +42,9 @@ static LRESULT OSS_drvLoad(void) - { - TRACE("()\n"); - OSS_WaveInit(); -+#ifdef HAVE_OSS_MIDI - OSS_MidiInit(); -+#endif - OSS_MixerInit(); - OSS_AuxInit(); - return 1; -@@ -55,7 +57,9 @@ static LRESULT OSS_drvFree(void) - { - TRACE("()\n"); - OSS_WaveExit(); -+#ifdef HAVE_OSS_MIDI - OSS_MidiExit(); -+#endif - OSS_MixerExit(); - OSS_AuxExit(); - return 1; diff --git a/emulators/wine/patches/patch-ba b/emulators/wine/patches/patch-ba index 5e9e02be79d..6f945039cda 100644 --- a/emulators/wine/patches/patch-ba +++ b/emulators/wine/patches/patch-ba @@ -1,16 +1,16 @@ -$NetBSD: patch-ba,v 1.1 2008/06/26 19:46:56 jmcneill Exp $ +$NetBSD: patch-ba,v 1.2 2011/05/04 20:31:40 adam Exp $ ---- configure.orig 2008-06-26 15:39:25.000000000 -0400 -+++ configure 2008-06-26 15:39:53.000000000 -0400 -@@ -16819,6 +16819,11 @@ +--- configure.orig 2010-06-18 17:36:58.000000000 +0000 ++++ configure +@@ -4166,11 +4166,6 @@ fi + $as_echo "$wine_cv_toolsdir" >&6; } + TOOLSDIR=$wine_cv_toolsdir - EXTRA_BINARIES="wine-pthread" - ;; -+ netbsd*) -+ MAIN_BINARY="wine-kthread" -+ -+ EXTRA_BINARIES="wine-pthread" -+ ;; - esac - ;; - esac +-if test -n "$host_alias" -a "$host_alias" != "$build_alias" +-then +- TARGETFLAGS="-b $host_alias $TARGETFLAGS" +- +-fi + + for ac_prog in flex + do diff --git a/emulators/wine/patches/patch-bb b/emulators/wine/patches/patch-bb deleted file mode 100644 index d927ed7ae86..00000000000 --- a/emulators/wine/patches/patch-bb +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-bb,v 1.2 2008/06/27 11:47:24 jmcneill Exp $ - ---- loader/kthread.c.orig 2008-06-17 10:07:31.000000000 -0400 -+++ loader/kthread.c 2008-06-27 07:32:03.000000000 -0400 -@@ -115,6 +115,14 @@ - pthread_descr descr = __pthread_thread_self(); - return &descr->thread_errno; - } -+ -+#ifdef __errno -+#undef __errno -+#endif -+#ifdef ___errno -+#undef ___errno -+#endif -+ - int *__error(void) { return __errno_location(); } /* FreeBSD */ - int *__errno(void) { return __errno_location(); } /* NetBSD */ - int *___errno(void) { return __errno_location(); } /* Solaris */ diff --git a/emulators/wine/patches/patch-bc b/emulators/wine/patches/patch-bc index 66d60b7ec7c..8c50fab999e 100644 --- a/emulators/wine/patches/patch-bc +++ b/emulators/wine/patches/patch-bc @@ -1,7 +1,7 @@ -$NetBSD: patch-bc,v 1.1 2008/06/27 02:51:11 jmcneill Exp $ +$NetBSD: patch-bc,v 1.2 2011/05/04 20:31:40 adam Exp $ ---- dlls/wineoss.drv/audio.c.orig 2008-06-26 22:44:15.000000000 -0400 -+++ dlls/wineoss.drv/audio.c 2008-06-26 22:45:02.000000000 -0400 +--- dlls/wineoss.drv/audio.c.orig 2011-04-08 17:09:51.000000000 +0000 ++++ dlls/wineoss.drv/audio.c @@ -75,6 +75,12 @@ #include "audio.h" @@ -15,7 +15,7 @@ $NetBSD: patch-bc,v 1.1 2008/06/27 02:51:11 jmcneill Exp $ WINE_DEFAULT_DEBUG_CHANNEL(wave); /* Allow 1% deviation for sample rates (some ES137x cards) */ -@@ -1167,12 +1173,12 @@ +@@ -1170,12 +1176,12 @@ static LRESULT OSS_WaveInit(void) } else { @@ -25,8 +25,8 @@ $NetBSD: patch-bc,v 1.1 2008/06/27 02:51:11 jmcneill Exp $ for (i = 1; i < MAX_WAVEDRV; ++i) { WOutDev[i].ossdev.dev_name = WInDev[i].ossdev.dev_name = HeapAlloc(GetProcessHeap(),0,11); -- sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%d", i); -+ sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%d", i); +- sprintf(WOutDev[i].ossdev.dev_name, "/dev/dsp%u", i); ++ sprintf(WOutDev[i].ossdev.dev_name, SOUND_DEV "%u", i); WOutDev[i].ossdev.mixer_name = WInDev[i].ossdev.mixer_name = HeapAlloc(GetProcessHeap(),0,13); - sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%d", i); + sprintf(WOutDev[i].ossdev.mixer_name, "/dev/mixer%u", i); } diff --git a/emulators/wine/patches/patch-bd b/emulators/wine/patches/patch-bd index deca3620a74..7500976e3ca 100644 --- a/emulators/wine/patches/patch-bd +++ b/emulators/wine/patches/patch-bd @@ -1,13 +1,13 @@ -$NetBSD: patch-bd,v 1.1 2009/04/20 18:55:42 adam Exp $ +$NetBSD: patch-bd,v 1.2 2011/05/04 20:31:40 adam Exp $ ---- dlls/Makedll.rules.in.orig 2008-10-17 17:45:25.000000000 +0200 +--- dlls/Makedll.rules.in.orig 2010-06-18 17:36:58.000000000 +0000 +++ dlls/Makedll.rules.in -@@ -96,7 +96,7 @@ install_static_implib_a: - $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) +@@ -85,7 +85,7 @@ install_dll: $(MODULE) $(DESTDIR)$(dlldi + $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) - install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy -- $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) -+ ${BSD_INSTALL_LIB} $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) - - install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) + install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy +- $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so ++ $(BSD_INSTALL_LIB) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) diff --git a/emulators/wine/patches/patch-be b/emulators/wine/patches/patch-be index 05468d3ba35..701330af24c 100644 --- a/emulators/wine/patches/patch-be +++ b/emulators/wine/patches/patch-be @@ -1,13 +1,13 @@ -$NetBSD: patch-be,v 1.1 2009/04/20 18:55:42 adam Exp $ +$NetBSD: patch-be,v 1.2 2011/05/04 20:31:40 adam Exp $ ---- programs/Makeprog.rules.in.orig 2008-10-17 17:45:25.000000000 +0200 +--- programs/Makeprog.rules.in.orig 2011-04-08 17:09:51.000000000 +0000 +++ programs/Makeprog.rules.in -@@ -44,7 +44,7 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT) - .PHONY: install_prog install_prog.so uninstall_prog uninstall_prog.so +@@ -26,7 +26,7 @@ $(MODULE) $(MODULE).so $(MODULE).fake: $ + .PHONY: install_prog install_prog.so install_prog.fake install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + ${BSD_INSTALL_LIB} $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so - install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy - $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE) + install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) diff --git a/emulators/wine/patches/patch-bf b/emulators/wine/patches/patch-bf index 6afe13d2c05..803807a3438 100644 --- a/emulators/wine/patches/patch-bf +++ b/emulators/wine/patches/patch-bf @@ -1,8 +1,8 @@ -$NetBSD: patch-bf,v 1.1 2009/04/20 18:55:42 adam Exp $ +$NetBSD: patch-bf,v 1.2 2011/05/04 20:31:40 adam Exp $ --- libs/wine/Makefile.in.orig 2008-10-17 17:45:25.000000000 +0200 +++ libs/wine/Makefile.in -@@ -150,14 +150,14 @@ libwine.dylib: libwine.$(SOVERSION).dyli +@@ -149,14 +149,14 @@ libwine.dylib: libwine.$(SOVERSION).dyli .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib install-lib-so: libwine.so.$(VERSION) $(DESTDIR)$(libdir) dummy diff --git a/emulators/wine/patches/patch-ca b/emulators/wine/patches/patch-ca index 53f04edef0d..fc11c9b732a 100644 --- a/emulators/wine/patches/patch-ca +++ b/emulators/wine/patches/patch-ca @@ -1,8 +1,8 @@ -$NetBSD: patch-ca,v 1.1 2008/06/28 05:18:57 jmcneill Exp $ +$NetBSD: patch-ca,v 1.2 2011/05/04 20:31:40 adam Exp $ --- dlls/winex11.drv/settings.c.orig 2008-06-27 11:42:50.000000000 -0400 +++ dlls/winex11.drv/settings.c 2008-06-27 11:43:40.000000000 -0400 -@@ -431,6 +431,16 @@ +@@ -432,6 +432,16 @@ return DISP_CHANGE_SUCCESSFUL; } diff --git a/emulators/wine/patches/patch-cb b/emulators/wine/patches/patch-cb deleted file mode 100644 index 9b2459b5688..00000000000 --- a/emulators/wine/patches/patch-cb +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-cb,v 1.2 2010/02/20 08:35:58 schwarz Exp $ - ---- dlls/gdi32/freetype.c.orig 2008-10-17 17:45:25.000000000 +0200 -+++ dlls/gdi32/freetype.c 2010-02-19 23:42:59.000000000 +0100 -@@ -163,7 +163,11 @@ - MAKE_FUNCPTR(FT_Init_FreeType); - MAKE_FUNCPTR(FT_Load_Glyph); - MAKE_FUNCPTR(FT_Matrix_Multiply); -+#ifdef FT_MULFIX_INLINED -+#define pFT_MulFix FT_MULFIX_INLINED -+#else - MAKE_FUNCPTR(FT_MulFix); -+#endif - MAKE_FUNCPTR(FT_New_Face); - MAKE_FUNCPTR(FT_New_Memory_Face); - MAKE_FUNCPTR(FT_Outline_Get_Bitmap); -@@ -2438,7 +2442,9 @@ - LOAD_FUNCPTR(FT_Init_FreeType) - LOAD_FUNCPTR(FT_Load_Glyph) - LOAD_FUNCPTR(FT_Matrix_Multiply) -+#ifndef FT_MULFIX_INLINED - LOAD_FUNCPTR(FT_MulFix) -+#endif - LOAD_FUNCPTR(FT_New_Face) - LOAD_FUNCPTR(FT_New_Memory_Face) - LOAD_FUNCPTR(FT_Outline_Get_Bitmap) diff --git a/emulators/wine/patches/patch-cd b/emulators/wine/patches/patch-cd new file mode 100644 index 00000000000..497973c7208 --- /dev/null +++ b/emulators/wine/patches/patch-cd @@ -0,0 +1,16 @@ +$NetBSD: patch-cd,v 1.1 2011/05/04 20:31:40 adam Exp $ + +--- dlls/wsock32/socket.c.orig 2009-02-27 23:21:46.000000000 +0100 ++++ dlls/wsock32/socket.c +@@ -23,10 +23,10 @@ + #include "config.h" + #include <stdarg.h> + ++#include "winsock2.h" + #include "windef.h" + #include "winbase.h" + #include "wine/debug.h" +-#include "winsock2.h" + #include "winnt.h" + #include "wscontrol.h" + #include "iphlpapi.h" diff --git a/emulators/wine/patches/patch-ce b/emulators/wine/patches/patch-ce new file mode 100644 index 00000000000..4a1c8980fb0 --- /dev/null +++ b/emulators/wine/patches/patch-ce @@ -0,0 +1,12 @@ +$NetBSD: patch-ce,v 1.1 2011/05/04 20:31:40 adam Exp $ + +--- dlls/riched20/tests/editor.c.orig 2009-02-27 23:21:46.000000000 +0100 ++++ dlls/riched20/tests/editor.c +@@ -23,6 +23,7 @@ + #include <stdarg.h> + #include <stdio.h> + #include <assert.h> ++#include <winsock2.h> + #include <windef.h> + #include <winbase.h> + #include <wingdi.h> diff --git a/emulators/wine/patches/patch-cf b/emulators/wine/patches/patch-cf new file mode 100644 index 00000000000..241508a98de --- /dev/null +++ b/emulators/wine/patches/patch-cf @@ -0,0 +1,12 @@ +$NetBSD: patch-cf,v 1.1 2011/05/04 20:31:40 adam Exp $ + +--- dlls/riched32/tests/editor.c.orig 2009-02-27 23:21:46.000000000 +0100 ++++ dlls/riched32/tests/editor.c +@@ -23,6 +23,7 @@ + + #include <stdarg.h> + #include <assert.h> ++#include <winsock2.h> + #include <windef.h> + #include <winbase.h> + #include <wingdi.h> |