From owner-svn-ports-all@FreeBSD.ORG Tue May 20 15:57:32 2014 Return-Path: Delivered-To: svn-ports-all@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 9BDA8F4E; Tue, 20 May 2014 15:57:32 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 694992403; Tue, 20 May 2014 15:57:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KFvWob032775; Tue, 20 May 2014 15:57:32 GMT (envelope-from nox@svn.freebsd.org) Received: (from nox@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4KFvWwY032773; Tue, 20 May 2014 15:57:32 GMT (envelope-from nox@svn.freebsd.org) Message-Id: <201405201557.s4KFvWwY032773@svn.freebsd.org> From: Juergen Lock Date: Tue, 20 May 2014 15:57:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354652 - in head/emulators/qemu-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2014 15:57:32 -0000 Author: nox Date: Tue May 20 15:57:31 2014 New Revision: 354652 URL: http://svnweb.freebsd.org/changeset/ports/354652 QAT: https://qat.redports.org/buildarchive/r354652/ Log: Pet check-plist. (I thought this was fixed by r354246 but looks like that commit only handles the pkgng case not pkg_*...) Submitted by: jenkins via swills Modified: head/emulators/qemu-devel/Makefile head/emulators/qemu-devel/files/patch-Makefile Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Tue May 20 15:53:45 2014 (r354651) +++ head/emulators/qemu-devel/Makefile Tue May 20 15:57:31 2014 (r354652) @@ -295,12 +295,8 @@ post-install: .endif @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc @${INSTALL_SCRIPT} ${FILESDIR}/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc - @if [ ! -f ${PREFIX}/etc/qemu-ifup ]; then \ - ${CP} -p ${STAGEDIR}${PREFIX}/etc/qemu-ifup.sample ${STAGEDIR}${PREFIX}/etc/qemu-ifup ; \ - fi - @if [ ! -f ${PREFIX}/etc/qemu-ifdown ]; then \ - ${CP} -p ${STAGEDIR}${PREFIX}/etc/qemu-ifdown.sample ${STAGEDIR}${PREFIX}/etc/qemu-ifdown ; \ - fi + @(cd ${STAGEDIR}${PREFIX}/etc/qemu && \ + ${MV} -i target-x86_64.conf target-x86_64.conf.sample) .endif .include Modified: head/emulators/qemu-devel/files/patch-Makefile ============================================================================== --- head/emulators/qemu-devel/files/patch-Makefile Tue May 20 15:53:45 2014 (r354651) +++ head/emulators/qemu-devel/files/patch-Makefile Tue May 20 15:57:31 2014 (r354652) @@ -23,15 +23,3 @@ ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" $(INSTALL_DATA) qemu.1 "$(DESTDIR)$(mandir)/man1" -@@ -341,7 +347,10 @@ - $(INSTALL_DIR) "$(DESTDIR)$(qemu_confdir)" - - install-sysconfig: install-datadir install-confdir -- $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" -+ $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)/target-x86_64.conf.sample" -+ if [ ! -f "$(qemu_confdir)/target-x86_64.conf" ]; then \ -+ $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"; \ -+ fi - - install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ - install-datadir install-localstatedir