Index: head/audio/wavpack/Makefile
===================================================================
--- head/audio/wavpack/Makefile	(revision 451720)
+++ head/audio/wavpack/Makefile	(revision 451721)
@@ -1,38 +1,39 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	wavpack
 PORTVERSION=	5.1.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.wavpack.com/
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Audio codec for lossless, lossy, and hybrid compression
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		iconv libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 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)
 
 .include <bsd.port.options.mk>
 
 # ASM needs clang 3.8+
 # depend on llvm39 since it's more likely to be installed already than 3.8
 .if ${OSVERSION} < 1100101 && ${PORT_OPTIONS:MASM}
 BUILD_DEPENDS+=	clang39:devel/llvm39
 CC=		clang39
 .endif
 
 .include <bsd.port.mk>
Index: head/audio/wavplay/Makefile
===================================================================
--- head/audio/wavplay/Makefile	(revision 451720)
+++ head/audio/wavplay/Makefile	(revision 451721)
@@ -1,25 +1,25 @@
 # Created by: greg
 # $FreeBSD$
 
 PORTNAME=	wavplay
 PORTVERSION=	1.4
 PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SUNSITE/apps/sound/players/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 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}"
 
 PLIST_FILES=	bin/wavplay bin/wavrec man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|u_long|u_int|g' ${WRKSRC}/*.c ${WRKSRC}/*.h
 
 .include <bsd.port.mk>
Index: head/comms/java-simple-serial-connector/Makefile
===================================================================
--- head/comms/java-simple-serial-connector/Makefile	(revision 451720)
+++ head/comms/java-simple-serial-connector/Makefile	(revision 451721)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	java-simple-serial-connector
 PORTVERSION=	2.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	comms java
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Library for working with serial ports from Java
 
 LICENSE=	LGPL3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	scream3r
 
 MAJOR_MINOR=	${PORTVERSION:C/(.*)\.[0-9]*/\\1/}
 USE_JAVA=	yes
 USE_ANT=	yes
 ALL_TARGET=	dist
 CXXFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 WRKSRC_LIBS=	${WRKSRC}/src/java/libs
 
 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}
 .endif
 
 post-extract:
 	@${CP} ${FILESDIR}/build.xml.in ${WRKSRC}/build.xml
 	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${WRKSRC}/build.xml
 
 pre-build:
 	${RM} -r ${WRKSRC_LIBS}/*
 	${MKDIR} ${WRKSRC_LIBS}/freebsd
 	(cd ${WRKSRC}/src/cpp/_nix_based && ${CXX} ${CXXFLAGS} ${CPPFLAGS} -shared -fPIC -o ${WRKSRC_LIBS}/freebsd/libjSSC-${MAJOR_MINOR}_${JSSC_ARCH}.so jssc.cpp)
 	${STRIP_CMD} ${WRKSRC_LIBS}/freebsd/libjSSC-${MAJOR_MINOR}_${JSSC_ARCH}.so
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext
 	${CP} ${WRKSRC}/build/jssc-${PORTVERSION}.jar ${STAGEDIR}${JAVA_HOME}/jre/lib/ext
 
 .include <bsd.port.post.mk>
Index: head/databases/db48/Makefile
===================================================================
--- head/databases/db48/Makefile	(revision 451720)
+++ head/databases/db48/Makefile	(revision 451721)
@@ -1,54 +1,54 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	db48
 PORTVERSION=	4.8.30.0
 PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
 DISTNAME=	db-${PORTVERSION:R}
 DIST_SUBDIR=	bdb
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Berkeley DB package, revision 4.8
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE
 
 DEPRECATED=		Please migrate to db5 or db6, make sure that bitcoin and siblings moved to another database or version by then
 # This port expires along with FreeBSD 10.X.
 EXPIRATION_DATE=	2018-04-30
 
 BDBVER=		${PORTVERSION:R:R}
 CONFIGURE_ARGS=	--enable-compat185 --enable-dump185 --enable-cxx \
 		--includedir=${PREFIX}/include/${PORTNAME} \
 		--libdir=${PREFIX}/lib/${PORTNAME} \
 		--bindir=${PREFIX}/bin/${PORTNAME}
 CONFIGURE_SCRIPT=	../dist/configure
 USES=		libtool:keepla
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install_include install_lib install_utilities
 WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 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
 
 post-patch:
 	${REINPLACE_CMD} -Ee 's|--mode=install cp -p|--mode=install ${INSTALL} -s|;' ${WRKSRC}/${CONFIGURE_SCRIPT}
 	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../dbinc/atomic.h ${WRKSRC}/../mp/mp_*.c ${WRKSRC}/../mutex/mut_*.c
 
 post-install:
 .for i in libdb libdb_cxx
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib
 	${LN} -s -f ${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib/${i}-${BDBVER}.so
 .endfor
 	cd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}; \
 	for i in *; do ${LN} -s -f ${PORTNAME}/$$i ../$$i-${BDBVER}; done
 
 .include <bsd.port.mk>
Index: head/databases/influxdb/Makefile
===================================================================
--- head/databases/influxdb/Makefile	(revision 451720)
+++ head/databases/influxdb/Makefile	(revision 451721)
@@ -1,128 +1,128 @@
 # $FreeBSD$
 
 PORTNAME=	influxdb
 PORTVERSION=	1.3.3
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	databases net-mgmt
 
 MAINTAINER=	cheffo@freebsd-bg.org
 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
 
 USE_RC_SUBR=	influxd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	influxdata:DEFAULT
 GH_TUPLE=	BurntSushi:toml:9906417:toml/src/github.com/BurntSushi/toml \
 		bmizerany:pat:c068ca2:pat/src/github.com/bmizerany/pat \
 		boltdb:bolt:4b1ebc1:bolt/src/github.com/boltdb/bolt \
 		cespare:xxhash:4a94f89:xxhash/src/github.com/cespare/xxhash \
 		davecgh:go-spew:346938d:go_spew/src/github.com/davecgh/go-spew \
 		dgrijalva:jwt-go:24c63f5:jwt_go/src/github.com/dgrijalva/jwt-go \
 		dgryski:go-bits:2ad8d70:go_bits/src/github.com/dgryski/go-bits \
 		dgryski:go-bitstream:7d46cd2:go_bitstream/src/github.com/dgryski/go-bitstream \
 		gogo:protobuf:3043356:protobuf/src/github.com/gogo/protobuf \
 		golang:snappy:d9eb7a3:snappy/src/github.com/golang/snappy \
 		influxdata:usage-client:6d38953:usage_client/src/github.com/influxdata/usage-client \
 		jwilder:encoding:278947:encoding/src/github.com/jwilder/encoding \
 		paulbellamy:ratecounter:5a11f58:ratecounter/src/github.com/paulbellamy/ratecounter \
 		peterh:liner:8860952:liner/src/github.com/peterh/liner \
 		retailnext:hllpp:38a7bb7:hllpp/src/github.com/retailnext/hllpp \
 		spaolacci:murmur3:0d12bf8:murmur3/src/github.com/spaolacci/murmur3 \
 		collectd:go-collectd:e84e8af:go_collectd/src/collectd.org \
 		uber-go:atomic:74ca5ec:atomic/src/github.com/uber-go/atomic \
 		uber-go:zap:fbae028:zap/src/github.com/uber-go/zap \
 		golang:crypto:9477e0b:crypto/src/golang.org/x/crypto
 
 SUB_FILES=	influxd
 SUB_LIST=	INFLUXD_USER=${INFLUXD_USER} \
 		INFLUXD_GROUP=${INFLUXD_GROUP} \
 		INFLUXD_DBDIR=${INFLUXD_DBDIR} \
 		INFLUXD_PIDDIR=${INFLUXD_PIDDIR} \
 		INFLUXD_LOGDIR=${INFLUXD_LOGDIR}
 
 PLIST_SUB=	INFLUXD_USER=${INFLUXD_USER} \
 		INFLUXD_GROUP=${INFLUXD_GROUP} \
 		INFLUXD_DBDIR=${INFLUXD_DBDIR} \
 		INFLUXD_PIDDIR=${INFLUXD_PIDDIR} \
 		INFLUXD_LOGDIR=${INFLUXD_LOGDIR}
 
 INFLUXD_USER=	influxd
 INFLUXD_GROUP=	influxd
 
 USERS=		${INFLUXD_USER}
 GROUPS=		${INFLUXD_GROUP}
 
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto \
 		asciidoc:textproc/asciidoc \
 		docbook-xml>0:textproc/docbook-xml
 MANPAGES_USES=	gmake
 
 INFLUXD_DBDIR=	/var/db/${PORTNAME}/
 INFLUXD_LOGDIR=	/var/log/${PORTNAME}/
 INFLUXD_PIDDIR=	/var/run/${PORTNAME}/
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == "FreeBSD" && ((${OSVERSION} >= 1100513 && ${OSVERSION} < 1200000) || \
     	${OSVERSION} >= 1200015)
 SUB_LIST+=	INFLUXD_LOGCMD="daemon"
 .else
 SUB_LIST+=	INFLUXD_LOGCMD="logger"
 .endif
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 	@cd ${WRKSRC} && \
 		${MV} appveyor.yml build.py build.sh CHANGELOG.md \
 		circle-test.sh circle.yml client cmd CODING_GUIDELINES.md \
 		CONTRIBUTING.md coordinator \
 		Dockerfile_build_ubuntu32 Dockerfile_build_ubuntu64 \
 		Dockerfile_build_ubuntu64_git Dockerfile_test_ubuntu32 \
 		errors.go etc gobuild.sh Godeps importer influxdb.go influxql \
 		internal LICENSE_OF_DEPENDENCIES.md Makefile man models \
 		monitor nightly.sh node.go pkg QUERIES.md README.md \
 		scripts services stress tcp test.sh tests TODO.md toml tsdb uuid \
  		${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
 do-build:
 		@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT} && \
 			${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./...
 
 do-build-MANPAGES-on:
 		@cd ${WRKSRC}/src/github.com/influxdata/influxdb/man && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
 
 do-install:
 		${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \
 		${STAGEDIR}${INFLUXD_PIDDIR} \
 		${STAGEDIR}${INFLUXD_LOGDIR}
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influxd ${STAGEDIR}${PREFIX}/bin/influxd
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx ${STAGEDIR}${PREFIX}/bin/influx
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_inspect ${STAGEDIR}${PREFIX}/bin/influx_inspect
 		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx_tsm ${STAGEDIR}${PREFIX}/bin/influx_tsm
 		@${SED} -i .bak -e \
 			"s|/var/lib/influxdb|/var/db/influxdb|g" \
 			${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT}/etc/config.sample.toml
 		${INSTALL_DATA} \
 			${WRKSRC}/src/github.com/${GH_ACCOUNT_DEFAULT}/${GH_PROJECT}/etc/config.sample.toml  \
 			${STAGEDIR}${PREFIX}/etc/influxd.conf.sample
 
 do-install-MANPAGES-on:
 .for i in influx.1 influx_inspect.1 influx_stress.1 influx_tsm.1 \
 	influxd-backup.1 influxd-config.1 influxd-restore.1 \
 	influxd-run.1 influxd-version.1 influxd.1
 		${INSTALL_MAN} ${WRKSRC}/src/github.com/influxdata/influxdb/man/$i ${STAGEDIR}${MAN8PREFIX}/man/man1
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/databases/mysql55-server/Makefile
===================================================================
--- head/databases/mysql55-server/Makefile	(revision 451720)
+++ head/databases/mysql55-server/Makefile	(revision 451721)
@@ -1,94 +1,94 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME?=	mysql
 PORTVERSION=	5.5.57
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.5
 PKGNAMESUFFIX?=	55-server
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
 
 SLAVEDIRS=	databases/mysql55-client
 USES=		cmake:noninja readline shebangfix
 CXXFLAGS+=	${CPPFLAGS}
 NO_OPTIONS_SORT=yes
 
 OPTIONS_DEFINE=	SSL FASTMTX
 OPTIONS_DEFAULT=SSL
 
 FASTMTX_DESC=	Replace mutexes with spinlocks
 
 CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="info" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_MANDIR="man" \
 		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SQLBENCHDIR="share/mysql" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DWITH_UNIT_TESTS=0 \
 		-DWITH_LIBEDIT=0 \
 		-DWITH_LIBWRAP=1
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 CMAKE_ARGS+=	-DWITH_SSL=bundled
 .endif
 .if ${PORT_OPTIONS:MFASTMTX}
 CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
 .endif
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	55
 
 CONFLICTS_INSTALL=	mysql5[0-46-9]-server-* \
 			mysqlwsrep* \
 			mariadb*-server-* \
 			percona*-server-*
 
 USE_RC_SUBR=	mysql-server
 
 USERS=		mysql
 GROUPS=		mysql
 
 MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
 		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
 		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
 .endif
 
 .include <bsd.port.post.mk>
Index: head/databases/mysql56-server/Makefile
===================================================================
--- head/databases/mysql56-server/Makefile	(revision 451720)
+++ head/databases/mysql56-server/Makefile	(revision 451721)
@@ -1,154 +1,154 @@
 # Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME?=	mysql
 PORTVERSION=	5.6.37
 PORTREVISION=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	MYSQL/MySQL-5.6
 PKGNAMESUFFIX?=	56-server
 
 MAINTAINER=	mmokhi@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
 
 SLAVEDIRS=	databases/mysql56-client
 USES=		bison:build cmake:outsource,noninja compiler:c11 compiler:c++11-lib \
 		cpe libedit localbase perl5 shebangfix ssl
 
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
 MY_SECDIR=	/var/db/mysql_secure
 MY_TMPDIR=	/var/db/mysql_tmpdir
 
 LIB_DEPENDS+=	libevent.so:devel/libevent \
 		liblz4.so:archivers/liblz4
 
 CMAKE_BUILD_TYPE=	Release
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
 		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
 		-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="info" \
 		-DINSTALL_LIBDIR="lib/mysql" \
 		-DINSTALL_MANDIR="man" \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
 		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
 		-DINSTALL_SBINDIR="libexec" \
 		-DINSTALL_SCRIPTDIR="bin" \
 		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
 		-DINSTALL_SHAREDIR="share" \
 		-DINSTALL_SQLBENCHDIR="share/mysql" \
 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
 		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
 		-DWITH_BOOST="${WRKSRC}/boost" \
 		-DWITH_EDITLINE=system \
 		-DWITH_LIBEVENT=system \
 		-DWITH_LZ4=system \
 		-DWITH_ZLIB=system \
 		-DWITH_SSL=${OPENSSLBASE} \
 		-DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
 		-DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
 		-DINSTALL_MYSQLTESTDIR=0
 
 SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
 
 .ifdef USE_MYSQL
 .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
 SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 		MY_SECDIR=${MY_SECDIR} \
 		MY_TMPDIR=${MY_TMPDIR}
 
 # MySQL-Server part
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:56
 
 CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
 			mysql[0-46-9][0-9]-server-* \
 			mysqlwsrep* \
 			mariadb[0-9][0-9]-server-* \
 			percona[0-9][0-9]-server-*
 
 USE_RC_SUBR=	mysql-server
 
 SUB_FILES=	my.cnf.sample
 
 USERS=		mysql
 GROUPS=		mysql
 
 USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
 
 MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
 		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
 		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 
 OPTIONS_GROUP=		STORAGE
 OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
 OPTIONS_SUB=		YES
 STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
 ARCHIVE_DESC=		Compile "Archive Storage" statically in server
 BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
 EXAMPLE_DESC=		Compile "Example Storage" statically in server
 FEDERATED_DESC=		Compile "Federated Storage" statically in server
 INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
 PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
 PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
 
 ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
 BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
 EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
 FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
 INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
 PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
 PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
 
 OPTIONS_GROUP+=		FEATURES
 OPTIONS_GROUP_FEATURES=	PERFSCHM
 FEATURES_DESC=		Default features knobs
 PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
 OPTIONS_DEFAULT+=	PERFSCHM
 
 PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
 PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
 FEDERATED_SUB_LIST+=		FEDER="--federated"
 FEDERATED_SUB_LIST_OFF+=	FEDER=""
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
 
 .if !defined(CLIENT_ONLY)
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
 .endif
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
 .endif
 
 .include <bsd.port.post.mk>
Index: head/databases/soci/Makefile
===================================================================
--- head/databases/soci/Makefile	(revision 451720)
+++ head/databases/soci/Makefile	(revision 451721)
@@ -1,62 +1,63 @@
 # Created by: Julien Laffaye <kimelto@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	soci
 PORTVERSION=	3.2.2
 PORTREVISION=	6
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	The C++ Database Access Library
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
 USES=		cmake zip
 CMAKE_ARGS+=	-DWITH_ORACLE:BOOL=OFF
 USE_LDCONFIG=	yes
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
 BOOST_DESC=	Enable support for additional types using Boost
 OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
 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
 OPTIONS_EXCLUDE_powerpc64=	FIREBIRD
 OPTIONS_EXCLUDE_sparc64=	FIREBIRD
 
 MYSQL_USE=	MYSQL=yes
 MYSQL_CMAKE_ON=	-DWITH_MYSQL:BOOL=ON
 MYSQL_CMAKE_OFF=	-DWITH_MYSQL:BOOL=OFF
 
 PGSQL_USES=	pgsql
 PGSQL_CMAKE_ON=	-DWITH_POSTGRESQL:BOOL=ON
 PGSQL_CMAKE_OFF=	-DWITH_POSTGRESQL:BOOL=OFF
 
 SQLITE_USES=	sqlite
 SQLITE_CMAKE_ON=	-DWITH_SQLITE3:BOOL=ON
 SQLITE_CMAKE_OFF=	-DWITH_SQLITE3:BOOL=OFF
 
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CMAKE_ON=	-DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so \
 		-DWITH_ODBC:BOOL=ON
 ODBC_CMAKE_OFF=	-DWITH_ODBC:BOOL=OFF
 
 BOOST_LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 BOOST_CMAKE_ON=	-DWITH_BOOST:BOOL=ON
 BOOST_CMAKE_OFF=	-DWITH_BOOST:BOOL=OFF
 
 FIREBIRD_USES=	firebird
 FIREBIRD_CMAKE_ARGS_ON=	-DWITH_FIREBIRD:BOOL=ON
 FIREBIRD_CMAKE_ARGS_OFF=	-DWITH_FIREBIRD:BOOL=OFF
 
 .include <bsd.port.mk>
Index: head/devel/cld/Makefile
===================================================================
--- head/devel/cld/Makefile	(revision 451720)
+++ head/devel/cld/Makefile	(revision 451721)
@@ -1,26 +1,26 @@
 # Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cld
 PORTVERSION=	0.1
 PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GOOGLE_CODE
 PROJECTHOST=	chromium-compact-language-detector
 DISTNAME=	compact-language-detector-${PORTVERSION}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Chromium compact language detector library
 
 BROKEN=		Unfetchable (google code has gone away)
 DEPRECATED=	Unfetchable for more than six months (google code has gone away)
 EXPIRATION_DATE=	2017-04-30
 
 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>
Index: head/devel/cxxtools/Makefile
===================================================================
--- head/devel/cxxtools/Makefile	(revision 451720)
+++ head/devel/cxxtools/Makefile	(revision 451721)
@@ -1,66 +1,66 @@
 # Created by: Juergen Lock <nox@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cxxtools
 PORTVERSION=	2.2.1
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of general-purpose C++ classes
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=		does not configure: error: check for atomictype failed
 BROKEN_mips=		does not configure: in section .data.rel.ro of csvdeserializer-test.o: defined in discarded section
 BROKEN_mips64=		does not configure: in section .data.rel.ro of csvdeserializer-test.o: defined in discarded section
 BROKEN_sparc64=		does not configure
 
 USES=		cpe iconv libtool localbase pathfix
 CPE_VENDOR=	tntnet
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 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 "
 .endif
 
 .include <bsd.port.post.mk>
Index: head/devel/gdb/Makefile
===================================================================
--- head/devel/gdb/Makefile	(revision 451720)
+++ head/devel/gdb/Makefile	(revision 451721)
@@ -1,145 +1,145 @@
 # Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gdb
 PORTVERSION=	8.0.1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	pizzamig@FreeBSD.org
 COMMENT=	GNU GDB of newer version than comes with the system
 
 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
 
 TEST_TARGET=	check
 # XXX: This should be compiler:c++11-lib as GDB doesn't really require
 # C++14.  However, clang in 10.3 crashes while building this port.
 # Requiring C++14 forces 10.3 to use an external version of clang while
 # still using the base system clang on 11.0 and later.
 USES=		compiler:c++14-lang cpe iconv gmake libtool tar:xz
 USE_CSTD=	gnu89
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CONFIGURED_M4=m4 CONFIGURED_BISON=byacc
 CONFIGURE_ARGS=	--program-suffix=${PORTVERSION:S/.//g} \
 		--enable-targets=all --enable-64-bit-bfd \
 		--with-gdb-datadir=${PREFIX}/share/gdb${PORTVERSION:S/.//g} \
 		--with-separate-debug-dir=/usr/lib/debug \
 		${ICONV_CONFIGURE_ARG} \
 		--with-expat=yes --with-libexpat-prefix=${LOCALBASE} \
 		--without-libunwind-ia64
 CFLAGS:=	${CFLAGS:C/ +$//}	# blanks at EOL creep in sometimes
 CFLAGS+=	-DRL_NO_COMPAT -Wno-unused-function -Wno-unused-variable
 EXCLUDE=	dejagnu expect sim texinfo intl
 EXTRACT_AFTER_ARGS=	${EXCLUDE:S/^/--exclude /}
 EXTRA_PATCHES=	${FILESDIR}/commit-45eba0ab7d \
 		${FILESDIR}/commit-3c3ae77e68 \
 		${FILESDIR}/commit-b5430a3ced \
 		${FILESDIR}/commit-762c974a09 \
 		${FILESDIR}/commit-929edea98d \
 		${FILESDIR}/commit-6e5eab33ab \
 		${FILESDIR}/commit-382b69bbb7 \
 		${FILESDIR}/commit-2af9fc4432 \
 		${FILESDIR}/commit-0b9305edf1 \
 		${FILESDIR}/commit-e6f3b9c319 \
 		${FILESDIR}/commit-4b654465bf \
 		${FILESDIR}/commit-b30ff123fb \
 		${FILESDIR}/commit-48aeef91c2 \
 		${FILESDIR}/commit-0aa37b654c \
 		${FILESDIR}/commit-0335ac6d12
 LIB_DEPENDS+=	libexpat.so:textproc/expat2
 
 VER=		${PORTVERSION:S/.//g}
 PLIST_SUB=	VER=${VER}
 
 OPTIONS_DEFINE=	DEBUG GDB_LINK GUILE KGDB PYTHON TUI
 
 OPTIONS_DEFAULT=	GDB_LINK KGDB PYTHON TUI PORT_READLINE
 
 OPTIONS_SINGLE=	READLINE
 OPTIONS_SINGLE_READLINE=	BUNDLED_READLINE PORT_READLINE
 
 GDB_LINK_DESC=		Create ${PREFIX}/bin/gdb symlink
 KGDB_DESC=		Kernel Debugging Support
 BUNDLED_READLINE_DESC=	from gdb distfile
 PORT_READLINE_DESC=	from devel/readline port
 TUI_DESC=		Text User Interface enabled
 
 OPTIONS_SUB=	yes
 
 BUNDLED_READLINE_CONFIGURE_OFF=	--with-system-readline
 DEBUG_CFLAGS=		-g
 GUILE_CONFIGURE_WITH=	guile
 GUILE_USES=		pkgconfig
 GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 PORT_READLINE_USES=	readline:port
 PYTHON_CONFIGURE_ON=	--with-python=${PYTHON_CMD}
 PYTHON_CONFIGURE_OFF=	--without-python
 PYTHON_USES=		python
 TUI_CONFIGURE_ENABLE=	tui
 
 .include <bsd.port.pre.mk>
 
 .if ! ${PORT_OPTIONS:MBUNDLED_READLINE}
 EXCLUDE+=	readline
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .endif
 
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS+=	-Wno-extended-offsetof
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$| [GDB v${PORTVERSION} for FreeBSD]|' \
 		${WRKSRC}/gdb/version.in
 
 post-patch-KGDB-on:
 	@${CP} -r ${FILESDIR}/kgdb/*.[ch] ${WRKSRC}/gdb/
 	@${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extrapatch-kgdb
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/gdb \
 		${STAGEDIR}${PREFIX}/bin/gdb${VER}
 	${INSTALL_MAN} ${WRKSRC}/gdb/doc/gdb.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/gdb${VER}.1
 	(cd ${WRKSRC}/gdb/data-directory ; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-syscalls )
 
 do-install-KGDB-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/gdb/kgdb \
 		${STAGEDIR}${PREFIX}/bin/kgdb${VER}
 	${INSTALL_MAN} ${FILESDIR}/kgdb/kgdb.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/kgdb${VER}.1
 
 do-install-TUI-on:
 	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdbtui${VER}
 
 do-install-GDB_LINK-on:
 	${LN} -sf gdb${VER} ${STAGEDIR}${PREFIX}/bin/gdb
 .if ${PORT_OPTIONS:MKGDB}
 	${LN} -sf kgdb${VER} ${STAGEDIR}${PREFIX}/bin/kgdb
 .endif
 
 do-install-PYTHON-on:
 	(cd ${WRKSRC}/gdb; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
 	(cd ${WRKSRC}/gdb/data-directory ; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-python )
 . for f in gdb gdb/command gdb/function gdb/printer
 	@(cd ${STAGEDIR}${PREFIX}/share/gdb${VER}/python/${f} ; ${CHMOD} 644 *.py* )
 . endfor
 
 do-install-GUILE-on:
 	(cd ${WRKSRC}/gdb; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
 	(cd ${WRKSRC}/gdb/data-directory ; \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-guile )
 
 .include <bsd.port.post.mk>
Index: head/devel/hwloc/Makefile
===================================================================
--- head/devel/hwloc/Makefile	(revision 451720)
+++ head/devel/hwloc/Makefile	(revision 451721)
@@ -1,45 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	hwloc
 PORTVERSION=	1.11.7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v${PORTVERSION:R}/downloads/ \
 		http://icl.cs.utk.edu/open-mpi/software/hwloc/v${PORTVERSION:R}/downloads/
 
 MAINTAINER=	phd_kimberlite@yahoo.co.jp
 COMMENT=	Portable Hardware Locality software package
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-opencl \
 		--disable-cuda \
 		--disable-nvml \
 		--disable-gl
 INSTALL_TARGET=	install-strip
 USES=		iconv libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 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
 OPTIONS_SUB=	yes
 
 CAIRO_CONFIGURE_OFF=	--disable-cairo --without-x
 CAIRO_CONFIGURE_ON=	--enable-cairo --with-x
 CAIRO_LIB_DEPENDS=	libcairo.so:graphics/cairo
 CAIRO_USE=		XORG=x11
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/doxygen-doc/html/* ${STAGEDIR}${DOCSDIR}/html/
 
 .include <bsd.port.mk>
Index: head/devel/judy/Makefile
===================================================================
--- head/devel/judy/Makefile	(revision 451720)
+++ head/devel/judy/Makefile	(revision 451721)
@@ -1,37 +1,37 @@
 # Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
 
 PORTNAME=	Judy
 PORTVERSION=	1.0.5
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME:tl}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose dynamic array
 
 LICENSE=	LGPL21
 
 USES=		gmake libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install-strip
 
 WRKSRC=	${WRKDIR}/${PORTNAME:tl}-${PORTVERSION}
 
 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
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S!^!${WRKSRC}/doc/ext/!} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
Index: head/games/scummvm/Makefile
===================================================================
--- head/games/scummvm/Makefile	(revision 451720)
+++ head/games/scummvm/Makefile	(revision 451721)
@@ -1,83 +1,83 @@
 # Created by: Alex Trull <freebsd.alex@trull.org>
 # $FreeBSD$
 
 PORTNAME=	scummvm
 PORTVERSION=	1.9.0
 CATEGORIES=	games emulators
 MASTER_SITES=	http://www.scummvm.org/frs/scummvm/${PORTVERSION}/
 
 MAINTAINER=	lme@FreeBSD.org
 COMMENT=	Interpreter for several adventure games
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtheoradec.so:multimedia/libtheora \
 		libfaad.so:audio/faad \
 		libmpeg2.so:multimedia/libmpeg2 \
 		libfreetype.so:print/freetype2
 
 USES=		gmake jpeg tar:xz
 HAS_CONFIGURE=	yes
 USE_SDL=	sdl2
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS=	--with-sdl-prefix=${LOCALBASE} \
 		--with-jpeg-prefix=${LOCALBASE} \
 		--disable-alsa \
 		--with-zlib-prefix=/usr \
 		--disable-debug \
 		--disable-nasm \
 		--disable-tremor \
 		--enable-verbose-build
 
 LDFLAGS+=	-lpthread
 
 OPTIONS_DEFINE=	VORBIS MP3 PNG FLAC FLUIDSYNTH MT32EMU DOCS SNDIO
 MT32EMU_DESC=	MT-32 emulator
 OPTIONS_DEFAULT=	VORBIS MP3 PNG MT32EMU
 
 VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
 			libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ON=	--with-ogg-prefix=${LOCALBASE} \
 			--with-vorbis-prefix=${LOCALBASE}
 VORBIS_CONFIGURE_OFF=	--disable-vorbis
 
 MP3_LIB_DEPENDS=	libmad.so:audio/libmad
 MP3_CONFIGURE_ON=	--with-mad-prefix=${LOCALBASE}
 MP3_CONFIGURE_OFF=	--disable-mad
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_ON=	--with-png-prefix=${LOCALBASE}
 PNG_CONFIGURE_OFF=	--disable-png
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_ON=	--with-flac-prefix=${LOCALBASE}
 FLAC_CONFIGURE_OFF=	--disable-flac
 
 FLUIDSYNTH_LIB_DEPENDS=		libfluidsynth.so:audio/fluidsynth
 FLUIDSYNTH_CONFIGURE_ON=	--with-fluidsynth-prefix=${LOCALBASE}
 FLUIDSYNTH_CONFIGURE_OFF=	--disable-fluidsynth
 
 MT32EMU_CONFIGURE_OFF=	--disable-mt32emu
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CONFIGURE_ON=	--with-sndio-prefix=${LOCALBASE}
 SNDIO_CONFIGURE_OFF=	--disable-sndio
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ENV+=	ASFLAGS=-meabi=5
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^mandir=/s/datarootdir/prefix/' \
 		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.post.mk>
Index: head/graphics/graphviz/Makefile
===================================================================
--- head/graphics/graphviz/Makefile	(revision 451720)
+++ head/graphics/graphviz/Makefile	(revision 451721)
@@ -1,303 +1,306 @@
 # Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	graphviz
 PORTVERSION=	2.40.1
 PORTREVISION=	2
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libpng.so:graphics/png \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libexpat.so:textproc/expat2 \
 		libgd.so:${GD_PORT}
 
 USES=		bison cpe gmake jpeg libtool:keepla pkgconfig pathfix shebangfix
 GNU_CONFIGURE=	yes
 # sincos is broken on armv6, see ports/220591
 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}"
 
 MAKE_ENV=	EXPR_COMPAT=yes
 
 FIX_INCLUDE=	\
 		lib/cdt/dthdr.h \
 		lib/pathplan/tri.h lib/pathplan/pathplan.h \
 		lib/pathplan/pathutil.h lib/pathplan/solvers.h \
 		lib/pathplan/vis.h lib/pathplan/vispath.h \
 		lib/common/arith.h lib/common/logic.h \
 		lib/common/globals.h \
 		lib/gvc/gvcint.h
 
 PATCH_TCL_SCRIPTS=	tclpkg/gv/Makefile.in tclpkg/tcldot/demo/doted.tcl \
 			tclpkg/tclpathplan/demo/pathplan.tcl
 PATCH_TK_SCRIPTS=	${PATCH_TCL_SCRIPTS}
 
 PDOCS_TXT=	doc/Dot.ref doc/latex_suggestions.txt
 PDOCS_PDF=	doc/*.pdf */*/*.pdf
 PDOCS_HTML=	doc/*.html doc/info/*.gif
 
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
 OPTIONS_DEFINE=	XPM DIGCOLA IPSEPCOLA ICONV NLS PANGOCAIRO LIBRSVG2 POPPLER \
 		ANN GTS GTK2 GDK GDK_PIXBUF GNOMEUI SMYRNA GVEDIT MING DEVIL \
 		GHOSTSCRIPT PERL PHP PYTHON RUBY LUA TCL TK GUILE NVTHREADS \
 		DOCS EXAMPLES
 OPTIONS_DEFAULT=	XPM DIGCOLA IPSEPCOLA ICONV PANGOCAIRO NVTHREADS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 DIGCOLA_DESC=	neato layout engine with DIGCOLA features
 IPSEPCOLA_DESC=	neato layout engine with IPSEPCOLA features
 PANGOCAIRO_DESC=pangocairo support
 ANN_DESC=	ANN edge bundling support
 GTS_DESC=	GNU Triangulated Surface Library support
 GTK2_DESC=	gtk2 plugin (requires PANGOCAIRO)
 GDK_DESC=	gdk library support (requires GTK2)
 GDK_PIXBUF_DESC=gdk pixbuf support (requires GDK)
 GNOMEUI_DESC=	libgnomeui support
 SMYRNA_DESC=	SMYRNA graph viewer (requires GTK2)
 GVEDIT_DESC=	gvedit (requires qt)
 MING_DESC=	ming plugin
 DEVIL_DESC=	devil plugin
 GHOSTSCRIPT_DESC=ghostscript plugin (requires PANGOCAIRO)
 PERL_DESC=	Perl bindings (swig)
 PHP_DESC=	PHP bindings (swig)
 PYTHON_DESC=	Python bindings (swig)
 RUBY_DESC=	Ruby bindings (swig)
 LUA_DESC=	Lua bindings (swig)
 TCL_DESC=	TCL bindings (swig)
 GUILE_DESC=	Guile bindings (swig)
 TK_DESC=	TK toolkit support
 NVTHREADS_DESC=	Link with threads (needed for nvidia)
 
 XPM_USE=	XORG=xaw,xpm,xmu,xt,sm,ice,xext,x11,xau,xdmcp,xp
 ICONV_USES=	iconv
 NLS_USES=	gettext
 PANGOCAIRO_USE=	GNOME=pango,cairo XORG=xrender,x11,xau,xdmcp
 LIBRSVG2_USE=	GNOME=librsvg2 GL=gl,glu,glut
 GTK2_USE=	XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
 GNOMEUI_USE=	GNOME=libgnomeui
 SMYRNA_USE=	GNOME=libglade2,pangox-compat GL=glut
 GVEDIT_USE=	qt4=qmake_build,moc_build,rcc_build,uic_build \
 		qt4=linguist_build,corelib,gui
 GHOSTSCRIPT_USES=ghostscript
 PERL_USES=	perl5
 PHP_USES=	php:build
 PYTHON_USES=	python:2.7,build
 RUBY_USE=	RUBY=yes
 LUA_USES=	lua
 TCL_USES=	tcl:build
 TK_USES=	tk:build
 TK_IMPLIES=	TCL
 POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 ANN_LIB_DEPENDS=	libann.so:math/ann
 GTS_LIB_DEPENDS=	libgts.so:graphics/gts
 SMYRNA_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2 \
 			libgtkglext-x11-1.0.so:x11-toolkits/gtkglext
 MING_LIB_DEPENDS=	libming.so:graphics/ming
 DEVIL_LIB_DEPENDS=	libIL.so:graphics/devil
 GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2 \
 			libgc-threaded.so:devel/boehm-gc-threaded
 
 XPM_CONFIGURE_WITH=		x
 DIGCOLA_CONFIGURE_WITH=		digcola
 IPSEPCOLA_CONFIGURE_WITH=	ipsepcola
 IPSEPCOLA_IMPLIES=		DIGCOLA
 NLS_CONFIGURE_ENABLE=		nls
 PANGOCAIRO_CONFIGURE_WITH=	pangocairo
 LIBRSVG2_CONFIGURE_WITH=	rsvg
 LIBRSVG2_IMPLIES=		PANGOCAIRO
 POPPLER_CONFIGURE_WITH=		poppler
 ANN_CONFIGURE_WITH=		ann
 ANN_CONFIGURE_ENV=	ANN_CFLAGS=-I${LOCALBASE}/include ANN_LIBS=-lann
 GTS_CONFIGURE_WITH=		gts
 GTK2_CONFIGURE_WITH=		gtk
 GTK2_IMPLIES=			PANGOCAIRO
 GDK_CONFIGURE_WITH=		gdk
 GDK_PIXBUF_CONFIGURE_WITH=	gdk-pixbuf
 GDK_PIXBUF_IMPLIES=		GTK2 GDK
 GNOMEUI_CONFIGURE_WITH=		gnomeui
 GNOMEUI_IMPLIES=		GTK2
 SMYRNA_CONFIGURE_WITH=		smyrna glade gtkgl gtkglext
 SMYRNA_IMPLIES=			GTK2 GTS
 GVEDIT_CONFIGURE_ON=		--with-gvedit=yes
 GVEDIT_CONFIGURE_OFF=		--with-qt=no
 MING_CONFIGURE_WITH=		ming
 DEVIL_CONFIGURE_WITH=		devil
 GHOSTSCRIPT_CONFIGURE_OFF=	--with-ghostscript=no
 GHOSTSCRIPT_IMPLIES=		PANGOCAIRO
 PERL_CONFIGURE_ENABLE=		perl
 PERL_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.pl
 PHP_CONFIGURE_ENABLE=		php
 PHP_CPPFLAGS=		-I${LOCALBASE}/include/php/Zend
 PHP_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.php
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_LDFLAGS=		"-L${PYTHONBASE}/lib"
 PYTHON_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.py
 RUBY_CONFIGURE_ENABLE=		ruby
 RUBY_CONFIGURE_ENV=	RUBY="${RUBY}"
 RUBY_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.rb
 LUA_CONFIGURE_ENABLE=		lua
 LUA_CFLAGS=		-I${LUA_INCDIR}
 LUA_LDFLAGS=		-L${LUA_LIBDIR} -lm
 LUA_CONFIGURE_ENV=	LUA="${LUA_BINDIR}/lua" \
 			LUA_INSTALL_DIR=${PREFIX}/lib/lua/${LUA_VER}
 LUA_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.lua
 TCL_CONFIGURE_ENABLE=		tcl
 TCL_CPPFLAGS=		-I${TK_INCLUDEDIR}
 TCL_CONFIGURE_ON=	--with-tclsh=${TCLSH} --enable-tcl=yes
 TCL_CONFIGURE_ENV=	TCLCONFIG="${TCL_LIBDIR}/tclConfig.sh"
 TCL_VARS=		SHEBANG_FILES+=tclpkg/gv/demo/modgraph.tcl \
 			PLIST_SUB+=TCL_VER="${TCL_VER}"
 TK_CPPFLAGS=		-I${TK_INCLUDEDIR}
 TK_CONFIGURE_ON=	--with-wish=${WISH}
 TK_CONFIGURE_ENV=	TKCONFIG="${TK_LIBDIR}/tkConfig.sh"
 GUILE_CONFIGURE_ENABLE=		guile
 NVTHREADS_LDFLAGS=	-lpthread
 
 .include <bsd.port.options.mk>
 
 # allow the use localized gd ports in Makefile.local or slave ports.
 GD_PORT?=	graphics/gd
 
 CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--enable-dependency-tracking \
 		--enable-r=no \
 		--with-freetype2=yes \
 		--with-libgd \
 		--with-fontconfigincludedir=${LOCALBASE}/include \
 		--with-fontconfiglibdir=${LOCALBASE}/lib \
 		--disable-io --disable-ocaml --disable-java \
 		--disable-sharp
 
 .if ${PORT_OPTIONS:MMING}
 BROKEN=	Ming incomplete, uses removed libgraph
 .endif
 
 .if ${PORT_OPTIONS:MTK}
 # USES=tk:build is BROKEN: Does not allow to set both tcl and tk depedencies
 BUILD_DEPENDS+=	tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION}
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=	--with-iconvlibdir=${ICONV_PREFIX}/lib
 CONFIGURE_ARGS+=	--with-iconvincludedir=${ICONV_PREFIX}/include
 .else
 CONFIGURE_ARGS+=	--without-libiconv-prefix
 .endif
 
 .if ${PORT_OPTIONS:MPERL} || ${PORT_OPTIONS:MPHP} || ${PORT_OPTIONS:MPYTHON} || \
     ${PORT_OPTIONS:MRUBY} || ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MTCL} || \
     ${PORT_OPTIONS:MGUILE}
 BUILD_DEPENDS+=		swig3.0:devel/swig30
 RUN_DEPENDS+=		swig3.0:devel/swig30
 CONFIGURE_ARGS+=	--enable-swig
 CONFIGURE_ENV+=		SWIG="${LOCALBASE}/bin/swig3.0"
 .else
 CONFIGURE_ARGS+=	--disable-swig
 CONFIGURE_ENV+=		SWIG="/nonexistent"
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MPHP}
 .if ${PHP_VER} < 70
 # force old PHP API
 MAKE_ARGS+=	SWIG_PHP_OPT=-php5
 .endif
 .endif
 
 post-patch:
 	${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-htmlDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-txtDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-demoDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-demoSCRIPTS\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \
 		-e 's|txtdir = $$(pkgdatadir)/doc|txtdir = ${DOCSDIR}|' \
 		-e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|';
 	${REINPLACE_CMD} \
 		-e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|' \
 		${WRKSRC}/cmd/tools/Makefile.in \
 		${WRKSRC}/cmd/gvpr/Makefile.in
 	${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|pkglibdir = $$(libdir)/@PACKAGE@|pkglibdir = $$(libdir)|g' \
 		-e 's|libdir = @libdir@|libdir = @libdir@/@PACKAGE@|g';
 	${FIND} ${WRKSRC}/lib -name '*.pc.in' | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|libdir=@libdir@|libdir=@libdir@/@PACKAGE@|';
 	${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
 		-e "s|vendorarchdir|sitearchdir|g" \
 		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" \
 		-e "s|ruby-1[.]9|ruby-${RUBY_VER}|g" \
 		-e 's|PHP_INSTALL_DIR=.*|PHP_INSTALL_DIR="${PREFIX}/lib/php/${PHP_EXT_DIR}"|' \
 		-e 's|PHP_INSTALL_DATADIR=.*|PHP_INSTALL_DATADIR="${PREFIX}/share/php"|' \
 		-e '/if test/ s| == | = |g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
 	${REINPLACE_CMD} -e 's|GTS_LIBS)|GTS_LIBS) $$(MATH_LIBS)|' \
 		${WRKSRC}/cmd/smyrna/Makefile.in
 	${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/
 .if ${OSVERSION} >= 1100093
 	${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \
 		${WRKSRC}/lib/sfio/*.[ch]
 .endif
 
 post-patch-DOCS-off:
 	${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
 		${WRKSRC}/Makefile.in
 
 pre-install-PHP-on:
 	${MKDIR} "${STAGEDIR}/${PREFIX}/share/php"
 
 post-install: install-ldconfig-file
 	cd ${WRKSRC}/lib/expr && \
 		${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${FIX_INCLUDE} ${STAGEDIR}${PREFIX}/include/graphviz/
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PDOCS_TXT} ${STAGEDIR}${DOCSDIR}/ && \
 		${INSTALL_DATA} ${PDOCS_PDF} ${STAGEDIR}${DOCSDIR}/pdf/ && \
 		${INSTALL_DATA} ${PDOCS_HTML} ${STAGEDIR}${DOCSDIR}/html/
 
 post-install-EXAMPLES-on:
 	@${ECHO_MSG} "Installing demo data..."
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl \
 		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl \
 		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl \
 		${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} \
 		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl.README \
 		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl.README \
 		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl.README \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl.README \
 		${STAGEDIR}${EXAMPLESDIR}/
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pathplan_data
 	${INSTALL_DATA} \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan_data/*.dat \
 		${STAGEDIR}${EXAMPLESDIR}/pathplan_data/
 
 .include <bsd.port.post.mk>
Index: head/graphics/libdrm/Makefile
===================================================================
--- head/graphics/libdrm/Makefile	(revision 451720)
+++ head/graphics/libdrm/Makefile	(revision 451721)
@@ -1,76 +1,76 @@
 # Created by: lesi@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	libdrm
 PORTVERSION=	2.4.83
 PORTEPOCH=	1
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Userspace interface to kernel Direct Rendering Module services
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 LIB_DEPENDS=	libpciaccess.so:devel/libpciaccess
 
 USES=		libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	MANPAGES TESTS
 OPTIONS_SUB=	yes
 
 TESTS_DESC=	Install test programs (which are always built)
 
 .if defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT+=	MANPAGES
 .endif
 
 MANPAGES_CONFIGURE_ENABLE=	manpages
 MANPAGES_BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 MANPAGES_USE=		GNOME=libxslt:build
 
 TESTS_CONFIGURE_ENABLE=	install-test-programs
 
 # avoid circular dependency in case cairo supports OpenGL (cairo->mesa-libs->libdrm->cairo)
 CONFIGURE_ARGS+=	--disable-cairo-tests
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	ARM_DRIVERS="@comment "
 PLIST_SUB+=	INTEL_DRIVER=""
 PLIST_SUB+=	NOUVEAU_DRIVER=""
 PLIST_SUB+=	RADEON_DRIVERS=""
 .elif ${ARCH} == powerpc || ${ARCH} == powerpc64
 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 "
 PLIST_SUB+=	RADEON_DRIVERS="@comment "
 .else
 PLIST_SUB+=	ARM_DRIVERS="@comment "
 PLIST_SUB+=	INTEL_DRIVER="@comment "
 PLIST_SUB+=	NOUVEAU_DRIVER="@comment "
 PLIST_SUB+=	RADEON_DRIVERS="@comment "
 .endif
 
 # This variable is not for users. So use a non-default name, intended for
 # people working on DRM kernel module development.
 .if ${OPSYS} == FreeBSD && !defined(LIBDRM_SKIP_RETURN_PATCH)
 EXTRA_PATCHES+=	${FILESDIR}/extra-xf86drm.c
 .endif
 
 pre-patch:
 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
 			   s,i?86|x86_64),i?86|amd64|x86_64),g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/graphics/mesa-dri/Makefile
===================================================================
--- head/graphics/mesa-dri/Makefile	(revision 451720)
+++ head/graphics/mesa-dri/Makefile	(revision 451721)
@@ -1,86 +1,86 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
 
 RUN_DEPENDS=	${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc
 
 USE_XORG=	dri2proto dri3proto glproto presentproto x11 xdamage xext \
 		xfixes xshmfence xv xvmc
 
 OPTIONS_DEFINE=	TEXTURE VAAPI VDPAU
 OPTIONS_DEFAULT=TEXTURE
 OPTIONS_SUB=	yes
 
 TEXTURE_DESC=	Enable texture-float support (patent encumbered)
 TEXTURE_CONFIGURE_ENABLE=	texture-float
 
 VAAPI_CONFIGURE_ENABLE=	va
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_USE=		XORG=xcb
 
 VDPAU_CONFIGURE_ENABLE=	vdpau
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 ALL_DRI_DRIVERS=	I915 I965 RADEON R200 SWRAST
 ALL_GALLIUM_DRIVERS=	FREEDRENO R300 R600 RADEONSI SVGA SWRAST VC4
 
 DRI_DRIVERS=		SWRAST	# classic swrast
 .if "${MESA_LLVM_VER}" != ""
 GALLIUM_DRIVERS=	SWRAST	# llvmpipe
 .else
 GALLIUM_DRIVERS=	""
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386 \
  || ${ARCH} == powerpc || ${ARCH} == powerpc64
 DRI_DRIVERS+=		RADEON R200
 GALLIUM_DRIVERS+=	R300 R600
 . if "${MESA_LLVM_VER}" != ""	# until PPC gets LLVM in base
 GALLIUM_DRIVERS+=	RADEONSI
 . endif
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386
 DRI_DRIVERS+=		I915 I965
 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
 
 CONFIGURE_ARGS+=	--with-dri-drivers="${DRI_DRIVERS:tl}" \
 			--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
 
 .for _d in ${ALL_DRI_DRIVERS}
 . if ${DRI_DRIVERS:M${_d}}
 PLIST_SUB+=	${_d}_DRIVER=""
 . else
 PLIST_SUB+=	${_d}_DRIVER="@comment "
 . endif
 .endfor
 
 .for _gd in ${ALL_GALLIUM_DRIVERS}
 . if ${GALLIUM_DRIVERS:M${_gd}}
 PLIST_SUB+=	${_gd}_GDRIVER=""
 . else
 PLIST_SUB+=	${_gd}_GDRIVER="@comment "
 . endif
 .endfor
 
 .include "${MASTERDIR}/Makefile.targets"
 
 post-install:
 	@${RM} -r ${STAGEDIR}/etc/OpenCL
 
 .include <bsd.port.post.mk>
Index: head/graphics/opencv/Makefile
===================================================================
--- head/graphics/opencv/Makefile	(revision 451720)
+++ head/graphics/opencv/Makefile	(revision 451721)
@@ -1,214 +1,215 @@
 # Created by: Marc Abramowitz (http://marc.abramowitz.info)
 # $FreeBSD$
 
 PORTNAME?=	opencv
 PORTVERSION=	2.4.13.1
 PORTREVISION?=	7
 CATEGORIES=	graphics
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 
 USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
 
 NOT_FOR_ARCHS=	sparc64
 NOT_FOR_ARCHS_REASON_sparc64=	does not compile on sparc64
 
 DATADIR=	${PREFIX}/share/OpenCV
 PLIST_SUB+=	VERSION=${DISTVERSION:R}
 
 CMAKE_ARGS+=	-DWITH_CUDA:BOOL=Off \
 		-DWITH_PVAPI:BOOL=Off \
 		-DWITH_UNICAP:BOOL=Off \
 		-DBUILD_TESTS:BOOL=Off \
 		-DBUILD_DOCS:BOOL=Off \
 		-DPYTHON_EXECUTABLE:FILEPATH=${PYTHON_CMD}
 
 SUB_FILES=	FindOpenCVCore.cmake
 SUB_LIST=	OCV_VERSION=${DISTVERSION:R}
 
 OCV_CORE_MODS=		core imgproc
 OCV_MODS=		calib3d contrib features2d flann gpu \
 			highgui legacy ml ocl objdetect photo \
 			stitching superres ts video videostab
 OCV_NONFREE_MODS=	nonfree
 OCV_JAVA_MODS=		java
 OCV_PYTHON_MODS=	python
 
 OPTIONS_DEFINE=		DC1394 EXAMPLES NONFREE OPENGL
 OPTIONS_GROUP=		IMAGE PERFORMANCE SIMD VIDEO
 OPTIONS_GROUP_IMAGE=	JASPER JPEG OPENEXR PNG TIFF
 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
 OPTIONS_RADIO_GUI=	GTK2 QT4
 OPTIONS_DEFAULT=	EIGEN3 JASPER JPEG PNG TIFF V4L ${MACHINE_CPU:tu}
 OPTIONS_SUB=		yes
 .if defined(OCV_CORE)
 OPTIONS_EXCLUDE=	DC1394 EXAMPLES GTK2 QT4 JASPER JPEG NONFREE OPENEXR \
 			OPENGL PNG TIFF FFMPEG GSTREAMER GSTREAMER0 V4L XINE
 .endif
 
 DC1394_DESC=		IEEE 1394 camera support
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 DC1394_CMAKE_BOOL=	WITH_1394
 
 EIGEN3_DESC=		Eigen 3 support
 EIGEN3_BUILD_DEPENDS=	${LOCALBASE}/include/eigen3/Eigen/Eigen:math/eigen3
 EIGEN3_CMAKE_BOOL=	WITH_EIGEN
 
 . if !defined(OCV_SLAVE)
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES INSTALL_C_EXAMPLES
 . endif
 EXAMPLES_PORTEXAMPLES=	*
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 
 GSTREAMER0_DESC=	${GSTREAMER_DESC} 0.10
 GSTREAMER0_USE=		GSTREAMER=yes
 GSTREAMER0_CMAKE_BOOL=	WITH_GSTREAMER_0_10
 
 GSTREAMER_USE=		GSTREAMER1=yes
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
 
 GTK2_USE=		GNOME=gtk20
 GTK2_CMAKE_BOOL=	WITH_GTK
 
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 JASPER_CMAKE_BOOL=	WITH_JASPER
 
 JPEG_USES=		jpeg
 JPEG_CMAKE_BOOL=	WITH_JPEG
 
 NONFREE_CMAKE_BOOL=	BUILD_opencv_nonfree
 
 OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 
 OPENGL_LIB_DEPENDS=	${PORT_OPTIONS:MGTK2:C,.+,libgtkglext-x11-1.0.so:x11-toolkits/gtkglext,}
 OPENGL_USE=		${PORT_OPTIONS:MQT4:S,$,=opengl,}
 OPENGL_CMAKE_BOOL=	WITH_OPENGL
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CMAKE_BOOL=		WITH_PNG
 
 QT4_USE=		QT4=gui,moc_build,qmake_build,rcc_build,uic_build,qtestlib
 QT4_CMAKE_ON=		-DWITH_QT:STRING="4"
 QT4_CMAKE_OFF=		-DWITH_QT:BOOL=false
 
 .for _simd in ${OPTIONS_GROUP_SIMD}
 ${_simd}_DESC=		${MMX_DESC:S/MMX/${_simd}/}
 ${_simd}_CMAKE_BOOL=	ENABLE_${_simd}
 .endfor
 
 TBB_LIB_DEPENDS=	libtbb.so:devel/tbb
 TBB_CMAKE_BOOL=		WITH_TBB
 TBB_CMAKE_ON=		-DTBB_INCLUDE_DIR:STRING="${LOCALBASE}/include"
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 TIFF_CMAKE_BOOL=	WITH_TIFF
 
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 V4L_CMAKE_BOOL=		WITH_V4L
 V4L_CMAKE_ON=		-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
 
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 XINE_CMAKE_BOOL=	WITH_XINE
 
 IMAGE_DESC=		Image format support
 NONFREE_DESC=		Build functionality that has possible limitations of use
 PERFORMANCE_DESC=	Performance enhancing libraries
 TBB_DESC=		TBB support
 
 .if defined(OCV_CORE)
 . for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
 .elif defined(OCV_PYTHON)
 LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 USES+=		python:2.7
 CMAKE_ARGS+=	-DBUILD_opencv_python:BOOL=On
 . for module in apps java stitching superres videostab
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
 INSTALL_WRKSRC=	${WRKSRC}/modules/python
 .elif defined(OCV_JAVA)
 BUILD_DEPENDS+=	ant:devel/apache-ant
 LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv
 USES+=		python:build
 USE_JAVA=	yes
 CMAKE_ARGS+=	-DBUILD_opencv_java:BOOL=On
 . for module in apps python stitching superres videostab
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
 CONFIGURE_ENV+=	JAVA_HOME="${JAVA_HOME}"
 INSTALL_WRKSRC=	${WRKSRC}/modules/java
 .else
 LIB_DEPENDS+=	libopencv_core.so:graphics/opencv-core
 . for module in ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS}
 CMAKE_ARGS+=	-DBUILD_opencv_${module}:BOOL=Off
 . endfor
 .endif
 
 post-patch:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 	@${REINPLACE_CMD} -e '/pkgconfig/s|$${OPENCV_LIB_INSTALL_PATH}|libdata|' \
 		 ${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake
 	@${REINPLACE_CMD} -e 's|share/OpenCV/doc|${DOCSDIR_REL}|g' \
 		-e 's|share/OpenCV/samples|${EXAMPLESDIR_REL}|g' \
 		${WRKSRC}/CMakeLists.txt
 	@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} {} \;
 .if defined(OCV_CORE)
 	@${REINPLACE_CMD} -e 's|opencv.pc|opencv-core.pc|g' \
 		${WRKSRC}/cmake/OpenCVGenPkgconfig.cmake
 	@${REINPLACE_CMD} -e 's|Name:.*|Name: OpenCV-core|' \
 		${WRKSRC}/cmake/templates/opencv-XXX.pc.in
 .endif
 .if defined(OCV_SLAVE)
 	@${REINPLACE_CMD} -e 's|add_subdirectory(data)||g' \
 		${WRKSRC}/CMakeLists.txt
 .endif
 
 post-install:
 .if !defined(OCV_SLAVE)
 	(cd ${STAGEDIR}${PREFIX} && \
 		${RM} -r include/opencv2/core include/opencv2/imgproc \
 			lib/libopencv_core* lib/libopencv_imgproc*)
 .endif
 .if defined(OCV_CORE)
 	${RM} -r ${STAGEDIR}${PREFIX}/include/opencv
 	${RM} -r ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/cmake/Modules
 	${INSTALL_DATA} ${WRKDIR}/FindOpenCVCore.cmake ${STAGEDIR}${PREFIX}/share/cmake/Modules
 .endif
 .if defined(OCV_PYTHON)
 	(cd ${STAGEDIR}${PREFIX} && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||} && \
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} -f ${PYTHONPREFIX_SITELIBDIR:S|${PREFIX}/||})
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples/python2 && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/python2
 .endif
 .if defined(OCV_JAVA)
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/samples/java && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/java
 .endif
 
 .include <bsd.port.mk>
Index: head/java/bouncycastle15/Makefile
===================================================================
--- head/java/bouncycastle15/Makefile	(revision 451720)
+++ head/java/bouncycastle15/Makefile	(revision 451721)
@@ -1,79 +1,80 @@
 # Created by: Eugene Grosbein <ports@grosbein.net>
 # $FreeBSD$
 
 PORTNAME=	bouncycastle
 PORTVERSION=	1.58
 CATEGORIES=	java security
 MASTER_SITES=	http://www.bouncycastle.org/download/ \
 		http://polydistortion.net/bc/download/
 PKGNAMESUFFIX=	15
 DISTNAME=	crypto-${DVERSION}
 
 MAINTAINER=	eugen@FreeBSD.org
 COMMENT=	Cleanroom build of Java Cryptography Extensions
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${JAVALIBDIR}/activation.jar:java/jaf \
 		${JAVALIBDIR}/mail.jar:java/javamail \
 		${JAVALIBDIR}/junit.jar:java/junit
 RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:java/jaf \
 		${JAVALIBDIR}/mail.jar:java/javamail
 
 OPTIONS_DEFINE=	DOCS ZIPSRC
 OPTIONS_DEFAULT=	ZIPSRC
 OPTIONS_SUB=	yes
 ZIPSRC_DESC=	Install bundled ZIP source files
 CONFLICTS_INSTALL=	bouncycastle-1.4*
 DVERSION=	${PORTVERSION:S/.//}
 NO_ARCH=	yes
 CPE_PRODUCT=	legion-of-the-bouncy-castle-java-crytography-api
 CPE_VENDOR=	${PORTNAME}
 USE_JAVA=	yes
 USES=		cpe
 JAVA_VERSION=	1.6+
 JDKMVERSION=	1.5
 JDKNVERSION=	15
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 MAKE_ARGS=	-f ant/jdk${JDKNVERSION}+.xml
 ALL_TARGET=	build-provider build zip-src
 
 JARS_SRC=	bcmail bcpkix bcprov bcpg
 JARS_DOCS=	${JARS_SRC} bctest bctls
 JARS=		${JARS_DOCS} bcprov-ext
 
 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
 
 do-install:
 .for jar in ${JARS}
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}on-${DVERSION}.jar \
 	      ${STAGEDIR}${JAVAJARDIR}/${jar}.jar
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}on-${DVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/bcprov.jar
 .if ${PORT_OPTIONS:MZIPSRC}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for jar in ${JARS_SRC}
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}on-${DVERSION}/src.zip \
 	      ${STAGEDIR}${DATADIR}/${jar}-src.zip
 .endfor
 .endif
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}
 .for jar in ${JARS_DOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${jar}
 	@cd ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}on-${DVERSION}/docs/ && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${jar}
 .endfor
 
 .include <bsd.port.mk>
Index: head/lang/erlang/Makefile
===================================================================
--- head/lang/erlang/Makefile	(revision 451720)
+++ head/lang/erlang/Makefile	(revision 451721)
@@ -1,290 +1,290 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	19.3.6.3
 PORTEPOCH=	4
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
 		http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg \
 		http://www.erlang.se/doc/:erlangse			\
 		http://www.erlang.se/publications/:publications		\
 		http://www.sics.se/~joe/thesis/:joe			\
 		LOCAL/olgeni:local
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
 PATCHFILES=	patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
 		patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6 \
 		patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 ERLANG_LIB=	${PORTNAME}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	TOOLS_VSN=${TOOLS_VSN}
 PLIST_SUB=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DIRTY DOCS DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
 DTRACE_DESC=	Enable DTrace support
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 NATIVE_DESC=	Enable native libraries
 SCTP_DESC=	Enable SCTP support
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 
 ERL_RELEASE=	19.3
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 USE_RC_SUBR=	epmd
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 APP_UPGRADE=	erts            8.3 8.3.5.3 \
 		lib/crypto    3.7.3   3.7.4 \
 		lib/compiler  7.0.4 7.0.4.1 \
 		lib/inets     6.3.6   6.3.9 \
 		lib/ssh       4.4.1   4.4.2 \
 		lib/ssl       8.1.1   8.1.3 \
 		lib/dialyzer    3.1   3.1.1 \
 		lib/xmerl    1.3.13  1.3.14
 
 EI_VSN=		3.9.3
 SNMP_VSN=	5.2.5
 TOOLS_VSN=	2.9.1
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${ERLANG_DOCS}:erlangorg		\
 		${DOC_DISTFILES}
 DOC_DISTFILES=	armstrong_thesis_2003.pdf:local		\
 		bjarnelic.pdf:publications		\
 		erlang-book-part1.pdf:erlangorg		\
 		master_thesis_patterns.pdf:local	\
 		mnesia_overview.pdf:publications	\
 		programming_rules.pdf:erlangse
 .endif
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
 CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
 CFLAGS+=	-fno-omit-frame-pointer
 STRIP=
 .else
 CONFIGURE_ARGS+=--without-dynamic-trace
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 CONFIGURE_ARGS+=--with-javac
 CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
 .else
 CONFIGURE_ARGS+=--without-javac
 .endif
 
 .if ${PORT_OPTIONS:MHIPE}
 CONFIGURE_ARGS+=--enable-hipe
 .else
 CONFIGURE_ARGS+=--disable-hipe
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 CONFIGURE_ARGS+=--enable-native-libs
 .else
 CONFIGURE_ARGS+=--disable-native-libs
 .endif
 
 .if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=--enable-kernel-poll
 .else
 CONFIGURE_ARGS+=--disable-kernel-poll
 .endif
 
 .if ${PORT_OPTIONS:MGS}
 USES+=		tk:run
 .endif
 
 .if ${PORT_OPTIONS:MWX}
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_GL+=	gl glu
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
 
 ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
 ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-threads
 .else
 CONFIGURE_ARGS+=--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MSCTP}
 CONFIGURE_ARGS+=--enable-sctp
 .else
 CONFIGURE_ARGS+=--disable-sctp
 .endif
 
 # enabling --enable-smp-support crashes the OS when
 # net_kernel:start([node_name, shortnames]) invoked repeatedly
 # TODO verify if it still applies
 
 .if ${PORT_OPTIONS:MSMP}
 CONFIGURE_ARGS+=--enable-smp-support
 .else
 CONFIGURE_ARGS+=--disable-smp-support
 .endif
 
 .if ${PORT_OPTIONS:MDIRTY}
 CONFIGURE_ARGS+=--enable-dirty-schedulers
 .endif
 
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
 # The man-pages are put (in spite of FreeBSD's port convention) in a private
 # subdir. This is to avoid cluttering up the man page name space. Also the
 # Erlang man pages are more of internal documentation using the man format than
 # actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
 
 # Install documentation. (HTML docs need to be in same dir as the
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 
 post-patch:
 	@${ECHO_CMD} "MANPATH ${PREFIX}/lib/erlang/man" > ${WRKDIR}/erlang.conf
 
 pre-configure:
 .if ! ${PORT_OPTIONS:MWX}
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif
 
 post-configure:
 .if ${PORT_OPTIONS:MODBC}
 	${RM} ${WRKSRC}/lib/odbc/SKIP
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 pre-build:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/erlang.conf ${STAGEDIR}${PREFIX}/etc/man.d/erlang.conf
 	${LN} -sf ../lib/${ERLANG_LIB}/lib/erl_interface-${EI_VSN}/bin/erl_call ${STAGEDIR}${PREFIX}/bin/erl_call
 	for SECTION in 1 3 4 6 7; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
 .for app v1 v2 in ${APP_UPGRADE}
 	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOC_DISTFILES}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/$$(expr ${FILE} : '\([^:]*\)') ${STAGEDIR}/${DOCSDIR}
 .endfor
 .endif
 .if ! ${PORT_OPTIONS:MGS}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
 .endif
 .if ! ${PORT_OPTIONS:MJAVA}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
 .endif
 .if ! ${PORT_OPTIONS:MODBC}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
 .endif
 .if ! ${PORT_OPTIONS:MOPENSSL}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
 .endif
 .if ! ${PORT_OPTIONS:MWX}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
 .endif
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
 	${LN} -s ../lib/erlang/lib/snmp-${SNMP_VSN}/bin/snmpc ${STAGEDIR}${PREFIX}/bin/snmpc
 
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} \
 		>> ${TMPPLIST}
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/erlang-runtime17/Makefile
===================================================================
--- head/lang/erlang-runtime17/Makefile	(revision 451720)
+++ head/lang/erlang-runtime17/Makefile	(revision 451721)
@@ -1,244 +1,244 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	17.5.6.9
 PORTREVISION=	6
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
 		http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg
 PKGNAMESUFFIX=	-runtime17
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
 PATCHFILES=	patch-otp-17.5.1 patch-otp-17.5.2 patch-otp-17.5.3 \
 		patch-otp-17.5.4 patch-otp-17.5.5 patch-otp-17.5.6 \
 		patch-otp-17.5.6.1 patch-otp-17.5.6.2 patch-otp-17.5.6.3 \
 		patch-otp-17.5.6.4 patch-otp-17.5.6.5 patch-otp-17.5.6.6 \
 		patch-otp-17.5.6.7 patch-otp-17.5.6.8 patch-otp-17.5.6.9
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DIRTY
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
 DTRACE_DESC=	Enable DTrace support
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 SCTP_DESC=	Enable SCTP support
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 OPTIONS_DEFAULT=KQUEUE OPENSSL SCTP SMP THREADS
 OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
 
 ERL_RELEASE=	17.5
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 APP_UPGRADE=	erts                 6.4  6.4.1.6 \
 		lib/common_test     1.10   1.10.1 \
 		lib/debugger       4.0.3  4.0.3.1 \
 		lib/diameter         1.9  1.9.2.4 \
 		lib/inets         5.10.6   5.10.9 \
 		lib/kernel           3.2  3.2.0.1 \
 		lib/runtime_tools 1.8.16 1.8.16.1 \
 		lib/snmp           5.1.1    5.1.2 \
 		lib/ssh              3.2    3.2.4 \
 		lib/ssl              6.0  6.0.1.2 \
 		lib/test_server      3.8    3.8.1
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${ERLANG_DOCS}:erlangorg
 .endif
 
 # See http://wiki.freebsd.org/DTrace to learn how to enable DTrace
 # on your system. You will need to configure STRIP, WITH_CTF and
 # CFLAGS in your make.conf before building.
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
 .if ${PORT_OPTIONS:MGCC}
 USE_GCC?=	yes
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
 .else
 CONFIGURE_ARGS+=--without-dynamic-trace
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 CONFIGURE_ARGS+=--with-javac
 CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
 .else
 CONFIGURE_ARGS+=--without-javac
 .endif
 
 .if ${PORT_OPTIONS:MHIPE}
 CONFIGURE_ARGS+=--enable-hipe
 .else
 CONFIGURE_ARGS+=--disable-hipe
 .endif
 
 .if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=--enable-kernel-poll
 .else
 CONFIGURE_ARGS+=--disable-kernel-poll
 .endif
 
 .if ${PORT_OPTIONS:MGS}
 USES+=		tk:run
 .endif
 
 .if ${PORT_OPTIONS:MWX}
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
 
 ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
 ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-threads
 .else
 CONFIGURE_ARGS+=--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MSCTP}
 CONFIGURE_ARGS+=--enable-sctp
 .else
 CONFIGURE_ARGS+=--disable-sctp
 .endif
 
 # enabling --enable-smp-support crashes the OS when
 # net_kernel:start([node_name, shortnames]) invoked repeatedly
 # TODO verify if it still applies
 
 .if ${PORT_OPTIONS:MSMP}
 CONFIGURE_ARGS+=--enable-smp-support
 .else
 CONFIGURE_ARGS+=--disable-smp-support
 .endif
 
 .if ${PORT_OPTIONS:MDIRTY}
 CONFIGURE_ARGS+=--enable-dirty-schedulers
 .endif
 
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
 # The man-pages are put (in spite of FreeBSD's port convention) in a private
 # subdir. This is to avoid cluttering up the man page name space. Also the
 # Erlang man pages are more of internal documentation using the man format than
 # actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
 
 # Install documentation. (HTML docs need to be in same dir as the
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 
 pre-configure:
 .if ${PORT_OPTIONS:MDTRACE}
 	@if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
 		${ECHO_CMD}; \
 		${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
 		${ECHO_CMD}; \
 		exit 1; \
 	fi
 .endif
 .if ! ${PORT_OPTIONS:MWX}
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif
 
 post-configure:
 .if ${PORT_OPTIONS:MODBC}
 	${RM} ${WRKSRC}/lib/odbc/SKIP
 .endif
 
 post-install:
 	for SECTION in 1 3 4 6 7; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
 .for app v1 v2 in ${APP_UPGRADE}
 	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 .endif
 .if ! ${PORT_OPTIONS:MGS}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
 .endif
 .if ! ${PORT_OPTIONS:MJAVA}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
 .endif
 .if ! ${PORT_OPTIONS:MODBC}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
 .endif
 .if ! ${PORT_OPTIONS:MOPENSSL}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
 .endif
 .if ! ${PORT_OPTIONS:MWX}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
 .endif
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} \
 		>> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime18/Makefile
===================================================================
--- head/lang/erlang-runtime18/Makefile	(revision 451720)
+++ head/lang/erlang-runtime18/Makefile	(revision 451721)
@@ -1,238 +1,238 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	18.3.4.5
 PORTREVISION=	2
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
 		http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg
 PKGNAMESUFFIX=	-runtime18
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
 PATCHFILES=	patch-otp-18.3.1 patch-otp-18.3.2 patch-otp-18.3.3 \
 		patch-otp-18.3.4 patch-otp-18.3.4.1 patch-otp-18.3.4.2 \
 		patch-otp-18.3.4.3 patch-otp-18.3.4.4 patch-otp-18.3.4.5
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS DTRACE GCC GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DIRTY
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
 DTRACE_DESC=	Enable DTrace support
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 SCTP_DESC=	Enable SCTP support
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS
 OPTIONS_EXCLUDE_DragonFly=	HIPE SCTP
 
 ERL_RELEASE=	18.3
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 APP_UPGRADE=	erts               7.3  7.3.1.3 \
 		lib/common_test   1.12 1.12.1.1 \
 		lib/crypto       3.6.3  3.6.3.1 \
 		lib/inets          6.2  6.2.4.1 \
 		lib/mnesia      4.13.3   4.13.4 \
 		lib/ssh          4.2.2  4.2.2.3 \
 		lib/ssl            7.3  7.3.3.1
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${ERLANG_DOCS}:erlangorg
 .endif
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
 .if ${PORT_OPTIONS:MGCC}
 USE_GCC?=	yes
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
 CFLAGS+=	-fno-omit-frame-pointer
 STRIP=
 .else
 CONFIGURE_ARGS+=--without-dynamic-trace
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 CONFIGURE_ARGS+=--with-javac
 CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
 .else
 CONFIGURE_ARGS+=--without-javac
 .endif
 
 .if ${PORT_OPTIONS:MHIPE}
 CONFIGURE_ARGS+=--enable-hipe
 .else
 CONFIGURE_ARGS+=--disable-hipe
 .endif
 
 .if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=--enable-kernel-poll
 .else
 CONFIGURE_ARGS+=--disable-kernel-poll
 .endif
 
 .if ${PORT_OPTIONS:MGS}
 USES+=		tk:run
 .endif
 
 .if ${PORT_OPTIONS:MWX}
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
 
 ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
 ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-threads
 .else
 CONFIGURE_ARGS+=--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MSCTP}
 CONFIGURE_ARGS+=--enable-sctp
 .else
 CONFIGURE_ARGS+=--disable-sctp
 .endif
 
 # enabling --enable-smp-support crashes the OS when
 # net_kernel:start([node_name, shortnames]) invoked repeatedly
 # TODO verify if it still applies
 
 .if ${PORT_OPTIONS:MSMP}
 CONFIGURE_ARGS+=--enable-smp-support
 .else
 CONFIGURE_ARGS+=--disable-smp-support
 .endif
 
 .if ${PORT_OPTIONS:MDIRTY}
 CONFIGURE_ARGS+=--enable-dirty-schedulers
 .endif
 
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
 # The man-pages are put (in spite of FreeBSD's port convention) in a private
 # subdir. This is to avoid cluttering up the man page name space. Also the
 # Erlang man pages are more of internal documentation using the man format than
 # actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
 
 # Install documentation. (HTML docs need to be in same dir as the
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 
 pre-configure:
 .if ${PORT_OPTIONS:MDTRACE}
 	@if ! /sbin/kldstat | ${GREP} dtraceall >/dev/null 2>&1; then \
 		${ECHO_CMD}; \
 		${ECHO_CMD} "DTRACE option requires kernel module \"dtraceall\" to be loaded."; \
 		${ECHO_CMD}; \
 		exit 1; \
 	fi
 .endif
 .if ! ${PORT_OPTIONS:MWX}
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif
 
 post-configure:
 .if ${PORT_OPTIONS:MODBC}
 	${RM} ${WRKSRC}/lib/odbc/SKIP
 .endif
 
 post-install:
 	for SECTION in 1 3 4 6 7; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
 .for app v1 v2 in ${APP_UPGRADE}
 	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 .endif
 .if ! ${PORT_OPTIONS:MGS}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
 .endif
 .if ! ${PORT_OPTIONS:MJAVA}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
 .endif
 .if ! ${PORT_OPTIONS:MODBC}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
 .endif
 .if ! ${PORT_OPTIONS:MOPENSSL}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
 .endif
 .if ! ${PORT_OPTIONS:MWX}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
 .endif
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} \
 		>> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/lang/erlang-runtime19/Makefile
===================================================================
--- head/lang/erlang-runtime19/Makefile	(revision 451720)
+++ head/lang/erlang-runtime19/Makefile	(revision 451721)
@@ -1,262 +1,262 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	19.3.6.3
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
 		http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg
 PKGNAMESUFFIX=	-runtime19
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
 PATCHFILES=	patch-otp-19.3.1 patch-otp-19.3.2 patch-otp-19.3.3 \
 		patch-otp-19.3.4 patch-otp-19.3.5 patch-otp-19.3.6 \
 		patch-otp-19.3.6.1 patch-otp-19.3.6.2 patch-otp-19.3.6.3
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DIRTY DOCS DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
 DTRACE_DESC=	Enable DTrace support
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 NATIVE_DESC=	Enable native libraries
 SCTP_DESC=	Enable SCTP support
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 
 ERL_RELEASE=	19.3
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 APP_UPGRADE=	erts            8.3 8.3.5.3 \
 		lib/crypto    3.7.3   3.7.4 \
 		lib/compiler  7.0.4 7.0.4.1 \
 		lib/inets     6.3.6   6.3.9 \
 		lib/ssh       4.4.1   4.4.2 \
 		lib/ssl       8.1.1   8.1.3 \
 		lib/dialyzer    3.1   3.1.1 \
 		lib/xmerl    1.3.13  1.3.14
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${ERLANG_DOCS}:erlangorg
 .endif
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
 CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
 CFLAGS+=	-fno-omit-frame-pointer
 STRIP=
 .else
 CONFIGURE_ARGS+=--without-dynamic-trace
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 CONFIGURE_ARGS+=--with-javac
 CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
 .else
 CONFIGURE_ARGS+=--without-javac
 .endif
 
 .if ${PORT_OPTIONS:MHIPE}
 CONFIGURE_ARGS+=--enable-hipe
 .else
 CONFIGURE_ARGS+=--disable-hipe
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 CONFIGURE_ARGS+=--enable-native-libs
 .else
 CONFIGURE_ARGS+=--disable-native-libs
 .endif
 
 .if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=--enable-kernel-poll
 .else
 CONFIGURE_ARGS+=--disable-kernel-poll
 .endif
 
 .if ${PORT_OPTIONS:MGS}
 USES+=		tk:run
 .endif
 
 .if ${PORT_OPTIONS:MWX}
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_GL+=	gl glu
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
 
 ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
 ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-threads
 .else
 CONFIGURE_ARGS+=--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MSCTP}
 CONFIGURE_ARGS+=--enable-sctp
 .else
 CONFIGURE_ARGS+=--disable-sctp
 .endif
 
 # enabling --enable-smp-support crashes the OS when
 # net_kernel:start([node_name, shortnames]) invoked repeatedly
 # TODO verify if it still applies
 
 .if ${PORT_OPTIONS:MSMP}
 CONFIGURE_ARGS+=--enable-smp-support
 .else
 CONFIGURE_ARGS+=--disable-smp-support
 .endif
 
 .if ${PORT_OPTIONS:MDIRTY}
 CONFIGURE_ARGS+=--enable-dirty-schedulers
 .endif
 
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
 # The man-pages are put (in spite of FreeBSD's port convention) in a private
 # subdir. This is to avoid cluttering up the man page name space. Also the
 # Erlang man pages are more of internal documentation using the man format than
 # actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
 
 # Install documentation. (HTML docs need to be in same dir as the
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 
 pre-configure:
 .if ! ${PORT_OPTIONS:MWX}
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif
 
 post-configure:
 .if ${PORT_OPTIONS:MODBC}
 	${RM} ${WRKSRC}/lib/odbc/SKIP
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 pre-build:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
 .endif
 
 post-install:
 	for SECTION in 1 3 4 6 7; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
 .for app v1 v2 in ${APP_UPGRADE}
 	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 .endif
 .if ! ${PORT_OPTIONS:MGS}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
 .endif
 .if ! ${PORT_OPTIONS:MJAVA}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
 .endif
 .if ! ${PORT_OPTIONS:MODBC}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
 .endif
 .if ! ${PORT_OPTIONS:MOPENSSL}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
 .endif
 .if ! ${PORT_OPTIONS:MWX}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
 .endif
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} \
 		>> ${TMPPLIST}
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/erlang-runtime20/Makefile
===================================================================
--- head/lang/erlang-runtime20/Makefile	(revision 451720)
+++ head/lang/erlang-runtime20/Makefile	(revision 451721)
@@ -1,253 +1,253 @@
 # Created by: ruslan@shevchenko.kiev.ua
 # $FreeBSD$
 
 PORTNAME=	erlang
 PORTVERSION=	20.1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
 		http://www.csd.uu.se/ftp/mirror/erlang/download/:erlangorg
 PKGNAMESUFFIX=	-runtime20
 DISTNAME=	otp_src_${ERL_RELEASE}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:erlangorg	\
 		${ERLANG_MAN}:erlangorg
 DIST_SUBDIR=	erlang
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
 PATCHFILES=
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
 
 LICENSE=	APACHE20
 
 BROKEN_sparc64=	Fails to build: error: fp_except undeclared
 
 WRKSRC=		${WRKDIR}/otp_src_${ERL_RELEASE}
 
 ERLANG_LIB=	${PORTNAME}${PORTVERSION:C/\..*//}
 
 SUB_FILES=	pkg-message
 SUB_LIST=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DIRTY DOCS DTRACE GS HIPE JAVA KQUEUE NATIVE ODBC OPENSSL SCTP SMP THREADS WX
 
 DIRTY_DESC=	Enable Dirty schedulers (experimental)
 DTRACE_DESC=	Enable DTrace support
 GS_DESC=	Enable GS application (deprecated)
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 NATIVE_DESC=	Enable native libraries
 SCTP_DESC=	Enable SCTP support
 SMP_DESC=	Enable SMP support
 WX_DESC=	Enable WX application
 
 NATIVE_IMPLIES=	HIPE
 
 OPTIONS_DEFAULT=HIPE KQUEUE OPENSSL SCTP SMP THREADS DTRACE
 OPTIONS_EXCLUDE_DragonFly=	HIPE NATIVE SCTP
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 OPTIONS_EXCLUDE_i386=		DTRACE
 # ld(1) fails to link probes: missing __dtrace_erlang___* symbols
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 
 ERL_RELEASE=	20.1
 
 USES=		gmake ncurses perl5
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 APP_UPGRADE=
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 DISTFILES+=	${ERLANG_DOCS}:erlangorg
 .endif
 
 # If you run Erlang and get a message resembling "WARNING: number of
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} > 1100000
 CFLAGS+=	-DMAP_NORESERVE=0
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
 CONFIGURE_ARGS+=--with-dynamic-trace=dtrace
 CFLAGS+=	-fno-omit-frame-pointer
 STRIP=
 .else
 CONFIGURE_ARGS+=--without-dynamic-trace
 .endif
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
 .else
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
 .if ${PORT_OPTIONS:MJAVA}
 USE_JAVA=	yes
 CONFIGURE_ARGS+=--with-javac
 CONFIGURE_ENV+=	ac_cv_prog_JAVAC="${JAVAC}"
 .else
 CONFIGURE_ARGS+=--without-javac
 .endif
 
 .if ${PORT_OPTIONS:MHIPE}
 CONFIGURE_ARGS+=--enable-hipe
 .else
 CONFIGURE_ARGS+=--disable-hipe
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 CONFIGURE_ARGS+=--enable-native-libs
 .else
 CONFIGURE_ARGS+=--disable-native-libs
 .endif
 
 .if ${PORT_OPTIONS:MKQUEUE}
 CONFIGURE_ARGS+=--enable-kernel-poll
 .else
 CONFIGURE_ARGS+=--disable-kernel-poll
 .endif
 
 .if ${PORT_OPTIONS:MGS}
 USES+=		tk:run
 .endif
 
 .if ${PORT_OPTIONS:MWX}
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 CONFIGURE_ARGS+=--with-wx-config=${WX_CONFIG}
 USE_GL+=	gl glu
 .endif
 
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=--with-odbc
 LIB_DEPENDS+=	libodbc.so:databases/unixODBC
 .else
 CONFIGURE_ARGS+=--without-odbc
 .endif
 
 ERLANG_MAN=	otp_doc_man_${ERL_RELEASE}.tar.gz
 ERLANG_DOCS=	otp_doc_html_${ERL_RELEASE}.tar.gz
 
 .if ${PORT_OPTIONS:MTHREADS}
 CONFIGURE_ARGS+=--enable-threads
 .else
 CONFIGURE_ARGS+=--disable-threads
 .endif
 
 .if ${PORT_OPTIONS:MSCTP}
 CONFIGURE_ARGS+=--enable-sctp
 .else
 CONFIGURE_ARGS+=--disable-sctp
 .endif
 
 # enabling --enable-smp-support crashes the OS when
 # net_kernel:start([node_name, shortnames]) invoked repeatedly
 # TODO verify if it still applies
 
 .if ${PORT_OPTIONS:MSMP}
 CONFIGURE_ARGS+=--enable-smp-support
 .else
 CONFIGURE_ARGS+=--disable-smp-support
 .endif
 
 .if ${PORT_OPTIONS:MDIRTY}
 CONFIGURE_ARGS+=--enable-dirty-schedulers
 .endif
 
 .if ${ARCH} == i386
 MAKE_ARGS+=	ARCH=x86
 .endif
 
-.if ${ARCH} == armv6
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 MAKE_ARGS+=	ARCH=arm
 .endif
 
 # The man-pages are put (in spite of FreeBSD's port convention) in a private
 # subdir. This is to avoid cluttering up the man page name space. Also the
 # Erlang man pages are more of internal documentation using the man format than
 # actual system man pages. (erl.1 and epmd.1 perhaps being the exception).
 
 # Install documentation. (HTML docs need to be in same dir as the
 # rest, not in share/doc/erlang as it should, because of relative
 # links in the documentation.
 
 pre-configure:
 .if ! ${PORT_OPTIONS:MWX}
 	echo "disabled by port options" > ${WRKSRC}/lib/wx/SKIP
 .endif
 
 post-configure:
 .if ${PORT_OPTIONS:MODBC}
 	${RM} ${WRKSRC}/lib/odbc/SKIP
 .endif
 
 .if ${PORT_OPTIONS:MNATIVE}
 pre-build:
 	@cd ${WRKSRC} && ${MAKE_CMD} clean
 .endif
 
 post-install:
 	for SECTION in 1 3 4 6 7; do \
 		${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_MAN} \
 			-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB} \
 			"man/man$${SECTION}/*.$${SECTION}" || ${TRUE}; \
 	done
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/man/cat?
 .if ${PORT_OPTIONS:MDOCS}
 	${TAR} --unlink -xzpf ${DISTDIR}/${DIST_SUBDIR}/${ERLANG_DOCS} \
 		-C ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}
 .for app v1 v2 in ${APP_UPGRADE}
 	${MV} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}/* \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v2}
 	${RMDIR} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/${app}-${v1}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/lib/dialyzer/doc/*.txt \
 		${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/lib/dialyzer-*/doc/
 .endif
 .if ! ${PORT_OPTIONS:MGS}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/gs-*
 .endif
 .if ! ${PORT_OPTIONS:MJAVA}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/jinterface-*
 .endif
 .if ! ${PORT_OPTIONS:MODBC}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/odbc-*
 .endif
 .if ! ${PORT_OPTIONS:MOPENSSL}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/crypto-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssh-*
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/ssl-*
 .endif
 .if ! ${PORT_OPTIONS:MWX}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/erlang/lib/wx-*
 .endif
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${ERLANG_LIB}/* -type d -empty -delete
 
 	@cd ${STAGEDIR}${PREFIX}; ${FIND} lib/${ERLANG_LIB}/* -type f -o -type l \
 		| ${SORT} \
 		>> ${TMPPLIST}
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL} && ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 .include <bsd.port.post.mk>
Index: head/lang/go/Makefile
===================================================================
--- head/lang/go/Makefile	(revision 451720)
+++ head/lang/go/Makefile	(revision 451721)
@@ -1,88 +1,88 @@
 # Created by: Devon H. O'Dell <devon.odell@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	go
 PORTVERSION=	1.9.1
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://golang.org/dl/
 DISTNAME=	go${PORTVERSION}.src
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Go programming language
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	go14>=1.4:lang/go14
 
 USES=		shebangfix
 SHEBANG_LANG=	sh perl
 SHEBANG_FILES=	src/*.bash \
 		doc/articles/wiki/*.bash \
 		lib/time/*.bash \
 		misc/benchcmp \
 		misc/nacl/go_nacl_*_exec \
 		src/cmd/dist/*.bash \
 		src/cmd/go/*.sh \
 		src/net/http/cgi/testdata/*.cgi \
 		src/regexp/syntax/*.pl
 
 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}
 .endif
 
 .if ${PORT_OPTIONS:MGO387}
 GO386=387
 .endif
 
 PLIST_SUB+=	opsys_ARCH=${OPSYS:tl}_${GOARCH}
 
 post-patch:
 	@cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete
 
 do-build:
 	cd ${WRKSRC}/src && \
 		GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go \
 		GOROOT_BOOTSTRAP=${LOCALBASE}/go14 \
 		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \
 		GO386=${GO386} \
 		${SH} make.bash
 
 do-install:
 	@${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX}
 .for f in go gofmt
 	@${LN} -sf ../go/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 
 regression-test: build
 	cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${SH} run.bash --no-rebuild --banner
 
 pkg-plist: stage
 	${RM} ${WRKDIR}/pkg-plist
 .for command in go gofmt
 	${ECHO_CMD} bin/${command} >> ${WRKDIR}/pkg-plist
 .endfor
 	cd ${WRKDIR} && ${FIND} go -type f | \
 		${SED} -e "s/\/${OPSYS:tl}_${GOARCH}\//\/%%opsys_ARCH%%\//g" | \
 		${SORT} >> ${WRKDIR}/pkg-plist
 	${ECHO_CMD} "@dir go/pkg/obj/%%opsys_ARCH%%" >> ${WRKDIR}/pkg-plist
 	${CP} ${WRKDIR}/pkg-plist ${.CURDIR}/pkg-plist
 
 .include <bsd.port.post.mk>
Index: head/lang/go14/Makefile
===================================================================
--- head/lang/go14/Makefile	(revision 451720)
+++ head/lang/go14/Makefile	(revision 451721)
@@ -1,74 +1,74 @@
 # $FreeBSD$
 
 PORTNAME=	go14
 PORTVERSION=	1.4.3
 PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://golang.org/dl/
 DISTNAME=	go${PORTVERSION}.src
 
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Go programming language
 
 LICENSE=	BSD3CLAUSE
 
 USES=		compiler shebangfix
 SHEBANG_LANG=	sh perl
 SHEBANG_FILES=	src/*.bash \
 		src/cmd/go/*.bash \
 		doc/progs/run \
 		doc/articles/wiki/*.bash \
 		test/bench/shootout/timing.sh \
 		misc/nacl/*_exec misc/benchcmp \
 		src/net/http/cgi/testdata/*.cgi \
 		src/regexp/syntax/*.pl \
 		lib/codereview/*.sh
 
 sh_OLD_CMD=	"/usr/bin/env bash"
 sh_CMD=		${SH}
 
 WRKSRC=		${WRKDIR}/go
 
-ONLY_FOR_ARCHS=		amd64 armv6 i386
+ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386
 
 .include <bsd.port.pre.mk>
 
 # If cc is clang, change it to clang to help Go identify the compiler
 .if ${COMPILER_TYPE} == "clang" && ${CC} == "cc"
 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
 IGNORE=		unknown arch ${ARCH}
 .endif
 
 PLIST_SUB+=	ARCH=${GOARCH} \
 		GOOBJ=${GOOBJ}
 
 post-patch:
 	@cd ${WRKSRC} && ${FIND} . -name '*.orig' -delete
 
 do-build:
 	cd ${WRKSRC}/src && \
 		CC=${CC} \
 		GOROOT=${WRKSRC} GOROOT_FINAL=${PREFIX}/go14 \
 		GOBIN= GOARCH=${GOARCH} GOOS=${OPSYS:tl} \
 		CGO_ENABLED=0 \
 		${SH} make.bash
 
 do-install:
 	@${CP} -a ${WRKSRC} ${STAGEDIR}${PREFIX}/go14
 
 regression-test: build
 	cd ${WRKSRC}/src && GOROOT=${WRKSRC} PATH=${WRKSRC}/bin:${PATH} ${SH} run.bash --no-rebuild --banner
 
 .include <bsd.port.post.mk>
Index: head/lang/luajit/Makefile
===================================================================
--- head/lang/luajit/Makefile	(revision 451720)
+++ head/lang/luajit/Makefile	(revision 451721)
@@ -1,27 +1,27 @@
 # Created by: Sergey A. Osokin <osa@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	luajit
 DISTVERSION=	2.0.5
 CATEGORIES=	lang
 MASTER_SITES=	http://luajit.org/download/
 DISTNAME=	LuaJIT-${DISTVERSION}
 
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	Just-In-Time Compiler for Lua
 
 WRKSRC=		${WRKDIR}/LuaJIT-${DISTVERSION}
 USES=		gmake
 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:
 	${LN} -sf ${PORTNAME}-${DISTVERSION} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${INSTALL_MAN} ${WRKSRC}/etc/luajit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: head/lang/mono/Makefile
===================================================================
--- head/lang/mono/Makefile	(revision 451720)
+++ head/lang/mono/Makefile	(revision 451721)
@@ -1,104 +1,104 @@
 # Created by: Yukihiro Nakai <nakai@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mono
 PORTVERSION=	4.8.1.0
 DISTVERSIONPREFIX=	mono-
 PORTREVISION=	2
 CATEGORIES=	lang
 
 MAINTAINER=	mono@FreeBSD.org
 COMMENT=	Open source implementation of .NET Development Framework
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser \
 		bash:shells/bash
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow
 
 OPTIONS_DEFINE=		ACCEPTANCE_TESTS MONOLITE
 OPTIONS_DEFAULT=	MONOLITE
 ACCEPTANCE_TESTS_DESC=	Download and run the .Net acceptance tests
 ACCEPTANCE_TESTS_DISTFILES=nuget.31.zip:nuget31
 ACCEPTANCE_TESTS_GH_TUPLE=xamarin:benchmarker:97f618c:12/acceptance-tests/external/benchmarker \
 			dotnet:coreclr:c7da48a:13/acceptance-tests/external/coreclr \
 			dotnet:roslyn:322bd5b:14/acceptance-tests/external/roslyn
 ACCEPTANCE_TESTS_MASTER_SITES=https://dotnetci.blob.core.windows.net/roslyn/:nuget31
 ACCEPTANCE_TESTS_TEST_DEPENDS=bash:shells/bash \
 			referenceassemblies-pcl>=4.6:lang/referenceassemblies-pcl
 ACCEPTANCE_TESTS_VARS=	SHEBANG_FILES+=${WRKSRC}/acceptance-tests/external/roslyn/cibuild.sh
 MONOLITE_DESC=		Use monolite to bootstrap mcs (otherwise use installed mcs)
 MONOLITE_DISTFILES=	monolite-${MONOLITE_VERSION}-latest.tar.gz:monolite
 MONOLITE_MASTER_SITES=	http://download.mono-project.com/monolite/:monolite
 
 MONOLITE_VERSION=	156
 USE_GITHUB=	yes
 GH_TUPLE=	mono:Lucene.Net.Light:85978b7:1/external/Lucene.Net.Light \
 		mono:Newtonsoft.Json:471c3e0:2/external/Newtonsoft.Json \
 		mono:NuGet.BuildTasks:04bdab5:3/external/nuget-buildtasks \
 		mono:aspnetwebstack:e77b12e:4/external/aspnetwebstack \
 		mono:buildtools:9b6ee86:5/external/buildtools \
 		mono:cecil:2b39856:6/external/cecil \
 		mono:cecil:33d50b8:7/external/cecil-legacy \
 		mono:ikdasm:e4deabf:8/external/ikdasm \
 		mono:ikvm-fork:367864e:9/external/ikvm \
 		mono:reference-assemblies:6c77197:10/external/binary-reference-assemblies \
 		mono:rx:b29a4b0:11/external/rx
 
 USES=		autoreconf bison compiler:c11 cpe gettext gmake iconv libtool pathfix \
 		perl5 python shebangfix tar:bzip2
 USE_GNOME=	glib20
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/mono-heapviz
 
 CONFIGURE_ARGS=	--disable-dtrace
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no
 
 MAKE_ENV=	MONO_SHARED_DIR="${WRKDIR}" \
 		INSTALL_STRIP_FLAG="${STRIP}" \
 		TZ=UTC
 
 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*
 
 LOCALBASE?=	/usr/local
 .if !exists(${LOCALBASE}/bin/mcs)
 OPTIONS_SLAVE=	MONOLITE
 .endif
 
 post-extract-MONOLITE-on:
 	${MKDIR} ${WRKSRC}/mcs/class/lib
 	${MV} ${WRKDIR}/monolite-${MONOLITE_VERSION}-latest ${WRKSRC}/mcs/class/lib/monolite
 
 post-patch:
 	${REINPLACE_CMD} -e 's|^#!/bin/bash|#!/usr/bin/env bash|g' \
 		${WRKSRC}/scripts/mono-find-provides.in \
 		${WRKSRC}/scripts/mono-find-requires.in \
 		${WRKSRC}/scripts/mono-test-install
 	${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|^#!/bin/bash|#!/bin/sh|g'
 	${SED} 's/tarball/${PORTVERSION}/' ${WRKSRC}/mono/mini/Makefile.am.in \
 		> ${WRKSRC}/mono/mini/Makefile.am
 
 post-patch-ACCEPTANCE_TESTS-on:
 	${REINPLACE_CMD} -E -e 's!(~/|/tmp/)!${WRKDIR}/!g' -e '/git clean/d' \
 		${WRKSRC}/acceptance-tests/external/roslyn/cibuild.sh
 	${TOUCH} ${WRKDIR}/nuget.31.zip
 
 post-configure:
 	${REINPLACE_CMD} -e 's|share\/man|man|g' \
 		${WRKSRC}/mcs/jay/Makefile
 
 do-test-ACCEPTANCE_TESTS-on:
 	@(cd ${WRKSRC}/acceptance-tests; \
 		${DO_MAKE_TEST} check-full IGNORE_BENCHMARKER_VERSION=1 IGNORE_CORECLR_VERSION=1 IGNORE_ROSLYN_VERSION=1)
 
 .include <bsd.port.mk>
Index: head/lang/swi-pl/Makefile
===================================================================
--- head/lang/swi-pl/Makefile	(revision 451720)
+++ head/lang/swi-pl/Makefile	(revision 451721)
@@ -1,86 +1,86 @@
 # Created by: Michael Butschky <butsch@computi.erols.com>
 # $FreeBSD$
 
 PORTNAME=	swi-pl
 PORTVERSION=	7.4.2
 PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://www.swi-prolog.org/download/stable/src/
 DISTNAME=	swipl-${PORTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Edinburgh-style Prolog compiler
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libgmp.so:math/gmp \
 		libodbc.so:databases/unixODBC \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 BROKEN_mips=		fails to link: libswipl.so: undefined reference to '__sync_sub_and_fetch_4'
 BROKEN_mips64=		fails to link: libswipl.so: undefined reference to '__sync_sub_and_fetch_4'
 BROKEN_powerpc64=	fails to compile: pce_principal.pl:155: Shared object "pl2xpce" not found, required by "swipl"
 
 SWIPLDIR=	${PORTNAME:C/-//}-${PORTVERSION}
 
 NOPRECIOUSMAKEVARS=	yes
 USE_XORG=	ice sm x11 xext xft xinerama xpm xt 
 
 USES=		libedit gmake jpeg libarchive pathfix pkgconfig \
 		readline shebangfix ssl
 MAKE_JOBS_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ARCH=${ARCH}-${OPSYS:tl}
 CONFIGURE_TARGET=	${ARCH}-${OPSYS:tl}
 CONFIGURE_ARGS=	--with-world --without-jpl --enable-shared
 MAKE_ARGS=	DISABLE_PKGS=jpl \
 		ac_cv_lib_ossp_uuid_uuid_create=no \
 		ac_cv_lib_uuid_uuid_create=no
 
 SHEBANG_LANG=	swipl
 swipl_OLD_CMD=	/usr/bin/swipl
 swipl_CMD=	${LOCALBASE}/bin/swipl
 SHEBANG_FILES=	library/dialect/sicstus/swipl-lfr.pl \
 		packages/http/examples/demo_inetd
 
 PLIST_SUB=	DISTNAME=${SWIPLDIR} ARCH=${ARCH} OS=${OPSYS:tl} \
 		VER=${PORTVERSION}
 
 .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
 	@{ ${ECHO} "#define HAVE_DLOPEN 1";  ${ECHO} "#define HAVE_DLADDR 1"; }\
 		>> ${WRKSRC}/src/config.h
 
 post-patch:
 	@${REINPLACE_CMD} -e 's!^mandir=@mandir@!mandir=${MANPREFIX}/man!' \
 		-e '/-o $$@ $$(PLOBJ)/s/$$/ $$(LIBS)/' \
 		-e '/ $$(SHAREDV) $$(SONAME)/d' \
 		${WRKSRC}/src/Makefile.in \
 		${WRKSRC}/packages/xpce/src/Makefile.in
 	@${REINPLACE_CMD} -e '/EXAMPLEEXE/s/INSTALL_PROGRAM/INSTALL_SCRIPT/' \
 		${WRKSRC}/packages/http/Makefile.in \
 		${WRKSRC}/packages/pldoc/Makefile.in
 	@${REINPLACE_CMD} -e 's/malloc\.h/stdlib.h/' \
 		${WRKSRC}/packages/cpp/SWI-cpp.h
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/xpce-client \
 		${STAGEDIR}${PREFIX}/lib/${SWIPLDIR}/lib/${ARCH}-${OPSYS:tl}/pl2xpce.so
 
 .include <bsd.port.post.mk>
Index: head/math/lp_solve/Makefile
===================================================================
--- head/math/lp_solve/Makefile	(revision 451720)
+++ head/math/lp_solve/Makefile	(revision 451721)
@@ -1,51 +1,51 @@
 # Created by: Pedro F. Giffuni
 # $FreeBSD$
 
 PORTNAME=	lp_solve
 PORTVERSION=	5.5.2.5
 CATEGORIES=	math
 MASTER_SITES=	SF/lpsolve/lpsolve/${PORTVERSION}
 DISTNAME=	${PORTNAME}_${PORTVERSION}_source
 
 MAINTAINER=	mayo@oyam.ca
 COMMENT=	Linear Programming Solver
 
 LICENSE=	LGPL21
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:R:R}
 
 USE_LDCONFIG=	yes
 
 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
 .endif
 
 pre-build:
 	@${FIND} ${WRKSRC} -name "ccc" | ${XARGS} ${REINPLACE_CMD} -e \
 		"s|^c=.*$$|c='${CC}'|g ; \
 		 s|^opts=.*$$|opts='${CFLAGS}'|g ; \
 		 s|-fpic|-fPIC|g ; \
 		 s|-ldl||g"
 
 do-build:
 	cd ${WRKSRC}/lp_solve  ; ${BUILDENV} ${SH} -x ccc
 	cd ${WRKSRC}/demo      ; ${BUILDENV} ${SH} -x ccc
 	cd ${WRKSRC}/lpsolve55 ; ${BUILDENV} ${SH} -x ccc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lp_solve/bin/${LPSOLVE_ARCH}/lp_solve ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/lpsolve55/bin/${LPSOLVE_ARCH}/liblpsolve55.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lpsolve55/bin/${LPSOLVE_ARCH}/liblpsolve55.so ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf liblpsolve55.so ${STAGEDIR}${PREFIX}/lib/liblpsolve55.so.1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/lpsolve
 .for i in declare.h fortify.h ini.h lp_*.h lpkit.h lpsolve.h ufortify.h yacc_read.h
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/include/lpsolve
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/multimedia/ffmpeg0/Makefile
===================================================================
--- head/multimedia/ffmpeg0/Makefile	(revision 451720)
+++ head/multimedia/ffmpeg0/Makefile	(revision 451721)
@@ -1,378 +1,378 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.17
 PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
 PKGNAMESUFFIX=	0
 
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	Realtime audio/video encoder/converter and streaming server
 
 LICENSE=		GPLv2+ LGPL21+
 LICENSE_COMB=		multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING.GPLv2
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPLv2.1
 
 BUILD_DEPENDS=	yasm:devel/yasm \
 		${LOCALBASE}/bin/as:devel/binutils \
 		${LOCALBASE}/bin/texi2html:textproc/texi2html
 
 PORTSCOUT=	limit:^0\.7.*
 
 USES=		cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
 USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
 USE_PERL5=	build
 SHEBANG_FILES=	doc/texi2pod.pl
 NOPRECIOUSMAKEVARS=	yes # ARCH
 
 FFMPEG_SUFFIX=	0
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
 CONFIGURE_ENV+=	EXESUF="${FFMPEG_SUFFIX}"
 MAKE_ARGS+=	EXESUF="${FFMPEG_SUFFIX}"
 PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
 PROGS=		ffmpeg ffprobe
 
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin V=1
 
 CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--mandir="${PREFIX}/man" \
 		--incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \
 		--libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
 		--shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
 		--datadir="${DATADIR}" \
 		--build-suffix="${FFMPEG_SUFFIX}" \
 		--enable-shared \
 		--enable-pic \
 		--enable-gpl \
 		--enable-postproc \
 		--enable-avfilter \
 		--enable-pthreads \
 		--enable-runtime-cpudetect \
 		--cc="${CC}" \
 		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
 		--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
 		--extra-libs="-lpthread"
 
 SHLIB_VER=	1
 PLIST_SUB+=	SHLIB_VER=${SHLIB_VER}
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 OPTIONS_DEFINE=		AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
 			FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
 			OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \
 			VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS
 OPTIONS_DEFAULT=	FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER \
 			THEORA VORBIS VPX X264 XVID
 OPTIONS_SUB=		yes
 
 FFSERVER_DESC=		Build and install ffserver
 X11GRAB_DESC=		Enable x11 grabbing
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
 			--disable-outdev=alsa
 
 CELT_LIB_DEPENDS=	libcelt0.so:audio/celt
 CELT_CONFIGURE_ENABLE=	libcelt
 
 DIRAC_LIB_DEPENDS=	libdirac_encoder.so:multimedia/dirac
 DIRAC_CONFIGURE_ENABLE=	libdirac
 
 DEBUG_CONFIGURE_ON=	--disable-stripping
 DEBUG_CONFIGURE_OFF=	--disable-debug
 
 FFSERVER_CONFIGURE_OFF=	--disable-ffserver
 
 FREETYPE_LIB_DEPENDS=		libfreetype.so:print/freetype2
 FREETYPE_CONFIGURE_ENABLE=	libfreetype
 
 FREI0R_BUILD_DEPENDS=		${LOCALBASE}/include/frei0r.h:graphics/frei0r
 FREI0R_CONFIGURE_ENABLE=	frei0r
 
 GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
 GSM_CONFIGURE_ENABLE=		libgsm
 
 LAME_LIB_DEPENDS=		libmp3lame.so:audio/lame
 LAME_CONFIGURE_ENABLE=		libmp3lame
 
 OPENCV_LIB_DEPENDS=		libopencv_imgproc.so:graphics/opencv-core
 OPENCV_CONFIGURE_ENABLE=	libopencv
 
 OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:graphics/openjpeg15
 OPENJPEG_CONFIGURE_ENABLE=	libopenjpeg
 
 RTMP_USES=			ssl
 
 SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
 SPEEX_LIB_DEPENDS=		libspeex.so:audio/speex
 SPEEX_CONFIGURE_ENABLE=		libspeex
 
 THEORA_LIB_DEPENDS=		libtheora.so:multimedia/libtheora
 THEORA_CONFIGURE_ENABLE=	libtheora
 
 X11GRAB_USE=		XORG=x11,xext,xfixes
 X11GRAB_CONFIGURE_ON=	--enable-x11grab
 
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_ENABLE=	libx264
 
 XVID_LIB_DEPENDS=	libxvidcore.so:multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid
 
 VDPAU_BUILD_DEPENDS=	${LOCALBASE}/include/vdpau/vdpau.h:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_ENABLE=	libvpx
 
 COMPAT_HEADERS=libavcodec/avcodec.h \
 	libavcodec/opt.h \
 	libavcodec/vdpau.h \
 	libavcodec/xvmc.h \
 	libavdevice/avdevice.h \
 	libavfilter/avfilter.h \
 	libavformat/avformat.h \
 	libavformat/avio.h \
 	libavutil/adler32.h \
 	libavutil/avstring.h \
 	libavutil/avutil.h \
 	libavutil/base64.h \
 	libavutil/common.h \
 	libavutil/crc.h \
 	libavutil/fifo.h \
 	libavutil/intfloat_readwrite.h \
 	libavutil/log.h \
 	libavutil/lzo.h \
 	libavutil/mathematics.h \
 	libavutil/md5.h \
 	libavutil/mem.h \
 	libavutil/pixfmt.h \
 	libavutil/rational.h \
 	libavutil/sha1.h \
 	libpostproc/postprocess.h \
 	libswscale/swscale.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
 
 DOC_FILES=	CREDITS INSTALL LICENSE MAINTAINERS README RELEASE
 # under doc subdirectory
 DOC_DOCFILES=	APIchanges RELEASE_NOTES TODO *.txt *.html
 
 .if ${PORT_OPTIONS:MFFSERVER}
 USE_RC_SUBR=	ffserver${FFMPEG_SUFFIX}
 PROGS+=		ffserver
 .endif
 
 # sse hardware vector support
 .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
 _BUILTIN_VECTOR=	yes
 .else
 CONFIGURE_ARGS+=	--disable-sse
 .endif
 
 # mmx support
 .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
 CONFIGURE_ARGS+=	--disable-mmx
 _NO_BUILTIN_VECTOR=	yes
 .endif
 
 # builtin vector, requires mmx and sse
 .if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
 CFLAGS+=	-msse
 .endif
 
 # optimizations
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
 .endif
 
 #aacplus
 .if ${PORT_OPTIONS:MAACPLUS}
 FFMPEG_NONFREE=	yes
 LIB_DEPENDS+=	libaacplus.so:audio/libaacplus
 CONFIGURE_ARGS+=	--enable-libaacplus
 .else
 CONFIGURE_ARGS+=	--disable-libaacplus
 .endif
 
 # Opencore AMR NB
 .if ${PORT_OPTIONS:MAMR_NB}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	libopencore-amrnb.so:audio/opencore-amr
 CONFIGURE_ARGS+=	--enable-libopencore-amrnb
 .else
 CONFIGURE_ARGS+=	--disable-libopencore-amrnb
 .endif
 
 # Opencore AMR WB
 .if ${PORT_OPTIONS:MAMR_WB}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	libopencore-amrwb.so:audio/opencore-amr
 CONFIGURE_ARGS+=	--enable-libopencore-amrwb
 .else
 CONFIGURE_ARGS+=	--disable-libopencore-amrwb
 .endif
 
 # faac
 .if ${PORT_OPTIONS:MFAAC}
 FFMPEG_NONFREE=	yes
 LIB_DEPENDS+=	libfaac.so:audio/faac
 CONFIGURE_ARGS+=	--enable-libfaac
 .else
 CONFIGURE_ARGS+=	--disable-libfaac
 .endif
 
 # rtmp
 .if ${PORT_OPTIONS:MRTMP}
 LIB_DEPENDS+=	librtmp.so:multimedia/librtmp
 CONFIGURE_ARGS+=	--enable-librtmp
 . if ${OPENSSLBASE} != "/usr"
 FFMPEG_CFLAGS+=		-I${OPENSSLINC}
 FFMPEG_LDFLAGS+=	-L${OPENSSLLIB}
 . endif
 .else
 CONFIGURE_ARGS+=	--disable-librtmp
 .endif
 
 # sdl
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL+=	sdl
 PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz
 PROGS+=		ffplay
 .else
 CONFIGURE_ARGS+=	--disable-ffplay
 .endif
 
 # vaapi
 .if ${PORT_OPTIONS:MVAAPI}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	libva.so:multimedia/libva
 CONFIGURE_ARGS+=	--enable-vaapi
 .else
 CONFIGURE_ARGS+=	--disable-vaapi
 .endif
 
 # vo-aacenc
 .if ${PORT_OPTIONS:MVO_AACENC}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	libvo-aacenc.so:audio/vo-aacenc
 CONFIGURE_ARGS+=	--enable-libvo-aacenc
 .else
 CONFIGURE_ARGS+=	--disable-libvo-aacenc
 .endif
 
 # vo-amrwbenc
 .if ${PORT_OPTIONS:MVO_AMRWBENC}
 FFMPEG_LICENSE_GPL3=	yes
 LIB_DEPENDS+=	libvo-amrwbenc.so:audio/vo-amrwbenc
 CONFIGURE_ARGS+=	--enable-libvo-amrwbenc
 .else
 CONFIGURE_ARGS+=	--disable-libvo-amrwbenc
 .endif
 
 # vorbis
 .if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	libvorbisenc.so:audio/libvorbis
 CONFIGURE_ARGS+=	--enable-libvorbis
 FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
 .else
 CONFIGURE_ARGS+=	--disable-libvorbis
 .endif
 
 # License knobs
 .if defined(FFMPEG_NONFREE)
 RESTRICTED=	linking to libfaac or libaacplus restricts redistribution
 CONFIGURE_ARGS+=	--enable-nonfree
 .endif
 
 .if defined(FFMPEG_LICENSE_GPL3)
 LICENSE+=		GPLv3+ LGPL3+
 LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING.GPLv3
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPLv3
 CONFIGURE_ARGS+=	--enable-version3
 .endif
 
 post-patch:
 # {C,LD}FLAGS safeness
 	@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/subdir.mak
 	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf|' \
 		${WRKSRC}/ffserver.c
 	@${REINPLACE_CMD} -E \
 		-e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|gsm/gsm.h|gsm.h|g" \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
 		-e 's|check_ldflags -Wl,--as-needed||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .if ${PORT_OPTIONS:MSDL}
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} ${WRKSRC} -type f | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E \
 		-e 's|#include <SDL|#include <SDL/SDL|'
 .endif
 
 post-configure:
 .if empty(PORT_OPTIONS:MTHEORA)
 	@${REINPLACE_CMD} -E \
 		-e 's|^(CONFIG_LIBTHEORA).*$$|\1=no|' \
 		${WRKSRC}/config.mak
 .endif
 	@${REINPLACE_CMD} -E \
 		-e 's|\$$\(INSTALL\) -m 644 \$$\(MANPAGES\) "\$$\(MANDIR\)/man1"||g' \
 			${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -E \
 		-e 's|\$$\$$\(INSTALL\) -m 644 \$$\$$\^ "\$$\(DESTDIR\)\$$\(prefix\)/libdata/pkgconfig"|\$$\$$\(INSTALL\) -m 644 \$$\$$\^ "\$$\(DESTDIR\)\$$\(prefix\)/libdata/pkgconfig/lib\$$\(NAME\)0.pc"|' \
 			${WRKSRC}/subdir.mak
 
 post-install:
 .if ${PORT_OPTIONS:MFFSERVER}
 	${INSTALL_DATA} ${WRKSRC}/doc/ffserver.conf ${STAGEDIR}${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf-dist
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for FILE in ${DOC_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for FILE in ${DOC_DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR}
 .endfor
 .for i in ${PROGS}
 	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${STAGEDIR}${MANPREFIX}/man/man1/${i}0.1
 .endfor
 	@${REINPLACE_CMD} \
 		-e 's|libavcodec|libavcodec0|' \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavformat0.pc
 	@${REINPLACE_CMD} \
 		-e 's|libavutil|libavutil0|' \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavcodec0.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpostproc0.pc \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libswscale0.pc
 	@${REINPLACE_CMD} \
 		-e 's|libavformat|libavformat0|' \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavdevice0.pc
 	@${RM}	${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavcodec0.pc.bak \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libpostproc0.pc.bak \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libswscale0.pc.bak \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavformat0.pc.bak \
 		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libavdevice0.pc.bak
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mplayer/Makefile.options
===================================================================
--- head/multimedia/mplayer/Makefile.options	(revision 451720)
+++ head/multimedia/mplayer/Makefile.options	(revision 451721)
@@ -1,69 +1,70 @@
 # $FreeBSD$
 #
 # Non-helper handling of option variables and build environment.
 # Include after bsd.port.pre.mk
 #
 # Almost all of mplayer's build-time configuration is controlled via the
 # OPTIONS framework. Exceptions are listed below. These variables must be
 # set via make.conf or by passing the variable to make during build, e.g.
 # make WITH_DVD_DEVICE=/dev/cd0
 #
 # WITH_DVD_DEVICE=/path/to/desired/device
 # default: /dev/cd0
 # This option changes the default device where mplayer looks by default
 # for a DVD medium
 #
 # WITH_CDROM_DEVICE=/path/to/desired/device
 # default: /dev/cd0
 # This option changes the default cdrom device, maybe useful for VCDs
 
 # Non-OPTIONS knob handling
 # =========================
 
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
 DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_CDROM_DEVICE)
 DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
 .else
 DEFAULT_CDROM_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_KERN_HZ)
 DEFAULT_KERN_HZ=${WITH_KERN_HZ}
 .else
 DEFAULT_KERN_HZ=1024
 .endif
 
 # Build system handling (including OPTIONS)
 # =========================================
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang-version
 # Require 16 byte stack realignment on i386 to interface
 # properly with hand crafted assembler code in ffmpeg
 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
 # =================================
 
 .if ${PORT_OPTIONS:MDEBUG}
 WITH_DEBUG=	yes
 CONFIGURE_ARGS+=	--enable-debug=3
 .endif
 
 # Win32 DLL codecs support on i386, mostly superseded by ffmpeg
 # =============================================================
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--codecsdir=${LOCALBASE}/lib/win32
 .else
 CONFIGURE_ARGS+=	--disable-win32dll \
 			--disable-qtx
 .endif
Index: head/net/appkonference/Makefile
===================================================================
--- head/net/appkonference/Makefile	(revision 451720)
+++ head/net/appkonference/Makefile	(revision 451721)
@@ -1,54 +1,54 @@
 # Created by: Alex Deiter <Alex.Deiter@Gmail.COM>
 # $FreeBSD$
 
 PORTNAME=	appkonference
 PORTVERSION=	2.7
 PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High-performance Asterisk voice/video conferencing plugin
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_CSTD=	gnu89
 USES=		compiler:features gmake
 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
 OPTIONS_DEFAULT=	ASTERISK13 OPTIMIZED_CFLAGS
 OPTIONS_SINGLE=		ASTERISK
 OPTIONS_SINGLE_ASTERISK=ASTERISK11 ASTERISK13
 
 ASTERISK_DESC=		Asterisk version
 ASTERISK11_DESC=	Asterisk 11.x support
 ASTERISK13_DESC=	Asterisk 13.x support
 
 ASTERISK11_BUILD_DEPENDS=	asterisk11>0:net/asterisk11
 ASTERISK11_RUN_DEPENDS=	asterisk11>0:net/asterisk11
 ASTERISK11_MAKE_ARGS=	ASTERISK_SRC_VERSION=1100
 
 ASTERISK13_BUILD_DEPENDS=	asterisk13>0:net/asterisk13
 ASTERISK13_RUN_DEPENDS=	asterisk13>0:net/asterisk13
 ASTERISK13_MAKE_ARGS=	ASTERISK_SRC_VERSION=1300
 
 OPTIMIZED_CFLAGS_CFLAGS=	-O3 -ffast-math
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && ${CHOSEN_COMPILER_TYPE} == gcc
 CFLAGS+=	-funroll-all-loops -fsingle-precision-constant
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 CFLAGS+=        -fblocks
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net/yate/Makefile
===================================================================
--- head/net/yate/Makefile	(revision 451720)
+++ head/net/yate/Makefile	(revision 451721)
@@ -1,99 +1,99 @@
 # Created by: Valery Komarov <komarov@valerka.net>
 # $FreeBSD$
 
 PORTNAME=	yate
 DISTVERSION=	5.5.0p1
 CATEGORIES=	net
 MASTER_SITES=	http://yate.null.ro/tarballs/yate5/
 DISTNAME=	${PORTNAME}-5.5.0-1
 
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	Yet Another Telephony Engine
 
 LICENSE=	GPLv2
 
 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 \
 		share/scripts/leavemail.php \
 		share/scripts/queue_in.php \
 		share/scripts/queue_out.php \
 		share/scripts/route.php \
 		share/scripts/voicemail.php
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--without-fdsize \
 		--without-libqt4 \
 		--with-zlib=/usr
 
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	yate
 USERS=		yate
 GROUPS=		yate
 
 OPTIONS_DEFINE=	AMRNB DOCS DAHDI H323 ILBC MYSQL PGSQL SCTP SPANDSP SQLITE SSL
 OPTIONS_DEFAULT=SCTP
 
 AMRNB_DESC=	Adaptive Multi-Rate Narrowband support
 DAHDI_DESC=	Dahdi support
 H323_DESC=	H323 software channel/protocol support
 ILBC_DESC=	iLBC narrowband speech codec support
 SCTP_DESC=	Stream Control Transmission Protocol support
 SPANDSP_DESC=	Spandsp faxing support
 
 OPTIONS_SUB=	yes
 
 AMRNB_CONFIGURE_WITH=	amrnb=${LOCALBASE}
 AMRNB_LIB_DEPENDS=	libamrnb.so:audio/libamrnb
 
 DAHDI_CONFIGURE_ENABLE=	dahdi
 DAHDI_BUILD_DEPENDS=	libpri>=1.4.10:misc/libpri \
 			${LOCALBASE}/include/dahdi/user.h:misc/dahdi
 DAHDI_LIB_DEPENDS=	libpri.so:misc/libpri \
 			libopenr2.so:misc/openr2
 
 H323_CONFIGURE_WITH=	openh323=${LOCALBASE}
 H323_LIB_DEPENDS=	libopenh323.so:net/h323plus
 
 ILBC_CONFIGURE_ENABLE=	ilbc
 ILBC_LIB_DEPENDS=	libilbc.so:net/ilbc
 
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_USE=		mysql=yes
 
 SSL_CONFIGURE_WITH=	openssl=${OPENSSLBASE}
 SSL_USES=		ssl
 
 PGSQL_CONFIGURE_WITH=	libpq=${LOCALBASE}
 PGSQL_USES=		pgsql
 
 SCTP_CONFIGURE_ENABLE=	sctp
 
 SPANDSP_CONFIGURE_WITH=	spandsp
 SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
 
 SQLITE_CONFIGURE_WITH=	sqlite
 SQLITE_USES=		pkgconfig sqlite
 
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/yate
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libyate*.so.5.5.0
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/*.yate
 .for dir in client server jabber sip
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/${dir}/*.yate
 .endfor
 
 .include <bsd.port.mk>
Index: head/net-mgmt/kapacitor/Makefile
===================================================================
--- head/net-mgmt/kapacitor/Makefile	(revision 451720)
+++ head/net-mgmt/kapacitor/Makefile	(revision 451721)
@@ -1,65 +1,65 @@
 # Created by: Stefan Lambrev <cheffo@freebsd-bg.org>
 # $FreeBSD$
 
 PORTNAME=	kapacitor
 PORTVERSION=	1.2.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	cheffo@freebsd-bg.org
 COMMENT=	Time-series data collection
 
 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
 
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	influxdata:DEFAULT
 
 # This should work, but go gets confused with the symlinks.
 #GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 
 SUB_FILES=	kapacitord
 SUB_LIST+=	KAPACITORD_PIDDIR=${KAPACITORD_PIDDIR}
 PLIST_SUB=	KAPACITORD_PIDDIR=${KAPACITORD_PIDDIR}
 
 STRIP=		# stripping can break go binaries
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 	@cd ${WRKSRC} && ${MV} \
 	alert alert.go auth batch.go BLOB_STORE_DESIGN.md bufpool build.py \
 	build.sh CHANGELOG.md circle-test.sh circle.yml client clock cmd \
 	combine_test.go combine.go command CONTRIBUTING.md default.go delete.go \
 	derivative.go DESIGN.md doc.go Dockerfile_build_ubuntu32 \
 	Dockerfile_build_ubuntu64 Dockerfile_build_ubuntu64_git edge_test.go \
 	edge.go etc eval.go examples expr.go expvar flatten.go gobuild.sh \
 	group_by.go http_out.go influxdb influxdb_out.go influxql.gen.go \
 	influxql.gen.go.tmpl influxql.go integrations join.go k8s_autoscale.go \
 	LICENSE LICENSE_OF_DEPENDENCIES.md list-deps log.go metaclient.go \
 	models node.go noop.go output.go pipeline query_test.go query.go \
 	README.md replay.go result.go sample.go scripts server services \
 	shift.go stats.go stream.go task_master.go task.go template.go \
 	test.sh tick tickdoc.conf timer tmpldata udf udf_test.go udf.go \
 	union.go update_tick_docs.sh usr vars vendor vendor.list vendor.sh \
 	where.go window_test.go window.go \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
 do-build:
 	@cd ${WRKSRC}/src/github.com/influxdata/${PORTNAME} \
 		&& ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME} \
 		&& ${SETENV} GOPATH=${WRKSRC} go install -ldflags "-X main.version=${DISTVERSION}" ./cmd/${PORTNAME}d
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME}d ${STAGEDIR}${PREFIX}/bin/${PORTNAME}d
 	${INSTALL_DATA} \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/${PORTNAME}/${PORTNAME}.conf  \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 .include <bsd.port.mk>
Index: head/science/openkim/Makefile
===================================================================
--- head/science/openkim/Makefile	(revision 451720)
+++ head/science/openkim/Makefile	(revision 451721)
@@ -1,51 +1,51 @@
 # Created by: Jason Bacon
 # $FreeBSD$
 
 PORTNAME=	openkim
 PORTVERSION=	1.1.1
 PORTREVISION=	5
 CATEGORIES=	science
 MASTER_SITES=	http://s3.openkim.org/openkim-api/
 DISTNAME=	${PORTNAME}-api-v${PORTVERSION}
 
 MAINTAINER=	bacon4000@gmail.com
 COMMENT=	Knowledgebase of Interatomic Models
 
 LICENSE=	CDDL
 
 MAKE_ENV+=	KIM_DIR=${WRKSRC}
 
 USES=		gmake fortran tar:tgz
 
 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
 
 post-patch:
 	${REINPLACE_CMD} \
 		-e "s|gcc|${CC}|g" \
 		-e "s|g++|${CXX}|g" \
 		-e "s|= gfortran|= ${FC}|g" \
 		-e "s|-O3|${CFLAGS}|g" \
 		-e "s|LINKLIBFLAG =|LINKLIBFLAG = ${LDFLAGS}|" \
 		${WRKSRC}/KIM_API/GNU_compiler_settings.mk
 
 # Required for main build to succeed
 pre-build:
 	(cd ${WRKSRC} && ${MAKE_CMD} KIM_DIR=${WRKSRC} examples)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/include/KIM_API
 	${INSTALL_DATA} ${WRKSRC}/KIM_API/libkim.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/KIM_API/*.h ${STAGEDIR}${PREFIX}/include/KIM_API
 
 regression-test:
 	(cd ${WRKSRC}/TESTs/ex_test_Ar_free_cluster_CLUSTER_F90 && \
 	${ECHO_CMD} "ex_model_Ar_P_MLJ_CLUSTER_C" | ./ex_test_Ar_free_cluster_CLUSTER_F90)
 
 .include <bsd.port.mk>
Index: head/security/cryptlib/Makefile
===================================================================
--- head/security/cryptlib/Makefile	(revision 451720)
+++ head/security/cryptlib/Makefile	(revision 451721)
@@ -1,46 +1,46 @@
 # Created by: Foxfair Hu <foxfair@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=		cryptlib
 PORTVERSION=		3.4.3
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.franken.de/pub/crypt/cryptlib/
 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
 
 USES=			zip:infozip
 EXTRACT_BEFORE_ARGS=	-aq
 NO_WRKSUBDIR=		yes
 MAKEFILE=		makefile
 ALL_TARGET=		default FreeBSD shared
 USE_LDCONFIG=		yes
 MAKE_JOBS_UNSAFE=	yes
 CFLAGS+=		-DUSE_PKCS11
 
 PLIST_FILES=		include/cryptlib.h \
 			lib/libcl.a lib/libcl.so \
 			lib/libcl.so.3 lib/libcl.so.${PORTVERSION}
 
 PORTDOCS=		README
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%%CFLAGS%%/${CFLAGS}/' ${WRKSRC}/makefile
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libcl.a ${WRKSRC}/libcl.so.${PORTVERSION} \
 		${STAGEDIR}${PREFIX}/lib
 	${LN} -sf libcl.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcl.so.3
 	${LN} -sf libcl.so.3 ${STAGEDIR}${PREFIX}/lib/libcl.so
 	${INSTALL_DATA} ${WRKSRC}/cryptlib.h ${STAGEDIR}${PREFIX}/include
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/py-cryptlib_py/Makefile
===================================================================
--- head/security/py-cryptlib_py/Makefile	(revision 451720)
+++ head/security/py-cryptlib_py/Makefile	(revision 451721)
@@ -1,28 +1,28 @@
 # Created by: Yuri Victorovich <yuri@rawbw.com>
 # $FreeBSD$
 
 PORTNAME=	cryptlib_py
 PORTVERSION=	3.4.3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.franken.de/pub/crypt/cryptlib/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	cl${PORTVERSION:S/.//g}
 
 MAINTAINER=	yuri@rawbw.com
 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
 
 LIB_DEPENDS+=	libcl.so:security/cryptlib
 
 BUILD_WRKSRC=	${WRKSRC}/bindings
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
Index: head/sysutils/cloudabi-utils/Makefile
===================================================================
--- head/sysutils/cloudabi-utils/Makefile	(revision 451720)
+++ head/sysutils/cloudabi-utils/Makefile	(revision 451721)
@@ -1,37 +1,37 @@
 # Created by: Ed Schouten <ed@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cloudabi-utils
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.30
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	ed@FreeBSD.org
 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 \
 		${LOCALBASE}/include/flower/protocol/switchboard.ad.h:net/flower \
 		${LOCALBASE}/include/yaml2argdata/yaml_builder.h:devel/yaml2argdata
 LIB_DEPENDS=	libargdata.so:devel/argdata \
 		libarpc.so:devel/arpc \
 		libyaml-cpp.so:devel/yaml-cpp
 
 USES=		cmake localbase:ldflags pkgconfig tar:xz
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	NuxiNL
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100511
 IGNORE=		requires various C++17 features
 .endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/syslinux/Makefile
===================================================================
--- head/sysutils/syslinux/Makefile	(revision 451720)
+++ head/sysutils/syslinux/Makefile	(revision 451721)
@@ -1,47 +1,47 @@
 # Created by: luigi@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	syslinux
 PORTVERSION=	6.03
 CATEGORIES=	sysutils
 MASTER_SITES=	KERNEL_ORG/linux/utils/boot/syslinux
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Boot loader for the Linux operating system
 
 LICENSE=	GPLv2
 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
 USE_PERL5=	build
 MAKE_ARGS=	CC="${CC}"
 ALL_TARGET=	bios
 
 PLIST_FILES=	bin/syslinux \
 		man/man1/syslinux.1.gz
 PORTDATA=	*
 
 pre-patch:
 	@(cd ${WRKSRC}; 						\
 	${FIND} . -type f -exec ${GREP} -le 'elf_i386' \{\} \; | 	\
 		${XARGS} ${REINPLACE_CMD} -e 's/elf_i386/elf_i386_fbsd/g;' )
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^UMAKEDEPS|#UMAKEDEPS|' ${WRKSRC}/mk/syslinux.mk
 
 do-install:
 	${STRIP_CMD} ${WRKSRC}/bios/mtools/syslinux
 	${INSTALL_PROGRAM} ${WRKSRC}/bios/mtools/syslinux ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/man/syslinux.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${FIND} -d ${WRKSRC} -type d -empty -delete
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "bios efi32 efi64" ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
Index: head/sysutils/yum/Makefile
===================================================================
--- head/sysutils/yum/Makefile	(revision 451720)
+++ head/sysutils/yum/Makefile	(revision 451721)
@@ -1,87 +1,87 @@
 # Created by: Anders F Bjorklund <afb@rpm5.org>
 # $FreeBSD$
 
 PORTNAME=	yum
 PORTVERSION=	3.4.3
 PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://yum.baseurl.org/download/${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Installer/updater for rpm
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:shells/bash \
 		intltool-update:textproc/intltool
 RUN_DEPENDS=	bash:shells/bash \
 		${PYTHON_SITELIBDIR}/rpm/__init__.py:archivers/rpm4 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/sqlitecachec.py:devel/py-yum-metadata-parser \
 		${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
 SHEBANG_FILES=	etc/yum-updatesd.init
 CPE_VENDOR=	baseurl
 
 MAKE_ARGS=	MAKE=${MAKE_CMD} PYTHON=${PYTHON_CMD} \
 		prefix=${PREFIX} mandir=${MANPREFIX}/man sysconfdir=${PREFIX}/etc
 
 RPMDIR?=	/var/lib/rpm
 
 post-patch:
 	${REINPLACE_CMD} -e 's|@PREFIX@|${PREFIX}|g' -e \
 	's|@RPMDIR@|${RPMDIR}|g' -e \
 	's|@LOCALBASE@|${LOCALBASE}|g' \
 		${WRKSRC}/bin/yum.py \
 		${WRKSRC}/bin/yum-updatesd.py \
 		${WRKSRC}/cli.py \
 		${WRKSRC}/yum-updatesd.py \
 		${WRKSRC}/yum/__init__.py \
 		${WRKSRC}/yum/config.py \
 		${WRKSRC}/yum/rpmsack.py \
 		${WRKSRC}/yum/plugins.py
 	${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!${PYTHON_CMD}|' \
 		${WRKSRC}/bin/yum.py \
 		${WRKSRC}/bin/yum-updatesd.py \
 		${WRKSRC}/callback.py \
 		${WRKSRC}/cli.py \
 		${WRKSRC}/output.py \
 		${WRKSRC}/yumcommands.py \
 		${WRKSRC}/yummain.py \
 		${WRKSRC}/yum-updatesd.py \
 		${WRKSRC}/utils.py \
 		${WRKSRC}/rpmUtils/__init__.py \
 		${WRKSRC}/rpmUtils/arch.py \
 		${WRKSRC}/rpmUtils/miscutils.py \
 		${WRKSRC}/rpmUtils/oldUtils.py \
 		${WRKSRC}/rpmUtils/transaction.py \
 		${WRKSRC}/rpmUtils/updates.py \
 		${WRKSRC}/yum/__init__.py \
 		${WRKSRC}/yum/Errors.py \
 		${WRKSRC}/yum/callbacks.py \
 		${WRKSRC}/yum/config.py \
 		${WRKSRC}/yum/depsolve.py \
 		${WRKSRC}/yum/failover.py \
 		${WRKSRC}/yum/history.py \
 		${WRKSRC}/yum/i18n.py \
 		${WRKSRC}/yum/metalink.py \
 		${WRKSRC}/yum/packageSack.py \
 		${WRKSRC}/yum/packages.py \
 		${WRKSRC}/yum/pkgtag_db.py \
 		${WRKSRC}/yum/repoMDObject.py \
 		${WRKSRC}/yum/repos.py \
 		${WRKSRC}/yum/rpmsack.py \
 		${WRKSRC}/yum/rpmtrans.py \
 		${WRKSRC}/yum/sqlitesack.py \
 		${WRKSRC}/yum/sqlutils.py \
 		${WRKSRC}/yum/update_md.py
 	${REINPLACE_CMD} -e 's|%%PYTHONPREFIX_SITELIBDIR%%|${PYTHONPREFIX_SITELIBDIR}|' \
 		${WRKSRC}/yum/Makefile ${WRKSRC}/rpmUtils/Makefile
 
 .include <bsd.port.mk>
Index: head/www/node/Makefile
===================================================================
--- head/www/node/Makefile	(revision 451720)
+++ head/www/node/Makefile	(revision 451721)
@@ -1,114 +1,114 @@
 # $FreeBSD$
 
 PORTNAME=	node
 PORTVERSION=	8.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 
 MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS DTRACE
 OPTIONS_DEFAULT=DTRACE
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFAULT_FreeBSD_10=	BUNDLED_SSL
 OPTIONS_DEFAULT+=		${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 OPTIONS_EXCLUDE_aarch64=	DTRACE
 
 BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation
 BUNDLED_SSL_USES_OFF=		ssl
 BUNDLED_SSL_CONFIGURE_OFF=	--shared-openssl --openssl-use-def-ca-store
 BUNDLED_SSL_RUN_DEPENDS_OFF=	ca_root_nss>=0:security/ca_root_nss
 
 NLS_CONFIGURE_ON=	--with-intl=system-icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
 DTRACE_CONFIGURE_ON=	--with-dtrace
 
 USES=		compiler:c++11-lib gmake python:2,build pkgconfig \
 		localbase shebangfix
 
 HAS_CONFIGURE=	yes
 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 \
 		--shared-cares \
 		--shared-libuv \
 		--shared-zlib
 
 SHEBANG_FILES=	tools/specialize_node_d.py tools/genv8constants.py
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 REINPLACE_ARGS=	-i ''
 MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 
 LIB_DEPENDS+=	libcares.so:dns/c-ares\
 		libuv.so:devel/libuv
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
 IGNORE=		node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf or enable BUNDLED_SSL option
 .endif
 
 .if !empty(SSL_DEFAULT:Mlibressl*)
 IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
 .endif
 
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
 .if ${COMPILER_TYPE} == gcc
 # GCC does not expose std::snprintf() without this define
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/deps/v8/src/v8.gyp
 	# So many different ways to run python. Fix them all.
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -type f -name '*.gyp*' -print0 \
 		| ${XARGS} -0 ${REINPLACE_CMD} \
 			-e "s|'python'|'${PYTHON_CMD}'|" \
 			-e 's|<!(python |<!(${PYTHON_CMD} |' \
 			-e 's|\&\& python |\&\& ${PYTHON_CMD} |'
 
 post-configure:
 	# Post-process Makefile and *.mk files created by node-gyp and remove
 	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
 	# before all -I../deps/* for bundled code. This can cause build
 	# breakages if the dependency is installed in ${LOCALBASE}. The
 	# USES+=localbase # above will ensure that we pick up includes for real
 	# external dependencies.
 	${FIND} ${WRKSRC}/out -type f -print0 \
 		| ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
 .include <bsd.port.post.mk>
Index: head/www/node6/Makefile
===================================================================
--- head/www/node6/Makefile	(revision 451720)
+++ head/www/node6/Makefile	(revision 451721)
@@ -1,113 +1,113 @@
 # $FreeBSD$
 
 PORTNAME=	node
 PORTVERSION=	6.11.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	bhughes@FreeBSD.org
 COMMENT=	V8 JavaScript for client and server (6.x)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	BUNDLED_SSL DOCS NLS DTRACE
 OPTIONS_DEFAULT=DTRACE
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFAULT_FreeBSD_10=	BUNDLED_SSL
 OPTIONS_DEFAULT+=		${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}}
 
 .if !exists(/usr/sbin/dtrace)
 OPTIONS_EXCLUDE+=	DTRACE
 .endif
 
 OPTIONS_EXCLUDE_FreeBSD_10=	DTRACE
 
 BUNDLED_SSL_DESC=		Use node.js's bundled OpenSSL implementation #'
 BUNDLED_SSL_USES_OFF=		ssl
 BUNDLED_SSL_CONFIGURE_OFF+=	--shared-openssl
 
 NLS_CONFIGURE_ON=	--with-intl=system-icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
 DTRACE_CONFIGURE_ON=	--with-dtrace
 
 USES=		compiler:c++11-lib gmake python:2,build pkgconfig \
 		localbase shebangfix
 
 HAS_CONFIGURE=	yes
 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 \
 		--shared-cares \
 		--shared-libuv \
 		--shared-zlib
 
 SHEBANG_FILES=	tools/specialize_node_d.py tools/genv8constants.py
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 REINPLACE_ARGS=	-i ''
 MAKE_ENV+=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 
 LIB_DEPENDS+=	libcares.so:dns/c-ares\
 		libuv.so:devel/libuv
 
 .include <bsd.port.options.mk>
 
 .if empty(PORT_OPTIONS:MBUNDLED_SSL)
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100085 && ${SSL_DEFAULT} == base
 IGNORE=		node.js requires openssl 1.0.2, add DEFAULT_VERSIONS+=ssl=openssl to /etc/make.conf or enable BUNDLED_SSL option
 .endif
 
 .if !empty(SSL_DEFAULT:Mlibressl*)
 IGNORE=		cannot build node.js with LibreSSL. You must enable BUNDLED_SSL
 .endif
 
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ARGS+=--openssl-no-asm
 .endif
 
 .if ${COMPILER_TYPE} == gcc
 # GCC does not expose std::snprintf() without this define
 CXXFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/deps/v8/tools/gyp/v8.gyp
 	# So many different ways to run python. Fix them all.
 	@${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -type f -name '*.gyp*' -print0 \
 		| ${XARGS} -0 ${REINPLACE_CMD} \
 			-e "s|'python'|'${PYTHON_CMD}'|" \
 			-e 's|<!(python |<!(${PYTHON_CMD} |' \
 			-e 's|\&\& python |\&\& ${PYTHON_CMD} |'
 
 post-configure:
 	# Post-process Makefile and *.mk files created by node-gyp and remove
 	# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
 	# before all -I../deps/* for bundled code. This can cause build
 	# breakages if the dependency is installed in ${LOCALBASE}. The
 	# USES+=localbase # above will ensure that we pick up includes for real
 	# external dependencies.
 	${FIND} ${WRKSRC}/out -type f -print0 \
 		| ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
 
 .include <bsd.port.post.mk>
Index: head/x11-wm/blackbox/Makefile
===================================================================
--- head/x11-wm/blackbox/Makefile	(revision 451720)
+++ head/x11-wm/blackbox/Makefile	(revision 451721)
@@ -1,53 +1,53 @@
 # Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
 
 PORTNAME=	blackbox
 PORTVERSION=	0.70.1
 PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/${PORTNAME}wm/${PORTNAME}wm/Blackbox%20${PORTVERSION}
 
 MAINTAINER=	A.J.Caines@halplant.com
 COMMENT=	Small and fast window manager for X11R6
 
 LICENSE=	MIT
 
 GNU_CONFIGURE=	yes
 USES=		pathfix pkgconfig iconv
 USE_XORG=	x11 xft
 LDFLAGS+=	${ICONV_LIB}
 
 PORTDOCS=	README.bbtools README.bsetbg
 
 OPTIONS_DEFINE=		TOOLS_ONLY
 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
 
 .if ${PORT_OPTIONS:MTOOLS_ONLY}
 PKGNAMESUFFIX=	-tools
 COMMENT+=	(tools only)
 MAKE_ARGS=	SUBDIRS="doc lib util" bin_PROGRAMS=bsetroot
 INSTALL_TARGET=	-C util install		# XXX dirty hack :(
 .else
 PORTDOCS+=	AUTHORS COMPLIANCE ChangeLog README RELNOTES TODO
 .endif
 
 post-patch:
 # Fix the build with libX11 > 1.40
 	@${REINPLACE_CMD} -e 's/_XUTIL_H_/_X11&/' ${WRKSRC}/lib/Util.hh
 
 post-install:
 .if ${PORT_OPTIONS:MTOOLS_ONLY}
 	@${REINPLACE_CMD} -E '/[^s]\/blackbox|bstyleconvert|lib|include/d' \
 		${TMPPLIST}
 	${INSTALL_MAN} ${MAN1:S#^#${WRKSRC}/doc/#} ${STAGEDIR}${MANPREFIX}/man/man1
 .endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S#^#${WRKSRC}/#} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>