summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2009-09-22 12:18:33 +0000
committertnn <tnn@pkgsrc.org>2009-09-22 12:18:33 +0000
commit66f747637a36f8e2562284cec6ce19d0fa2736c7 (patch)
tree586eb657e42256c869c35f7ae7f1f16c1f414e59 /emulators
parent8d82699363149fe559d409e3ef04e03df209e8ba (diff)
downloadpkgsrc-66f747637a36f8e2562284cec6ce19d0fa2736c7.tar.gz
The package's install target already installs manpages, no need for
us to do it manually anymore.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu/Makefile6
-rw-r--r--emulators/qemu/distinfo4
-rw-r--r--emulators/qemu/patches/patch-dd8
3 files changed, 8 insertions, 10 deletions
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index a28d1e57055..f91e1957c0b 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/08/31 14:30:50 tnn Exp $
+# $NetBSD: Makefile,v 1.59 2009/09/22 12:18:33 tnn Exp $
#
DISTNAME= qemu-0.10.6
@@ -26,7 +26,7 @@ CFLAGS+= -I${WRKSRC} -I${WRKSRC}/slirp
.include "../../mk/bsd.prefs.mk"
-CONFIGURE_ENV+= PKGMANDIR=${PKGMANDIR}
+CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
CONFIGURE_ARGS+= --interp-prefix=${PREFIX:Q}/share/qemu
@@ -69,8 +69,6 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
post-install:
${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 --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 874ca7a5a22..cb8fd027518 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2009/08/31 14:49:21 tnn Exp $
+$NetBSD: distinfo,v 1.49 2009/09/22 12:18:33 tnn Exp $
SHA1 (qemu-0.10.6.tar.gz) = 9432738ba513e07c981097468945b2e3ad9cb81e
RMD160 (qemu-0.10.6.tar.gz) = 1321a10777d2e0c6b53887d0525a28cc1b36ec9b
@@ -10,7 +10,7 @@ SHA1 (patch-ba) = 7c5043a39405f52b512e479a46fc76108580b7bc
SHA1 (patch-da) = 994eb51de1e7398acf95189da182f755f2ca65e1
SHA1 (patch-db) = 7e729851615598646aa3f2d7278147198d0a7a45
SHA1 (patch-dc) = 508d40a99242ba025ade0d067e6d44d3a8a4f0cc
-SHA1 (patch-dd) = 98133e7526441ddea5647c006f146474fcd59826
+SHA1 (patch-dd) = b0646af492c3081fc5cf752fb73df0013eadad94
SHA1 (patch-de) = 14f6598f5467c4dfbea729ca2f4adcf6fe1144be
SHA1 (patch-df) = f21a7832e2cc94dbe76626b74455d33f5ca50ee5
SHA1 (patch-dg) = 784fc32c7a93ec154b99f312db16aba9e950122a
diff --git a/emulators/qemu/patches/patch-dd b/emulators/qemu/patches/patch-dd
index 0e98e3077a0..4f972458b04 100644
--- a/emulators/qemu/patches/patch-dd
+++ b/emulators/qemu/patches/patch-dd
@@ -1,7 +1,7 @@
-$NetBSD: patch-dd,v 1.1 2009/08/31 10:18:49 hasso Exp $
+$NetBSD: patch-dd,v 1.2 2009/09/22 12:18:33 tnn Exp $
---- configure.orig 2009-07-17 03:56:22 +0300
-+++ configure 2009-08-30 19:37:40 +0300
+--- configure.orig 2009-07-17 02:56:22.000000000 +0200
++++ configure
@@ -228,6 +228,15 @@ if [ "$cpu" = "i386" -o "$cpu" = "x86_64
kqemu="yes"
fi
@@ -23,7 +23,7 @@ $NetBSD: patch-dd,v 1.1 2009/08/31 10:18:49 hasso Exp $
prefix="/usr/local"
fi
- mansuffix="/share/man"
-+ mansuffix="/man"
++ #mansuffix="/share/man"
datasuffix="/share/qemu"
docsuffix="/share/doc/qemu"
binsuffix="/bin"