For ports that are explicitly enabled on armv6, also enable them

on armv7.  This has not been tested with an -exp run but should
"do no harm".

PR:		221894 (partial)

44 files changed, 62 insertions, 54 deletions

diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
index 51ce05abdad3..efd137cf95a3 100644
--- a/audio/wavpack/Makefile
+++ b/audio/wavpack/Makefile
@@ -22,6 +22,7 @@ INSTALL_TARGET=	install-strip
 OPTIONS_DEFINE=	ASM
 OPTIONS_DEFAULT_amd64=	ASM
 OPTIONS_DEFAULT_armv6=	ASM
+OPTIONS_DEFAULT_armv7=	ASM
 
 ASM_CONFIGURE_OFF=	--disable-asm
 ASM_DESC=	Optimized assembler routines (requires MMX on x86)
diff --git a/audio/wavplay/Makefile b/audio/wavplay/Makefile
index 0516665cba47..1dd9adbb964d 100644
--- a/audio/wavplay/Makefile
+++ b/audio/wavplay/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Wav player and recorder
 LICENSE=	GPLv2 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-ONLY_FOR_ARCHS=	amd64 armv6 i386
+ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 
 INSTALL_TARGET=	install PREFIX="${STAGEDIR}${PREFIX}"
 
diff --git a/comms/java-simple-serial-connector/Makefile b/comms/java-simple-serial-connector/Makefile
index 5556f1b46cac..213d7fb0e8b5 100644
--- a/comms/java-simple-serial-connector/Makefile
+++ b/comms/java-simple-serial-connector/Makefile
@@ -24,7 +24,7 @@ PLIST_FILES=	${JAVA_HOME}/jre/lib/ext/jssc-${PORTVERSION}.jar
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6" || ${ARCH} == "aarch64"
+.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 JSSC_ARCH=		arm
 .else
 JSSC_ARCH=		${ARCH}
diff --git a/databases/db48/Makefile b/databases/db48/Makefile
index ef392be914ae..cc8334052863 100644
--- a/databases/db48/Makefile
+++ b/databases/db48/Makefile
@@ -34,7 +34,7 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == "aarch64" || ${ARCH} == "armv6"
+.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 # db48 uses a deprecated instruction for mutexes on ARM, fbsd bug#197227
 CONFIGURE_ARGS+=	--enable-posixmutexes
 .endif
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index d5c90cfc4725..20853a223c04 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Open-source distributed time series database
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	amd64 armv6 i386
+ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 
 BUILD_DEPENDS=	go>=1.8.1:lang/go
 
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 6e18a85ea628..4ceae2ec40d3 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -87,7 +87,7 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
 .endif
 
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index c2ac25b25642..30d498ecf8db 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -147,7 +147,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
 .endif
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
 .endif
 
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 8b19e3dddef7..01bc1d4c169e 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -28,6 +28,7 @@ OPTIONS_SUB=	yes
 # firebird is currently only available on x86.
 OPTIONS_EXCLUDE_aarch64=	FIREBIRD
 OPTIONS_EXCLUDE_armv6=		FIREBIRD
+OPTIONS_EXCLUDE_armv7=		FIREBIRD
 OPTIONS_EXCLUDE_mips=		FIREBIRD
 OPTIONS_EXCLUDE_mips64=		FIREBIRD
 OPTIONS_EXCLUDE_powerpc=	FIREBIRD
diff --git a/devel/cld/Makefile b/devel/cld/Makefile
index 40d265670cd5..67e0bc5f2a7b 100644
--- a/devel/cld/Makefile
+++ b/devel/cld/Makefile
@@ -20,7 +20,7 @@ USES=		libtool pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-ONLY_FOR_ARCHS=	i386 amd64 armv6 powerpc
+ONLY_FOR_ARCHS=	i386 amd64 armv6 armv7 powerpc
 ONLY_FOR_ARCHS_REASON=	hardcoded set of supported archs
 
 .include <bsd.port.mk>
diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile
index 79ac4916ffa3..55e8b227f7ea 100644
--- a/devel/cxxtools/Makefile
+++ b/devel/cxxtools/Makefile
@@ -27,37 +27,37 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
+.if ${ARCH} == amd64
 PLIST_SUB+=	X86_64_ONLY=""
 .else
 PLIST_SUB+=	X86_64_ONLY="@comment "
 .endif
 
-.if ${ARCH} == "i386"
+.if ${ARCH} == i386
 PLIST_SUB+=	I386_ONLY=""
 .else
 PLIST_SUB+=	I386_ONLY="@comment "
 .endif
 
-.if (${ARCH} == "amd64") || (${ARCH} == "i386")
+.if (${ARCH} == amd64) || (${ARCH} == i386)
 PLIST_SUB+=	X86_ONLY=""
 .else
 PLIST_SUB+=	X86_ONLY="@comment "
 .endif
 
-.if ${ARCH} == "arm" || ${ARCH} == "armv6"
+.if ${ARCH} == arm || ${ARCH} == armv6 || ${ARCH} == armv7
 PLIST_SUB+=	ARM_ONLY=""
 .else
 PLIST_SUB+=	ARM_ONLY="@comment "
 .endif
 
-.if ${ARCH} == "mips" || ${ARCH} == "mips64"
+.if ${ARCH} == mips || ${ARCH} == mips64
 PLIST_SUB+=	MIPS_ONLY=""
 .else
 PLIST_SUB+=	MIPS_ONLY="@comment "
 .endif
 
-.if ${ARCH} == "powerpc" || ${ARCH} == "powerpc64"
+.if ${ARCH} == powerpc || ${ARCH} == powerpc64
 PLIST_SUB+=	PPC_ONLY=""
 .else
 PLIST_SUB+=	PPC_ONLY="@comment "
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index 503a918572ab..ad64fb4d6fff 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -13,7 +13,7 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING3
 
 # untested on sparc64, might work
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 i386 mips powerpc powerpc64
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 mips powerpc powerpc64
 
 TEST_DEPENDS=	runtest:misc/dejagnu
 
diff --git a/devel/hwloc/Makefile b/devel/hwloc/Makefile
index d62006edb95d..02b3d031df70 100644
--- a/devel/hwloc/Makefile
+++ b/devel/hwloc/Makefile
@@ -27,7 +27,7 @@ USE_GNOME=	libxml2
 
 PORTDOCS=	*
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386
 ONLY_FOR_ARCHS_REASON=	has not been ported to this architecture
 
 OPTIONS_DEFINE=	CAIRO DOCS
diff --git a/devel/judy/Makefile b/devel/judy/Makefile
index 5fc175468752..0aaaf9d8fb68 100644
--- a/devel/judy/Makefile
+++ b/devel/judy/Makefile
@@ -24,7 +24,7 @@ PORTDOCS=	COPYRIGHT README *.htm
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == armv6 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc
+.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc
 CONFIGURE_ARGS+=	--enable-32-bit
 .else
 CONFIGURE_ARGS+=	--enable-64-bit
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index edc3bcb24482..524874fa2fc2 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -67,7 +67,7 @@ SNDIO_CONFIGURE_OFF=	--disable-sndio
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ENV+=	ASFLAGS=-meabi=5
 .endif
 
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index e38fe351e20a..90c42c75836c 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -26,6 +26,9 @@ GNU_CONFIGURE=	yes
 CFLAGS_armv6=	-fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \
 		-fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \
 		-fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl
+CFLAGS_armv7=	-fno-builtin-sincos -fno-builtin-sin -fno-builtin-cos \
+		-fno-builtin-sincosf -fno-builtin-sinf -fno-builtin-cosf \
+		-fno-builtin-sincosl -fno-builtin-sinl -fno-builtin-cosl
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 8061397e5dee..a2764f1d1c49 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -50,7 +50,7 @@ PLIST_SUB+=	ARM_DRIVERS="@comment "
 PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	NOUVEAU_DRIVER=""
 PLIST_SUB+=	RADEON_DRIVERS=""
-.elif ${ARCH} == armv6 || ${ARCH} == aarch64
+.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 PLIST_SUB+=	ARM_DRIVERS=""
 PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index beca61bc9461..1971c115f182 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -52,9 +52,9 @@ GALLIUM_DRIVERS+=	SVGA
 . if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_mesa_drivers_dri_i965_intel__screen.c
 . endif
-.elif ${ARCH} == armv6 || ${ARCH} == aarch64
+.elif ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7
 GALLIUM_DRIVERS+=	FREEDRENO VC4
-. if ${ARCH} == armv6
+. if ${ARCH} == armv6 || ${ARCH} == armv7
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in
 . endif
 .endif
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 339ef789f277..c3ba3d391084 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -48,6 +48,7 @@ OPTIONS_GROUP_PERFORMANCE=	EIGEN3 TBB
 OPTIONS_GROUP_SIMD=	${OPTIONS_GROUP_SIMD_${MACHINE_ARCH}}
 OPTIONS_GROUP_SIMD_amd64=	${OPTIONS_GROUP_SIMD_i386}
 OPTIONS_GROUP_SIMD_armv6=	NEON VFPV3
+OPTIONS_GROUP_SIMD_armv7=	NEON VFPV3
 OPTIONS_GROUP_SIMD_i386=	SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX AVX2
 OPTIONS_GROUP_VIDEO=	FFMPEG GSTREAMER GSTREAMER0 V4L XINE
 OPTIONS_RADIO=		GUI
diff --git a/java/bouncycastle15/Makefile b/java/bouncycastle15/Makefile
index 540a126928e7..fe3629228774 100644
--- a/java/bouncycastle15/Makefile
+++ b/java/bouncycastle15/Makefile
@@ -48,7 +48,8 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 # PR 220612: remove fork="true" in javac and fork="yes" in junit tasks
-.if ${ARCH}=="armv6"
+# NB: as of adding armv7, the patchname is kind of obsolete.
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 EXTRA_PATCHES+=	${FILESDIR}/armv6-patch-bc+-build.xml
 .endif
 
diff --git a/lang/erlang-runtime17/Makefile b/lang/erlang-runtime17/Makefile
index 589ca8144fa4..f066634c619e 100644
--- a/lang/erlang-runtime17/Makefile
+++ b/lang/erlang-runtime17/Makefile
@@ -169,7 +169,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
diff --git a/lang/erlang-runtime18/Makefile b/lang/erlang-runtime18/Makefile
index 2f3246110fc4..53e1b9ac4767 100644
--- a/lang/erlang-runtime18/Makefile
+++ b/lang/erlang-runtime18/Makefile
@@ -163,7 +163,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
diff --git a/lang/erlang-runtime19/Makefile b/lang/erlang-runtime19/Makefile
index 610fcb9d7a4e..d3b800c7c96a 100644
--- a/lang/erlang-runtime19/Makefile
+++ b/lang/erlang-runtime19/Makefile
@@ -184,7 +184,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
diff --git a/lang/erlang-runtime20/Makefile b/lang/erlang-runtime20/Makefile
index eeb801f7e5ab..3dd63daeaf4e 100644
--- a/lang/erlang-runtime20/Makefile
+++ b/lang/erlang-runtime20/Makefile
@@ -175,7 +175,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 8867272a4da0..f93ad6dd5418 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -201,7 +201,7 @@ CONFIGURE_ARGS+=--enable-dirty-schedulers
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
diff --git a/lang/go/Makefile b/lang/go/Makefile
index 7c9eea6e773b..ff236a1aa14f 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -31,18 +31,18 @@ sh_OLD_CMD=	"/usr/bin/env bash"
 sh_CMD=		${SH}
 
 WRKSRC=		${WRKDIR}/go
-ONLY_FOR_ARCHS=	i386 amd64 armv6
+ONLY_FOR_ARCHS=	i386 amd64 armv6 armv7
 
 OPTIONS_DEFINE=	GO387
 GO387_DESC=	Do not generate code with SSE2 (for old x86 CPU)
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386"
+.if ${ARCH} == i386
 GOARCH=386
 .elif ${ARCH} == "amd64"
 GOARCH=amd64
-.elif ${ARCH} == "armv6"
+.elif ${ARCH} == armv6 || ${ARCH} == armv7
 GOARCH=arm
 .else
 IGNORE=		unknown arch ${ARCH}
diff --git a/lang/go14/Makefile b/lang/go14/Makefile
index ed977a704d7b..efc500184a62 100644
--- a/lang/go14/Makefile
+++ b/lang/go14/Makefile
@@ -29,7 +29,7 @@ sh_CMD=		${SH}
 
 WRKSRC=		${WRKDIR}/go
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386
 
 .include <bsd.port.pre.mk>
 
@@ -38,13 +38,13 @@ ONLY_FOR_ARCHS=		amd64 armv6 i386
 CC=clang
 .endif
 
-.if ${ARCH} == "i386"
+.if ${ARCH} == i386
 GOARCH=386
 GOOBJ=8
-.elif ${ARCH} == "amd64"
+.elif ${ARCH} == amd64
 GOARCH=amd64
 GOOBJ=6
-.elif ${ARCH} == "armv6"
+.elif ${ARCH} == armv6 || ${ARCH} == armv7
 GOARCH=arm
 GOOBJ=5
 .else
diff --git a/lang/luajit/Makefile b/lang/luajit/Makefile
index fa3356aefc9f..0ecd589316cd 100644
--- a/lang/luajit/Makefile
+++ b/lang/luajit/Makefile
@@ -16,7 +16,7 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB+=	VERSION=${DISTVERSION}
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386
 ONLY_FOR_ARCHS_REASON=	Requires newer gcc/clang to compile.
 
 post-install:
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 320c3446020e..90876b4d937c 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -65,7 +65,7 @@ MAKE_ENV=	MONO_SHARED_DIR="${WRKDIR}" \
 TEST_TARGET=	check
 TEST_WRKSRC=	${WRKSRC}/mono/tests
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386 powerpc
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc
 
 PORTSCOUT=	limit:^\d+\.\d+\.[1-9]\d*
 
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 710d72954467..fecb9a498a82 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -49,18 +49,18 @@ PLIST_SUB=	DISTNAME=${SWIPLDIR} ARCH=${ARCH} OS=${OPSYS:tl} \
 
 .include <bsd.port.pre.mk>
 
-.if (${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH} == "armv6")
+.if (${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc)
 PLIST_SUB+=	BITS=32
 .else
 PLIST_SUB+=	BITS=64
 .endif
 
-.if (${ARCH} == "amd64")
+.if (${ARCH} == amd64)
 ARCH=		x86_64
 .endif
 
 post-configure:
-.if ${ARCH} != "i386"
+.if ${ARCH} != i386
 	@${REINPLACE_CMD} -e '/^CMFLAGS=/s/$$/ -fPIC/' \
 		${WRKSRC}/packages/Dialect.defs
 .endif
diff --git a/math/lp_solve/Makefile b/math/lp_solve/Makefile
index 891b0f753ead..cff7d213af98 100644
--- a/math/lp_solve/Makefile
+++ b/math/lp_solve/Makefile
@@ -20,7 +20,7 @@ BUILDENV=	${SETENV} TMPDIR="${WRKDIR}"
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" || ${ARCH} == "powerpc" || ${ARCH} == "armv6" || ${ARCH} == "mips"
+.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc
 LPSOLVE_ARCH=	ux32
 .else
 LPSOLVE_ARCH=	ux64
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index c84a2d5de809..b8e7753352ca 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -164,7 +164,7 @@ COMPAT_HEADERS=libavcodec/avcodec.h \
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ENV+=	ASFLAGS=-no-integrated-as
 CFLAGS+=	-no-integrated-as
 .endif
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index f7378951955d..0411021059ba 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -49,6 +49,7 @@ CFLAGS_i386+=	-mstack-alignment=16 -mstackrealign
 .endif # ${CHOSEN_COMPILER_TYPE} == clang
 
 CFLAGS_armv6+=	-no-integrated-as
+CFLAGS_armv7+=	-no-integrated-as
 
 # Extra build options for debugging
 # =================================
diff --git a/net-mgmt/kapacitor/Makefile b/net-mgmt/kapacitor/Makefile
index 56245e30fda9..e8446d909a26 100644
--- a/net-mgmt/kapacitor/Makefile
+++ b/net-mgmt/kapacitor/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 BUILD_DEPENDS=	go>=1.6.0:lang/go
 
-ONLY_FOR_ARCHS=	i386 amd64 armv6
+ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386
 
 USE_RC_SUBR=	kapacitord
 
diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
index e8cc25e4db9c..fc8ce9c733ae 100644
--- a/net/appkonference/Makefile
+++ b/net/appkonference/Makefile
@@ -19,7 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}/konference
 
 PLIST_FILES=	lib/asterisk/modules/app_konference.so
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386 powerpc
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc
 ONLY_FOR_ARCHS_REASON=	not yet ported to this architecture
 
 OPTIONS_DEFINE=		OPTIMIZED_CFLAGS
diff --git a/net/yate/Makefile b/net/yate/Makefile
index e656330ab965..61b85772bffd 100644
--- a/net/yate/Makefile
+++ b/net/yate/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libspeex.so:audio/speex \
 		libgsm.so:audio/gsm
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386 sparc64
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 sparc64
 
 USES=		autoreconf bison gmake shebangfix
 SHEBANG_FILES=	share/scripts/banbrutes.php \
diff --git a/science/openkim/Makefile b/science/openkim/Makefile
index e82142798f5d..7908c772cd61 100644
--- a/science/openkim/Makefile
+++ b/science/openkim/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_UNSAFE=yes
 .include <bsd.port.options.mk>
 
 # Is there a better way to detect 32-bit systems?
-.if ${ARCH} == "armv6" || ${ARCH} == "i386" || ${ARCH} == "mips" || ${ARCH} == "powerpc"
+.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == mips || ${ARCH} == powerpc
 MAKE_ENV+=	KIM_SYSTEM32="yes"
 .endif
 
diff --git a/security/cryptlib/Makefile b/security/cryptlib/Makefile
index 8aeb1146bee9..7309931720c2 100644
--- a/security/cryptlib/Makefile
+++ b/security/cryptlib/Makefile
@@ -10,7 +10,7 @@ DISTNAME=		cl${PORTVERSION:S/.//g}
 MAINTAINER=		ale@FreeBSD.org
 COMMENT=		Powerful security programming toolkit
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386
 
 OPTIONS_DEFINE=		DOCS
 
diff --git a/security/py-cryptlib_py/Makefile b/security/py-cryptlib_py/Makefile
index 6c2e25932abb..b4a636ffe5d7 100644
--- a/security/py-cryptlib_py/Makefile
+++ b/security/py-cryptlib_py/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Pythin binding for cryptlib
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-ONLY_FOR_ARCHS=	i386 amd64 armv6
+ONLY_FOR_ARCHS=	i386 amd64 armv6 armv7
 
 USES=		python:2 zip:infozip
 USE_PYTHON=	distutils autoplist
diff --git a/sysutils/cloudabi-utils/Makefile b/sysutils/cloudabi-utils/Makefile
index 903996ef984a..45efcc107d34 100644
--- a/sysutils/cloudabi-utils/Makefile
+++ b/sysutils/cloudabi-utils/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Utilities for running CloudABI programs
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv6 i386
+ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386
 ONLY_FOR_ARCHS_REASON=	CloudABI has not yet been ported to other architectures
 
 BUILD_DEPENDS=	${LOCALBASE}/include/cloudabi_types.h:devel/cloudabi \
diff --git a/sysutils/syslinux/Makefile b/sysutils/syslinux/Makefile
index 6622e365c4ec..0574c0ebb9b7 100644
--- a/sysutils/syslinux/Makefile
+++ b/sysutils/syslinux/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	nasm:devel/nasm
 RUN_DEPENDS=	mtools:emulators/mtools
 
-ONLY_FOR_ARCHS=		aarch64 amd64 armv6 i386
+ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386
 ONLY_FOR_ARCHS_REASON=	linux is not available for ${ARCH}
 
 USES=		perl5 gmake tar:xz
diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index b3201cd66ea7..fad3ec5c0adc 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -22,7 +22,7 @@ RUN_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}iniparse>0:devel/py-iniparse \
 		${PYTHON_PKGNAMEPREFIX}urlgrabber>0:www/py-urlgrabber
 
-ONLY_FOR_ARCHS=		amd64 aarch64 armv6 i386
+ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386
 ONLY_FOR_ARCHS_REASON=	linux is not available for ${ARCH}
 
 USES=		cpe gettext gmake python shebangfix
diff --git a/www/node/Makefile b/www/node/Makefile
index 7eea70417563..e4741b24b15b 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -44,7 +44,7 @@ USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	node[456]-[0-9]* node01[02]-[0-9]* node-devel-[0-9]* iojs-[0-9]*
 
-ONLY_FOR_ARCHS=		aarch64 amd64 armv6 i386
+ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--without-npm \
@@ -77,7 +77,7 @@ IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
diff --git a/www/node6/Makefile b/www/node6/Makefile
index 0fd01d83a169..211d6625a431 100644
--- a/www/node6/Makefile
+++ b/www/node6/Makefile
@@ -43,7 +43,7 @@ USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	node[45]-[0-9]* node01[02]-[0-9]* node-[0-9]* node-devel-[0-9]* iojs-[0-9]*
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386
 
 CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
 		--without-npm \
@@ -76,7 +76,7 @@ IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index 1801fddccb96..9fe2031faeaf 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"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_Toolbar.cc
 .endif