CVS commit: [pkgsrc-2017Q1] pkgsrc/emulators/qemu

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon Apr 17 14:51:06 UTC 2017

Modified Files:
        pkgsrc/emulators/qemu [pkgsrc-2017Q1]: distinfo
        pkgsrc/emulators/qemu/patches [pkgsrc-2017Q1]: patch-configure

Log Message:
Pullup ticket #5291 - requested by sevan
emulators/qemu: build fix

Revisions pulled up:
- emulators/qemu/distinfo                                       1.124
- emulators/qemu/patches/patch-configure                        1.18

---
   Module Name:    pkgsrc
   Committed By:   riastradh
   Date:           Sat Apr 15 17:38:48 UTC 2017

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

   Log Message:
   Restore @PREFIX@, not accidental personal /dist/pkg directory.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.122.2.1 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.17 -r1.17.2.1 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/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.122 pkgsrc/emulators/qemu/distinfo:1.122.2.1
--- pkgsrc/emulators/qemu/distinfo:1.122        Sat Mar  4 15:11:10 2017
+++ pkgsrc/emulators/qemu/distinfo      Mon Apr 17 14:51:06 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.122 2017/03/04 15:11:10 spz Exp $
+$NetBSD: distinfo,v 1.122.2.1 2017/04/17 14:51:06 bsiegert 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) = 302d0ed283947b943e7fbcdd1138ba5fad3d1683
+SHA1 (patch-configure) = 4d6e0737cfbd9efcd02ab43c219fed0f0a1a55a9
 SHA1 (patch-default-configs_pci.mak) = 2162550a68de514c8fe9e255df88f8a0a07ee6c7
 SHA1 (patch-disas_libvixl_vixl_a64_disasm-a64.cc) = 0660a0c2d37c332fcd1e00edb2dc3c52fe179cc9
 SHA1 (patch-disas_libvixl_vixl_utils.h) = 85285473b6021f9a0d190832d03c60c4d9df6bb7

Index: pkgsrc/emulators/qemu/patches/patch-configure
diff -u pkgsrc/emulators/qemu/patches/patch-configure:1.17 pkgsrc/emulators/qemu/patches/patch-configure:1.17.2.1
--- pkgsrc/emulators/qemu/patches/patch-configure:1.17  Mon Feb 27 05:19:29 2017
+++ pkgsrc/emulators/qemu/patches/patch-configure       Mon Apr 17 14:51:06 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.17 2017/02/27 05:19:29 adam Exp $
+$NetBSD: patch-configure,v 1.17.2.1 2017/04/17 14:51:06 bsiegert Exp $
 
 Don't use gld on SunOS
 Use ncursesw6-config; define NCURSES_WIDECHAR to fix building on Darwin (at least).
@@ -21,8 +21,8 @@ avoid bad substitution
    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="$(/dist/pkg/bin/ncursesw6-config --cflags 2>/dev/null):-I/usr/include/ncursesw:"
-+    curses_lib_list="$(/dist/pkg/bin/ncursesw6-config --libs 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