Scrub mention of armv6hf from ARCHS. It was never in a released version.

While here, sort ARCHS and pet portlint.

Reviewed by:	imp
Approved by:	portmgr (tier-2 blanket)

7 files changed, 6 insertions, 7 deletions

diff --git a/devel/gcc-arm-embedded/Makefile b/devel/gcc-arm-embedded/Makefile
index 0199318..2e96810 100644
--- a/devel/gcc-arm-embedded/Makefile
+++ b/devel/gcc-arm-embedded/Makefile
@@ -36,7 +36,7 @@ PYGDB_USES=		python:2
 
 OPTIONS_SUB=		yes
 
-NOT_FOR_ARCHS=		aarch64 arm armeb armv6 armv6hf \
+NOT_FOR_ARCHS=		aarch64 arm armeb armv6 \
 			mips mips64 mips64el mipsel mipsn32
 NOT_FOR_ARCHS_REASON=	Very slow to build on emulator
 
diff --git a/games/digger-vgl/Makefile b/games/digger-vgl/Makefile
index 7328e2b..e7f5ccc 100644
--- a/games/digger-vgl/Makefile
+++ b/games/digger-vgl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.digger.org/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FreeBSD graphics console (VGL) version of the famous Digger game
 
-ONLY_FOR_ARCHS=	i386 amd64	# Alphas don't have libvgl yet...
+ONLY_FOR_ARCHS=	amd64 i386
 
 MAKEFILE=	Makefile.fbsd
 
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index 82ab5d5..59c1cee 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	java-zoneinfo>0:java/java-zoneinfo
 
 BUNDLE_LIBS=	yes
 
-ONLY_FOR_ARCHS=	amd64 armv6 armv6hf i386 powerpc64
+ONLY_FOR_ARCHS=		amd64 armv6 i386 powerpc64
 BROKEN_powerpc64=	fails to build: pkg-static: Unable to access file jre/lib/powerpc64/jvm.cfg
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${JDK_ARCH}
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 3f42081..03dfbec 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -66,7 +66,7 @@ X11_LIB_DEPENDS+=	libXtst.so.6:x11/libXtst
 BUILD_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
 .endif
 
-ONLY_FOR_ARCHS=	amd64 armv6 armv6hf i386 powerpc powerpc64
+ONLY_FOR_ARCHS=	amd64 armv6 i386 powerpc powerpc64
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \
diff --git a/lang/go14/Makefile b/lang/go14/Makefile
index b153a52..c3c1356 100644
--- a/lang/go14/Makefile
+++ b/lang/go14/Makefile
@@ -28,7 +28,7 @@ sh_OLD_CMD=	"/usr/bin/env bash"
 sh_CMD=		${SH}
 
 WRKSRC=		${WRKDIR}/go
-ONLY_FOR_ARCHS=	i386 amd64 armv6 armv6hf
+ONLY_FOR_ARCHS=	amd64 armv6 i386
 
 # NB: apparently this failure is only when running under emulation via
 # qemu; it works fine on native hardware.  Let's leave the line in as a
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index f7c94ec..79160aa 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -48,7 +48,6 @@ OPTIONS_GROUP_LICENSE=	GPL3 NONFREE
 
 OPTIONS_DEFINE_amd64=	MMX SSE
 OPTIONS_DEFINE_armv6=	VFP NEON
-OPTIONS_DEFINE_armv6hf=	VFP NEON
 OPTIONS_DEFINE_i386=	MMX SSE
 OPTIONS_DEFAULT_amd64=	MMX SSE
 OPTIONS_DEFAULT_i386=	MMX SSE
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index d0ee5ab..1801fdd 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -24,7 +24,7 @@ TOOLS_ONLY_DESC=	Do not install window manager, only tools
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
+.if ${ARCH} == "armv6"
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_Toolbar.cc
 .endif