another qemu-devel port update ready for testing

[Juergen Lock]

On Sun, May 27, 2007 at 12:32:18PM -0500, Eric Anderson wrote:
> On 05/27/07 07:58, Juergen Lock wrote:
> >On Sat, May 26, 2007 at 06:02:06PM -0500, Eric Anderson wrote:
> >>On a recent -CURRENT (with the new GCC):
> >>
> >># make
> >>...
> >>===>  Configuring for qemu-devel-0.9.0s.20070526
> >>WARNING: "cc" looks like gcc 4.x
> >>QEMU is known to have problems when compiled with gcc 4.x
> >>It is recommended that you use gcc 3.x to build QEMU
> >>To use this compiler anyway, configure with --disable-gcc-check
> >>===>  Script "configure" failed unexpectedly.
> >>Please report the problem to nox at FreeBSD.org [maintainer] and attach the
> >>"/usr/ports/emulators/qemu-devel/work/qemu-snapshot-2007-05-26_05/config.log"
> >>including the output of the failure of your make command. Also, it might 
> >>be
> >>a good idea to provide an overview of all packages installed on your 
> >>system
> >>(e.g. an `ls /var/db/pkg`).
> >>*** Error code 1
> >>
> >>Stop in /usr/ports/emulators/qemu-devel.
> >>*** Error code 1
> >>
> >>Stop in /usr/ports/emulators/qemu-devel.
> >
> >Hmm that should not happen...  Do you have an old version of
> >bsd.gcc.mk maybe?
> >
> >	Juergen
> 
> 
> # $FreeBSD: ports/Mk/bsd.gcc.mk,v 1.12 2007/05/19 22:06:14 pav Exp $
> 
> 
> That the right one?

Yeah.  Ok probably CONFIGURE_ARGS needs to come after the
bsd.port.pre.mk include for it to pick up the right ${CC}...  try this:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu-devel/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- Makefile	19 May 2007 20:04:37 -0000	1.77
+++ Makefile	27 May 2007 18:21:12 -0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.9.0s.20070405
-PORTREVISION=	4
+PORTVERSION=	0.9.0s.20070526
 CATEGORIES=	emulators
 MASTER_SITES=	http://qemu.org/:release \
 		http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \
@@ -15,11 +14,11 @@
 		http://www.volny.cz/xnavara/qemu/:snapshot \
 		http://people.brandeis.edu/~jcoiner/qemu_idedma/:idedma \
 		http://people.freebsd.org/~maho/qemu/:misc
-DISTNAME=	${PORTNAME}-snapshot-2007-04-05_05
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-snapshot-2007-05-26_05
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 DIST_SUBDIR=	qemu
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	nox at FreeBSD.org
 COMMENT=	QEMU CPU Emulator - development snapshot
@@ -31,7 +30,6 @@
 USE_PERL5=	yes
 USE_GCC=	3.4
 PATCH_STRIP=	-p1
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}
 MAKE_ENV+=	BSD_MAKE="${MAKE}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	amd64 i386
@@ -47,6 +45,7 @@
 .include <bsd.port.pre.mk>
 
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
+CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}
 
 .if defined(WITHOUT_SDL)
 CONFIGURE_ARGS+=	--disable-sdl --disable-gfx-check
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu-devel/distinfo,v
retrieving revision 1.45
diff -u -r1.45 distinfo
--- distinfo	7 Apr 2007 19:14:42 -0000	1.45
+++ distinfo	26 May 2007 14:06:06 -0000
@@ -1,6 +1,6 @@
-MD5 (qemu/qemu-snapshot-2007-04-05_05.tar.bz2) = 48321d0997db88f09f01d38500c52807
-SHA256 (qemu/qemu-snapshot-2007-04-05_05.tar.bz2) = 48835ca90ced5cba2230fc95502b648167b5ca7247f885ee398ba891dbbf4c1b
-SIZE (qemu/qemu-snapshot-2007-04-05_05.tar.bz2) = 1721640
+MD5 (qemu/qemu-snapshot-2007-05-26_05.tar.bz2) = 3fe2cf8c5cb26431499056bd08bb5be8
+SHA256 (qemu/qemu-snapshot-2007-05-26_05.tar.bz2) = 55e73f0593c5d31ba3483e8034542c5ab33217cc3048995dd94edf9640e8411e
+SIZE (qemu/qemu-snapshot-2007-05-26_05.tar.bz2) = 1964534
 MD5 (qemu/patch3_cirrus) = ebe7ed9fce804c49e024bc93bfdfc810
 SHA256 (qemu/patch3_cirrus) = e862371834b7d895a896fbdb84fd9f70d17b5729a6f6789a48a61504fc941e11
 SIZE (qemu/patch3_cirrus) = 8817
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/qemu-devel/pkg-plist,v
retrieving revision 1.21
diff -u -r1.21 pkg-plist
--- pkg-plist	9 Apr 2007 22:11:23 -0000	1.21
+++ pkg-plist	26 May 2007 14:32:52 -0000
@@ -1,6 +1,7 @@
 bin/qemu
 bin/qemu-img
 bin/qemu-system-arm
+bin/qemu-system-m68k
 bin/qemu-system-mips
 bin/qemu-system-mips64
 bin/qemu-system-mips64el
@@ -13,7 +14,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%DATADIR%%/bios.bin
-%%DATADIR%%/linux_boot.bin
 %%DATADIR%%/vgabios.bin
 %%DATADIR%%/vgabios-cirrus.bin
 %%DATADIR%%/ppc_rom.bin