From e3fbaab8266652a33bbbb7aabce311ffa7424b93 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 23 Jan 2021 22:50:42 +0000 Subject: [PATCH] MFH: r562222 r562224 emulators/qemu-utils: unbreak after r553312 Due to many breaking changes temporarily switch to qemu42. ===> Applying extra patch files/patch-configure 1 out of 2 hunks failed--saving rejects to configure.rej ===> Applying extra patch files/patch-Makefile 2 out of 3 hunks failed--saving rejects to Makefile.rej ERROR: unknown option --disable-bluez strip: open ../stage/usr/local/bin/qemu-* failed: No such file or directory PR: 252498 --- emulators/qemu-utils/Makefile | 4 +--- emulators/qemu42/Makefile | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/emulators/qemu-utils/Makefile b/emulators/qemu-utils/Makefile index 53f100c74a0e..d2b97724968a 100644 --- a/emulators/qemu-utils/Makefile +++ b/emulators/qemu-utils/Makefile @@ -5,8 +5,6 @@ PKGNAMESUFFIX= -utils MAINTAINER= ken@FreeBSD.org COMMENT= QEMU userland utilities -BROKEN= fails to patch - HAS_CONFIGURE= yes USES= compiler:c11 cpe gettext-runtime gmake gnome perl5 pkgconfig \ python:build tar:xz @@ -18,7 +16,7 @@ OPTIONS_SLAVE= DOCS OPTIONS_EXCLUDE= SAMBA X11 GTK3 OPENGL GNUTLS SASL JPEG PNG CURL \ CDROM_DMA PCAP USBREDIR GNS3 X86_TARGETS \ STATIC_LINK NCURSES VDE -MASTERDIR= ${.CURDIR}/../qemu +MASTERDIR= ${.CURDIR}/../qemu42 PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr EXTRA_PATCHES= ${.CURDIR}/files/patch-configure diff --git a/emulators/qemu42/Makefile b/emulators/qemu42/Makefile index 0c31c0c69bff..6dc8270dfcb4 100644 --- a/emulators/qemu42/Makefile +++ b/emulators/qemu42/Makefile @@ -5,7 +5,7 @@ PORTNAME= qemu PORTVERSION= 4.2.1 CATEGORIES= emulators MASTER_SITES= https://download.qemu.org/ -PKGNAMESUFFIX= 42 +PKGNAMESUFFIX?= 42 DIST_SUBDIR= qemu/${PORTVERSION} MAINTAINER?= bofh@FreeBSD.org @@ -21,11 +21,13 @@ LIB_DEPENDS?= libnettle.so:security/nettle \ libpcre2-8.so:devel/pcre2 \ libfdt.so:sysutils/dtc +.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 USES= bison compiler:c11 cpe gmake gnome iconv:wchar_t perl5 \ pkgconfig python:build tar:xz xorg USE_XORG= pixman USE_GNOME= cairo glib20 libxml2 +.endif USE_PERL5= build @@ -103,9 +105,11 @@ VDE_LIB_DEPENDS= libvdeplug.so:net/vde2 X11_CONFIGURE_ENABLE= sdl X11_USE= SDL=sdl2 XORG=x11,xext GNOME=gdkpixbuf2 X11_USES= sdl +.if !defined(PKGNAMESUFFIX) || (${PKGNAMESUFFIX} != "-utils" && ${PKGNAMESUFFIX} != "-guest-agent") X86_TARGETS_USE_OFF= XORG=pixman,x11 X86_TARGETS_USES_OFF= xorg INSTALLS_ICONS= yes +.endif PORTDOCS?= docs interop/.buildinfo interop/* qemu-doc.html qemu-doc.txt qemu-ga-ref.html qemu-ga-ref.txt \ qemu-qmp-ref.html qemu-qmp-ref.txt specs/.buildinfo specs/*