Index: head/emulators/qemu-cheri/Makefile =================================================================== --- head/emulators/qemu-cheri/Makefile (revision 518849) +++ head/emulators/qemu-cheri/Makefile (revision 518850) @@ -1,69 +1,69 @@ # $FreeBSD$ PORTNAME= qemu PORTVERSION= 0.d${SNAPDATE} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= emulators devel PKGNAMESUFFIX= -cheri MAINTAINER= brooks@FreeBSD.org COMMENT?= QEMU emulator with CHERI CPU support # XXX: disabling gnutls doesn't work so depend on it to avoid breakage. LIB_DEPENDS= libcapstone.so:devel/capstone3 \ libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libgnutls.so:security/gnutls \ libnettle.so:security/nettle RUN_DEPENDS= qemu-system-i386:emulators/qemu LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= CTSRD-CHERI GH_TAGNAME= ${QEMU_COMMIT} GH_TUPLE= qemu:keycodemapdb:6b3d716:qemu/ui/keycodemapdb HAS_CONFIGURE= yes USES= compiler:c11 gettext-runtime gl gmake gnome libtool makeinfo pkgconfig \ - python:2.7,build xorg + python:build xorg USE_XORG= pixman USE_GNOME+= glib20 libxml2 USE_GL+= gbm ONLY_FOR_ARCHS= amd64 powerpc64 OPTIONS_DEFINE= DOCS .include "Makefile.snapshot" CONFIGURE_ARGS+= \ --target-list=cheri128-softmmu,cheri128magic-softmmu,cheri256-softmmu \ --disable-curl \ --disable-git-update \ --disable-gtk \ --disable-libssh2 \ --disable-linux-user \ --disable-linux-aio \ --disable-kvm \ --disable-vnc-png \ --disable-sdl \ --disable-vte \ --disable-xen \ --smbd=${LOCALBASE}/sbin/smbd \ --extra-cflags="-g ${EXTRA_CFLAGS}" \ --localstatedir=/var EXTRA_CFLAGS= -DCHERI_UNALIGNED QEMU_SYSTEM_CHERI?= qemu-system${PKGNAMESUFFIX} PLIST= /dev/null PLIST_FILES= bin/qemu-system-cheri128 \ bin/qemu-system-cheri128magic \ bin/qemu-system-cheri256 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cheri128-softmmu/qemu-system-cheri128 \ ${WRKSRC}/cheri128magic-softmmu/qemu-system-cheri128magic \ ${WRKSRC}/cheri256-softmmu/qemu-system-cheri256 \ ${STAGEDIR}${PREFIX}/bin/ .include Index: head/emulators/qemu-powernv/Makefile =================================================================== --- head/emulators/qemu-powernv/Makefile (revision 518849) +++ head/emulators/qemu-powernv/Makefile (revision 518850) @@ -1,57 +1,57 @@ # $FreeBSD$ PORTNAME= qemu-powernv PORTVERSION= 3.0.50 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://people.freebsd.org/~kbowling/distfiles/ MAINTAINER= kbowling@FreeBSD.org COMMENT= Fork of QEMU with experimental PowerNV emulation support LICENSE= GPLv2 BUILD_DEPENDS= ${LOCALBASE}/lib/libfdt.so:sysutils/dtc USES= bison:build compiler:c11 gmake gnome libtool makeinfo \ - pkgconfig python:2.7,build tar:bz2 xorg + pkgconfig python:build tar:bz2 xorg USE_XORG= pixman USE_GNOME= glib20 HAS_CONFIGURE= yes CONFIGURE_ARGS+=--target-list=ppc64-softmmu \ --cc=${CC} \ --disable-curl \ --disable-docs \ --disable-gtk \ --disable-gcrypt \ --disable-kvm \ --disable-libssh2 \ --disable-linux-aio \ --disable-linux-user \ --disable-vnc \ --disable-sdl \ --disable-nettle \ --disable-gnutls \ --disable-vte \ --disable-xen \ --extra-cflags=-I${WRKSRC}\ -I${LOCALBASE}/include\ -DPREFIX=\\\"\"${PREFIX}\\\"\" \ --extra-ldflags=-L\"${LOCALBASE}/lib\" \ --localstatedir=/var \ --datadir=${DATADIR} \ --python=${PYTHON_CMD} PLIST_FILES= bin/qemu-system-powernv \ ${DATADIR}/qemu/skiboot.lid \ ${DATADIR}/qemu/slof.bin \ ${DATADIR}/qemu/spapr-rtas.bin # remap names to avoid conflicts with mainline port do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ppc64-softmmu/qemu-system-ppc64 ${STAGEDIR}${PREFIX}/bin/qemu-system-powernv ${MKDIR} ${STAGEDIR}${DATADIR}/qemu ${INSTALL_DATA} ${WRKSRC}/pc-bios/skiboot.lid ${STAGEDIR}${DATADIR}/qemu/skiboot.lid ${INSTALL_DATA} ${WRKSRC}/pc-bios/slof.bin ${STAGEDIR}${DATADIR}/qemu/slof.bin ${INSTALL_DATA} ${WRKSRC}/pc-bios/spapr-rtas.bin ${STAGEDIR}${DATADIR}/qemu/spapr-rtas.bin .include