Index: emulators/qemu-devel/Makefile
===================================================================
RCS file: /a/.csup/ports/emulators/qemu-devel/Makefile,v
--- emulators/qemu-devel/Makefile	13 Oct 2011 19:08:30 -0000	1.128
+++ emulators/qemu-devel/Makefile	21 Oct 2011 05:16:01 -0000
@@ -25,8 +25,6 @@ COMMENT=	QEMU CPU Emulator - development
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_PYTHON=	yes
-USE_GNOME=	glib20
 USE_PERL5_BUILD=	yes
 PATCH_STRIP=	-p1
 MAKE_ENV+=	BSD_MAKE="${MAKE}"
@@ -41,6 +39,9 @@ OPTIONS=	SAMBA "samba dependency (for -s
 		OPENGL "OpenGL dependency" On \
 		GNUTLS "gnutls dependency (vnc encryption)" On \
 		SASL "cyrus-sasl dependency (vnc encryption)" On \
+		JPEG "jpeg dependency (vnc lossy compression)" On \
+		PNG "png dependency (vnc compression)" On \
+		GA "glib20 dependency (guest agent)" On \
 		CURL "libcurl dependency (remote images)" On \
 		CDROM_DMA "IDE CDROM DMA" On \
 		PCAP "pcap dependency (networking with bpf)" On \
@@ -50,12 +51,10 @@ OPTIONS=	SAMBA "samba dependency (for -s
 		ADD_AUDIO "Emulate more audio hardware (experimental!)" Off \
 		ALL_TARGETS "Also build bsd-user targets (for testing)" Off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 CONFIGURE_ARGS+=	--extra-ldflags=-L${LOCALBASE}/lib
 PORTDOCS=	docs qemu-doc.html qemu-tech.html
-LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png
 
 .if defined(WITHOUT_ALL_TARGETS)
 CONFIGURE_ARGS+=	--disable-bsd-user
@@ -105,6 +104,27 @@ CONFIGURE_ARGS+=	--disable-vnc-sasl
 LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
 .endif
 
+.if defined(WITHOUT_JPEG)
+CONFIGURE_ARGS+=	--disable-vnc-jpeg
+.else
+LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg
+.endif
+
+.if defined(WITHOUT_PNG)
+CONFIGURE_ARGS+=	--disable-vnc-png
+.else
+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
+USE_GNOME+=	glib20
+PLIST_SUB+=	GA=""
+.endif
+
 .if defined(WITHOUT_CURL)
 CONFIGURE_ARGS+=	--disable-curl
 .else
@@ -210,4 +234,4 @@ post-install:
 	fi
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: emulators/qemu-devel/pkg-plist
===================================================================
RCS file: /a/.csup/ports/emulators/qemu-devel/pkg-plist,v
--- emulators/qemu-devel/pkg-plist	16 Sep 2011 19:17:12 -0000	1.31
+++ emulators/qemu-devel/pkg-plist	21 Oct 2011 03:11:52 -0000
@@ -1,5 +1,5 @@ 
 bin/qemu
-bin/qemu-ga
+%%GA%%bin/qemu-ga
 bin/qemu-img
 bin/qemu-io
 bin/qemu-nbd