[pkgsrc/trunk]: pkgsrc/emulators/qemu DESTDIR support, order PLIST and add RC...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bc006a10cd3c
branches:  trunk
changeset: 536607:bc006a10cd3c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Dec 18 00:16:56 2007 +0000

description:
DESTDIR support, order PLIST and add RCS ids to some patches.

diffstat:

 emulators/qemu/Makefile         |  16 +++++++++-------
 emulators/qemu/PLIST            |   8 ++++----
 emulators/qemu/distinfo         |   8 ++++----
 emulators/qemu/patches/patch-ac |   2 ++
 emulators/qemu/patches/patch-ak |  14 ++++++++------
 emulators/qemu/patches/patch-au |   2 ++
 6 files changed, 29 insertions(+), 21 deletions(-)

diffs (132 lines):

diff -r 9b17adbe52af -r bc006a10cd3c emulators/qemu/Makefile
--- a/emulators/qemu/Makefile   Tue Dec 18 00:11:26 2007 +0000
+++ b/emulators/qemu/Makefile   Tue Dec 18 00:16:56 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2007/09/10 12:18:13 abs Exp $
+# $NetBSD: Makefile,v 1.49 2007/12/18 00:16:56 joerg Exp $
 #
 
 DISTNAME=              qemu-0.9.0
@@ -9,6 +9,8 @@
 HOMEPAGE=              http://www.qemu.org/
 COMMENT=               CPU emulator using dynamic translation
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS+=            qemu-bin-[0-9]*
 NOT_FOR_PLATFORM=      NetBSD-1.[0-6]*-*
 
@@ -58,13 +60,13 @@
 CONFIGURE_ARGS+=       --disable-gcc-check
 .endif
 
+INSTALLATION_DIRS=     ${PKGMANDIR}/man1 share/doc/qemu
+
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/qemu
-       ${INSTALL_DATA} ${FILESDIR:Q}/Makefile.multinode-NetBSD \
-               ${PREFIX:Q}/share/doc/qemu/
-
-       ${INSTALL_MAN} ${WRKSRC}/qemu.1 ${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_MAN} ${WRKSRC}/qemu-img.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_DATA} ${FILESDIR}/Makefile.multinode-NetBSD \
+               ${DESTDIR}${PREFIX}/share/doc/qemu/
+       ${INSTALL_MAN} ${WRKSRC}/qemu.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/qemu-img.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
diff -r 9b17adbe52af -r bc006a10cd3c emulators/qemu/PLIST
--- a/emulators/qemu/PLIST      Tue Dec 18 00:11:26 2007 +0000
+++ b/emulators/qemu/PLIST      Tue Dec 18 00:16:56 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2007/05/21 20:24:44 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/12/18 00:16:56 joerg Exp $
 bin/qemu
 bin/qemu-img
 bin/qemu-system-arm
@@ -51,12 +51,12 @@
 share/qemu/linux_boot.bin
 share/qemu/openbios-sparc32
 share/qemu/ppc_rom.bin
+share/qemu/pxe-ne2k_pci.bin
+share/qemu/pxe-pcnet.bin
+share/qemu/pxe-rtl8139.bin
 share/qemu/vgabios-cirrus.bin
 share/qemu/vgabios.bin
 share/qemu/video.x
-share/qemu/pxe-ne2k_pci.bin
-share/qemu/pxe-pcnet.bin
-share/qemu/pxe-rtl8139.bin
 @dirrm share/qemu/keymaps
 @dirrm share/qemu
 @dirrm share/doc/qemu
diff -r 9b17adbe52af -r bc006a10cd3c emulators/qemu/distinfo
--- a/emulators/qemu/distinfo   Tue Dec 18 00:11:26 2007 +0000
+++ b/emulators/qemu/distinfo   Tue Dec 18 00:16:56 2007 +0000
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.33 2007/10/07 21:21:00 heinz Exp $
+$NetBSD: distinfo,v 1.34 2007/12/18 00:16:56 joerg Exp $
 
 SHA1 (qemu-0.9.0.tar.gz) = 1e57e48a06eb8729913d92601000466eecef06cb
 RMD160 (qemu-0.9.0.tar.gz) = 4296542b6da18a6ac93d20787330d3c1c2ac0a19
 Size (qemu-0.9.0.tar.gz) = 1901741 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
-SHA1 (patch-ac) = dd1325e19bee1fb1ff1f08e0248d0972706802ac
+SHA1 (patch-ac) = f3f37f2e72de28077a6579b12ecb2ea6650eea85
 SHA1 (patch-ag) = 91f10c4556a45ca3ec19efe67dcaa6625902c120
-SHA1 (patch-ak) = d57f616987260a700f038a633708a27b68d2bbe2
+SHA1 (patch-ak) = 004f47719cd533354162c336da833c20a2b288af
 SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
 SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
-SHA1 (patch-au) = afe7e210b7158064b8f64452c5e5ab95631bf9eb
+SHA1 (patch-au) = 8dec416dcff966ecf23bd8cb7904ab5bed22d08a
 SHA1 (patch-av) = 715e9680d70c1aa1c83bda0270125144a26d6140
 SHA1 (patch-aw) = 3b1472a95a2312f9e49ea1a6aa517ad81328324c
 SHA1 (patch-ax) = 66b060005ecbf9fd0451f7960e81eccbabf959ca
diff -r 9b17adbe52af -r bc006a10cd3c emulators/qemu/patches/patch-ac
--- a/emulators/qemu/patches/patch-ac   Tue Dec 18 00:11:26 2007 +0000
+++ b/emulators/qemu/patches/patch-ac   Tue Dec 18 00:16:56 2007 +0000
@@ -1,3 +1,5 @@
+$NetBSD: patch-ac,v 1.9 2007/12/18 00:16:56 joerg Exp $
+
 --- vl.c.orig  2007-05-02 01:56:26.000000000 +0200
 +++ vl.c       2007-05-02 01:57:42.000000000 +0200
 @@ -44,7 +44,7 @@
diff -r 9b17adbe52af -r bc006a10cd3c emulators/qemu/patches/patch-ak
--- a/emulators/qemu/patches/patch-ak   Tue Dec 18 00:11:26 2007 +0000
+++ b/emulators/qemu/patches/patch-ak   Tue Dec 18 00:16:56 2007 +0000
@@ -1,6 +1,8 @@
---- Makefile.orig      2007-05-02 02:06:53.000000000 +0200
-+++ Makefile   2007-05-02 02:08:59.000000000 +0200
-@@ -66,21 +66,21 @@
+$NetBSD: patch-ak,v 1.11 2007/12/18 00:16:56 joerg Exp $
+
+--- Makefile.orig      2007-02-06 00:01:54.000000000 +0100
++++ Makefile
+@@ -66,21 +66,21 @@ ar      de     en-us  fi  fr-be  hr     
  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr
  
  install-doc: $(DOCS)
@@ -17,9 +19,9 @@
 -      mkdir -p "$(DESTDIR)$(bindir)"
 -      $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
 -      mkdir -p "$(DESTDIR)$(datadir)"
-+      $(BSD_INSTALL_PROGRAM_DIR) $(bindir)
-+      $(BSD_INSTALL_PROGRAM) $(TOOLS) $(bindir)
-+      $(BSD_INSTALL_DATA_DIR) $(datadir)
++      $(BSD_INSTALL_PROGRAM_DIR) ${DESTDIR}$(bindir)
++      $(BSD_INSTALL_PROGRAM) $(TOOLS) ${DESTDIR}$(bindir)
++      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(datadir)
        for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
                video.x openbios-sparc32 linux_boot.bin pxe-ne2k_pci.bin \
                pxe-rtl8139.bin pxe-pcnet.bin; do \
diff -r 9b17adbe52af -r bc006a10cd3c emulators/qemu/patches/patch-au
--- a/emulators/qemu/patches/patch-au   Tue Dec 18 00:11:26 2007 +0000
+++ b/emulators/qemu/patches/patch-au   Tue Dec 18 00:16:56 2007 +0000
@@ -1,3 +1,5 @@
+$NetBSD: patch-au,v 1.4 2007/12/18 00:16:56 joerg Exp $
+
 --- fpu/softfloat-native.h.orig        2007-02-06 00:01:54.000000000 +0100
 +++ fpu/softfloat-native.h     2007-05-02 01:54:50.000000000 +0200
 @@ -33,6 +33,24 @@