aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2005-02-27 23:43:19 +0800
committerpav <pav@FreeBSD.org>2005-02-27 23:43:19 +0800
commit50e92a57957d836c05fb223883378e595c3787d1 (patch)
tree3f7f458692de494e50f4e42b14411bed076b44ff /emulators
parentb5ccb83f3c1d95822f772dd494c99448235a46e6 (diff)
downloadfreebsd-ports-gnome-50e92a57957d836c05fb223883378e595c3787d1.tar.gz
freebsd-ports-gnome-50e92a57957d836c05fb223883378e595c3787d1.tar.zst
freebsd-ports-gnome-50e92a57957d836c05fb223883378e595c3787d1.zip
- Update to 2005-02-24 snap
PR: ports/78089 Submitted by: Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu-devel/Makefile22
-rw-r--r--emulators/qemu-devel/distinfo4
-rw-r--r--emulators/qemu-devel/pkg-plist1
-rw-r--r--emulators/qemu/Makefile22
-rw-r--r--emulators/qemu/distinfo4
-rw-r--r--emulators/qemu/pkg-plist1
6 files changed, 28 insertions, 26 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index a76550d179fb..667330fa4313 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= qemu
-PORTVERSION= 0.6.2s.20041228
-PORTREVISION= 0
+PORTVERSION= 0.6.2s.20050224
CATEGORIES= emulators
MASTER_SITES= http://people.fruitsalad.org/nox/qemu/ \
http://dad-answers.com/qemu/
-DISTNAME= ${PORTNAME}-snapshot-2004-12-28_23
+DISTNAME= ${PORTNAME}-snapshot-2005-02-24_23
MAINTAINER= nox@jelal.kn-bremen.de
COMMENT= QEMU CPU Emulator
@@ -30,17 +29,18 @@ 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
+# gcc34 (system cc on 5.x now) has problems with qemu on amd64
+# (doesnt build target-i386/op.c), try the one in ports which is newer
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-CC= gcc33
-CXX= g++33
-BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33
-GCCVERSION= 030301
+.if ${ARCH} == "amd64" && ${OSVERSION} >= 502126
+BROKEN= Does not compile
+CC= gcc34
+CXX= g++34
+BUILD_DEPENDS+= gcc34:${PORTSDIR}/lang/gcc34
+GCCVERSION= 030402
.else
-USE_GCC= 3.3
+USE_GCC= 3.4
.endif
post-install:
diff --git a/emulators/qemu-devel/distinfo b/emulators/qemu-devel/distinfo
index 32214b6116f7..866f451d949e 100644
--- a/emulators/qemu-devel/distinfo
+++ b/emulators/qemu-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (qemu-snapshot-2004-12-28_23.tar.bz2) = 01ee06f083091053f6c2595549f615a0
-SIZE (qemu-snapshot-2004-12-28_23.tar.bz2) = 911183
+MD5 (qemu-snapshot-2005-02-24_23.tar.bz2) = a8f5cfd18ae44cc7e8c8231f494baeff
+SIZE (qemu-snapshot-2005-02-24_23.tar.bz2) = 956742
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index ec235ec37a81..3ff1d2332248 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -2,6 +2,7 @@ bin/qemu
bin/qemu-img
bin/qemu-system-ppc
bin/qemu-system-sparc
+bin/qemu-system-x86_64
%%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html
%%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html
share/qemu/bios.bin
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index a76550d179fb..667330fa4313 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -6,12 +6,11 @@
#
PORTNAME= qemu
-PORTVERSION= 0.6.2s.20041228
-PORTREVISION= 0
+PORTVERSION= 0.6.2s.20050224
CATEGORIES= emulators
MASTER_SITES= http://people.fruitsalad.org/nox/qemu/ \
http://dad-answers.com/qemu/
-DISTNAME= ${PORTNAME}-snapshot-2004-12-28_23
+DISTNAME= ${PORTNAME}-snapshot-2005-02-24_23
MAINTAINER= nox@jelal.kn-bremen.de
COMMENT= QEMU CPU Emulator
@@ -30,17 +29,18 @@ 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
+# gcc34 (system cc on 5.x now) has problems with qemu on amd64
+# (doesnt build target-i386/op.c), try the one in ports which is newer
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 502126
-CC= gcc33
-CXX= g++33
-BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33
-GCCVERSION= 030301
+.if ${ARCH} == "amd64" && ${OSVERSION} >= 502126
+BROKEN= Does not compile
+CC= gcc34
+CXX= g++34
+BUILD_DEPENDS+= gcc34:${PORTSDIR}/lang/gcc34
+GCCVERSION= 030402
.else
-USE_GCC= 3.3
+USE_GCC= 3.4
.endif
post-install:
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 32214b6116f7..866f451d949e 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,2 +1,2 @@
-MD5 (qemu-snapshot-2004-12-28_23.tar.bz2) = 01ee06f083091053f6c2595549f615a0
-SIZE (qemu-snapshot-2004-12-28_23.tar.bz2) = 911183
+MD5 (qemu-snapshot-2005-02-24_23.tar.bz2) = a8f5cfd18ae44cc7e8c8231f494baeff
+SIZE (qemu-snapshot-2005-02-24_23.tar.bz2) = 956742
diff --git a/emulators/qemu/pkg-plist b/emulators/qemu/pkg-plist
index ec235ec37a81..3ff1d2332248 100644
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@@ -2,6 +2,7 @@ bin/qemu
bin/qemu-img
bin/qemu-system-ppc
bin/qemu-system-sparc
+bin/qemu-system-x86_64
%%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html
%%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html
share/qemu/bios.bin