diff options
22 files changed, 945 insertions, 343 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 45ad406bc4e..b9381c12f71 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2011/04/22 13:43:30 obache Exp $ +# $NetBSD: Makefile,v 1.19 2011/05/02 21:23:01 adam Exp $ -DISTNAME= wine-1.1.16 -PKGREVISION= 4 +DISTNAME= wine-1.3.19 CATEGORIES= emulators MASTER_SITES= http://ibiblio.org/pub/linux/system/emulators/wine/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} @@ -10,17 +9,13 @@ 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+= *-*-i386 #ONLY_FOR_PLATFORM+= *-*-x86_64 -ONLY_FOR_PLATFORM+= *-*-i386 *-*-x86_64 - -NOT_FOR_PLATFORM+= NetBSD-*-x86_64 - PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c @@ -41,19 +36,21 @@ 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) -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 -.endif -.if !empty(MACHINE_ARCH:Mx86_64) -CONFIGURE_ARGS+= --enable-win64 +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" @@ -64,8 +61,15 @@ post-install: .endfor .include "../../devel/ncurses/buildlink3.mk" +.include "../../graphics/lcms/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-devel/PLIST.FreeBSD b/emulators/wine-devel/PLIST.FreeBSD deleted file mode 100644 index 3da0237b09c..00000000000 --- a/emulators/wine-devel/PLIST.FreeBSD +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.FreeBSD,v 1.1.1.1 2008/11/21 17:40:29 adam Exp $ -bin/wine-pthread diff --git a/emulators/wine-devel/PLIST.Linux b/emulators/wine-devel/PLIST.Linux index 83f044d9052..d1d9ab2835d 100644 --- a/emulators/wine-devel/PLIST.Linux +++ b/emulators/wine-devel/PLIST.Linux @@ -1,4 +1,2 @@ -@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2008/11/21 17:40:29 adam Exp $ -bin/wine-kthread +@comment $NetBSD: PLIST.Linux,v 1.2 2011/05/02 21:23:01 adam Exp $ bin/wine-preloader -bin/wine-pthread diff --git a/emulators/wine-devel/PLIST.NetBSD b/emulators/wine-devel/PLIST.NetBSD deleted file mode 100644 index 17f7852674e..00000000000 --- a/emulators/wine-devel/PLIST.NetBSD +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ -bin/wine-pthread diff --git a/emulators/wine-devel/PLIST.common b/emulators/wine-devel/PLIST.common index 2b360353e7e..eacabf8656a 100644 --- a/emulators/wine-devel/PLIST.common +++ b/emulators/wine-devel/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.8 2009/06/14 17:51:10 joerg Exp $ +@comment $NetBSD: PLIST.common,v 1.9 2011/05/02 21:23:01 adam Exp $ bin/fnt2bdf bin/function_grep.pl bin/msiexec @@ -20,7 +20,6 @@ bin/winegcc bin/winemaker bin/winemine bin/winepath -bin/wineprefixcreate bin/wineserver bin/wmc bin/wrc @@ -29,6 +28,7 @@ include/wine/exception.h include/wine/itss.h include/wine/itss.idl include/wine/library.h +include/wine/msvcrt/assert.h include/wine/msvcrt/conio.h include/wine/msvcrt/crtdbg.h include/wine/msvcrt/crtdefs.h @@ -71,6 +71,7 @@ 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 @@ -81,20 +82,35 @@ 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/atliface.h +include/wine/windows/atliface.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 @@ -105,20 +121,28 @@ 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/cor.idl 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 @@ -126,9 +150,15 @@ include/wine/windows/cvconst.h include/wine/windows/d3d.h include/wine/windows/d3d10.h include/wine/windows/d3d10.idl +include/wine/windows/d3d10_1.h +include/wine/windows/d3d10_1.idl +include/wine/windows/d3d10_1shader.h include/wine/windows/d3d10effect.h include/wine/windows/d3d10misc.h include/wine/windows/d3d10shader.h +include/wine/windows/d3d11.h +include/wine/windows/d3d11.idl +include/wine/windows/d3d11shader.h include/wine/windows/d3d8.h include/wine/windows/d3d8caps.h include/wine/windows/d3d8types.h @@ -136,24 +166,30 @@ include/wine/windows/d3d9.h include/wine/windows/d3d9caps.h include/wine/windows/d3d9types.h include/wine/windows/d3dcaps.h +include/wine/windows/d3dcommon.h +include/wine/windows/d3dcommon.idl +include/wine/windows/d3dcompiler.h include/wine/windows/d3dhal.h include/wine/windows/d3drm.h include/wine/windows/d3drmdef.h include/wine/windows/d3drmobj.h +include/wine/windows/d3drmwin.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/d3dx9anim.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/d3dx9xof.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 @@ -179,11 +215,16 @@ 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 @@ -207,6 +248,8 @@ include/wine/windows/dmusici.h include/wine/windows/dmusics.h include/wine/windows/docobj.h include/wine/windows/docobj.idl +include/wine/windows/docobjectservice.h +include/wine/windows/docobjectservice.idl include/wine/windows/downloadmgr.h include/wine/windows/downloadmgr.idl include/wine/windows/dpaddr.h @@ -232,9 +275,12 @@ 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 +include/wine/windows/evntprov.h include/wine/windows/evntrace.h include/wine/windows/excpt.h include/wine/windows/exdisp.h @@ -244,6 +290,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 @@ -272,12 +320,15 @@ include/wine/windows/icftypes.idl include/wine/windows/icm.h include/wine/windows/icmpapi.h include/wine/windows/idispids.h +include/wine/windows/ifdef.h include/wine/windows/imagehlp.h include/wine/windows/imm.h 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/inaddr.h include/wine/windows/indexsrv.h include/wine/windows/indexsrv.idl include/wine/windows/initguid.h @@ -288,6 +339,7 @@ include/wine/windows/ipifcons.h include/wine/windows/iprtrmib.h include/wine/windows/iptypes.h include/wine/windows/isguids.h +include/wine/windows/knownfolders.h include/wine/windows/ks.h include/wine/windows/ksguid.h include/wine/windows/ksmedia.h @@ -321,6 +373,8 @@ include/wine/windows/mcx.h include/wine/windows/mediaerr.h include/wine/windows/mediaobj.h include/wine/windows/mediaobj.idl +include/wine/windows/metahost.h +include/wine/windows/metahost.idl include/wine/windows/midles.h include/wine/windows/mimeinfo.h include/wine/windows/mimeinfo.idl @@ -330,11 +384,14 @@ 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 include/wine/windows/mmsystem.h include/wine/windows/mprapi.h +include/wine/windows/mprerror.h include/wine/windows/msacm.h include/wine/windows/msacmdlg.h include/wine/windows/msacmdrv.h @@ -343,6 +400,9 @@ 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 @@ -364,14 +424,20 @@ include/wine/windows/msxml.idl include/wine/windows/msxml2.h include/wine/windows/msxml2.idl include/wine/windows/msxml2did.h +include/wine/windows/msxml6.h +include/wine/windows/msxml6.idl +include/wine/windows/msxml6did.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 @@ -400,9 +466,11 @@ 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 @@ -415,6 +483,10 @@ 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 @@ -427,13 +499,17 @@ 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/restartmanager.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 @@ -441,6 +517,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 @@ -453,8 +533,11 @@ 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 @@ -477,11 +560,15 @@ 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/strsafe.h +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 @@ -491,6 +578,7 @@ 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 @@ -509,8 +597,18 @@ 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/werapi.h 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 @@ -539,6 +637,8 @@ include/wine/windows/winsock.h include/wine/windows/winsock2.h include/wine/windows/winspool.h include/wine/windows/winsvc.h +include/wine/windows/winsxs.h +include/wine/windows/winsxs.idl include/wine/windows/wintab.h include/wine/windows/wintabx.h include/wine/windows/winternl.h @@ -549,6 +649,8 @@ 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 @@ -564,9 +666,10 @@ 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 @@ -579,12 +682,17 @@ lib/wine/advapi32.dll.so lib/wine/advpack.dll.so lib/wine/amstream.dll.so lib/wine/appwiz.cpl.so +lib/wine/aspnet_regiis.exe.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/cabarc.exe.so lib/wine/cabinet.dll.so lib/wine/cacls.exe.so lib/wine/capi2032.dll.so @@ -596,9 +704,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 @@ -609,16 +717,37 @@ 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/d3dcompiler_33.dll.so +lib/wine/d3dcompiler_34.dll.so +lib/wine/d3dcompiler_35.dll.so +lib/wine/d3dcompiler_36.dll.so +lib/wine/d3dcompiler_37.dll.so +lib/wine/d3dcompiler_38.dll.so +lib/wine/d3dcompiler_39.dll.so +lib/wine/d3dcompiler_40.dll.so +lib/wine/d3dcompiler_41.dll.so +lib/wine/d3dcompiler_42.dll.so +lib/wine/d3dcompiler_43.dll.so lib/wine/d3dim.dll.so lib/wine/d3drm.dll.so -lib/wine/d3dx8.dll.so +lib/wine/d3dx10_33.dll.so +lib/wine/d3dx10_34.dll.so +lib/wine/d3dx10_35.dll.so +lib/wine/d3dx10_36.dll.so +lib/wine/d3dx10_37.dll.so +lib/wine/d3dx10_38.dll.so +lib/wine/d3dx10_39.dll.so +lib/wine/d3dx10_40.dll.so +lib/wine/d3dx10_41.dll.so +lib/wine/d3dx10_42.dll.so +lib/wine/d3dx10_43.dll.so lib/wine/d3dx9_24.dll.so lib/wine/d3dx9_25.dll.so lib/wine/d3dx9_26.dll.so @@ -636,17 +765,22 @@ 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/d3dx9_43.dll.so lib/wine/d3dxof.dll.so +lib/wine/dbgeng.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 @@ -664,22 +798,493 @@ 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/explorerframe.dll.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/aspnet_regiis.exe +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/cabarc.exe +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/d3dcompiler_33.dll +lib/wine/fakedlls/d3dcompiler_34.dll +lib/wine/fakedlls/d3dcompiler_35.dll +lib/wine/fakedlls/d3dcompiler_36.dll +lib/wine/fakedlls/d3dcompiler_37.dll +lib/wine/fakedlls/d3dcompiler_38.dll +lib/wine/fakedlls/d3dcompiler_39.dll +lib/wine/fakedlls/d3dcompiler_40.dll +lib/wine/fakedlls/d3dcompiler_41.dll +lib/wine/fakedlls/d3dcompiler_42.dll +lib/wine/fakedlls/d3dcompiler_43.dll +lib/wine/fakedlls/d3dim.dll +lib/wine/fakedlls/d3drm.dll +lib/wine/fakedlls/d3dx10_33.dll +lib/wine/fakedlls/d3dx10_34.dll +lib/wine/fakedlls/d3dx10_35.dll +lib/wine/fakedlls/d3dx10_36.dll +lib/wine/fakedlls/d3dx10_37.dll +lib/wine/fakedlls/d3dx10_38.dll +lib/wine/fakedlls/d3dx10_39.dll +lib/wine/fakedlls/d3dx10_40.dll +lib/wine/fakedlls/d3dx10_41.dll +lib/wine/fakedlls/d3dx10_42.dll +lib/wine/fakedlls/d3dx10_43.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/d3dx9_43.dll +lib/wine/fakedlls/d3dxof.dll +lib/wine/fakedlls/dbgeng.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/explorerframe.dll +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/gameux.dll +lib/wine/fakedlls/gdi.exe16 +lib/wine/fakedlls/gdi32.dll +lib/wine/fakedlls/gdiplus.dll +${PLIST.opengl}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/inetcpl.cpl +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/ipconfig.exe +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/ktmw32.dll +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/mofcomp.exe +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/msimsg.dll +lib/wine/fakedlls/msimtf.dll +lib/wine/fakedlls/msisip.dll +lib/wine/fakedlls/msisys.ocx +lib/wine/fakedlls/msnet32.dll +lib/wine/fakedlls/mspatcha.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/msvcp100.dll +lib/wine/fakedlls/msvcp60.dll +lib/wine/fakedlls/msvcp80.dll +lib/wine/fakedlls/msvcp90.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/msxml.dll +lib/wine/fakedlls/msxml2.dll +lib/wine/fakedlls/msxml3.dll +lib/wine/fakedlls/msxml4.dll +lib/wine/fakedlls/msxml6.dll +lib/wine/fakedlls/nddeapi.dll +lib/wine/fakedlls/net.exe +lib/wine/fakedlls/netapi32.dll +lib/wine/fakedlls/netsh.exe +lib/wine/fakedlls/newdev.dll +lib/wine/fakedlls/ngen.exe +lib/wine/fakedlls/normaliz.dll +lib/wine/fakedlls/notepad.exe +lib/wine/fakedlls/npmshtml.dll +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 +${PLIST.opengl}lib/wine/fakedlls/opengl32.dll +lib/wine/fakedlls/pdh.dll +lib/wine/fakedlls/pidgen.dll +lib/wine/fakedlls/ping.exe +lib/wine/fakedlls/plugplay.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/regsvcs.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/rstrtmgr.dll +lib/wine/fakedlls/rtutils.dll +lib/wine/fakedlls/rundll.exe16 +lib/wine/fakedlls/rundll32.exe +lib/wine/fakedlls/samlib.dll +lib/wine/fakedlls/sane.ds +lib/wine/fakedlls/sc.exe +lib/wine/fakedlls/scarddlg.dll +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/servicemodelreg.exe +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/taskkill.exe +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/vcomp.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/wer.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/wineboot.exe +lib/wine/fakedlls/winebrowser.exe +lib/wine/fakedlls/winecfg.exe +lib/wine/fakedlls/wineconsole.exe +lib/wine/fakedlls/wined3d.dll +lib/wine/fakedlls/winedbg.exe +lib/wine/fakedlls/winedevice.exe +${PLIST.esd}lib/wine/fakedlls/wineesd.drv +lib/wine/fakedlls/winefile.exe +lib/wine/fakedlls/winemapi.dll +lib/wine/fakedlls/winemenubuilder.exe +lib/wine/fakedlls/winemine.exe +lib/wine/fakedlls/winemsibuilder.exe +lib/wine/fakedlls/winepath.exe +lib/wine/fakedlls/wineps.drv +${PLIST.x11}lib/wine/fakedlls/winex11.drv +lib/wine/fakedlls/wineps16.drv16 +lib/wine/fakedlls/winevdm.exe +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/wlanapi.dll +lib/wine/fakedlls/wldap32.dll +lib/wine/fakedlls/wmi.dll +lib/wine/fakedlls/wmic.exe +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/wscript.exe +lib/wine/fakedlls/wsock32.dll +lib/wine/fakedlls/wtsapi32.dll +lib/wine/fakedlls/wuapi.dll +lib/wine/fakedlls/wuaueng.dll +lib/wine/fakedlls/xapofx1_1.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/gameux.dll.so +lib/wine/gdi.exe16.so lib/wine/gdi32.dll.so lib/wine/gdiplus.dll.so ${PLIST.opengl}lib/wine/glu32.dll.so -lib/wine/gphoto2.ds.so +${PLIST.x11}lib/wine/gphoto2.ds.so lib/wine/gpkcsp.dll.so lib/wine/hal.dll.so lib/wine/hh.exe.so @@ -695,21 +1300,24 @@ 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/inetcpl.cpl.so lib/wine/inetmib1.dll.so lib/wine/infosoft.dll.so lib/wine/initpki.dll.so lib/wine/inkobj.dll.so lib/wine/inseng.dll.so +lib/wine/ipconfig.exe.so lib/wine/iphlpapi.dll.so 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/ktmw32.dll.so lib/wine/libaclui.def lib/wine/libactiveds.def lib/wine/libadsiid.a @@ -718,6 +1326,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 @@ -737,11 +1346,12 @@ lib/wine/libd3d10.def lib/wine/libd3d10core.def lib/wine/libd3d8.def lib/wine/libd3d9.def +lib/wine/libd3dcompiler.def lib/wine/libd3dim.def lib/wine/libd3drm.def -lib/wine/libd3dx8.def lib/wine/libd3dx9.def lib/wine/libd3dxof.def +lib/wine/libdbgeng.def lib/wine/libdbghelp.def lib/wine/libdciman32.def lib/wine/libddraw.def @@ -759,6 +1369,7 @@ lib/wine/libdxerr8.a lib/wine/libdxerr9.a lib/wine/libdxgi.def lib/wine/libdxguid.a +lib/wine/libfaultrep.def lib/wine/libgdi32.def lib/wine/libgdiplus.def ${PLIST.opengl}lib/wine/libglu32.def @@ -768,6 +1379,7 @@ 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 @@ -781,6 +1393,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 @@ -791,6 +1404,7 @@ lib/wine/libmswsock.def lib/wine/libnddeapi.def lib/wine/libnetapi32.def lib/wine/libnewdev.def +lib/wine/libnormaliz.def lib/wine/libntdll.def lib/wine/libntdsapi.def lib/wine/libntoskrnl.exe.def @@ -806,6 +1420,7 @@ lib/wine/libolesvr32.def ${PLIST.opengl}lib/wine/libopengl32.def lib/wine/libpdh.def lib/wine/libpowrprof.def +lib/wine/libpropsys.def lib/wine/libpsapi.def lib/wine/libquartz.def lib/wine/librasapi32.def @@ -814,6 +1429,7 @@ 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 @@ -828,11 +1444,13 @@ lib/wine/libslc.def lib/wine/libsnmpapi.def lib/wine/libspoolss.def lib/wine/libsti.def +lib/wine/libstrmbase.a lib/wine/libstrmiids.a 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 @@ -840,9 +1458,10 @@ lib/wine/libuuid.a lib/wine/libuxtheme.def lib/wine/libvdmdbg.def lib/wine/libversion.def +lib/wine/libwer.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 @@ -863,8 +1482,9 @@ 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 @@ -872,14 +1492,16 @@ 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/mofcomp.exe.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 @@ -887,38 +1509,59 @@ 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/msimsg.dll.so lib/wine/msimtf.dll.so lib/wine/msisip.dll.so lib/wine/msisys.ocx.so lib/wine/msnet32.dll.so +lib/wine/mspatcha.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/msvcp100.dll.so +lib/wine/msvcp60.dll.so +lib/wine/msvcp80.dll.so +lib/wine/msvcp90.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/msxml.dll.so +lib/wine/msxml2.dll.so lib/wine/msxml3.dll.so +lib/wine/msxml4.dll.so +lib/wine/msxml6.dll.so lib/wine/nddeapi.dll.so lib/wine/net.exe.so lib/wine/netapi32.dll.so +lib/wine/netsh.exe.so lib/wine/newdev.dll.so +lib/wine/ngen.exe.so +lib/wine/normaliz.dll.so lib/wine/notepad.exe.so +lib/wine/npmshtml.dll.so lib/wine/ntdll.dll.so lib/wine/ntdsapi.dll.so lib/wine/ntoskrnl.exe.so @@ -926,26 +1569,29 @@ 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/plugplay.exe.so lib/wine/powrprof.dll.so lib/wine/printui.dll.so lib/wine/progman.exe.so @@ -958,11 +1604,12 @@ 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/regsvcs.exe.so lib/wine/regsvr32.exe.so lib/wine/resutils.dll.so lib/wine/riched20.dll.so @@ -971,8 +1618,14 @@ lib/wine/rpcrt4.dll.so lib/wine/rpcss.exe.so lib/wine/rsabase.dll.so lib/wine/rsaenh.dll.so +lib/wine/rstrtmgr.dll.so +lib/wine/rtutils.dll.so +lib/wine/rundll.exe16.so lib/wine/rundll32.exe.so +lib/wine/samlib.dll.so lib/wine/sane.ds.so +lib/wine/sc.exe.so +lib/wine/scarddlg.dll.so lib/wine/sccbase.dll.so lib/wine/schannel.dll.so lib/wine/secedit.exe.so @@ -980,14 +1633,15 @@ lib/wine/secur32.dll.so lib/wine/security.dll.so lib/wine/sensapi.dll.so lib/wine/serialui.dll.so +lib/wine/servicemodelreg.exe.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 @@ -995,40 +1649,45 @@ 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/taskkill.exe.so lib/wine/taskmgr.exe.so -lib/wine/toolhelp.dll16 +lib/wine/termsv.exe.so +lib/wine/toolhelp.dll16.so lib/wine/traffic.dll.so -lib/wine/twain.dll16 +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/vcomp.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 @@ -1036,85 +1695,100 @@ 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/winealsa.drv.so -lib/wine/wineaudioio.drv.so +lib/wine/w32sys.dll16.so +lib/wine/wbemprox.dll.so +lib/wine/wer.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/wineboot.exe.so lib/wine/winebrowser.exe.so lib/wine/winecfg.exe.so lib/wine/wineconsole.exe.so -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 +${PLIST.esd}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/winemsibuilder.exe.so lib/wine/winepath.exe.so lib/wine/wineps.drv.so -lib/wine/wineps16.drv16 -lib/wine/winevdm.exe.so ${PLIST.x11}lib/wine/winex11.drv.so -lib/wine/wing.dll16 +lib/wine/wineps16.drv16.so +lib/wine/winevdm.exe.so +lib/wine/wing.dll16.so lib/wine/wing32.dll.so 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.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/wlanapi.dll.so lib/wine/wldap32.dll.so lib/wine/wmi.dll.so +lib/wine/wmic.exe.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/wscript.exe.so lib/wine/wsock32.dll.so lib/wine/wtsapi32.dll.so lib/wine/wuapi.dll.so +lib/wine/wuaueng.dll.so +lib/wine/xapofx1_1.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 @@ -1160,4 +1834,5 @@ ${PLIST.x11}share/wine/fonts/vgasysg.fon ${PLIST.x11}share/wine/fonts/vgasysr.fon ${PLIST.x11}share/wine/fonts/vgasyst.fon share/wine/generic.ppd +share/wine/l_intl.nls share/wine/wine.inf diff --git a/emulators/wine-devel/buildlink3.mk b/emulators/wine-devel/buildlink3.mk index d3d2f5c8e53..7f67a0742e5 100644 --- a/emulators/wine-devel/buildlink3.mk +++ b/emulators/wine-devel/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.5 2010/12/23 11:44:30 dsainty Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2011/05/02 21:23:01 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.1.16nb2 +BUILDLINK_API_DEPENDS.wine+= wine>=1.3.0 BUILDLINK_PKGSRCDIR.wine?= ../../emulators/wine pkgbase:= wine @@ -17,8 +16,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-devel/distinfo b/emulators/wine-devel/distinfo index 869dc92254e..fad8acdb364 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,24 +1,24 @@ -$NetBSD: distinfo,v 1.11 2010/02/20 08:59:03 schwarz Exp $ +$NetBSD: distinfo,v 1.12 2011/05/02 21:23:01 adam Exp $ -SHA1 (wine-1.1.16.tar.bz2) = 02f3363de5a2476b513beca3da2bb42aeeff5218 -RMD160 (wine-1.1.16.tar.bz2) = 449baa620eea114d65a8a65d1f0e88d377b94615 -Size (wine-1.1.16.tar.bz2) = 15178491 bytes -SHA1 (patch-aa) = 91e612766286d8bc05d419a3dfd0c1b8a1852a54 +SHA1 (wine-1.3.19.tar.bz2) = aaf58edfe0ffa1759ab7caee2efa057269e47b9f +RMD160 (wine-1.3.19.tar.bz2) = 7798b07b38375a1156f1cdb4e85e7fcb9b64a934 +Size (wine-1.3.19.tar.bz2) = 19185499 bytes +SHA1 (patch-aa) = d3dfe9fe061271e83b75fcfd10fb0ed85e6549b1 SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c -SHA1 (patch-ac) = 81816d4e04cfb13ce407355140d61135a1d494e6 -SHA1 (patch-ad) = 28eda8273241200e11ab8da945f0713c1cfb27ba -SHA1 (patch-ae) = 23bd992e3b56e1838e27753d8cc48112d7de7bcb -SHA1 (patch-af) = f3577aa88f6594feb9a4819742a37b6d69d82cb5 -SHA1 (patch-ah) = 61520f1e238762496502b25ea257b98b01799124 +SHA1 (patch-ac) = e534b092242b19fe25b2761339c42341734fe0e8 +SHA1 (patch-ad) = 54df859456f8f6efcddfcdbb5b3fd514e48e8045 +SHA1 (patch-ae) = 9d216294340483f37223c186e5d76ae34880b0a6 +SHA1 (patch-af) = 32a23d042a2d4f76898dff76e981166ade9e0275 SHA1 (patch-ai) = 54453ed21f52d1da6a7f89bc437f7b318db5058f -SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09 SHA1 (patch-ak) = ff41f617d2ae7bbff57af52dda85647bc4fba354 -SHA1 (patch-ba) = 190b2dd0166c79f681e49fc2e653058ddbd8766f +SHA1 (patch-ba) = 6a8756059b07278398cf6ee83ec94c50e25b6a67 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda -SHA1 (patch-bc) = bf8b1f4aed78de9326824e227df7831e5c8b4dc3 +SHA1 (patch-bc) = 8132bdc30e665ecf8dacad52a2b06c48d4aa553f +SHA1 (patch-bd) = a60f7353f838bb3bf5e554bf80b1751b7d9d2138 +SHA1 (patch-be) = f4d11193a364f3ebcd33825e850addb1638cef30 +SHA1 (patch-bf) = 75c37d9889d535a2c46c0a21f0c9cd49271d96a4 SHA1 (patch-ca) = 90df667407765c473f1331ec8113088fdddc58e5 -SHA1 (patch-cc) = c6fb13ca5625e9231719a0deabede3ec5239b50d SHA1 (patch-cd) = aec27ca5616625e80123e92b3db1abdd90d212a0 SHA1 (patch-ce) = 23088aac01e74164ec6d4a42f96ab7fa34d002c3 SHA1 (patch-cf) = 6a1c8ce2c77de0eebb9aad9cd5078cf18538d8d8 -SHA1 (patch-cg) = 3269054e3cee4af027ea3029c6d05ce2bf70408a +SHA1 (patch-cg) = a4ed965470b150f619e5ca673138fe07094963b2 diff --git a/emulators/wine-devel/options.mk b/emulators/wine-devel/options.mk index 00ec13657ab..462820199f2 100644 --- a/emulators/wine-devel/options.mk +++ b/emulators/wine-devel/options.mk @@ -1,55 +1,52 @@ -# $NetBSD: options.mk,v 1.4 2011/03/09 17:14:13 drochner Exp $ +# $NetBSD: options.mk,v 1.5 2011/05/02 21:23:01 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wine -PKG_SUPPORTED_OPTIONS= cups opengl sane esound ldap dbus hal ssl x11 -PKG_SUGGESTED_OPTIONS= opengl esound ldap dbus 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" -.endif - -.if !empty(PKG_OPTIONS:Mldap) -.include "../../databases/openldap-client/buildlink3.mk" +.if !empty(PKG_OPTIONS:Mcups) +.include "../../print/cups/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-ldap +CONFIGURE_ARGS+= --without-cups .endif .if !empty(PKG_OPTIONS:Mdbus) .include "../../sysutils/dbus/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-dbus +CONFIGURE_ARGS+= --without-dbus +.endif + +.if !empty(PKG_OPTIONS:Mesound) +PLIST.esd= yes +.include "../../audio/esound/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mhal) .include "../../sysutils/hal/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-hal +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) PLIST.x11= yes .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../mk/jpeg.buildlink3.mk" -.include "../../graphics/lcms/buildlink3.mk" -.include "../../mk/giflib.buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" @@ -62,7 +59,8 @@ PLIST.x11= yes .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libXxf86vm/buildlink3.mk" .else -CONFIGURE_ARGS+= --without-x --without-freetype +CONFIGURE_ARGS+= --without-freetype +CONFIGURE_ARGS+= --without-x .endif .if !empty(PKG_OPTIONS:Mopengl) && !empty(PKG_OPTIONS:Mx11) diff --git a/emulators/wine-devel/patches/patch-aa b/emulators/wine-devel/patches/patch-aa index 11fad18abc1..037933648b2 100644 --- a/emulators/wine-devel/patches/patch-aa +++ b/emulators/wine-devel/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2009/01/03 20:12:44 adam Exp $ +$NetBSD: patch-aa,v 1.3 2011/05/02 21:23:01 adam Exp $ ---- Make.rules.in.orig 2009-01-02 17:24:09.000000000 +0100 -+++ Make.rules.in -@@ -122,7 +122,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) - 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) +--- dlls/ntdll/signal_x86_64.c.orig 2011-04-29 18:04:41.000000000 +0000 ++++ dlls/ntdll/signal_x86_64.c +@@ -2450,7 +2450,7 @@ void signal_init_thread( TEB *teb ) + #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) + amd64_set_gsbase( teb ); + #else +-# error Please define setting %gs for your architecture ++# warning Please define setting %gs for your architecture + #endif --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) + ss.ss_sp = (char *)teb + teb_size; diff --git a/emulators/wine-devel/patches/patch-ac b/emulators/wine-devel/patches/patch-ac index 34ed551c18f..2a52af2df0e 100644 --- a/emulators/wine-devel/patches/patch-ac +++ b/emulators/wine-devel/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2008/11/21 18:54:56 adam Exp $ +$NetBSD: patch-ac,v 1.3 2011/05/02 21:23:01 adam Exp $ ---- dlls/ntdll/directory.c.orig 2008-11-21 17:20:28.000000000 +0100 +--- dlls/ntdll/directory.c.orig 2010-06-18 17:36:58.000000000 +0000 +++ dlls/ntdll/directory.c -@@ -130,6 +130,20 @@ static inline int getdents64( int fd, ch +@@ -128,6 +128,20 @@ static inline int getdents64( int fd, ch #endif /* linux */ #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') diff --git a/emulators/wine-devel/patches/patch-ad b/emulators/wine-devel/patches/patch-ad index 484f1f24f37..b7b393d9ac6 100644 --- a/emulators/wine-devel/patches/patch-ad +++ b/emulators/wine-devel/patches/patch-ad @@ -1,10 +1,10 @@ -$NetBSD: patch-ad,v 1.5 2009/02/28 15:30:13 adam Exp $ +$NetBSD: patch-ad,v 1.6 2011/05/02 21:23:01 adam Exp $ ---- dlls/iphlpapi/ipstats.c.orig 2009-02-27 23:21:46.000000000 +0100 -+++ dlls/iphlpapi/ipstats.c +--- 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 <stdlib.h> #include <string.h> + #include <errno.h> #include <sys/types.h> +#if defined(__NetBSD__) +#include <sys/param.h> @@ -13,82 +13,48 @@ $NetBSD: patch-ad,v 1.5 2009/02/28 15:30:13 adam Exp $ #ifdef HAVE_ALIAS_H #include <alias.h> #endif -@@ -287,7 +291,7 @@ DWORD getInterfaceStatsByName(const char - - DWORD getICMPStats(MIB_ICMP *stats) - { --#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) -+#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && !defined(__NetBSD__) - int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; +@@ -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])) - size_t needed; -@@ -484,7 +488,7 @@ DWORD getICMPStats(MIB_ICMP *stats) - - DWORD getIPStats(PMIB_IPSTATS stats) - { --#if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) -+#if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && !defined(__NetBSD__) - int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; +@@ -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])) - int ip_ttl, ip_forwarding; -@@ -653,7 +657,7 @@ DWORD getIPStats(PMIB_IPSTATS stats) - - DWORD getTCPStats(MIB_TCPSTATS *stats) - { --#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) -+#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) +@@ -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 - #define TCPTV_REXMTMAX 128 -@@ -790,7 +794,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) - - DWORD getUDPStats(MIB_UDPSTATS *stats) - { --#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) -+#if 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])) - struct udpstat udp_stat; -@@ -1032,7 +1036,11 @@ DWORD getNumRoutes(void) - - /* 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++; -@@ -1108,8 +1116,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE - - /* 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, -@@ -1270,7 +1282,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE - - DWORD getNumArpEntries(void) - { --#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) -+#if 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}; +@@ -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])) - DWORD arpEntries = 0; -@@ -1326,7 +1338,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN - if (numEntries > 1) - size += (numEntries - 1) * sizeof(MIB_IPNETROW); - table = HeapAlloc(heap, flags, size); --#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) -+#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__) - if (table) +@@ -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-devel/patches/patch-ae b/emulators/wine-devel/patches/patch-ae index 742a373df4b..0fe7ab35137 100644 --- a/emulators/wine-devel/patches/patch-ae +++ b/emulators/wine-devel/patches/patch-ae @@ -1,12 +1,12 @@ -$NetBSD: patch-ae,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $ +$NetBSD: patch-ae,v 1.2 2011/05/02 21:23:01 adam Exp $ ---- dlls/winex11.drv/opengl.c.orig 2008-06-27 16:24:42.000000000 +0200 +--- dlls/winex11.drv/opengl.c.orig 2010-06-18 17:36:58.000000000 +0000 +++ dlls/winex11.drv/opengl.c -@@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl); +@@ -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-devel/patches/patch-af b/emulators/wine-devel/patches/patch-af index 37b7a1a3baa..591997b7954 100644 --- a/emulators/wine-devel/patches/patch-af +++ b/emulators/wine-devel/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.6 2009/02/28 15:30:13 adam Exp $ +$NetBSD: patch-af,v 1.7 2011/05/02 21:23:01 adam Exp $ ---- dlls/ntdll/signal_i386.c.orig 2009-02-27 23:21:46.000000000 +0100 +--- dlls/ntdll/signal_i386.c.orig 2009-07-03 18:28:33.000000000 +0200 +++ dlls/ntdll/signal_i386.c -@@ -403,8 +403,13 @@ enum i386_trap_code +@@ -448,8 +448,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 */ diff --git a/emulators/wine-devel/patches/patch-ah b/emulators/wine-devel/patches/patch-ah deleted file mode 100644 index d345db15c50..00000000000 --- a/emulators/wine-devel/patches/patch-ah +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2009/01/30 19:39:04 adam Exp $ - ---- dlls/kernel32/cpu.c.orig 2009-01-30 17:54:01.000000000 +0100 -+++ dlls/kernel32/cpu.c -@@ -551,7 +551,7 @@ VOID WINAPI GetSystemInfo( - size_t val_len; - char model[256]; - char *cpuclass; -- FILE *f = fopen ("/var/run/dmesg.boot", "r"); -+ //FILE *f = fopen ("/var/run/dmesg.boot", "r"); - - /* first deduce as much as possible from the sysctls */ - mib[0] = CTL_MACHDEP; -@@ -611,6 +611,7 @@ VOID WINAPI GetSystemInfo( - additional information such as CX8, MMX and TSC - (however this information should be considered less - reliable than that from the sysctl calls) */ -+#if 0 - if (f != NULL) - { - while (fgets(model, 255, f) != NULL) { -@@ -632,6 +633,7 @@ VOID WINAPI GetSystemInfo( - } - fclose(f); - } -+#endif - - } - #elif defined(__FreeBSD__) diff --git a/emulators/wine-devel/patches/patch-aj b/emulators/wine-devel/patches/patch-aj deleted file mode 100644 index 59b80a1c829..00000000000 --- a/emulators/wine-devel/patches/patch-aj +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aj,v 1.1.1.1 2008/11/21 17:40:31 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-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba index 64934183ebc..c94e9305950 100644 --- a/emulators/wine-devel/patches/patch-ba +++ b/emulators/wine-devel/patches/patch-ba @@ -1,8 +1,8 @@ -$NetBSD: patch-ba,v 1.9 2010/02/20 08:59:04 schwarz Exp $ +$NetBSD: patch-ba,v 1.10 2011/05/02 21:23:01 adam Exp $ ---- configure.orig 2009-02-27 23:21:46.000000000 +0100 -+++ configure 2010-02-20 09:52:42.000000000 +0100 -@@ -3945,12 +3945,6 @@ +--- configure.orig 2010-06-18 17:36:58.000000000 +0000 ++++ configure +@@ -4204,11 +4204,6 @@ fi $as_echo "$wine_cv_toolsdir" >&6; } TOOLSDIR=$wine_cv_toolsdir @@ -11,19 +11,6 @@ $NetBSD: patch-ba,v 1.9 2010/02/20 08:59:04 schwarz Exp $ - TARGETFLAGS="-b $host_alias $TARGETFLAGS" - -fi -- + for ac_prog in flex do - # Extract the first word of "$ac_prog", so it can be a program name with args. -@@ -17913,6 +17907,11 @@ - - EXTRA_BINARIES="wine-pthread" - ;; -+ netbsd*) -+ MAIN_BINARY="wine-kthread" -+ -+ EXTRA_BINARIES="wine-pthread" -+ ;; - esac - ;; - esac diff --git a/emulators/wine-devel/patches/patch-bc b/emulators/wine-devel/patches/patch-bc index 71008056db3..2a2f76f556c 100644 --- a/emulators/wine-devel/patches/patch-bc +++ b/emulators/wine-devel/patches/patch-bc @@ -1,8 +1,8 @@ -$NetBSD: patch-bc,v 1.2 2008/12/07 00:43:03 adam Exp $ +$NetBSD: patch-bc,v 1.3 2011/05/02 21:23:01 adam Exp $ --- dlls/wineoss.drv/audio.c.orig 2008-12-05 17:57:45.000000000 +0100 +++ dlls/wineoss.drv/audio.c -@@ -75,6 +75,12 @@ +@@ -83,6 +83,12 @@ #include "audio.h" @@ -15,7 +15,7 @@ $NetBSD: patch-bc,v 1.2 2008/12/07 00:43:03 adam Exp $ WINE_DEFAULT_DEBUG_CHANNEL(wave); /* Allow 1% deviation for sample rates (some ES137x cards) */ -@@ -1170,12 +1176,12 @@ LRESULT OSS_WaveInit(void) +@@ -1168,12 +1174,12 @@ LRESULT OSS_WaveInit(void) } else { diff --git a/emulators/wine-devel/patches/patch-bd b/emulators/wine-devel/patches/patch-bd new file mode 100644 index 00000000000..45c92692c12 --- /dev/null +++ b/emulators/wine-devel/patches/patch-bd @@ -0,0 +1,13 @@ +$NetBSD: patch-bd,v 1.1 2011/05/02 21:23:01 adam Exp $ + +--- dlls/Makedll.rules.in.orig 2010-06-18 17:36:58.000000000 +0000 ++++ dlls/Makedll.rules.in +@@ -84,7 +84,7 @@ install_dll: $(MODULE) $(DESTDIR)$(dlldi + $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) + + 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-devel/patches/patch-be b/emulators/wine-devel/patches/patch-be new file mode 100644 index 00000000000..47a417cf173 --- /dev/null +++ b/emulators/wine-devel/patches/patch-be @@ -0,0 +1,13 @@ +$NetBSD: patch-be,v 1.1 2011/05/02 21:23:01 adam Exp $ + +--- programs/Makeprog.rules.in.orig 2010-06-18 17:36:58.000000000 +0000 ++++ programs/Makeprog.rules.in +@@ -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.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) diff --git a/emulators/wine-devel/patches/patch-bf b/emulators/wine-devel/patches/patch-bf new file mode 100644 index 00000000000..932f0576599 --- /dev/null +++ b/emulators/wine-devel/patches/patch-bf @@ -0,0 +1,21 @@ +$NetBSD: patch-bf,v 1.1 2011/05/02 21:23:01 adam Exp $ + +--- libs/wine/Makefile.in.orig 2009-10-09 18:05:57.000000000 +0200 ++++ libs/wine/Makefile.in +@@ -144,14 +144,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 +- $(INSTALL_PROGRAM) libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION) ++ ${BSD_INSTALL_LIB} libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION) + cd $(DESTDIR)$(libdir) && $(RM) libwine.so.$(SOVERSION) && $(LN_S) libwine.so.$(VERSION) libwine.so.$(SOVERSION) + + install-lib-dll: libwine.dll $(DESTDIR)$(libdir) dummy + $(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll + + install-lib-dylib: libwine.$(VERSION).dylib $(DESTDIR)$(libdir) dummy +- $(INSTALL_PROGRAM) libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib ++ ${BSD_INSTALL_LIB} libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib + cd $(DESTDIR)$(libdir) && $(RM) libwine.$(SOVERSION).dylib && $(LN_S) libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib + + install-dev-so: $(DESTDIR)$(libdir) dummy diff --git a/emulators/wine-devel/patches/patch-cc b/emulators/wine-devel/patches/patch-cc deleted file mode 100644 index b793c31b259..00000000000 --- a/emulators/wine-devel/patches/patch-cc +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2009/09/07 20:27:25 reinoud Exp $ - ---- dlls/inetcomm/internettransport.c.orig 2009-02-27 23:21:46.000000000 +0100 -+++ dlls/inetcomm/internettransport.c -@@ -23,11 +23,11 @@ - #include <stdarg.h> - #include <stdio.h> - -+#include "winsock2.h" - #include "windef.h" - #include "winbase.h" - #include "winnt.h" - #include "winuser.h" --#include "winsock2.h" - #include "ws2tcpip.h" - #include "objbase.h" - #include "ole2.h" diff --git a/emulators/wine-devel/patches/patch-cg b/emulators/wine-devel/patches/patch-cg index e8c2a029184..d58026531c3 100644 --- a/emulators/wine-devel/patches/patch-cg +++ b/emulators/wine-devel/patches/patch-cg @@ -1,12 +1,14 @@ -$NetBSD: patch-cg,v 1.1 2009/09/07 20:27:25 reinoud Exp $ +$NetBSD: patch-cg,v 1.2 2011/05/02 21:23:01 adam Exp $ ---- dlls/ws2_32/tests/sock.c.orig 2009-02-27 23:21:46.000000000 +0100 -+++ dlls/ws2_32/tests/sock.c -@@ -22,6 +22,7 @@ +--- dlls/ws2_32/socket.c.orig 2010-12-10 22:33:07.000000000 +0300 ++++ dlls/ws2_32/socket.c 2010-12-22 02:33:54.000000000 +0300 +@@ -440,7 +440,9 @@ + MAP_OPTION( AI_PASSIVE ), + MAP_OPTION( AI_CANONNAME ), + MAP_OPTION( AI_NUMERICHOST ), ++#if !defined(__NetBSD__) + MAP_OPTION( AI_ADDRCONFIG ), ++#endif + }; - #include <stdarg.h> - -+#include <winsock2.h> - #include <windef.h> - #include <winbase.h> - #include <winsock2.h> + static const int ws_niflag_map[][2] = |