From owner-svn-ports-head@FreeBSD.ORG Sun Jan 26 14:49:42 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BEF3429B; Sun, 26 Jan 2014 14:49:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F5C01D45; Sun, 26 Jan 2014 14:49:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0QEngJt079242; Sun, 26 Jan 2014 14:49:42 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0QEngVa079240; Sun, 26 Jan 2014 14:49:42 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201401261449.s0QEngVa079240@svn.freebsd.org> From: Juergen Lock Date: Sun, 26 Jan 2014 14:49:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341193 - head/emulators/qemu X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jan 2014 14:49:42 -0000 Author: nox Date: Sun Jan 26 14:49:41 2014 New Revision: 341193 URL: http://svnweb.freebsd.org/changeset/ports/341193 QAT: https://qat.redports.org/buildarchive/r341193/ Log: - Update LIB_DEPENDS. - Rewrite NOPORTDOCS. - Stagify. Modified: head/emulators/qemu/Makefile head/emulators/qemu/pkg-plist Modified: head/emulators/qemu/Makefile ============================================================================== --- head/emulators/qemu/Makefile Sun Jan 26 14:47:56 2014 (r341192) +++ head/emulators/qemu/Makefile Sun Jan 26 14:49:41 2014 (r341193) @@ -19,7 +19,6 @@ USES= gmake perl5 USE_PERL5= build PATCH_STRIP= -p1 MAKE_ENV+= BSD_MAKE="${MAKE}" -MAN1= qemu.1 qemu-img.1 ONLY_FOR_ARCHS= amd64 i386 CONFLICTS= qemu-devel-[0-9]* @@ -38,7 +37,6 @@ ADD_AUDIO_DESC= Emulate more audio hard ALL_TARGETS_DESC= Also build non-x86 targets OPTIONS_DEFAULT= SDL GNUTLS CURL PCAP GNS3 CDROM_DMA ALL_TARGETS -NO_STAGE= yes .include .if empty(PORT_OPTIONS:MALL_TARGETS) @@ -61,13 +59,13 @@ USE_SDL= sdl .if empty(PORT_OPTIONS:MGNUTLS) CONFIGURE_ARGS+= --disable-vnc-tls .else -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls .endif .if empty(PORT_OPTIONS:MCURL) CONFIGURE_ARGS+= --disable-curl .else -LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl .endif .if ${PORT_OPTIONS:MPCAP} @@ -92,10 +90,11 @@ RUN_DEPENDS+= kqemu-kmod-devel>=1.4.0pre CONFIGURE_ARGS+= --disable-kqemu .endif -.if defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} +BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html +.else MAKE_ARGS+= NOPORTDOCS=1 .else -BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html .endif .if !defined(STRIP) || ${STRIP} == "" @@ -154,14 +153,7 @@ post-configure: .endif post-install: - @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${PREFIX}/etc - @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${PREFIX}/etc - @if [ ! -f ${PREFIX}/etc/qemu-ifup ]; then \ - ${CP} -p ${PREFIX}/etc/qemu-ifup.sample ${PREFIX}/etc/qemu-ifup ; \ - fi - @if [ ! -f ${PREFIX}/etc/qemu-ifdown ]; then \ - ${CP} -p ${PREFIX}/etc/qemu-ifdown.sample ${PREFIX}/etc/qemu-ifdown ; \ - fi - @${CAT} ${PKGMESSAGE} + @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc + @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc .include Modified: head/emulators/qemu/pkg-plist ============================================================================== --- head/emulators/qemu/pkg-plist Sun Jan 26 14:47:56 2014 (r341192) +++ head/emulators/qemu/pkg-plist Sun Jan 26 14:49:41 2014 (r341193) @@ -16,6 +16,8 @@ bin/qemu-img %%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