Import of pkgsrc-2016Q3

emulators/wine/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.190 2015/08/23 14:30:38 wiz Exp $
+# $NetBSD: Makefile,v 1.194 2016/09/19 13:04:21 wiz Exp $
 
 DISTNAME=	wine-1.6.2
-PKGREVISION=	9
+PKGREVISION=	12
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM+=	*-*-i386 #*-*-x86_64
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LANGUAGES=		c
+USE_LANGUAGES=		c c99
 USE_LIBTOOL=		yes
 USE_NCURSES=		yes
 USE_TOOLS+=		bison flex gmake mktemp msgfmt
@@ -52,6 +52,11 @@ CONFIGURE_ARGS+=	--disable-win16
 CONFIGURE_ARGS+=	--enable-win64
 .endif
 
+.if ${OPSYS} == "NetBSD"
+# gethostbyname_r is in libc, but has a different calling convention
+CONFIGURE_ARGS+=	wine_cv_linux_gethostbyname_r_6=no
+.endif
+
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"

emulators/wine/distinfo

@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.89 2014/01/17 09:01:58 adam Exp $
+$NetBSD: distinfo,v 1.91 2016/06/09 15:26:35 fhajny Exp $
 
 SHA1 (wine-1.6.2.tar.bz2) = 574b9ccedbf213622b7ee55f715764673fc27692
 RMD160 (wine-1.6.2.tar.bz2) = 7252851af5e9f748750685900c918e4fcb31c1f6
+SHA512 (wine-1.6.2.tar.bz2) = 81c83566dc2cab276ab7b9cfb5edc5fbca0f003dcb78044a0197c9a4d9a05a40f9045e5b4981c9219c3c39dab52fe519ef3cb338d79ee01e1fe66e3c056e8397
 Size (wine-1.6.2.tar.bz2) = 21252985 bytes
 SHA1 (patch-configure) = dae045a6c4d3e8a8424567ea058e48e6fa08ed26
+SHA1 (patch-dlls_ntdll_signal__i386.c) = 23028c77cda2611e5fe9c3f78dde55259d0bd6d6
 SHA1 (patch-dlls_wbemprox_builtin.c) = a120531c3ac1e5eddc3c82424d96c0afae69cc7a
 SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 9ea9ad05a32b3f684f22986b227534d87c7dafe7

emulators/wine/patches/patch-dlls_ntdll_signal__i386.c

@@ -0,0 +1,15 @@
+$NetBSD: patch-dlls_ntdll_signal__i386.c,v 1.1 2016/06/09 15:26:35 fhajny Exp $
+
+SunOS needs sys/regset.h for registers too.
+
+--- dlls/ntdll/signal_i386.c.orig	2014-01-10 20:37:29.000000000 +0000
++++ dlls/ntdll/signal_i386.c
+@@ -269,7 +269,7 @@ typedef struct sigcontext SIGCONTEXT;
+ 
+ #elif defined(__svr4__) || defined(_SCO_DS) || defined(__sun)
+ 
+-#ifdef _SCO_DS
++#if defined(_SCO_DS) || defined(__sun)
+ #include <sys/regset.h>
+ #endif
+ #include <sys/ucontext.h>