Mon Aug 9 11:49:11 2010 UTC ()
- remove obsolete SUBST_foo lines
- use less wildcard for SUBST_FILES.qaudio so that
  we won't miss valid "Nothing changed" warnings


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

--- pkgsrc/emulators/qemu/Makefile 2010/06/16 18:31:27 1.68
+++ pkgsrc/emulators/qemu/Makefile 2010/08/09 11:49:10 1.69
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.68 2010/06/16 18:31:27 tnn Exp $ 1# $NetBSD: Makefile,v 1.69 2010/08/09 11:49:10 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
@@ -20,53 +20,50 @@ HAS_CONFIGURE= yes @@ -20,53 +20,50 @@ HAS_CONFIGURE= yes
20 20
21BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html 21BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
22 22
23# Workaround for PR/41007 - ensure WRKSRC comes before any buildlinked 23# Workaround for PR/41007 - ensure WRKSRC comes before any buildlinked
24# directories so we pickup our audio/audio.h. Cannot use CPPFLAGS for this 24# directories so we pickup our audio/audio.h. Cannot use CPPFLAGS for this
25CFLAGS+= -I${WRKSRC} -I${WRKSRC}/slirp 25CFLAGS+= -I${WRKSRC} -I${WRKSRC}/slirp
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} 29CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
30CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 30CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
31CONFIGURE_ARGS+= --interp-prefix=${PREFIX:Q}/share/qemu 31CONFIGURE_ARGS+= --interp-prefix=${PREFIX:Q}/share/qemu
32 32
33.if !empty(MACHINE_PLATFORM:MNetBSD-*) 
34SUBST_CLASSES+= lib 
35SUBST_STAGE.lib= pre-configure 
36SUBST_FILES.lib= x86_64.ld 
37SUBST_SED.lib= -e s,/lib64,/lib,g 
38SUBST_MESSAGE.lib= fixing hardcoded paths to libraries. 
39.endif 
40 
41SUBST_CLASSES+= snd 
42SUBST_STAGE.snd= pre-configure 
43SUBST_FILES.snd= audio/ossaudio.c 
44SUBST_SED.snd= -e s,/dev/dsp,${DEVOSSAUDIO:Q},g 
45SUBST_MESSAGE.snd= Fixing hardcoded audio device. 
46 
47SUBST_CLASSES+= smbd 
48SUBST_STAGE.smbd= pre-configure 
49SUBST_FILES.smbd= vl.c 
50SUBST_SED.smbd= -e s,/usr/sbin/smbd,${PREFIX:Q}/sbin/smbd,g 
51SUBST_MESSAGE.smbd= Fixing hardcoded paths. 
52 
53# Avoid clash with system include file: 33# Avoid clash with system include file:
54pre-patch: 34pre-patch:
55 mv ${WRKSRC}/audio/audio.h ${WRKSRC}/audio/qaudio.h 35 mv ${WRKSRC}/audio/audio.h ${WRKSRC}/audio/qaudio.h
56 36
57SUBST_CLASSES+= qaudio 37SUBST_CLASSES+= qaudio
58SUBST_STAGE.qaudio= pre-configure 38SUBST_STAGE.qaudio= pre-configure
59SUBST_FILES.qaudio= *.c *.h audio/*.c hw/*.c 39SUBST_FILES.qaudio= monitor.c savevm.c vl.c vnc.h \
 40 audio/*.c \
 41 hw/ac97.c \
 42 hw/adlib.c \
 43 hw/cs4231a.c \
 44 hw/es1370.c \
 45 hw/gus.c \
 46 hw/marvell_88w8618_audio.c \
 47 hw/mips_jazz.c \
 48 hw/mips_malta.c \
 49 hw/omap2.c \
 50 hw/palm.c \
 51 hw/pc.c \
 52 hw/pcspk.c \
 53 hw/sb16.c \
 54 hw/spitz.c \
 55 hw/tsc210x.c \
 56 hw/wm8750.c
60SUBST_SED.qaudio= -e s,audio.h\",qaudio.h\",g 57SUBST_SED.qaudio= -e s,audio.h\",qaudio.h\",g
61SUBST_MESSAGE.qaudio= Fixing audio.h confusion 58SUBST_MESSAGE.qaudio= Fixing audio.h confusion
62 59
63REPLACE_PERL+= texi2pod.pl 60REPLACE_PERL+= texi2pod.pl
64 61
65BUILDLINK_PASSTHRU_DIRS+= /usr/lib 62BUILDLINK_PASSTHRU_DIRS+= /usr/lib
66BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib 63BUILDLINK_PASSTHRU_RPATHDIRS+= /usr/lib
67 64
68INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu 65INSTALLATION_DIRS= ${PKGMANDIR}/man1 share/doc/qemu
69 66
70UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel 67UE_ARCHS+= alpha arm armeb cris i386 m68k microblaze mips mipsel
71UE_ARCHS+= nbd ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus 68UE_ARCHS+= nbd ppc ppc64 ppc64abi32 sh4 sh4eb sparc sparc32plus
72UE_ARCHS+= sparc64 x86_64 69UE_ARCHS+= sparc64 x86_64