Index: head/devel/sonar-ant-task/Makefile
===================================================================
--- head/devel/sonar-ant-task/Makefile	(revision 529171)
+++ head/devel/sonar-ant-task/Makefile	(revision 529172)
@@ -1,41 +1,41 @@
 # Created by: Dusan Vejnovic <freebsd@dussan.org>
 # $FreeBSD$
 
 PORTNAME=	sonar-ant-task
 PORTVERSION=	2.5
 CATEGORIES=	devel java
 MASTER_SITES=	https://sonarsource.bintray.com/Distribution/sonarqube-ant-task/ \
 			LOCAL/ler/sonar-ant-task
 DISTNAME=	sonarqube-ant-task-${PORTVERSION}
 EXTRACT_SUFX=	.jar
 EXTRACT_ONLY=
 
-MAINTAINER=	freebsd@dussan.org
+MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	SonarQube Plugin for analysis projects with an Apache Ant
 
 LICENSE=	LGPL3
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 RUN_DEPENDS+=	ant:devel/apache-ant
 
 USES=		cpe
 CPE_VENDOR=	sonarsource
 
 USE_JAVA=	yes
 
 SUB_FILES=	pkg-message
 PLIST_FILES=	${DATADIR_REL}/sonar-ant-task.jar
 
 OPTIONS_DEFINE=	SQ
 SQ_DESC=	SonarQube server support
 SQ_RUN_DEPENDS=	sonarqube>=0:devel/sonarqube
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} \
 		${STAGEDIR}${DATADIR}/${PORTNAME}${EXTRACT_SUFX}
 
 .include <bsd.port.mk>
Index: head/devel/sonar-scanner-cli/Makefile
===================================================================
--- head/devel/sonar-scanner-cli/Makefile	(revision 529171)
+++ head/devel/sonar-scanner-cli/Makefile	(revision 529172)
@@ -1,50 +1,50 @@
 # Created by: Dusan Vejnovic <freebsd@dussan.org>
 # $FreeBSD$
 
 PORTNAME=	sonar-scanner-cli
 PORTVERSION=	2.8
 PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	https://sonarsource.bintray.com/Distribution/${PORTNAME}/
 DISTNAME=	sonar-scanner-${PORTVERSION}
 
-MAINTAINER=	freebsd@dussan.org
+MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Launcher for analyzing projects with SonarQube
 
 BROKEN=		unfetchable
 
 LICENSE=	LGPL3
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USES=		cpe zip
 CPE_VENDOR=	sonarsource
 
 USE_JAVA=	yes
 
 SR=		sonar-runner
 SQ_CLI=		sonar-scanner
 SQ_ARCH=	x86-${ARCH:S/i386/32/:S/amd64/64/}
 SQ=		${PREFIX}/sonarqube/bin/freebsd-${SQ_ARCH}
 
 SUB_FILES=	pkg-message
 PLIST_SUB=	SR_HOME=${PREFIX}/${PORTNAME}
 
 OPTIONS_DEFINE=	SQ
 SQ_DESC=	SonarQube server support
 SQ_RUN_DEPENDS=	${SQ}/sonar.sh.sample:devel/sonarqube
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${PORTNAME})
 	@${MV} -f ${STAGEDIR}${PREFIX}/${PORTNAME}/conf/${SQ_CLI}.properties \
 	 ${STAGEDIR}${PREFIX}/${PORTNAME}/conf/${SQ_CLI}.properties.sample
 
 post-install:
 	@${LN} -f ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${SR} \
 	 ${STAGEDIR}${PREFIX}/bin/${SR}
 	@${LN} -f ${STAGEDIR}${PREFIX}/${PORTNAME}/bin/${SQ_CLI} \
 	 ${STAGEDIR}${PREFIX}/bin/${SQ_CLI}
 
 .include <bsd.port.mk>
Index: head/devel/sonarqube/Makefile
===================================================================
--- head/devel/sonarqube/Makefile	(revision 529171)
+++ head/devel/sonarqube/Makefile	(revision 529172)
@@ -1,90 +1,90 @@
 # Created by: Dusan Vejnovic <freebsd@dussan.org>
 # $FreeBSD$
 
 PORTNAME=	sonarqube
 PORTVERSION=	6.2
 CATEGORIES=	devel www java
 MASTER_SITES=	http://sonarsource.bintray.com/Distribution/sonarqube/
 
-MAINTAINER=	freebsd@dussan.org
+MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Platform for continuous inspection of code quality
 
 BROKEN=		unfetchable
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libbiconv.so:converters/iconv
 RUN_DEPENDS=	javaservicewrapper:sysutils/javaservicewrapper
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USE_RC_SUBR=	${PORTNAME}
 USERS=		www
 GROUPS=		www
 
 USES=		cpe dos2unix zip
 CPE_VENDOR=	sonarsource
 DOS2UNIX_GLOB=	*.properties *.conf
 
 USE_JAVA=	yes
 
 SQ_FILE=	sonar.sh
 SQ_HOME=	${PREFIX}/share/${PORTNAME}
 SQ_DB_DIR=	/var/db/${PORTNAME}
 SQ_LOG_DIR=	/var/log/${PORTNAME}
 SQ_LOG_FILE=	${PORTNAME}.log
 SQ_JSW=		${PREFIX}/lib/javaservicewrapper
 
 SUB_LIST+=	SQ_DB_DIR=${SQ_DB_DIR} \
 			SQ_GROUP=${GROUPS} \
 			SQ_LOG_DIR=${SQ_LOG_DIR} \
 			SQ_LOG_FILE=${SQ_LOG_FILE} \
 			SQ_RC=${PORTNAME} \
 			SQ_RUN=${SQ_HOME}/bin/freebsd/${SQ_FILE} \
 			SQ_USER=${USERS}
 PLIST_SUB+=	SQ_DB_DIR=${SQ_DB_DIR} \
 			SQ_GROUP=${GROUPS} \
 			SQ_HOME=${SQ_HOME} \
 			SQ_LOG_DIR=${SQ_LOG_DIR} \
 			SQ_USER=${USERS}
 
 OPTIONS_RADIO=		SQL
 OPTIONS_RADIO_SQL=	MYSQL PGSQL
 
 MYSQL_USES=	mysql
 PGSQL_USES=	pgsql
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DIR%%|${SQ_HOME}|' \
 		-e 's|%%LIB%%|${SQ_JSW}|' \
 		-e 's|%%LOG%%|${SQ_LOG_DIR}/${SQ_LOG_FILE}|' \
 		-e 's|%%LOGDIR%%|${SQ_LOG_DIR}|' \
 		-e 's|%%DBDIR%%|${SQ_DB_DIR}|' \
 		-e 's|%%WRAPPER_JAR%%|${SQ_JSW}/lib/wrapper.jar|' \
 		${WRKSRC}/conf/wrapper.conf ${WRKSRC}/conf/sonar.properties
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${SQ_HOME}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${SQ_HOME})
 	@${MKDIR} ${STAGEDIR}${SQ_HOME}/bin/freebsd/lib
 	@${CP} ${STAGEDIR}${SQ_HOME}/bin/linux-x86-64/${SQ_FILE} \
 		${STAGEDIR}${SQ_HOME}/bin/freebsd
 	@${REINPLACE_CMD} -e 's|#RUN_AS_USER=|RUN_AS_USER=${USERS}|' \
 		-e 's|-p $$pid -o args|ww $$pid|' \
 		-e 's|=\"./wrapper\"|=\"${SQ_JSW}/bin/wrapper\"|' \
 		${STAGEDIR}${SQ_HOME}/bin/freebsd/${SQ_FILE}
 	@${MV} -f ${STAGEDIR}${SQ_HOME}/bin/freebsd/${SQ_FILE} \
 		${STAGEDIR}${SQ_HOME}/bin/freebsd/${SQ_FILE}.sample
 	@${MV} -f ${STAGEDIR}${SQ_HOME}/conf/sonar.properties \
 		${STAGEDIR}${SQ_HOME}/conf/sonar.properties.sample
 	@${MV} -f ${STAGEDIR}${SQ_HOME}/conf/wrapper.conf \
 	${STAGEDIR}${SQ_HOME}/conf/wrapper.conf.sample
 	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/linux-x86-32
 	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/linux-x86-64
 	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/macosx-universal-64
 	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/windows-x86-32
 	@${RM} -drf ${STAGEDIR}${SQ_HOME}/bin/windows-x86-64
 
 .include <bsd.port.mk>