 @@ -1,32 +1,33 @@
-# $NetBSD: Makefile,v 1.161 2017/01/01 14:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.162 2017/01/08 02:26:47 kamil Exp $
 DISTNAME=	qemu-2.8.0
 PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.qemu.org/
 COMMENT=	CPU emulator using dynamic translation
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
 CONFLICTS+=		qemu-bin-[0-9]*
 NOT_FOR_PLATFORM+=	NetBSD-1.[0-6]*-*
 # qemu 1 does not work on NetBSD-5; see http://gnats.netbsd.org/46565.
 NOT_FOR_PLATFORM+=	NetBSD-5*-*
 USE_TOOLS+=		bison gmake makeinfo perl:build pkg-config
-USE_NCURSES=		yes			# requires resize_term()
+FAKE_NCURSES=		yes
 UNLIMIT_RESOURCES=	datasize
 HAS_CONFIGURE=		yes
 BUILD_DEPENDS+=		texi2html-[0-9]*:../../textproc/texi2html
 SUBST_CLASSES+=			prefix
 SUBST_STAGE.prefix=		pre-configure
 SUBST_MESSAGE.prefix=		Setting PREFIX
 SUBST_FILES.prefix+=		configure
 SUBST_VARS.prefix+=		PREFIX
 .include "options.mk"
 @@ -125,20 +126,20 @@ PLIST_VARS+=		${UE_ARCHS} nbd ivshmem
 .for _var_ in ${USER_EMUL}
 PLIST.${_var_}=		YES
 .endfor
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
 		${DESTDIR}${PREFIX}/share/doc/qemu/
 # On Darwin, qemu uses Cocoa and CoreAudio
 .if empty(OPSYS:MDarwin)
 .include "../../mk/oss.buildlink3.mk"
 .endif
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/ncursesw/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,21 +1,21 @@
-$NetBSD: distinfo,v 1.119 2016/12/30 10:00:16 ryoon Exp $
+$NetBSD: distinfo,v 1.120 2017/01/08 02:26:47 kamil Exp $
 SHA1 (qemu-2.8.0.tar.bz2) = a5602f2ddb51d61b4c0e618b779fdb0dbdc9cc1f
 RMD160 (qemu-2.8.0.tar.bz2) = da1e640443a15f36a242fe803c65a39f85b06fcc
 SHA512 (qemu-2.8.0.tar.bz2) = 50f2988d822388ba9fd1bf5dbe68359033ed7432d7f0f9790299f32f63faa6dc72979256b5632ba572d47ee3e74ed40e3e8e331dc6303ec1599f1b4367cb78c2
 Size (qemu-2.8.0.tar.bz2) = 28368517 bytes
 SHA1 (patch-Makefile.objs) = f40deeed5482a24369e898411bb611be418dc3ca
-SHA1 (patch-configure) = dba5399fb674f0848111c3fecb65462a6829444a
+SHA1 (patch-configure) = 5c2911c1375a2f8916f84f68d4ba9a799b7624cb
 SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7
 SHA1 (patch-ef) = 98a1de2fd48638886b5d16f6a61dc72910e98b41
 SHA1 (patch-et) = e9b850ac5985cbe934b541acbfdb330cce421d50
 SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
 SHA1 (patch-hw_misc_ivshmem.c) = c1fdc8111286f2c760512189db4a854bfc6129d0
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_ppc_mac__newworld.c) = 5131bb6edf8b0acf6e7ed3b6bc7be962dc71eca6
 SHA1 (patch-hw_ppc_mac__oldworld.c) = b71667ab281dc23c9d971dc8754eeefc879bd1d7
 SHA1 (patch-memory.c) = 9f94de7799ef80931fb1de572e5603894f3fb328
 SHA1 (patch-scripts_qemu-binfmt-conf.sh) = a59c227e5891efe201eb2b8af15fb0832a1b20d0
 SHA1 (patch-slirp_tcp__subr.c) = f011c9dc58282e61b26017547a9884f30a6e6154
 SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162

 @@ -1,41 +1,57 @@
-$NetBSD: patch-configure,v 1.15 2016/12/30 10:00:16 ryoon Exp $
+$NetBSD: patch-configure,v 1.16 2017/01/08 02:26:47 kamil Exp $
 Don't use gld on SunOS
 add check for shm_open
 avoid bad substitution
 --- configure.orig	2016-12-20 20:16:44.000000000 +0000
 +++ configure
 @@ -631,7 +631,6 @@ SunOS)
    solaris="yes"
    make="${MAKE-gmake}"
    install="${INSTALL-ginstall}"
 -  ld="gld"
    smbd="${SMBD-/usr/sfw/sbin/smbd}"
    needs_libsunmath="no"
    solarisrev=$(uname -r | cut -f2 -d.)
 @@ -2928,8 +2927,8 @@ if test "$curses" != "no" ; then
      curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
      curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
    else
 -    curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
 -    curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
 +    curses_inc_list="$(@PREFIX@/bin/ncursesw6-config --cflags 2>/dev/null):-I/usr/include/ncursesw:"
 +    curses_lib_list="$(@PREFIX@/bin/ncursesw6-config --libs 2>/dev/null):-lncursesw:-lcursesw"
    fi
    curses_found=no
    cat > $TMPC << EOF
-@@ -3762,6 +3761,27 @@ if compile_prog "" "" ; then
+@@ -2937,14 +2936,13 @@ if test "$curses" != "no" ; then
  #include <curses.h>
  #include <wchar.h>
  int main(void) {
 -  const char *s = curses_version();
    wchar_t wch = L'w';
    setlocale(LC_ALL, "");
    resize_term(0, 0);
    addwstr(L"wide chars\n");
    addnwstr(&wch, 1);
    add_wch(WACS_DEGREE);
 -  return s != 0;
 +  return 0;
+ }
  EOF
    IFS=:
@@ -3762,6 +3760,27 @@ if compile_prog "" "" ; then
    fallocate_zero_range=yes
  fi
 +# check for shm_open
 +shm_open=no
 +cat > $TMPC << EOF
 +#include <sys/types.h>
 +#include <sys/mman.h>
 +#include <fcntl.h>
 +#include <stddef.h> // for NULL
++
 +int main(void)
 +{
 @@ -43,48 +59,48 @@ avoid bad substitution
 +    return 0;
 +}
 +EOF
 +if compile_prog "" "" ; then
 +    shm_open=yes
 +elif compile_prog "" "-lrt" ; then
 +    LIBS="$LIBS -lrt"
 +    shm_open=yes
 +fi
++
  # check for posix_fallocate
  posix_fallocate=no
  cat > $TMPC << EOF
-@@ -4041,8 +4061,13 @@ fi
+@@ -4041,8 +4060,13 @@ fi
  cat > $TMPC <<EOF
  #include <signal.h>
  #include <time.h>
 +#include <sys/types.h>
 +#include <sys/mman.h>
 +#include <fcntl.h>
++
  int main(void) {
    timer_create(CLOCK_REALTIME, NULL, NULL);
 +    shm_open(NULL, O_RDWR, 0644);
    return clock_gettime(CLOCK_REALTIME, NULL);
+ }
  EOF
-@@ -4797,7 +4822,9 @@ if test "$want_tools" = "yes" ; then
+@@ -4797,7 +4821,9 @@ if test "$want_tools" = "yes" ; then
    tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
    if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
      tools="qemu-nbd\$(EXESUF) $tools"
 -    tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
 +    if test "$shm_open" = "yes" ; then
 +      tools="ivshmem-client\$(EXESUF) ivshmem-server\$(EXESUF) $tools"
 +    fi
    fi
  fi
  if test "$softmmu" = yes ; then
-@@ -5303,6 +5330,9 @@ fi
+@@ -5303,6 +5329,9 @@ fi
  if test "$fallocate_zero_range" = "yes" ; then
    echo "CONFIG_FALLOCATE_ZERO_RANGE=y" >> $config_host_mak
  fi
 +if [ "$shm_open" = "yes" ] ; then
 +  echo "CONFIG_SHM_OPEN=y" >> $config_host_mak
 +fi
  if test "$posix_fallocate" = "yes" ; then
    echo "CONFIG_POSIX_FALLOCATE=y" >> $config_host_mak
  fi