Index: head/MOVED =================================================================== --- head/MOVED +++ head/MOVED @@ -9491,3 +9491,5 @@ sysutils/flyback||2017-07-31|Unfetchable for more than six months (google code has gone away) multimedia/py-ffmpeg||2017-07-31|Has expired: Depreciated upstream in favour of ffpyplayer mail/dovecot|mail/dovecot2|2017-07-31|Has expired: Deprecated by upstream years ago. Use mail/dovecot2 instead +devel/cloudabi-binutils-aarch64|devel/cloudabi-toolchain|2017-07-31|ELF-toolchain based tools should be used instead +devel/cloudabi-binutils-x86_64|devel/cloudabi-toolchain|2017-07-31|ELF-toolchain based tools should be used instead Index: head/devel/Makefile =================================================================== --- head/devel/Makefile +++ head/devel/Makefile @@ -305,8 +305,6 @@ SUBDIR += clisp-hyperspec SUBDIR += clojure-cider SUBDIR += cloudabi - SUBDIR += cloudabi-binutils-aarch64 - SUBDIR += cloudabi-binutils-x86_64 SUBDIR += cloudabi-toolchain SUBDIR += cltune SUBDIR += cmake Index: head/devel/cloudabi-binutils-aarch64/Makefile =================================================================== --- head/devel/cloudabi-binutils-aarch64/Makefile +++ head/devel/cloudabi-binutils-aarch64/Makefile @@ -1,18 +0,0 @@ -# Created by: Ed Schouten -# $FreeBSD$ - -PKGNAMEPREFIX= cloudabi- -PKGNAMESUFFIX= -aarch64 - -MAINTAINER= ed@FreeBSD.org -COMMENT= GNU Binutils for CloudABI cross-development - -MASTERDIR= ${.CURDIR}/../binutils -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -BUTARGET= aarch64-unknown-cloudabi -BUREMOVE= ar dlltool ld ld.bfd nlmconv nm objdump ranlib size windmc \ - windres - -.include "${MASTERDIR}/Makefile" Index: head/devel/cloudabi-binutils-aarch64/pkg-plist =================================================================== --- head/devel/cloudabi-binutils-aarch64/pkg-plist +++ head/devel/cloudabi-binutils-aarch64/pkg-plist @@ -1,22 +0,0 @@ -bin/aarch64-unknown-cloudabi-addr2line -bin/aarch64-unknown-cloudabi-as -bin/aarch64-unknown-cloudabi-c++filt -bin/aarch64-unknown-cloudabi-elfedit -bin/aarch64-unknown-cloudabi-gprof -bin/aarch64-unknown-cloudabi-objcopy -bin/aarch64-unknown-cloudabi-readelf -bin/aarch64-unknown-cloudabi-strings -bin/aarch64-unknown-cloudabi-strip -man/man1/aarch64-unknown-cloudabi-addr2line.1.gz -man/man1/aarch64-unknown-cloudabi-as.1.gz -man/man1/aarch64-unknown-cloudabi-c++filt.1.gz -man/man1/aarch64-unknown-cloudabi-elfedit.1.gz -man/man1/aarch64-unknown-cloudabi-gprof.1.gz -man/man1/aarch64-unknown-cloudabi-objcopy.1.gz -man/man1/aarch64-unknown-cloudabi-readelf.1.gz -man/man1/aarch64-unknown-cloudabi-strings.1.gz -man/man1/aarch64-unknown-cloudabi-strip.1.gz -aarch64-unknown-cloudabi/bin/as -aarch64-unknown-cloudabi/bin/objcopy -aarch64-unknown-cloudabi/bin/readelf -aarch64-unknown-cloudabi/bin/strip Index: head/devel/cloudabi-binutils-x86_64/Makefile =================================================================== --- head/devel/cloudabi-binutils-x86_64/Makefile +++ head/devel/cloudabi-binutils-x86_64/Makefile @@ -1,18 +0,0 @@ -# Created by: Ed Schouten -# $FreeBSD$ - -PKGNAMEPREFIX= cloudabi- -PKGNAMESUFFIX= -x86_64 - -MAINTAINER= ed@FreeBSD.org -COMMENT= GNU Binutils for CloudABI cross-development - -MASTERDIR= ${.CURDIR}/../binutils -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -BUTARGET= x86_64-unknown-cloudabi -BUREMOVE= ar dlltool ld ld.bfd nlmconv nm objdump ranlib size windmc \ - windres - -.include "${MASTERDIR}/Makefile" Index: head/devel/cloudabi-binutils-x86_64/pkg-plist =================================================================== --- head/devel/cloudabi-binutils-x86_64/pkg-plist +++ head/devel/cloudabi-binutils-x86_64/pkg-plist @@ -1,22 +0,0 @@ -bin/x86_64-unknown-cloudabi-addr2line -bin/x86_64-unknown-cloudabi-as -bin/x86_64-unknown-cloudabi-c++filt -bin/x86_64-unknown-cloudabi-elfedit -bin/x86_64-unknown-cloudabi-gprof -bin/x86_64-unknown-cloudabi-objcopy -bin/x86_64-unknown-cloudabi-readelf -bin/x86_64-unknown-cloudabi-strings -bin/x86_64-unknown-cloudabi-strip -man/man1/x86_64-unknown-cloudabi-addr2line.1.gz -man/man1/x86_64-unknown-cloudabi-as.1.gz -man/man1/x86_64-unknown-cloudabi-c++filt.1.gz -man/man1/x86_64-unknown-cloudabi-elfedit.1.gz -man/man1/x86_64-unknown-cloudabi-gprof.1.gz -man/man1/x86_64-unknown-cloudabi-objcopy.1.gz -man/man1/x86_64-unknown-cloudabi-readelf.1.gz -man/man1/x86_64-unknown-cloudabi-strings.1.gz -man/man1/x86_64-unknown-cloudabi-strip.1.gz -x86_64-unknown-cloudabi/bin/as -x86_64-unknown-cloudabi/bin/objcopy -x86_64-unknown-cloudabi/bin/readelf -x86_64-unknown-cloudabi/bin/strip Index: head/devel/cloudabi-toolchain/Makefile =================================================================== --- head/devel/cloudabi-toolchain/Makefile +++ head/devel/cloudabi-toolchain/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cloudabi-toolchain -PORTVERSION= 1.9 +PORTVERSION= 1.10 CATEGORIES= devel MASTER_SITES= # None DISTFILES= # None @@ -16,28 +16,19 @@ lld${LLVM_SUFFIX}:devel/llvm${LLVM_SUFFIX} \ pkgconf:devel/pkgconf +CONFLICTS= cloudabi-binutils-* + LLVM_SUFFIX= 40 CLOUDABI_ARCHS= aarch64-unknown-cloudabi armv6-unknown-cloudabi-eabihf \ armv7-unknown-cloudabi-eabihf i686-unknown-cloudabi \ x86_64-unknown-cloudabi +BASE_TOOLS= addr2line c++filt objcopy readelf strings strip LLVM_TOOLS= ar nm objdump ranlib size SHELL_TOOLS= man pkg-config .include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100100 -# Depend on ELF tools provided by the base system. They work well with -# CloudABI executables. -BASE_TOOLS= addr2line c++filt objcopy readelf strings strip -CONFLICTS= cloudabi-binutils-* -.else -# The tools in the base system are too old to properly support CloudABI -# and aarch64. Depend on versions provided by GNU Binutils instead. -RUN_DEPENDS+= aarch64-unknown-cloudabi-readelf:devel/cloudabi-binutils-aarch64 \ - x86_64-unknown-cloudabi-readelf:devel/cloudabi-binutils-x86_64 -.endif .for arch in ${CLOUDABI_ARCHS} . for tool in ${BASE_TOOLS} ${LLVM_TOOLS} ${SHELL_TOOLS}