Index: head/emulators/Makefile =================================================================== --- head/emulators/Makefile (revision 409364) +++ head/emulators/Makefile (revision 409365) @@ -1,183 +1,184 @@ # $FreeBSD$ # COMMENT = Emulators for other operating systems SUBDIR += adamem SUBDIR += advancemame SUBDIR += advancemenu SUBDIR += advancemess SUBDIR += aftp SUBDIR += aqemu SUBDIR += atari800 SUBDIR += bfe SUBDIR += bochs SUBDIR += bsvc SUBDIR += catapult SUBDIR += cinc SUBDIR += cingb SUBDIR += cpmemu SUBDIR += cpmtools SUBDIR += cpmtools2 SUBDIR += darcnes SUBDIR += dboxfe SUBDIR += desmume SUBDIR += dgen-sdl SUBDIR += dolphin-emu SUBDIR += dosbox SUBDIR += doscmd SUBDIR += dtcyber SUBDIR += dynagen SUBDIR += dynagui SUBDIR += dynamips SUBDIR += dynamips-community SUBDIR += dynamips-devel SUBDIR += e-uae SUBDIR += fceux SUBDIR += fmsx SUBDIR += frodo SUBDIR += fs-uae SUBDIR += fs-uae-launcher SUBDIR += fuse SUBDIR += fuse-roms SUBDIR += fuse-utils SUBDIR += gbe SUBDIR += gem5 SUBDIR += generator SUBDIR += generator-cbiere SUBDIR += gens SUBDIR += gngb SUBDIR += gngeo SUBDIR += gns3 SUBDIR += gnuboy SUBDIR += gxemul SUBDIR += hatari SUBDIR += hercules SUBDIR += higan SUBDIR += hugo SUBDIR += hyperv-is SUBDIR += i386-wine SUBDIR += i386-wine-devel SUBDIR += i386-wine-staging SUBDIR += ia64sim SUBDIR += ines SUBDIR += javatari SUBDIR += joytran SUBDIR += jzintv SUBDIR += kcemu SUBDIR += klh10 SUBDIR += kqemu-kmod SUBDIR += kqemu-kmod-devel SUBDIR += lib765 SUBDIR += libdsk SUBDIR += libspectrum SUBDIR += linux-c6 SUBDIR += linux-f10 SUBDIR += linux_base-c6 SUBDIR += linux_base-f10 SUBDIR += lisaem SUBDIR += loemu SUBDIR += m2000 SUBDIR += mame SUBDIR += mastergear SUBDIR += mednafen SUBDIR += mess SUBDIR += minivmac SUBDIR += mtools SUBDIR += mupen64plus SUBDIR += mupen64plus-audio-sdl SUBDIR += mupen64plus-core SUBDIR += mupen64plus-input-sdl SUBDIR += mupen64plus-plugins SUBDIR += mupen64plus-rsp-cxd4 SUBDIR += mupen64plus-rsp-hle SUBDIR += mupen64plus-rsp-z64 SUBDIR += mupen64plus-ui-console SUBDIR += mupen64plus-video-arachnoid SUBDIR += mupen64plus-video-glide64 SUBDIR += mupen64plus-video-glide64mk2 SUBDIR += mupen64plus-video-rice SUBDIR += mupen64plus-video-z64 SUBDIR += nestopia SUBDIR += nonpareil SUBDIR += o2em SUBDIR += ods2reader SUBDIR += open-vm-tools SUBDIR += open-vm-tools-nox11 SUBDIR += openmsx SUBDIR += p5-Acme-6502 SUBDIR += parallels-tools SUBDIR += pcemu SUBDIR += pcsxr SUBDIR += pearpc SUBDIR += pipelight SUBDIR += playonbsd SUBDIR += ppsspp SUBDIR += py-gns3-converter SUBDIR += q4wine SUBDIR += qemu SUBDIR += qemu-cheri + SUBDIR += qemu-cheri128 SUBDIR += qemu-devel SUBDIR += qemu-launcher SUBDIR += qemu-sbruno SUBDIR += qemu-user-static SUBDIR += qmc2 SUBDIR += qtemu SUBDIR += quasi88 SUBDIR += raine SUBDIR += rtc SUBDIR += rubygem-fission SUBDIR += sim6811 SUBDIR += simh SUBDIR += skyeye SUBDIR += snes9express SUBDIR += snes9x SUBDIR += snes9x-gtk SUBDIR += spim SUBDIR += stella SUBDIR += stonx SUBDIR += swine SUBDIR += tiemu3 SUBDIR += tilem SUBDIR += tme SUBDIR += tpm-emulator SUBDIR += tuxnes SUBDIR += uae SUBDIR += ucon64 SUBDIR += vba SUBDIR += vboxtool SUBDIR += vgb-bin SUBDIR += vgba-bin SUBDIR += vice SUBDIR += virtio-kmod SUBDIR += virtualbox-ose SUBDIR += virtualbox-ose-additions SUBDIR += virtualbox-ose-kmod SUBDIR += visualboyadvance-m SUBDIR += vmips SUBDIR += vmsbackup SUBDIR += vmw SUBDIR += vpcs SUBDIR += vxtools SUBDIR += wine SUBDIR += wine-devel SUBDIR += wine-gecko SUBDIR += wine-gecko-devel SUBDIR += wine-mono SUBDIR += wine-mono-devel SUBDIR += wine-staging SUBDIR += wxmupen64plus SUBDIR += x48 SUBDIR += x49gp SUBDIR += xbraitenberg SUBDIR += xcpc SUBDIR += xen SUBDIR += xen-kernel SUBDIR += xhomer SUBDIR += xsystem35 SUBDIR += xzx SUBDIR += yabause SUBDIR += yape SUBDIR += zsnes .include Index: head/emulators/qemu-cheri/Makefile =================================================================== --- head/emulators/qemu-cheri/Makefile (revision 409364) +++ head/emulators/qemu-cheri/Makefile (revision 409365) @@ -1,38 +1,38 @@ # $FreeBSD$ PORTNAME= qemu PORTVERSION= 0.d${SNAPDATE} CATEGORIES= emulators devel -PKGNAMESUFFIX= -cheri +PKGNAMESUFFIX?= -cheri MAINTAINER= brooks@FreeBSD.org -COMMENT= QEMU emulator with CHERI CPU support +COMMENT?= QEMU emulator with CHERI CPU support USE_GITHUB= yes GH_ACCOUNT= CTSRD-CHERI GH_TAGNAME= ${QEMU_COMMIT} HAS_CONFIGURE= yes USES= gmake libtool makeinfo pkgconfig python:2,build USE_XORG= pixman USE_GNOME+= glib20 #MAKE_ENV+= BSD_MAKE="${MAKE}" ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 CONFLICTS_INSTALL= qemu-[0-9]* qemu-devel-[0-9]* qemu-sbruno-[0-9]* .include "Makefile.snapshot" CONFIGURE_ARGS+= \ --target-list=cheri-softmmu \ --disable-gtk \ --disable-linux-user \ --disable-linux-aio \ --disable-kvm \ --disable-smartcard-nss \ --disable-vte \ --disable-xen \ - --extra-cflags=-g \ + --extra-cflags="-g ${EXTRA_CFLAGS}" \ --localstatedir=/var .include Index: head/emulators/qemu-cheri/Makefile.snapshot =================================================================== --- head/emulators/qemu-cheri/Makefile.snapshot (revision 409364) +++ head/emulators/qemu-cheri/Makefile.snapshot (revision 409365) @@ -1,9 +1,9 @@ # $FreeBSD$ # # Generated file! Do not edit! # # Generated by: files/gen-Makefile.snapshot.sh. # -SNAPDATE= 20160128 +SNAPDATE= 20160220 -QEMU_COMMIT= 100abeddda5764c193807863806df7027471db94 +QEMU_COMMIT= 5f5668398f6eba799298072ac761e7216e360d85 Index: head/emulators/qemu-cheri/distinfo =================================================================== --- head/emulators/qemu-cheri/distinfo (revision 409364) +++ head/emulators/qemu-cheri/distinfo (revision 409365) @@ -1,2 +1,2 @@ -SHA256 (CTSRD-CHERI-qemu-0.d20160128-100abeddda5764c193807863806df7027471db94_GH0.tar.gz) = cbe4c5508c8b3ab2ecf52e1d1e80580fdfe610ec15d7b4413c5531563f71d349 -SIZE (CTSRD-CHERI-qemu-0.d20160128-100abeddda5764c193807863806df7027471db94_GH0.tar.gz) = 11137465 +SHA256 (CTSRD-CHERI-qemu-0.d20160220-5f5668398f6eba799298072ac761e7216e360d85_GH0.tar.gz) = 9a43a26c7144ac7995e33e956390b96695a8d5cae5327dbb06c9ca0b32289437 +SIZE (CTSRD-CHERI-qemu-0.d20160220-5f5668398f6eba799298072ac761e7216e360d85_GH0.tar.gz) = 11139308 Index: head/emulators/qemu-cheri128/Makefile =================================================================== --- head/emulators/qemu-cheri128/Makefile (nonexistent) +++ head/emulators/qemu-cheri128/Makefile (revision 409365) @@ -0,0 +1,20 @@ +# Created by: Brooks Davis +# $FreeBSD$ + +PKGNAMESUFFIX= -cheri128 + +COMMENT= QEMU emulator with CHERI CPU support (128-bit) + +RUN_DEPENDS= qemu-system-cheri:${PORTSDIR}/emulators/qemu-cheri + +MASTERDIR= ${.CURDIR}/../qemu-cheri + +EXTRA_CFLAGS= -DCHERI_MAGIC128 +PLIST= /dev/null +PLIST_FILES= bin/qemu-system-cheri128 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/cheri-softmmu/qemu-system-cheri \ + ${STAGEDIR}${PREFIX}/bin/qemu-system-cheri128 + +.include <${MASTERDIR}/Makefile> Property changes on: head/emulators/qemu-cheri128/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property