aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2012-02-28 22:41:05 +0000
committerJuergen Lock <nox@FreeBSD.org>2012-02-28 22:41:05 +0000
commit72cb34ee50f320e1fad3a53c538a88370f3771e5 (patch)
treec9e461ce5ac5155b7c76d2680747b67c51d62c9f /emulators
parent45022c0ba2967c248f8d511094c1061e0f468f8c (diff)
Notes
Diffstat (limited to 'emulators')
-rw-r--r--emulators/qemu-devel/Makefile10
-rw-r--r--emulators/qemu-devel/pkg-plist2
2 files changed, 2 insertions, 10 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 768158887f2b..02bc543778ab 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -21,6 +21,7 @@ COMMENT= QEMU CPU Emulator - development version
HAS_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5_BUILD= yes
+USE_PYTHON_BUILD= yes
USE_GNOME+= glib20
PATCH_STRIP= -p1
MAKE_ENV+= BSD_MAKE="${MAKE}"
@@ -37,7 +38,6 @@ OPTIONS= SAMBA "samba dependency (for -smb)" Off \
SASL "cyrus-sasl dependency (vnc encryption)" On \
JPEG "jpeg dependency (vnc lossy compression)" On \
PNG "png dependency (vnc compression)" On \
- GA "python build dependency (guest agent)" On \
CURL "libcurl dependency (remote images)" On \
CDROM_DMA "IDE CDROM DMA" On \
PCAP "pcap dependency (networking with bpf)" On \
@@ -110,14 +110,6 @@ CONFIGURE_ARGS+= --disable-vnc-png
LIB_DEPENDS+= png.6:${PORTSDIR}/graphics/png
.endif
-.if defined(WITHOUT_GA)
-CONFIGURE_ARGS+= --disable-guest-agent --python="${NONEXISTENT}"
-PLIST_SUB+= GA="@comment "
-.else
-USE_PYTHON_BUILD= yes
-PLIST_SUB+= GA=""
-.endif
-
.if defined(WITHOUT_CURL)
CONFIGURE_ARGS+= --disable-curl
.else
diff --git a/emulators/qemu-devel/pkg-plist b/emulators/qemu-devel/pkg-plist
index f7470a0c9d1e..87b492f11b55 100644
--- a/emulators/qemu-devel/pkg-plist
+++ b/emulators/qemu-devel/pkg-plist
@@ -1,4 +1,4 @@
-%%GA%%bin/qemu-ga
+bin/qemu-ga
bin/qemu-img
bin/qemu-io
bin/qemu-nbd