Mon Aug 9 20:28:32 2010 UTC ()
Remove obsolete workaround for PR/41007.
The audio.h confusion has been handled by SUBST_*.qaudio lines.


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

--- pkgsrc/emulators/qemu/Makefile 2010/08/09 11:49:10 1.69
+++ pkgsrc/emulators/qemu/Makefile 2010/08/09 20:28:32 1.70
@@ -1,39 +1,35 @@ @@ -1,39 +1,35 @@
1# $NetBSD: Makefile,v 1.69 2010/08/09 11:49:10 tsutsui Exp $ 1# $NetBSD: Makefile,v 1.70 2010/08/09 20:28:32 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
15CONFLICTS+= qemu-bin-[0-9]* 15CONFLICTS+= qemu-bin-[0-9]*
16NOT_FOR_PLATFORM= NetBSD-1.[0-6]*-* 16NOT_FOR_PLATFORM= NetBSD-1.[0-6]*-*
17 17
18USE_TOOLS+= gmake perl:build 18USE_TOOLS+= gmake perl:build
19HAS_CONFIGURE= yes 19HAS_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 
24# directories so we pickup our audio/audio.h. Cannot use CPPFLAGS for this 
25CFLAGS+= -I${WRKSRC} -I${WRKSRC}/slirp 
26 
27.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
28 24
29CONFIGURE_ENV+= mansuffix=/${PKGMANDIR} 25CONFIGURE_ENV+= mansuffix=/${PKGMANDIR}
30CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 26CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
31CONFIGURE_ARGS+= --interp-prefix=${PREFIX:Q}/share/qemu 27CONFIGURE_ARGS+= --interp-prefix=${PREFIX:Q}/share/qemu
32 28
33# Avoid clash with system include file: 29# Avoid clash with system include file:
34pre-patch: 30pre-patch:
35 mv ${WRKSRC}/audio/audio.h ${WRKSRC}/audio/qaudio.h 31 mv ${WRKSRC}/audio/audio.h ${WRKSRC}/audio/qaudio.h
36 32
37SUBST_CLASSES+= qaudio 33SUBST_CLASSES+= qaudio
38SUBST_STAGE.qaudio= pre-configure 34SUBST_STAGE.qaudio= pre-configure
39SUBST_FILES.qaudio= monitor.c savevm.c vl.c vnc.h \ 35SUBST_FILES.qaudio= monitor.c savevm.c vl.c vnc.h \