--- net-mgmt/pushgateway/Makefile	(revision 485326)
+++ net-mgmt/pushgateway/Makefile	(working copy)
@@ -1,33 +1,39 @@ 
 # Created by: Athanasios Douitsis <aduitsis@cpan.org>
 # $FreeBSD$
 
 PORTNAME=	pushgateway
-PORTVERSION=	0.3.1
-PORTREVISION=	1
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.6.0
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	aduitsis@cpan.org
 COMMENT=	Prometheus push acceptor for ephemeral and batch jobs
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		go gmake
 GH_ACCOUNT=	prometheus
 USE_GITHUB=	yes
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 USE_RC_SUBR=	pushgateway
 
 USERS=		prometheus
 GROUPS=		prometheus
 
 do-build:
-	@(cd ${GO_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${GO_ENV} go install)
+	cd ${GO_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install
 
 do-install:
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/pushgateway ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/${PORTNAME}
 
+pre-test:
+	${LN} -sf ${WRKSRC}/vendor ${WRKSRC}/src
+
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} GOPATH="${WRKDIR}:${WRKSRC}:${LOCAL_GOPATH}" ${GMAKE} test
+
 .include <bsd.port.mk>
--- net-mgmt/pushgateway/distinfo	(revision 485326)
+++ net-mgmt/pushgateway/distinfo	(working copy)
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1486461319
-SHA256 (prometheus-pushgateway-v0.3.1_GH0.tar.gz) = 6b0fffd0ffd05babbcfd8838027e4bad8ee4d91aeaca705aa83d7ddf1f8bb6c6
-SIZE (prometheus-pushgateway-v0.3.1_GH0.tar.gz) = 1140371
+TIMESTAMP = 1543574321
+SHA256 (prometheus-pushgateway-v0.6.0_GH0.tar.gz) = 4a905e54ee8f180e3150a0d12757b933e63a63e1e09251348a2094c70dd20da7
+SIZE (prometheus-pushgateway-v0.6.0_GH0.tar.gz) = 1768979
--- net-mgmt/pushgateway/files/pushgateway.in	(revision 485326)
+++ net-mgmt/pushgateway/files/pushgateway.in	(working copy)
@@ -1,66 +1,66 @@ 
 #!/bin/sh
-# 
+#
 # $FreeBSD$
 
 # PROVIDE: pushgateway
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # pushgateway_enable (bool):	 Set to NO by default
 #							   Set it to YES to enable pushgateway
 # pushgateway_user (string):	 Set user to run pushgateway
 #							   Default is "prometheus"
 # pushgateway_group (string):	Set group to run pushgateway
 #							   Default is "prometheus"
 # pushgateway_data_dir (string): Set dir to run pushgateway in
 #							   Default is "/var/db/pushgateway"
 # pushgateway_persistence_file (string): Set file in which the pushed
 #				metrics will be persisted
 #							   Default is "${pushgateway_data_dir}/persistent.data"
 # pushgateway_log_file (string): Set file that pushgateway will log to
 #							   Default is "/var/log/pushgateway.log"
 # pushgateway_args (string):	 Set additional command line arguments
 #							   Default is ""
 
 . /etc/rc.subr
 
 name=pushgateway
 rcvar=pushgateway_enable
 
 load_rc_config $name
 
 : ${pushgateway_enable:=NO}
 : ${pushgateway_user:=prometheus}
 : ${pushgateway_group:=prometheus}
 : ${pushgateway_data_dir=/var/db/pushgateway}
 : ${pushgateway_persistence_file=${pushgateway_data_dir}/persistent.data}
 : ${pushgateway_log_file=/var/log/pushgateway.log}
 
 pidfile=/var/run/pushgateway.pid
 command=/usr/sbin/daemon
 procname="%%PREFIX%%/bin/pushgateway"
 sig_reload=HUP
 extra_commands=reload
 command_args="-p ${pidfile} /usr/bin/env ${procname} \
-				-persistence.file=${pushgateway_persistence_file} \
+				--persistence.file=${pushgateway_persistence_file} \
 				${pushgateway_args} > ${pushgateway_log_file} 2>&1"
 
 start_precmd=pushgateway_startprecmd
 
 pushgateway_startprecmd()
 {
 	if [ ! -e ${pidfile} ]; then
 		install -o ${pushgateway_user} -g ${pushgateway_group} /dev/null ${pidfile};
 	fi
 	if [ ! -f "${pushgateway_log_file}" ]; then
 		install -o ${pushgateway_user} -g ${pushgateway_group} -m 640 /dev/null ${pushgateway_log_file};
 	fi
 	if [ ! -d ${pushgateway_data_dir} ]; then
 		install -d -o ${pushgateway_user} -g ${pushgateway_group} -m 750 ${pushgateway_data_dir}
 	fi
 }
 
 run_rc_command "$1"