summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2006-09-17 07:51:56 +0000
committerxtraeme <xtraeme@pkgsrc.org>2006-09-17 07:51:56 +0000
commitcbc9dccdfa629762298a7f0d1a62838de557788d (patch)
tree976438cbffa26a70f9fcb84b42fcad5dd3b5a14c /emulators
parentd884d498b42dea43f41e3294e97485f21c8a506e (diff)
downloadpkgsrc-cbc9dccdfa629762298a7f0d1a62838de557788d.tar.gz
Install html documentation, noted by hira@.
Bump PKGREVISION.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu/Makefile6
-rw-r--r--emulators/qemu/PLIST4
-rw-r--r--emulators/qemu/distinfo4
-rw-r--r--emulators/qemu/patches/patch-ak10
4 files changed, 12 insertions, 12 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index caa52951419..f9584e04665 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2006/09/16 21:39:30 adrianp Exp $
+# $NetBSD: Makefile,v 1.42 2006/09/17 07:51:56 xtraeme Exp $
#
DISTNAME= qemu-0.8.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= emulators
MASTER_SITES= http://fabrice.bellard.free.fr/qemu/
@@ -10,7 +10,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.qemu.org/
COMMENT= CPU emulator using dynamic translation
-CONFLICTS+= qemu-bin-*
+CONFLICTS+= qemu-bin-[0-9]*
NOT_FOR_PLATFORM= NetBSD-1.[0-6]*-*
USE_TOOLS+= gmake perl:build
diff --git a/emulators/qemu/PLIST b/emulators/qemu/PLIST
index 56e5ad0d504..85386143343 100644
--- a/emulators/qemu/PLIST
+++ b/emulators/qemu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/09/16 13:00:09 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/09/17 07:51:56 xtraeme Exp $
bin/qemu
bin/qemu-img
bin/qemu-system-arm
@@ -10,6 +10,8 @@ bin/qemu-system-x86_64
man/man1/qemu-img.1
man/man1/qemu.1
share/doc/qemu/Makefile.multinode-NetBSD
+share/doc/qemu/qemu-doc.html
+share/doc/qemu/qemu-tech.html
share/qemu/bios.bin
share/qemu/keymaps/ar
share/qemu/keymaps/common
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index b03a3b9a796..87032cb7561 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2006/09/16 15:29:35 hira Exp $
+$NetBSD: distinfo,v 1.28 2006/09/17 07:51:56 xtraeme Exp $
SHA1 (qemu-0.8.2.tar.gz) = d775239a545e7d0c5b677660a2122df590afde6d
RMD160 (qemu-0.8.2.tar.gz) = 715c24997330352aa675cd7279731cec251f833a
@@ -11,7 +11,7 @@ SHA1 (patch-ag) = 197b8f35dc62369d42236e37662eebbdb1a55974
SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
SHA1 (patch-ai) = 480cc80a451488a1376f99ed152a917116759cbf
SHA1 (patch-aj) = a177cd01c32732321d8473d5e5f4489e433fbf8f
-SHA1 (patch-ak) = 75a58b8fe0acd74f40b38b9a9338a708ef2fe76a
+SHA1 (patch-ak) = 4715a464554469e8dac9cde93db83a90885b8a7e
SHA1 (patch-al) = d61bce6a4cebae4ba1f87ce9def277c0ffc5843d
SHA1 (patch-am) = a22a3b23284c377afa8113768d68c8ef40c514f9
SHA1 (patch-ao) = e92d56f991cf29f83e39464f9e695caa86fe5fe0
diff --git a/emulators/qemu/patches/patch-ak b/emulators/qemu/patches/patch-ak
index 304b3cc63d8..5dabd7e51b8 100644
--- a/emulators/qemu/patches/patch-ak
+++ b/emulators/qemu/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.8 2006/09/05 00:44:38 xtraeme Exp $
+$NetBSD: patch-ak,v 1.9 2006/09/17 07:51:56 xtraeme Exp $
--- Makefile.orig 2006-07-22 19:23:34.000000000 +0200
-+++ Makefile 2006-09-05 02:37:31.000000000 +0200
++++ Makefile 2006-09-17 09:43:56.000000000 +0200
@@ -5,15 +5,15 @@
.PHONY: all clean distclean dvi info install install-doc tar tarbin \
speed test test2 html dvi info
@@ -21,7 +21,7 @@ $NetBSD: patch-ak,v 1.8 2006/09/05 00:44:38 xtraeme Exp $
DEFINES+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
TOOLS=qemu-img$(EXESUF)
ifdef CONFIG_STATIC
-@@ -59,20 +59,21 @@
+@@ -59,20 +59,20 @@
common de-ch es fo fr-ca hu ja mk nl-be pt sl tr
install-doc: $(DOCS)
@@ -34,12 +34,10 @@ $NetBSD: patch-ak,v 1.8 2006/09/05 00:44:38 xtraeme Exp $
$(INSTALL) qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
endif
--install: all $(if $(BUILD_DOCS),install-doc)
+ install: all $(if $(BUILD_DOCS),install-doc)
- mkdir -p "$(DESTDIR)$(bindir)"
- $(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
- mkdir -p "$(DESTDIR)$(datadir)"
-+install: all
-+install: all
+ $(BSD_INSTALL_PROGRAM_DIR) $(bindir)
+ $(BSD_INSTALL_PROGRAM) $(TOOLS) $(bindir)
+ $(BSD_INSTALL_DATA_DIR) $(datadir)