svn commit: r533075 - in head: . emulators emulators/qemu-sbruno emulators/qemu-user-static

[Kyle Evans]

Author: kevans
Date: Sun Apr 26 15:57:12 2020
New Revision: 533075
URL: https://svnweb.freebsd.org/changeset/ports/533075

Log:
  emulators/qemu-user-static: revive as a copy of qemu-user-static-devel
  
  This is effectively the 3.1 update of qemu-user-static. The main feature of
  the update to 3.1 is RISC-V support, contributed by Embecosm.
  
  PR:		243906
  Approved by:	koobs (mentor)

Added:
  head/emulators/qemu-user-static/
     - copied from r533073, head/emulators/qemu-user-static-devel/
Modified:
  head/MOVED
  head/emulators/Makefile
  head/emulators/qemu-sbruno/Makefile
  head/emulators/qemu-user-static/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Apr 26 15:45:11 2020	(r533074)
+++ head/MOVED	Sun Apr 26 15:57:12 2020	(r533075)
@@ -14551,4 +14551,3 @@ emulators/qemu30|emulators/qemu31|2020-04-21|Has expir
 editors/nano-devel||2020-04-23|Removed: Obsolete now, use editors/nano instead
 devel/py-liblarch||2020-04-25|Removed: uses deprecated version of python; no consumers left
 sysutils/DTraceToolkit|sysutils/dtrace-toolkit|2020-04-26|Renamed to match the package name
-emulators/qemu-user-static||2020-04-25|Slave port being replaced by a copy of qemu-user-static-devel

Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile	Sun Apr 26 15:45:11 2020	(r533074)
+++ head/emulators/Makefile	Sun Apr 26 15:57:12 2020	(r533075)
@@ -110,6 +110,7 @@
     SUBDIR += qemu-devel
     SUBDIR += qemu-powernv
     SUBDIR += qemu-sbruno
+    SUBDIR += qemu-user-static
     SUBDIR += qemu-user-static-devel
     SUBDIR += qemu-utils
     SUBDIR += qemu31

Modified: head/emulators/qemu-sbruno/Makefile
==============================================================================
--- head/emulators/qemu-sbruno/Makefile	Sun Apr 26 15:45:11 2020	(r533074)
+++ head/emulators/qemu-sbruno/Makefile	Sun Apr 26 15:57:12 2020	(r533075)
@@ -20,6 +20,9 @@ USES=		bison compiler:c11 gmake perl5 pkgconfig python
 USE_PERL5=	build
 MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
 
+DEPRECATED=	Port will be removed in favor of emulators/qemu
+EXPIRATION_DATE=	2020-10-01
+
 ONLY_FOR_ARCHS=		amd64 powerpc powerpc64 # XXX someone wants to debug sparc64 hosts?
 BROKEN_i386=		aarch64 system target is currently broken for i386 hosts, disable for now while dealing with upstream
 

Modified: head/emulators/qemu-user-static/Makefile
==============================================================================
--- head/emulators/qemu-user-static-devel/Makefile	Sun Apr 26 15:01:07 2020	(r533073)
+++ head/emulators/qemu-user-static/Makefile	Sun Apr 26 15:57:12 2020	(r533075)
@@ -2,9 +2,8 @@
 
 PORTNAME=	qemu
 PORTVERSION=	3.1.0
-PORTREVISION=	3
 CATEGORIES=	emulators
-PKGNAMESUFFIX=	-user-static-devel
+PKGNAMESUFFIX=	-user-static
 DIST_SUBDIR=	qemu/${PORTVERSION}
 
 MAINTAINER=	emulation at FreeBSD.org
@@ -14,7 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=		amd64 powerpc powerpc64
-CONFLICTS_INSTALL=	qemu-user-static-[0-9]*
+CONFLICTS_INSTALL=	qemu-user-static-devel-[0-9]*
 
 USES=		bison compiler:c11 gmake perl5 pkgconfig python:build
 USE_GITHUB=	yes