Update to 0.6.2 (2004/12/28 snapshot).

PR:		ports/75644
Submitted by:	Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)

8 files changed, 136 insertions, 40 deletions

diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index e17b56b8ea26..a76550d179fb 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.6.1s.20041115
+PORTVERSION=	0.6.2s.20041228
 PORTREVISION=	0
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.fruitsalad.org/qemu/ \
+MASTER_SITES=	http://people.fruitsalad.org/nox/qemu/ \
 		http://dad-answers.com/qemu/
-DISTNAME=	${PORTNAME}-snapshot-2004-11-15_23
+DISTNAME=	${PORTNAME}-snapshot-2004-12-28_23
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 COMMENT=	QEMU CPU Emulator
@@ -24,14 +24,26 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes
 USE_SDL=	sdl
-USE_GCC=	3.4
 USE_PERL5=	yes
 PATCH_STRIP=	-p1
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}\ -I${PREFIX}/include
 MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
+# gcc34 (system cc on 5.x now) has problems with qemu:
+# doesnt build target-i386/op.c on amd64, and builds a broken qemu-system-ppc
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 502126
+CC=		gcc33
+CXX=		g++33
+BUILD_DEPENDS+=	gcc33:${PORTSDIR}/lang/gcc33
+GCCVERSION=	030301
+.else
+USE_GCC=	3.3
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 5ed7f8c62847..32214b6116f7 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (qemu-snapshot-2004-11-15_23.tar.bz2) = ea604165b37be4d4dd6c3fbdfacf06c5
-SIZE (qemu-snapshot-2004-11-15_23.tar.bz2) = 845053
+MD5 (qemu-snapshot-2004-12-28_23.tar.bz2) = 01ee06f083091053f6c2595549f615a0
+SIZE (qemu-snapshot-2004-12-28_23.tar.bz2) = 911183
diff --git a/emulators/qemu-devel/pkg-message b/emulators/qemu-devel/pkg-message
index 049dac5952c5..3257ec60f3fe 100644
--- a/emulators/qemu-devel/pkg-message
+++ b/emulators/qemu-devel/pkg-message
@@ -1,19 +1,19 @@
 ====
 FreeBSD host notes:
 - needs to run as root in order to use /dev/tap* networking (why?)
-- slirp (usermode networking) is fixed now in cvs, on FreeSBIE guests
+- slirp (usermode networking) is fixed now in cvs, on FreeSBIE 1.0 guests
 you still have to manually do:
 	echo nameserver 10.0.2.3 >/etc/resolv.conf
-but i've been told that that's normal. (and you have to wait a bit
-for dhclient to do its thing; traffic to address 10.0.2.2 is routed
-to 127.1 on the host)
-- expect timer problems when guest kernel HZ is > hosts
-(for example time sleep 1 takes 49 seconds and booting sleeps for
-minutes at the acd0 probe with a FreeSBIE guest, thats because
-the FreeSBIE kernel is built with HZ=5000, and FreeBSD's default
-is 100...  The linux 2.6 kernel uses 1000 by default btw.)  Enabling
-/dev/rtc doesn't seem to help either (not included since it needs a
-patch to emulators/rtc.)
+but i've been told that that's normal. (fixed on FreeSBIE 1.1.)
+and you have to wait a bit for dhclient to do its thing; traffic to
+address 10.0.2.2 is routed to 127.1 on the host.
+- expect timer problems when guest kernel HZ is > hosts,
+for example time sleep 1 takes 49 seconds and booting sleeps for
+minutes at the acd0 probe with a FreeSBIE 1.0 guest, thats because
+its kernel is built with HZ=5000, and FreeBSD's default is 100...
+(no longer a problem with FreeSBIE 1.1.)  The linux 2.6 kernel uses
+1000 by default btw.  Enabling /dev/rtc doesn't seem to help either
+(not included since it needs a patch to emulators/rtc.)
 - using physical media doesn't work on 4.x hosts (missing DIOCGMEDIASIZE
-ioctl)
+ioctl.)
 ====
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index 06795fcb31d2..ec235ec37a81 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -9,6 +9,42 @@ share/qemu/linux_boot.bin
 share/qemu/vgabios.bin
 share/qemu/vgabios-cirrus.bin
 share/qemu/ppc_rom.bin
-share/qemu/proll.bin
+share/qemu/proll.elf
+share/qemu/keymaps/ar
+share/qemu/keymaps/common
+share/qemu/keymaps/da
+share/qemu/keymaps/de
+share/qemu/keymaps/de-ch
+share/qemu/keymaps/en-gb
+share/qemu/keymaps/en-us
+share/qemu/keymaps/es
+share/qemu/keymaps/et
+share/qemu/keymaps/fi
+share/qemu/keymaps/fo
+share/qemu/keymaps/fr
+share/qemu/keymaps/fr-be
+share/qemu/keymaps/fr-ca
+share/qemu/keymaps/fr-ch
+share/qemu/keymaps/hr
+share/qemu/keymaps/hu
+share/qemu/keymaps/is
+share/qemu/keymaps/it
+share/qemu/keymaps/ja
+share/qemu/keymaps/lt
+share/qemu/keymaps/lv
+share/qemu/keymaps/mk
+share/qemu/keymaps/modifiers
+share/qemu/keymaps/nl
+share/qemu/keymaps/nl-be
+share/qemu/keymaps/no
+share/qemu/keymaps/pl
+share/qemu/keymaps/pt
+share/qemu/keymaps/pt-br
+share/qemu/keymaps/ru
+share/qemu/keymaps/sl
+share/qemu/keymaps/sv
+share/qemu/keymaps/th
+share/qemu/keymaps/tr
+@dirrm share/qemu/keymaps
 @dirrm share/qemu
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index e17b56b8ea26..a76550d179fb 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	qemu
-PORTVERSION=	0.6.1s.20041115
+PORTVERSION=	0.6.2s.20041228
 PORTREVISION=	0
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.fruitsalad.org/qemu/ \
+MASTER_SITES=	http://people.fruitsalad.org/nox/qemu/ \
 		http://dad-answers.com/qemu/
-DISTNAME=	${PORTNAME}-snapshot-2004-11-15_23
+DISTNAME=	${PORTNAME}-snapshot-2004-12-28_23
 
 MAINTAINER=	nox@jelal.kn-bremen.de
 COMMENT=	QEMU CPU Emulator
@@ -24,14 +24,26 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETOPT_LONG=	yes
 USE_SDL=	sdl
-USE_GCC=	3.4
 USE_PERL5=	yes
 PATCH_STRIP=	-p1
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}\ -I${PREFIX}/include
 MAN1=		qemu.1 qemu-img.1
 ONLY_FOR_ARCHS=	i386 amd64 powerpc
 
+# gcc34 (system cc on 5.x now) has problems with qemu:
+# doesnt build target-i386/op.c on amd64, and builds a broken qemu-system-ppc
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 502126
+CC=		gcc33
+CXX=		g++33
+BUILD_DEPENDS+=	gcc33:${PORTSDIR}/lang/gcc33
+GCCVERSION=	030301
+.else
+USE_GCC=	3.3
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 5ed7f8c62847..32214b6116f7 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,2 +1,2 @@
-MD5 (qemu-snapshot-2004-11-15_23.tar.bz2) = ea604165b37be4d4dd6c3fbdfacf06c5
-SIZE (qemu-snapshot-2004-11-15_23.tar.bz2) = 845053
+MD5 (qemu-snapshot-2004-12-28_23.tar.bz2) = 01ee06f083091053f6c2595549f615a0
+SIZE (qemu-snapshot-2004-12-28_23.tar.bz2) = 911183
diff --git a/emulators/qemu/pkg-message b/emulators/qemu/pkg-message
index 049dac5952c5..3257ec60f3fe 100644
--- a/emulators/qemu/pkg-message
+++ b/emulators/qemu/pkg-message
@@ -1,19 +1,19 @@
 ====
 FreeBSD host notes:
 - needs to run as root in order to use /dev/tap* networking (why?)
-- slirp (usermode networking) is fixed now in cvs, on FreeSBIE guests
+- slirp (usermode networking) is fixed now in cvs, on FreeSBIE 1.0 guests
 you still have to manually do:
 	echo nameserver 10.0.2.3 >/etc/resolv.conf
-but i've been told that that's normal. (and you have to wait a bit
-for dhclient to do its thing; traffic to address 10.0.2.2 is routed
-to 127.1 on the host)
-- expect timer problems when guest kernel HZ is > hosts
-(for example time sleep 1 takes 49 seconds and booting sleeps for
-minutes at the acd0 probe with a FreeSBIE guest, thats because
-the FreeSBIE kernel is built with HZ=5000, and FreeBSD's default
-is 100...  The linux 2.6 kernel uses 1000 by default btw.)  Enabling
-/dev/rtc doesn't seem to help either (not included since it needs a
-patch to emulators/rtc.)
+but i've been told that that's normal. (fixed on FreeSBIE 1.1.)
+and you have to wait a bit for dhclient to do its thing; traffic to
+address 10.0.2.2 is routed to 127.1 on the host.
+- expect timer problems when guest kernel HZ is > hosts,
+for example time sleep 1 takes 49 seconds and booting sleeps for
+minutes at the acd0 probe with a FreeSBIE 1.0 guest, thats because
+its kernel is built with HZ=5000, and FreeBSD's default is 100...
+(no longer a problem with FreeSBIE 1.1.)  The linux 2.6 kernel uses
+1000 by default btw.  Enabling /dev/rtc doesn't seem to help either
+(not included since it needs a patch to emulators/rtc.)
 - using physical media doesn't work on 4.x hosts (missing DIOCGMEDIASIZE
-ioctl)
+ioctl.)
 ====
diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist
index 06795fcb31d2..ec235ec37a81 100644
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@@ -9,6 +9,42 @@ share/qemu/linux_boot.bin
 share/qemu/vgabios.bin
 share/qemu/vgabios-cirrus.bin
 share/qemu/ppc_rom.bin
-share/qemu/proll.bin
+share/qemu/proll.elf
+share/qemu/keymaps/ar
+share/qemu/keymaps/common
+share/qemu/keymaps/da
+share/qemu/keymaps/de
+share/qemu/keymaps/de-ch
+share/qemu/keymaps/en-gb
+share/qemu/keymaps/en-us
+share/qemu/keymaps/es
+share/qemu/keymaps/et
+share/qemu/keymaps/fi
+share/qemu/keymaps/fo
+share/qemu/keymaps/fr
+share/qemu/keymaps/fr-be
+share/qemu/keymaps/fr-ca
+share/qemu/keymaps/fr-ch
+share/qemu/keymaps/hr
+share/qemu/keymaps/hu
+share/qemu/keymaps/is
+share/qemu/keymaps/it
+share/qemu/keymaps/ja
+share/qemu/keymaps/lt
+share/qemu/keymaps/lv
+share/qemu/keymaps/mk
+share/qemu/keymaps/modifiers
+share/qemu/keymaps/nl
+share/qemu/keymaps/nl-be
+share/qemu/keymaps/no
+share/qemu/keymaps/pl
+share/qemu/keymaps/pt
+share/qemu/keymaps/pt-br
+share/qemu/keymaps/ru
+share/qemu/keymaps/sl
+share/qemu/keymaps/sv
+share/qemu/keymaps/th
+share/qemu/keymaps/tr
+@dirrm share/qemu/keymaps
 @dirrm share/qemu
 %%PORTDOCS%%@dirrm %%DOCSDIR%%