Mon Aug 9 20:35:25 2010 UTC ()
Remove nbd from UE_ARCHS.  It's not UE but a tool,
and handled in PLIST.nbd and PLIST_VARS lines.


(tsutsui)
diff -r1.70 -r1.71 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.70 -r1.71 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2010/08/09 20:28:32 1.70
+++ pkgsrc/emulators/qemu/Makefile 2010/08/09 20:35:25 1.71
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.70 2010/08/09 20:28:32 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.71 2010/08/09 20:35:25 tsutsui Exp $
2# 2#
3 3
4DISTNAME= qemu-0.12.4 4DISTNAME= qemu-0.12.4
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= http://download.savannah.gnu.org/releases/qemu/ 6MASTER_SITES= http://download.savannah.gnu.org/releases/qemu/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.qemu.org/ 9HOMEPAGE= http://www.qemu.org/
10COMMENT= CPU emulator using dynamic translation 10COMMENT= CPU emulator using dynamic translation
11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -51,27 +51,27 @@ SUBST_FILES.qaudio= monitor.c savevm.c v @@ -51,27 +51,27 @@ SUBST_FILES.qaudio= monitor.c savevm.c v
51 hw/tsc210x.c \ 51 hw/tsc210x.c \
52 hw/wm8750.c 52 hw/wm8750.c
53SUBST_SED.qaudio= -e s,audio.h\",qaudio.h\",g 53SUBST_SED.qaudio= -e s,audio.h\",qaudio.h\",g
54SUBST_MESSAGE.qaudio= Fixing audio.h confusion 54SUBST_MESSAGE.qaudio= Fixing audio.h confusion
55 55
56REPLACE_PERL+= texi2pod.pl 56REPLACE_PERL+= texi2pod.pl
57 57
58BUILDLINK_PASSTHRU_DIRS+= /usr/lib 58BUILDLINK_PASSTHRU_DIRS+= /usr/lib
59BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib 59BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
60 60
61INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu 61INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
62 62
63UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel 63UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel
64UE_ARCHS+= nbd ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus 64UE_ARCHS+= ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
65UE_ARCHS+= sparc64 x86_64 65UE_ARCHS+= sparc64 x86_64
66 66
67.if !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly) 67.if !empty(OPSYS:M*BSD) || !empty(OPSYS:MDragonFly)
68USER_EMUL= i386 x86_64 sparc sparc64 68USER_EMUL= i386 x86_64 sparc sparc64
69.elif !empty(OPSYS:MDarwin) 69.elif !empty(OPSYS:MDarwin)
70USER_EMUL= i386 x86_64 sparc sparc64 ppc 70USER_EMUL= i386 x86_64 sparc sparc64 ppc
71.elif !empty(OPSYS:MLinux) 71.elif !empty(OPSYS:MLinux)
72USER_EMUL= ${UE_ARCHS} 72USER_EMUL= ${UE_ARCHS}
73PLIST.nbd= YES 73PLIST.nbd= YES
74.endif 74.endif
75 75
76PLIST_VARS+= ${UE_ARCHS} nbd 76PLIST_VARS+= ${UE_ARCHS} nbd
77.for _var_ in ${USER_EMUL} 77.for _var_ in ${USER_EMUL}