Index: head/databases/opentsdb/Makefile
===================================================================
--- head/databases/opentsdb/Makefile	(revision 433830)
+++ head/databases/opentsdb/Makefile	(revision 433831)
@@ -1,63 +1,63 @@
 # Created by: Johannes Meixner <johannes@perceivon.net>
 # $FreeBSD$
 
 PORTNAME=	opentsdb
 PORTVERSION=	2.3.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
 
-MAINTAINER=	kbowling@freebsd.org
+MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	OpenTSDB is the Scalable Timeseries Database
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	bash:shells/bash \
 		curl:ftp/curl \
 		gawk:lang/gawk
 LIB_DEPENDS=	libhadoop.so:devel/hadoop2
 RUN_DEPENDS=	hbase>0:databases/hbase
 
 USES=		gmake python shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 SHEBANG_FILES=	tools/check_tsd tools/opentsdb_restart.py \
 		tools/tsddrain.py
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		GNUPLOT
 OPTIONS_DEFAULT=	GNUPLOT
 
 GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
 
 HAS_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 OPENTSDB_LOGDIR=	/var/log/${PORTNAME}
 OPENTSDB_RUNDIR=	/var/run/${PORTNAME}
 
 OPENTSDB_USER=	opentsdb
 OPENTSDB_GROUP=	opentsdb
 
 USERS=		${OPENTSDB_USER}
 GROUPS=		${OPENTSDB_GROUP}
 
 USE_RC_SUBR=	opentsdb
 
 SUB_LIST=	OPENTSDB_USER="${OPENTSDB_USER}" \
 		OPENTSDB_LOGDIR="${OPENTSDB_LOGDIR}" \
 		OPENTSDB_RUNDIR="${OPENTSDB_RUNDIR}"
 
 post-patch:
 	${REINPLACE_CMD} -i "" -e "s|python|${PYTHON_CMD}|" ${WRKSRC}/build-aux/gen_build_data.sh
 	${REINPLACE_CMD} -i "" -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/src/utils/Config.java
 	${REINPLACE_CMD} -e "s#%%JAVA_VERSION%%#${JAVA_VERSION}#" ${WRKSRC}/tsdb.in
 	${REINPLACE_CMD} -i "" -e "s|tsd.http.staticroot =|tsd.http.staticroot = ${DATADIR}/static|; s|tsd.http.cachedir =|tsd.http.cachedir = /tmp/opentsdb|; s|tsd.network.port =|tsd.network.port = 4242|;" ${WRKSRC}/src/opentsdb.conf
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${OPENTSDB_LOGDIR} ${STAGEDIR}${OPENTSDB_RUNDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/logback.xml ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/src/opentsdb.conf ${STAGEDIR}${ETCDIR}/opentsdb.conf.sample
 	(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s share/${PORTNAME}/static -name \*cache.html) >> ${TMPPLIST}
 
 .include <bsd.port.mk>
Index: head/devel/oclgrind/Makefile
===================================================================
--- head/devel/oclgrind/Makefile	(revision 433830)
+++ head/devel/oclgrind/Makefile	(revision 433831)
@@ -1,32 +1,32 @@
 # Created by: Johannes Dieterich <jmd@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	oclgrind
 PORTVERSION=	20170122
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
-MAINTAINER=	jmd@freebsd.org
+MAINTAINER=	jmd@FreeBSD.org
 COMMENT=	SPIR interpreter and virtual OpenCL device simulator
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	opencl>=0:devel/opencl \
 		llvm-config40:devel/llvm40
 LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 RUN_DEPENDS=	opencl>=0:devel/opencl
 
 BROKEN_FreeBSD_10=	oclgrind is only supported on FreeBSD 11.0 and newer, crashes LLVM 3.4
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrprice
 GH_PROJECT=	Oclgrind
 GH_TAGNAME=	b777367
 
 USE_LDCONFIG=	yes
 USES=		cmake
 
 CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm40/share/llvm/cmake
 
 .include <bsd.port.mk>