CVS commit: pkgsrc/emulators/qemu

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Sun Jan  8 02:26:47 UTC 2017

Modified Files:
        pkgsrc/emulators/qemu: Makefile distinfo
        pkgsrc/emulators/qemu/patches: patch-configure

Log Message:
Add support in qemu for native NetBSD curses(3)

curses_version() is ncurses specific function available only in ncurses and
used just in configure.

Bump revision to 1


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.119 -r1.120 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/qemu/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.161 pkgsrc/emulators/qemu/Makefile:1.162
--- pkgsrc/emulators/qemu/Makefile:1.161        Sun Jan  1 14:43:38 2017
+++ pkgsrc/emulators/qemu/Makefile      Sun Jan  8 02:26:47 2017
@@ -1,6 +1,7 @@
-# $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
@@ -16,7 +17,7 @@ NOT_FOR_PLATFORM+=    NetBSD-1.[0-6]*-*
 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
 
@@ -135,10 +136,10 @@ post-install:
 .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"

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.119 pkgsrc/emulators/qemu/distinfo:1.120
--- pkgsrc/emulators/qemu/distinfo:1.119        Fri Dec 30 10:00:16 2016
+++ pkgsrc/emulators/qemu/distinfo      Sun Jan  8 02:26:47 2017
@@ -1,11 +1,11 @@
-$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

Index: pkgsrc/emulators/qemu/patches/patch-configure
diff -u pkgsrc/emulators/qemu/patches/patch-configure:1.15 pkgsrc/emulators/qemu/patches/patch-configure:1.16
--- pkgsrc/emulators/qemu/patches/patch-configure:1.15  Fri Dec 30 10:00:16 2016
+++ pkgsrc/emulators/qemu/patches/patch-configure       Sun Jan  8 02:26:47 2017
@@ -1,4 +1,4 @@
-$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
@@ -25,7 +25,23 @@ avoid bad substitution
    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
  
@@ -53,7 +69,7 @@ avoid bad substitution
  # 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>
@@ -67,7 +83,7 @@ avoid bad substitution
    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"
@@ -78,7 +94,7 @@ avoid bad substitution
    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