Attachment 209176 Details for Bug 241995 – svn(1) diff against the ports tree

[patch] svn(1) diff against the ports tree

qemu-3.1.diff (text/plain), 5.98 KB, created by Kyle Evans on 2019-11-16 05:06:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2019-11-16 05:06:57 UTC

Size: 5.98 KB

patch

obsolete

>Index: emulators/qemu-sbruno/Makefile
>===================================================================
>--- emulators/qemu-sbruno/Makefile	(revision 517377)
>+++ emulators/qemu-sbruno/Makefile	(working copy)
>@@ -2,17 +2,17 @@
> # $FreeBSD$
> 
> PORTNAME=	qemu
>-PORTVERSION=	2.11.50.g20191112
>+PORTVERSION=	3.1.0
> CATEGORIES=	emulators
> PKGNAMESUFFIX?=	-sbruno
> DIST_SUBDIR=	qemu/${PORTVERSION}
> 
>-MAINTAINER=	sbruno@FreeBSD.org
>+MAINTAINER=	emulation@FreeBSD.org
> COMMENT?=	QEMU CPU Emulator - github bsd-user branch
> 
> LICENSE=	GPLv2
> USE_GITHUB=	yes
>-GH_TUPLE=	seanbruno:qemu-bsd-user:b581800	\
>+GH_TUPLE=	seanbruno:qemu-bsd-user:0337421f238	\
> 		qemu:keycodemapdb:10739aa:keycodemapdb/ui/keycodemapdb
> HAS_CONFIGURE=	yes
> USES=		bison compiler:c11 gmake perl5 pkgconfig python:2.7,build
>@@ -76,7 +76,7 @@
> .if ${ARCH} != "amd64"
> CONFIGURE_ARGS+=	--target-list=i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user
> .else
>-CONFIGURE_ARGS+=	--target-list=i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user
>+CONFIGURE_ARGS+=	--target-list=i386-bsd-user,x86_64-bsd-user,riscv64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user
> .endif
> .else
> .if ${PORT_OPTIONS:MX86_TARGETS}
>@@ -84,7 +84,7 @@
> .if ${ARCH} != "amd64"
> CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user
> .else
>-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user
>+CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,i386-bsd-user,x86_64-bsd-user,sparc-bsd-user,riscv64-bsd-user,sparc64-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,mips64-bsd-user,mips64el-bsd-user,ppc-bsd-user,ppc64-bsd-user,aarch64-bsd-user
> .endif
> .else
> CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu
>@@ -94,7 +94,7 @@
> CONFIGURE_ARGS+=	--disable-bsd-user
> .else
> .if ${ARCH} != "amd64"
>-CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,aarch64-softmmu,alpha-softmmu,arm-softmmu,cris-softmmu,lm32-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu,or32-softmmu,ppc-softmmu,ppcemb-softmmu,ppc64-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,s390x-softmmu,xtensa-softmmu,xtensaeb-softmmu,unicore32-softmmu,moxie-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user
>+CONFIGURE_ARGS+=	--target-list=i386-softmmu,x86_64-softmmu,aarch64-softmmu,alpha-softmmu,arm-softmmu,cris-softmmu,lm32-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mipsel-softmmu,mips64-softmmu,mips64el-softmmu,or32-softmmu,ppc-softmmu,ppcemb-softmmu,ppc64-softmmu,sh4-softmmu,sh4eb-softmmu,riscv64-softmmu,sparc-softmmu,sparc64-softmmu,s390x-softmmu,xtensa-softmmu,xtensaeb-softmmu,unicore32-softmmu,moxie-softmmu,i386-bsd-user,sparc-bsd-user,arm-bsd-user,mips-bsd-user,mipsel-bsd-user,ppc-bsd-user
> .endif
> .endif
> .endif
>Index: emulators/qemu-sbruno/distinfo
>===================================================================
>--- emulators/qemu-sbruno/distinfo	(revision 517377)
>+++ emulators/qemu-sbruno/distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1573592353
>-SHA256 (qemu/2.11.50.g20191112/seanbruno-qemu-bsd-user-2.11.50.g20191112-b581800_GH0.tar.gz) = d4dd9ab5fcc7c72f63f1068ff443bb9b0b14c87334e7aa18d147596f139ffa0d
>-SIZE (qemu/2.11.50.g20191112/seanbruno-qemu-bsd-user-2.11.50.g20191112-b581800_GH0.tar.gz) = 15511875
>-SHA256 (qemu/2.11.50.g20191112/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
>-SIZE (qemu/2.11.50.g20191112/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895
>+TIMESTAMP = 1573875356
>+SHA256 (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-0337421f238_GH0.tar.gz) = 7ae7340a2b99e24e0d85b8d632ecef41ddd3ef76382af4dbe6dab082d3c4d16a
>+SIZE (qemu/3.1.0/seanbruno-qemu-bsd-user-3.1.0-0337421f238_GH0.tar.gz) = 16903184
>+SHA256 (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = ae43fb1e2b07b78be88a7882306b6e71383eb77472a35d7d78fed21e345d134a
>+SIZE (qemu/3.1.0/qemu-keycodemapdb-10739aa_GH0.tar.gz) = 47895
>Index: emulators/qemu-sbruno/files/patch-Makefile
>===================================================================
>--- emulators/qemu-sbruno/files/patch-Makefile	(revision 517377)
>+++ emulators/qemu-sbruno/files/patch-Makefile	(working copy)
>@@ -14,7 +14,7 @@
>  DOCS+=docs/qemu-block-drivers.7
>  ifdef CONFIG_VIRTFS
>  DOCS+=fsdev/virtfs-proxy-helper.1
>-@@ -669,16 +673,20 @@ endif
>+@@ -669,17 +673,21 @@ endif
>  
>  install-doc: $(DOCS)
>  	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
>@@ -31,6 +31,7 @@
> +ifndef NOPORTDOCS
>  	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
>  	$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
>+ 	$(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7"
> +endif
>  ifneq ($(TOOLS),)
>  	$(INSTALL_DATA) qemu-img.1 "$(DESTDIR)$(mandir)/man1"
>Index: emulators/qemu-sbruno/pkg-plist
>===================================================================
>--- emulators/qemu-sbruno/pkg-plist	(revision 517377)
>+++ emulators/qemu-sbruno/pkg-plist	(working copy)
>@@ -22,6 +22,7 @@
> %%NONX86%%bin/qemu-system-ppc
> %%NONX86%%bin/qemu-system-ppc64
> %%NONX86%%bin/qemu-system-ppcemb
>+%%NONX86%%bin/qemu-system-riscv64
> %%NONX86%%bin/qemu-system-s390x
> %%NONX86%%bin/qemu-system-sh4
> %%NONX86%%bin/qemu-system-sh4eb
>@@ -41,6 +42,7 @@
> %%BSD_USER%%bin/qemu-mipsel%%STATIC%%
> %%BSD_USER%%bin/qemu-ppc%%STATIC%%
> %%BSD_USER64%%bin/qemu-ppc64%%STATIC%%
>+%%BSD_USER64%%bin/qemu-riscv64%%STATIC%%
> %%BSD_USER%%bin/qemu-sparc%%STATIC%%
> %%BSD_USER64%%bin/qemu-sparc64%%STATIC%%
> %%BSD_USER64%%bin/qemu-x86_64%%STATIC%%

Actions: View | Diff

Attachments on bug 241995: 209176