Index: head/emulators/qemu/Makefile
===================================================================
--- head/emulators/qemu/Makefile	(revision 395610)
+++ head/emulators/qemu/Makefile	(revision 395611)
@@ -1,162 +1,165 @@
 # Created by: Juergen Lock <nox@jelal.kn-bremen.de>
 # $FreeBSD$
 
 PORTNAME=	qemu
 PORTVERSION=	0.11.1
 PORTREVISION=	20
 CATEGORIES=	emulators
 MASTER_SITES=	SAVANNAH \
 		http://bellard.org/qemu/
 DIST_SUBDIR=	qemu
 
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	QEMU CPU Emulator
 
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 HAS_CONFIGURE=	yes
-USES=		cpe gmake perl5 compiler:features
+USES=		compiler:features cpe gmake perl5
 USE_PERL5=	build
 PATCH_STRIP=	-p1
 MAKE_ENV+=	BSD_MAKE="${MAKE}"
 ONLY_FOR_ARCHS=	amd64 i386
 CONFLICTS=	qemu-devel-[0-9]* qemu-sbruno-[0-9]*
 
 OPTIONS_DEFINE=	KQEMU RTL8139_TIMER SAMBA SDL GNUTLS CURL PCAP GNS3 \
 		CDROM_DMA ADD_AUDIO ALL_TARGETS DOCS
 KQEMU_DESC=		Build with (alpha!) accelerator module
 RTL8139_TIMER_DESC=	allow use of re(4) nic with FreeBSD guests
 SAMBA_DESC=		samba dependency (for -smb)
 SDL_DESC=		SDL/X dependency (graphical output)
 GNUTLS_DESC=		gnutls dependency (vnc encryption)
 CURL_DESC=		libcurl dependency (remote images)
 PCAP_DESC=		pcap dependency (networking with bpf)
 GNS3_DESC=		gns3 patches (udp, promiscuous multicast)
 CDROM_DMA_DESC=		IDE CDROM DMA
 ADD_AUDIO_DESC=		Emulate more audio hardware (experimental!)
 ALL_TARGETS_DESC=	Also build non-x86 targets
 OPTIONS_DEFAULT=	SDL GNUTLS CURL PCAP GNS3 CDROM_DMA
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang"
 # gcc49 breaks target-i386 on i386, and gcc48 breaks ALL_TARGETS on i386:
 #	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=196855
 USE_GCC=	4.7
 .else
 USE_GCC=	any
 .endif
 
 .if empty(PORT_OPTIONS:MALL_TARGETS)
 CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu
 PLIST_SUB+=	ALLTARGETS="@comment "
 .else
 PLIST_SUB+=	ALLTARGETS=""
 .endif
 
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}
 
 .if empty(PORT_OPTIONS:MSDL)
 CONFIGURE_ARGS+=	--disable-sdl
 .else
 USE_SDL=	sdl
 .endif
 
 .if empty(PORT_OPTIONS:MGNUTLS)
 CONFIGURE_ARGS+=	--disable-vnc-tls
 .else
 LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
 .endif
 
 .if empty(PORT_OPTIONS:MCURL)
 CONFIGURE_ARGS+=	--disable-curl
 .else
 LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
 .endif
 
 .if ${PORT_OPTIONS:MPCAP}
 CONFIGURE_ARGS+=	--enable-pcap
 .endif
 
 .if ${PORT_OPTIONS:MADD_AUDIO}
 CONFIGURE_ARGS+=	--audio-card-list=ac97,es1370,sb16,cs4231a,adlib,gus
 .endif
 
 # XXX
 CONFIGURE_ARGS+=	--disable-bsd-user
 
 .if ${PORT_OPTIONS:MSAMBA}
 RUN_DEPENDS+=	${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba36
 .endif
 
 .if ${PORT_OPTIONS:MKQEMU}
 BUILD_DEPENDS+=	kqemu-kmod-devel>=1.4.0pre1:${PORTSDIR}/emulators/kqemu-kmod-devel
 RUN_DEPENDS+=	kqemu-kmod-devel>=1.4.0pre1:${PORTSDIR}/emulators/kqemu-kmod-devel
 .else
 CONFIGURE_ARGS+=	--disable-kqemu
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	texi2html:${PORTSDIR}/textproc/texi2html
 .else
 MAKE_ARGS+=	NOPORTDOCS=1
 .endif
 
 .if !defined(STRIP) || ${STRIP} == ""
 CONFIGURE_ARGS+=--disable-strip
 .endif
 
 .if ${ARCH} == "amd64"
 MAKE_ARGS+=	ARCH=x86_64
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/kqemu
 	@${TOUCH} ${WRKSRC}/kqemu/Makefile
 	@${ECHO} all: > ${WRKSRC}/kqemu/Makefile.freebsd
 
 pre-patch:
 	@for A in ${ONLY_FOR_ARCHS}; do \
 		${MKDIR} ${WRKSRC}/bsd/$$A; \
 	done
 
 post-patch:
 .if ${PORT_OPTIONS:MRTL8139_TIMER}
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/rtl8139-re-patch
 .endif
 .if ${PORT_OPTIONS:MPCAP}
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/pcap-patch
 .endif
 .if ${PORT_OPTIONS:MGNS3}
 	@cd ${WRKSRC} && ${PATCH} -p1 --quiet < ${FILESDIR}/gns3-patch
 .endif
 .if empty(PORT_OPTIONS:MCDROM_DMA)
 	@cd ${WRKSRC} && ${PATCH} --quiet < ${FILESDIR}/cdrom-dma-patch
 .endif
 	@${REINPLACE_CMD} -E \
 		-e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \
 		${WRKSRC}/qemu-doc.texi
 	@${REINPLACE_CMD} -E \
 		-e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing|" \
 		-e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \
 		${WRKSRC}/Makefile.target
 	@${REINPLACE_CMD} -E \
 		-e "s|^(CFLAGS=).*|\1${CFLAGS} -fno-strict-aliasing -I.|" \
 		-e "s|^(LDFLAGS=).*|\1${LDFLAGS}|" \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -E \
 		-e "1s|^(#! )/usr/bin/perl|\1${PERL}|" \
 		${WRKSRC}/texi2pod.pl
 
 # XXX need to disable usb host code on head while it's not ported to the
 # new usb stack yet
 post-configure:
 	@${REINPLACE_CMD} -E \
 		-e "s|^(HOST_USB=)bsd|\1stub|" \
 		${WRKSRC}/config-host.mak
 
 post-install:
-	@${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
-	@${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.post.mk>
Index: head/emulators/qemu/pkg-plist
===================================================================
--- head/emulators/qemu/pkg-plist	(revision 395610)
+++ head/emulators/qemu/pkg-plist	(revision 395611)
@@ -1,78 +1,74 @@
 bin/qemu
 bin/qemu-img
 %%ALLTARGETS%%bin/qemu-system-arm
 %%ALLTARGETS%%bin/qemu-system-cris
 %%ALLTARGETS%%bin/qemu-system-m68k
 %%ALLTARGETS%%bin/qemu-system-microblaze
 %%ALLTARGETS%%bin/qemu-system-mips
 %%ALLTARGETS%%bin/qemu-system-mips64
 %%ALLTARGETS%%bin/qemu-system-mips64el
 %%ALLTARGETS%%bin/qemu-system-mipsel
 %%ALLTARGETS%%bin/qemu-system-ppc
 %%ALLTARGETS%%bin/qemu-system-ppc64
 %%ALLTARGETS%%bin/qemu-system-ppcemb
 %%ALLTARGETS%%bin/qemu-system-sh4
 %%ALLTARGETS%%bin/qemu-system-sh4eb
 %%ALLTARGETS%%bin/qemu-system-sparc
 %%ALLTARGETS%%bin/qemu-system-sparc64
 bin/qemu-system-x86_64
 man/man1/qemu.1.gz
 man/man1/qemu-img.1.gz
-@unexec if cmp -s %D/etc/qemu-ifup.sample %D/etc/qemu-ifup; then rm -f %D/etc/qemu-ifup; fi
-etc/qemu-ifup.sample
-@exec if [ ! -f %D/etc/qemu-ifup ] ; then cp -p %D/%F %B/qemu-ifup; fi
-@unexec if cmp -s %D/etc/qemu-ifdown.sample %D/etc/qemu-ifdown; then rm -f %D/etc/qemu-ifdown; fi
-etc/qemu-ifdown.sample
-@exec if [ ! -f %D/etc/qemu-ifdown ] ; then cp -p %D/%F %B/qemu-ifdown; fi
+@sample etc/qemu-ifup.sample
+@sample etc/qemu-ifdown.sample
 %%PORTDOCS%%%%DOCSDIR%%/qemu-doc.html
 %%PORTDOCS%%%%DOCSDIR%%/qemu-tech.html
 %%DATADIR%%/bios.bin
 %%DATADIR%%/vgabios.bin
 %%DATADIR%%/vgabios-cirrus.bin
 %%DATADIR%%/ppc_rom.bin
 %%DATADIR%%/openbios-ppc
 %%DATADIR%%/openbios-sparc32
 %%DATADIR%%/openbios-sparc64
 %%DATADIR%%/video.x
 %%DATADIR%%/pxe-e1000.bin
 %%DATADIR%%/pxe-ne2k_pci.bin
 %%DATADIR%%/pxe-rtl8139.bin
 %%DATADIR%%/pxe-pcnet.bin
 %%DATADIR%%/multiboot.bin
 %%DATADIR%%/petalogix-s3adsp1800.dtb
 %%DATADIR%%/bamboo.dtb
 %%DATADIR%%/keymaps/ar
 %%DATADIR%%/keymaps/common
 %%DATADIR%%/keymaps/da
 %%DATADIR%%/keymaps/de
 %%DATADIR%%/keymaps/de-ch
 %%DATADIR%%/keymaps/en-gb
 %%DATADIR%%/keymaps/en-us
 %%DATADIR%%/keymaps/es
 %%DATADIR%%/keymaps/et
 %%DATADIR%%/keymaps/fi
 %%DATADIR%%/keymaps/fo
 %%DATADIR%%/keymaps/fr
 %%DATADIR%%/keymaps/fr-be
 %%DATADIR%%/keymaps/fr-ca
 %%DATADIR%%/keymaps/fr-ch
 %%DATADIR%%/keymaps/hr
 %%DATADIR%%/keymaps/hu
 %%DATADIR%%/keymaps/is
 %%DATADIR%%/keymaps/it
 %%DATADIR%%/keymaps/ja
 %%DATADIR%%/keymaps/lt
 %%DATADIR%%/keymaps/lv
 %%DATADIR%%/keymaps/mk
 %%DATADIR%%/keymaps/modifiers
 %%DATADIR%%/keymaps/nl
 %%DATADIR%%/keymaps/nl-be
 %%DATADIR%%/keymaps/no
 %%DATADIR%%/keymaps/pl
 %%DATADIR%%/keymaps/pt
 %%DATADIR%%/keymaps/pt-br
 %%DATADIR%%/keymaps/ru
 %%DATADIR%%/keymaps/sl
 %%DATADIR%%/keymaps/sv
 %%DATADIR%%/keymaps/th
 %%DATADIR%%/keymaps/tr