svn commit: r354652 - in head/emulators/qemu-devel: . files

[Juergen Lock]

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 <bsd.port.mk>

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