Import of pkgsrc-2015Q1

emulators/wine-devel/Makefile

@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2014/02/12 23:17:53 tron Exp $
+# $NetBSD: Makefile,v 1.49 2015/02/09 13:30:44 adam Exp $
 
-DISTNAME=	wine-1.7.11
-PKGREVISION=	1
+DISTNAME=	wine-1.7.36
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -24,6 +23,7 @@ USE_NCURSES=		yes
 USE_TOOLS+=		bison flex gmake mktemp msgfmt
 FLEX_REQD=		2.5.33
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-tests
 UNLIMIT_RESOURCES=	datasize
 
 REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
@@ -36,34 +36,44 @@ CONFIGURE_ENV+=		CFLAGS=${CFLAGS:M*:Q}\ -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
 CONFIGURE_ENV+=		LDD=${LDD:Q}
 LIBS+=			${LDFLAGS}
 
+PLIST_VARS+=		oss wine16 wine32 wine64
 # 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).
+# XXX seems not needed anymore; to be removed on next update
 .include "../../mk/bsd.prefs.mk"
 .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
+#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
+PLIST.wine16=		yes
+PLIST.wine32=		yes
 .endif
-# Needs GCC >= 4.4
+# Needs GCC >= 4.4; Experimental
 .if !empty(MACHINE_ARCH:Mx86_64)
-CONFIGURE_ARGS+=	--disable-win16
 CONFIGURE_ARGS+=	--enable-win64
+PLIST.wine64=		yes
+.endif
+
+.if ${OPSYS} != "Darwin"
+PLIST.oss=		yes
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
 .endif
 
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms2/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 "../../graphics/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"

emulators/wine-devel/PLIST.Darwin

@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2011/05/02 21:23:28 adam Exp $
+@comment $NetBSD: PLIST.Darwin,v 1.2 2015/02/09 13:30:44 adam Exp $
 lib/wine/fakedlls/openal32.dll
 lib/wine/fakedlls/opencl.dll
 lib/wine/fakedlls/winecoreaudio.drv
+lib/wine/fakedlls/winemac.drv
 lib/wine/fakedlls/winemp3.acm
 lib/wine/fakedlls/wineqtdecoder.dll
-lib/wine/fakedlls/winequartz.drv
 lib/wine/openal32.dll.so
 lib/wine/opencl.dll.so
 lib/wine/winecoreaudio.drv.so
+lib/wine/winemac.drv.so
 lib/wine/winemp3.acm.so
 lib/wine/wineqtdecoder.dll.so
-lib/wine/winequartz.drv.so

emulators/wine-devel/buildlink3.mk

@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2014/01/19 10:58:23 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2014/05/31 15:56:26 wiz Exp $
 
 BUILDLINK_TREE+=	wine
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	wine
 WINE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wine+=	wine>=1.3.0
-BUILDLINK_ABI_DEPENDS.wine+=	wine>=1.3.26nb1
+BUILDLINK_ABI_DEPENDS.wine+=	wine>=1.7.11nb2
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
 
 pkgbase:= wine
@@ -17,7 +17,7 @@ pkgbase:= wine
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .endif
-.include "../../mk/giflib.buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .endif # WINE_BUILDLINK3_MK
 

emulators/wine-devel/distinfo

@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.21 2014/01/19 10:58:23 adam Exp $
+$NetBSD: distinfo,v 1.24 2015/02/09 13:30:44 adam Exp $
 
-SHA1 (wine-1.7.11.tar.bz2) = ebe30cf1a93782a958e8b1e3ed898310c37676fe
-RMD160 (wine-1.7.11.tar.bz2) = ea565f9f46eeabf803cc5ab319469831a4afa93d
-Size (wine-1.7.11.tar.bz2) = 21359534 bytes
-SHA1 (patch-configure) = 2d540b149e59298ca0fcc43d50873c986fbe0140
-SHA1 (patch-dlls_wbemprox_builtin.c) = a11f910d8b94047f2dcf8b45c27fb1c6c3f3ce59
-SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = fc44346b889ee7486a92e9704a8447334f48f4d1
+SHA1 (wine-1.7.36.tar.bz2) = 69c8bf7116572a4c1e5b1113612f461d88489663
+RMD160 (wine-1.7.36.tar.bz2) = 2cde7505154c656eb58145b4ad7df55251362931
+Size (wine-1.7.36.tar.bz2) = 22010371 bytes
+SHA1 (patch-configure) = 77b5259dfe3644ca17bb9af8aa1be045b5f88c7f
+SHA1 (patch-dlls_ntdll_signal__x86__64.c) = 92ad434b5d8de9d4dcca5004d2fadede58cfeea8
+SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 89f9d1c08dbfbed3eac971ee534944f7403246a4
 SHA1 (patch-dlls_ws2__32_socket.c) = 98ebaa7b0831e558f49a484ffb3a1b28adb9bcf2
+SHA1 (patch-include_msvcrt_crtdefs.h) = a0ceb8e03b6c85133a8cb4b6c91018b2f2bcc860
+SHA1 (patch-include_windef.h) = af09d491cdbdd50a1cc78442c656e26364a53c39
+SHA1 (patch-include_wine_test.h) = af33ec675c67e2fc56cf52e9c6634cab3e6fdfd2

emulators/wine-devel/options.mk

@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2011/05/02 21:23:01 adam Exp $
+# $NetBSD: options.mk,v 1.7 2015/02/09 13:30:44 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	cups dbus esound hal ldap opengl sane ssl x11
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=	opengl ssl x11
 PLIST_VARS+=		esd opengl x11
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-cups
 .endif
@@ -38,15 +38,13 @@ CONFIGURE_ARGS+=	--without-ldap
 .endif
 
 .if !empty(PKG_OPTIONS:Mssl)
-.include "../../security/openssl/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-openssl
+CONFIGURE_ARGS+=	--without-gnutls
 .endif
 
 .if !empty(PKG_OPTIONS:Mx11)
 PLIST.x11=		yes
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
@@ -59,7 +57,6 @@ PLIST.x11=		yes
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--without-freetype
 CONFIGURE_ARGS+=	--without-x
 .endif
 

emulators/wine-devel/patches/patch-configure

@@ -1,10 +1,42 @@
-$NetBSD: patch-configure,v 1.1 2014/01/19 10:58:23 adam Exp $
+$NetBSD: patch-configure,v 1.2 2015/02/09 13:30:44 adam Exp $
 
+Clang does not support __builtin_ms_va_list; make a work-around.
+Do not install 64-bit libraries into ${PREFIX}/lib64.
+Use correct -install_name on Darwin.
 Configure for OSS v3 support for NetBSD.
 
---- configure.orig	2014-01-03 19:00:47.000000000 +0000
+--- configure.orig	2015-02-07 08:14:10.000000000 +0000
 +++ configure
-@@ -12325,14 +12325,25 @@ then
+@@ -4895,6 +4894,9 @@ $as_echo_n "checking whether $CC support
+         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdarg.h>
++#ifdef __clang__
++#define __builtin_ms_va_list va_list
++#endif
+ int
+ main ()
+ {
+@@ -4968,9 +4970,6 @@ then
+     fi
+     enable_fonts=${enable_fonts:-no}
+     enable_server=${enable_server:-no}
+-elif test "x$enable_win64" = "xyes"
+-then
+-    test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64"
+ fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5
+@@ -8048,7 +8047,7 @@ OBJS = \$(C_SRCS:.c=.o) \$(EXTRA_OBJS)
+ all: libwine.dylib
+ 
+ libwine.$libwine_version.dylib: \$(OBJS)
+-	\$(CC) -dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@
++	\$(CC) -dynamiclib -install_name \$(PREFIX)/lib/libwine.$libwine_soversion.dylib -compatibility_version $libwine_soversion -current_version $libwine_version \$(OBJS) \$(EXTRALIBS) \$(LDFLAGS) \$(LIBS) -o \$@
+ 
+ libwine.$libwine_soversion.dylib: libwine.$libwine_version.dylib
+ 	\$(RM) \$@ && \$(LN_S) libwine.$libwine_version.dylib \$@
+@@ -12593,14 +12592,25 @@ then
  if test "x$ac_cv_header_sys_soundcard_h" = xyes; then :
    ac_fn_c_check_member "$LINENO" "oss_sysinfo" "numaudioengines" "ac_cv_member_oss_sysinfo_numaudioengines" "#include <sys/soundcard.h>
  "
@@ -16,7 +48,7 @@ Configure for OSS v3 support for NetBSD.
 +#define HAVE_OSSv4 1
  _ACEOF
  
- OSS4INCL="$ac_oss_incl"
+ OSS4_CFLAGS="$ac_oss_incl"
  
 +else
 +ac_cv_member_oss_sysinfo_numaudioengines=yes

emulators/wine-devel/patches/patch-dlls_ntdll_signal__x86__64.c

@@ -0,0 +1,46 @@
+$NetBSD: patch-dlls_ntdll_signal__x86__64.c,v 1.3 2015/02/09 13:30:44 adam Exp $
+
+--- dlls/ntdll/signal_x86_64.c.orig	2015-01-20 11:56:36.000000000 +0000
++++ dlls/ntdll/signal_x86_64.c
+@@ -694,7 +694,9 @@ struct dwarf_fde
+     unsigned int cie_offset;
+ };
+ 
++#ifdef __linux__
+ extern const struct dwarf_fde *_Unwind_Find_FDE (void *, struct dwarf_eh_bases *);
++#endif
+ 
+ static unsigned char dwarf_get_u1( const unsigned char **p )
+ {
+@@ -2108,6 +2110,7 @@ static NTSTATUS call_stack_handlers( EXC
+ 
+         if (!module || (module->Flags & LDR_WINE_INTERNAL))
+         {
++#ifdef __linux__
+             struct dwarf_eh_bases bases;
+             const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context.Rip - 1), &bases );
+ 
+@@ -2124,6 +2127,7 @@ static NTSTATUS call_stack_handlers( EXC
+                 }
+                 goto unwind_done;
+             }
++#endif
+         }
+         else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) );
+ 
+@@ -3108,6 +3112,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame
+ 
+         if (!module || (module->Flags & LDR_WINE_INTERNAL))
+         {
++#ifdef __linux__
+             struct dwarf_eh_bases bases;
+             const struct dwarf_fde *fde = _Unwind_Find_FDE( (void *)(context->Rip - 1), &bases );
+ 
+@@ -3124,6 +3129,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame
+                 }
+                 goto unwind_done;
+             }
++#endif
+         }
+         else WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) );
+ 

emulators/wine-devel/patches/patch-dlls_wbemprox_builtin.c

@@ -1,20 +0,0 @@
-$NetBSD: patch-dlls_wbemprox_builtin.c,v 1.1 2014/01/19 10:58:23 adam Exp $
-
-Reorder includes to fix 'select' being redefined error on NetBSD.
-
---- dlls/wbemprox/builtin.c.orig	2014-01-03 19:00:47.000000000 +0000
-+++ dlls/wbemprox/builtin.c
-@@ -25,12 +25,12 @@
- 
- #include "ntstatus.h"
- #define WIN32_NO_STATUS
-+#include "winsock2.h"
- #include "windef.h"
- #include "winbase.h"
- #include "initguid.h"
- #include "wbemcli.h"
- #include "wbemprov.h"
--#include "winsock2.h"
- #include "iphlpapi.h"
- #include "tlhelp32.h"
- #include "d3d10.h"

emulators/wine-devel/patches/patch-dlls_wineoss.drv_mmdevdrv.c

@@ -1,8 +1,8 @@
-$NetBSD: patch-dlls_wineoss.drv_mmdevdrv.c,v 1.1 2014/01/19 10:58:23 adam Exp $
+$NetBSD: patch-dlls_wineoss.drv_mmdevdrv.c,v 1.2 2015/02/09 13:30:44 adam Exp $
 
 Restore OSSv3 support for NetBSD.
 
---- dlls/wineoss.drv/mmdevdrv.c.orig	2014-01-03 19:00:47.000000000 +0000
+--- dlls/wineoss.drv/mmdevdrv.c.orig	2015-01-09 19:48:24.000000000 +0000
 +++ dlls/wineoss.drv/mmdevdrv.c
 @@ -55,6 +55,10 @@
  
@@ -14,7 +14,7 @@ Restore OSSv3 support for NetBSD.
 +
  #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
  
- static const REFERENCE_TIME DefaultPeriod = 200000;
+ static const REFERENCE_TIME DefaultPeriod = 100000;
 @@ -112,7 +116,9 @@ struct ACImpl {
      float *vols;
  
@@ -25,7 +25,7 @@ Restore OSSv3 support for NetBSD.
      char devnode[OSS_DEVNODE_SIZE];
  
      BOOL initted, playing;
-@@ -270,7 +276,9 @@ enum DriverPriority {
+@@ -267,7 +273,9 @@ enum DriverPriority {
  int WINAPI AUDDRV_GetPriority(void)
  {
      int mixer_fd;
@@ -35,7 +35,7 @@ Restore OSSv3 support for NetBSD.
  
      /* Attempt to determine if we are running on OSS or ALSA's OSS
       * compatibility layer. There is no official way to do that, so just check
-@@ -283,6 +291,7 @@ int WINAPI AUDDRV_GetPriority(void)
+@@ -280,6 +288,7 @@ int WINAPI AUDDRV_GetPriority(void)
          return Priority_Unavailable;
      }
  
@@ -43,7 +43,7 @@ Restore OSSv3 support for NetBSD.
      sysinfo.version[0] = 0xFF;
      sysinfo.versionnum = ~0;
      if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){
-@@ -290,9 +299,11 @@ int WINAPI AUDDRV_GetPriority(void)
+@@ -287,9 +296,11 @@ int WINAPI AUDDRV_GetPriority(void)
          close(mixer_fd);
          return Priority_Unavailable;
      }
@@ -55,7 +55,7 @@ Restore OSSv3 support for NetBSD.
      if(sysinfo.version[0] < '4' || sysinfo.version[0] > '9'){
          TRACE("Priority_Low: sysinfo.version[0]: %x\n", sysinfo.version[0]);
          return Priority_Low;
-@@ -301,6 +312,7 @@ int WINAPI AUDDRV_GetPriority(void)
+@@ -298,6 +309,7 @@ int WINAPI AUDDRV_GetPriority(void)
          TRACE("Priority_Low: sysinfo.versionnum: %x\n", sysinfo.versionnum);
          return Priority_Low;
      }
@@ -63,7 +63,7 @@ Restore OSSv3 support for NetBSD.
  
      TRACE("Priority_Preferred: Seems like valid OSS!\n");
  
-@@ -407,29 +419,34 @@ static UINT get_default_index(EDataFlow 
+@@ -404,29 +416,34 @@ static UINT get_default_index(EDataFlow 
  {
      int fd = -1, err;
      UINT i;
@@ -100,7 +100,7 @@ Restore OSSv3 support for NetBSD.
      TRACE("Default devnode: %s\n", ai.devnode);
      devnode = oss_clean_devnode(ai.devnode);
      i = 0;
-@@ -440,6 +457,7 @@ static UINT get_default_index(EDataFlow 
+@@ -437,6 +454,7 @@ static UINT get_default_index(EDataFlow 
              ++i;
          }
      }
@@ -108,7 +108,7 @@ Restore OSSv3 support for NetBSD.
  
      WARN("Couldn't find default device! Choosing first.\n");
      return 0;
-@@ -449,7 +467,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
+@@ -446,7 +464,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
          UINT *num, UINT *def_index)
  {
      int i, mixer_fd;
@@ -118,7 +118,7 @@ Restore OSSv3 support for NetBSD.
      static int print_once = 0;
  
      static const WCHAR outW[] = {'O','u','t',':',' ',0};
-@@ -463,6 +483,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
+@@ -460,6 +480,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
          return AUDCLNT_E_SERVICE_NOT_RUNNING;
      }
  
@@ -126,7 +126,7 @@ Restore OSSv3 support for NetBSD.
      if(ioctl(mixer_fd, SNDCTL_SYSINFO, &sysinfo) < 0){
          close(mixer_fd);
  
-@@ -575,6 +596,55 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
+@@ -572,6 +593,55 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDa
          }
      }
  
@@ -182,7 +182,7 @@ Restore OSSv3 support for NetBSD.
      close(mixer_fd);
  
      *def_index = get_default_index(flow);
-@@ -634,6 +704,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G
+@@ -631,6 +701,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G
  
      This->dataflow = oss_dev->flow;
  
@@ -190,7 +190,7 @@ Restore OSSv3 support for NetBSD.
      This->ai.dev = -1;
      if(ioctl(This->fd, SNDCTL_ENGINEINFO, &This->ai) < 0){
          WARN("Unable to get audio info for device %s: %d (%s)\n", oss_dev->devnode,
-@@ -642,9 +713,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G
+@@ -639,9 +710,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G
          HeapFree(GetProcessHeap(), 0, This);
          return E_FAIL;
      }
@@ -202,7 +202,7 @@ Restore OSSv3 support for NetBSD.
      TRACE("OSS audioinfo:\n");
      TRACE("devnode: %s\n", This->ai.devnode);
      TRACE("name: %s\n", This->ai.name);
-@@ -657,6 +730,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G
+@@ -654,6 +727,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(G
      TRACE("max_rate: %d\n", This->ai.max_rate);
      TRACE("min_channels: %d\n", This->ai.min_channels);
      TRACE("max_channels: %d\n", This->ai.max_channels);
@@ -210,7 +210,7 @@ Restore OSSv3 support for NetBSD.
  
      This->IAudioClient_iface.lpVtbl = &AudioClient_Vtbl;
      This->IAudioRenderClient_iface.lpVtbl = &AudioRenderClient_Vtbl;
-@@ -807,10 +881,12 @@ static int get_oss_format(const WAVEFORM
+@@ -816,10 +890,12 @@ static int get_oss_format(const WAVEFORM
              return AFMT_U8;
          case 16:
              return AFMT_S16_LE;
@@ -223,7 +223,7 @@ Restore OSSv3 support for NetBSD.
          }
          return -1;
      }
-@@ -1254,10 +1330,14 @@ static HRESULT WINAPI AudioClient_IsForm
+@@ -1265,10 +1341,14 @@ static HRESULT WINAPI AudioClient_IsForm
              outpwfx = NULL;
      }
  
@@ -238,7 +238,7 @@ Restore OSSv3 support for NetBSD.
  
      if(fd < 0){
          WARN("Unable to open device %s: %d (%s)\n", This->devnode, errno,
-@@ -1267,7 +1347,9 @@ static HRESULT WINAPI AudioClient_IsForm
+@@ -1278,7 +1358,9 @@ static HRESULT WINAPI AudioClient_IsForm
  
      ret = setup_oss_device(mode, fd, pwfx, outpwfx);
  
@@ -248,7 +248,7 @@ Restore OSSv3 support for NetBSD.
  
      return ret;
  }
-@@ -1285,11 +1367,19 @@ static HRESULT WINAPI AudioClient_GetMix
+@@ -1296,11 +1378,19 @@ static HRESULT WINAPI AudioClient_GetMix
          return E_POINTER;
      *pwfx = NULL;
  
@@ -271,7 +271,7 @@ Restore OSSv3 support for NetBSD.
          return E_UNEXPECTED;
  
      fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE));
-@@ -1308,12 +1398,14 @@ static HRESULT WINAPI AudioClient_GetMix
+@@ -1319,12 +1409,14 @@ static HRESULT WINAPI AudioClient_GetMix
      }else if(formats & AFMT_U8){
          fmt->Format.wBitsPerSample = 8;
          fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM;
@@ -286,7 +286,7 @@ Restore OSSv3 support for NetBSD.
      }else{
          WARN("Didn't recognize any available OSS formats: %x\n", formats);
          CoTaskMemFree(fmt);
-@@ -1322,16 +1414,22 @@ static HRESULT WINAPI AudioClient_GetMix
+@@ -1333,16 +1425,22 @@ static HRESULT WINAPI AudioClient_GetMix
  
      /* some OSS drivers are buggy, so set reasonable defaults if
       * the reported values seem wacky */

emulators/wine-devel/patches/patch-include_msvcrt_crtdefs.h

@@ -0,0 +1,13 @@
+$NetBSD: patch-include_msvcrt_crtdefs.h,v 1.1 2015/02/09 13:30:44 adam Exp $
+
+--- include/msvcrt/crtdefs.h.orig	2015-01-20 11:09:23.000000000 +0000
++++ include/msvcrt/crtdefs.h
+@@ -76,7 +76,7 @@
+ #endif /* __cdecl */
+ 
+ #ifndef __ms_va_list
+-# if defined(__x86_64__) && defined (__GNUC__)
++# if defined(__x86_64__) && defined(__GNUC__) && !defined(__clang__)
+ #  define __ms_va_list __builtin_ms_va_list
+ #  define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
+ #  define __ms_va_end(list) __builtin_ms_va_end(list)

emulators/wine-devel/patches/patch-include_windef.h

@@ -0,0 +1,16 @@
+$NetBSD: patch-include_windef.h,v 1.1 2015/02/09 13:30:44 adam Exp $
+
+Clang does not have __builtin_ms_va_list.
+See http://reviews.llvm.org/D1622?id=4152
+
+--- include/windef.h.orig	2015-01-20 09:29:53.000000000 +0000
++++ include/windef.h
+@@ -85,7 +85,7 @@ extern "C" {
+ #endif /* __cdecl */
+ 
+ #ifndef __ms_va_list
+-# if defined(__x86_64__) && defined (__GNUC__)
++# if defined(__x86_64__) && defined(__GNUC__) && !defined(__clang__)
+ #  define __ms_va_list __builtin_ms_va_list
+ #  define __ms_va_start(list,arg) __builtin_ms_va_start(list,arg)
+ #  define __ms_va_end(list) __builtin_ms_va_end(list)

emulators/wine-devel/patches/patch-include_wine_test.h

@@ -0,0 +1,22 @@
+$NetBSD: patch-include_wine_test.h,v 1.1 2015/02/09 13:30:44 adam Exp $
+
+--- include/wine/test.h.orig	2015-01-20 09:39:59.000000000 +0000
++++ include/wine/test.h
+@@ -85,7 +85,7 @@ static inline int winetest_strcmpW( cons
+ #define START_TEST(name) void func_##name(void)
+ #endif
+ 
+-#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT)
++#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) && !defined(__clang__)
+ #define __winetest_cdecl __cdecl
+ #define __winetest_va_list __builtin_ms_va_list
+ #else
+@@ -180,7 +180,7 @@ extern void __winetest_cdecl winetest_tr
+ #include <stdio.h>
+ #include <excpt.h>
+ 
+-#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT)
++#if defined(__x86_64__) && defined(__GNUC__) && defined(__WINE_USE_MSVCRT) && !defined(__clang__)
+ # define __winetest_va_start(list,arg) __builtin_ms_va_start(list,arg)
+ # define __winetest_va_end(list) __builtin_ms_va_end(list)
+ #else