Update ports in the n* categories to not use GH_COMMIT.

With minor cleanups to make things simpler.

With hat:	portmgr
Sponsored by:	Absolight

14 files changed, 22 insertions, 34 deletions

diff --git a/net-mgmt/arpscan/Makefile b/net-mgmt/arpscan/Makefile
index 8d6780f5cc0c..e0ecdad82dc3 100644
--- a/net-mgmt/arpscan/Makefile
+++ b/net-mgmt/arpscan/Makefile
@@ -5,8 +5,6 @@ PORTNAME=	arpscan
 PORTVERSION=	0.5
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	GHL
-DIST_SUBDIR=	repacked
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple arp scanner
@@ -18,8 +16,7 @@ LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jasonish
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	e59831a
+GH_TAGNAME=	e59831a
 
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 AUTOMAKE_ARGS=	--add-missing --copy
diff --git a/net-mgmt/arpscan/distinfo b/net-mgmt/arpscan/distinfo
index 950b0ddb73ee..50a7ad2d3db4 100644
--- a/net-mgmt/arpscan/distinfo
+++ b/net-mgmt/arpscan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (repacked/arpscan-0.5.tar.gz) = e3fc78ef7f6bfa558a5c40025750d4fdc505bc632be6af1bdd83102c2782cfb3
-SIZE (repacked/arpscan-0.5.tar.gz) = 5187
+SHA256 (jasonish-arpscan-0.5-e59831a_GH0.tar.gz) = f7d81c929b8885a56cc104f3a17def4edeb72f1bfecc679d926b1ba2d7e0156a
+SIZE (jasonish-arpscan-0.5-e59831a_GH0.tar.gz) = 5174
diff --git a/net-mgmt/ccnet/Makefile b/net-mgmt/ccnet/Makefile
index 6e249b8c5e21..da3447371abc 100644
--- a/net-mgmt/ccnet/Makefile
+++ b/net-mgmt/ccnet/Makefile
@@ -2,6 +2,8 @@
 
 PORTNAME=	ccnet
 PORTVERSION=	4.0.6
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	-server
 PORTREVISION=	5
 CATEGORIES=	net-mgmt devel
 
@@ -23,8 +25,6 @@ LIB_DEPENDS=	libsearpc.so:${PORTSDIR}/devel/libsearpc \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
-GH_TAGNAME=	v${PORTVERSION}-server
-GH_COMMIT=	1e1aeae
 
 USES=		autoreconf libtool pkgconfig pathfix python:2
 PATHFIX_MAKEFILEIN=	Makefile.am
diff --git a/net-mgmt/ccnet/distinfo b/net-mgmt/ccnet/distinfo
index 21369cbee60d..1c33db983154 100644
--- a/net-mgmt/ccnet/distinfo
+++ b/net-mgmt/ccnet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ccnet-4.0.6.tar.gz) = 4030d931c2aaad5d2d783c4afb2e2cda556a91307c26a378c91602540255b7eb
-SIZE (ccnet-4.0.6.tar.gz) = 218569
+SHA256 (haiwen-ccnet-v4.0.6-server_GH0.tar.gz) = d9793715b3473a161f802224dbeac75744e70313f073f8e0b7191b9141c36812
+SIZE (haiwen-ccnet-v4.0.6-server_GH0.tar.gz) = 218550
diff --git a/net-mgmt/nagios-check_ports/Makefile b/net-mgmt/nagios-check_ports/Makefile
index 4fa472ad900e..e432511235b3 100644
--- a/net-mgmt/nagios-check_ports/Makefile
+++ b/net-mgmt/nagios-check_ports/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	check_ports
 PORTVERSION=	0.7.1
+DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	net-mgmt
 PKGNAMEPREFIX=	nagios-
@@ -12,8 +13,6 @@ COMMENT=	monitor FreeBSD ports for updates or vulnerabilities
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rfrederick
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	4e039d7
 
 NO_BUILD=	yes
 
diff --git a/net-mgmt/nagios-check_ports/distinfo b/net-mgmt/nagios-check_ports/distinfo
index 44ac5df7e527..0587d568510c 100644
--- a/net-mgmt/nagios-check_ports/distinfo
+++ b/net-mgmt/nagios-check_ports/distinfo
@@ -1,2 +1,2 @@
-SHA256 (check_ports-0.7.1.tar.gz) = 0603c67f999b8d34984b503e683437b76f58e3aac592537ce93db0e98f3ce8f5
-SIZE (check_ports-0.7.1.tar.gz) = 4946
+SHA256 (rfrederick-check_ports-v0.7.1_GH0.tar.gz) = 50a12775138635031cf652632a779014d2365e0e66091daf6fb9ba1f05e3df3e
+SIZE (rfrederick-check_ports-v0.7.1_GH0.tar.gz) = 4941
diff --git a/net-mgmt/nagios-pf-plugin/Makefile b/net-mgmt/nagios-pf-plugin/Makefile
index e9557586ca39..6bcda14724a9 100644
--- a/net-mgmt/nagios-pf-plugin/Makefile
+++ b/net-mgmt/nagios-pf-plugin/Makefile
@@ -5,16 +5,13 @@ PORTNAME=	nagios-pf-plugin
 PORTVERSION=	0.1
 PORTREVISION=	2
 CATEGORIES=	net-mgmt
-DISTNAME=	check_pf-${PORTVERSION}
 
 MAINTAINER=	rand@iteris.com
 COMMENT=	Nagios plugin for checking PF
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	kian
-GH_PROJECT=	nagios-pf-plugin
-GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	2aba423
+GH_TAGNAME=	2aba423
 
 PLIST_FILES=	libexec/nagios/check_pf
 SUB_FILES=	pkg-message
diff --git a/net-mgmt/nagios-pf-plugin/distinfo b/net-mgmt/nagios-pf-plugin/distinfo
index b56faaf24d81..6971390d96f8 100644
--- a/net-mgmt/nagios-pf-plugin/distinfo
+++ b/net-mgmt/nagios-pf-plugin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (check_pf-0.1.tar.gz) = 5a6a5a2cdfed35bf1f07a8a49b139a7e423fb6cc06403aabc1fc1609c5d8782d
-SIZE (check_pf-0.1.tar.gz) = 3145
+SHA256 (kian-nagios-pf-plugin-0.1-2aba423_GH0.tar.gz) = bc7e115024dc4684f895a3afba236d9b69d7e3f5695ce83fdcaddad5c3526703
+SIZE (kian-nagios-pf-plugin-0.1-2aba423_GH0.tar.gz) = 3142
diff --git a/net-mgmt/ng_ipacct/Makefile b/net-mgmt/ng_ipacct/Makefile
index 57248b4f1f0a..4b83b2ca9c94 100644
--- a/net-mgmt/ng_ipacct/Makefile
+++ b/net-mgmt/ng_ipacct/Makefile
@@ -14,9 +14,6 @@ USE_GITHUB=	yes
 USES=		kmod uidfix
 
 GH_ACCOUNT=	vstakhov
-GH_PROJECT=	ng_ipacct
-GH_TAGNAME=	${PORTVERSION}
-GH_COMMIT=	68ff97c
 
 MAKE_ENV=	BINDIR="${PREFIX}/sbin"
 
diff --git a/net-mgmt/ng_ipacct/distinfo b/net-mgmt/ng_ipacct/distinfo
index e78ce7ef381e..531d97226f4c 100644
--- a/net-mgmt/ng_ipacct/distinfo
+++ b/net-mgmt/ng_ipacct/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ng_ipacct-20150304.tar.gz) = 10d0ca1d77cd836edbc0fa258c7db2a428a59a772ec96de4c9213a598e8108cc
-SIZE (ng_ipacct-20150304.tar.gz) = 24569
+SHA256 (vstakhov-ng_ipacct-20150304_GH0.tar.gz) = 4ad4412656d415d0841d5ba30dfa367179fc4e7f70f002990540fafdee3bc784
+SIZE (vstakhov-ng_ipacct-20150304_GH0.tar.gz) = 24567
diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile
index 22fd6785a293..3f9ab7f6d3e3 100644
--- a/net-mgmt/seafile-gui/Makefile
+++ b/net-mgmt/seafile-gui/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	seafile-gui
 PORTVERSION=	4.1.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
-DISTNAME=	seafile-client-${PORTVERSION}
 
 MAINTAINER=	yan_jingfeng@yahoo.com
 COMMENT=	Seafile desktop client
@@ -20,8 +20,6 @@ LIB_DEPENDS+=	libglib-2.0.so:${PORTSDIR}/devel/glib20 \
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
 GH_PROJECT=	seafile-client
-GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	74817c4	
 
 USES=		cmake pkgconfig
 USE_QT4=	corelib dbus gui network \
diff --git a/net-mgmt/seafile-gui/distinfo b/net-mgmt/seafile-gui/distinfo
index 41b946709dd6..ce8aae31724b 100644
--- a/net-mgmt/seafile-gui/distinfo
+++ b/net-mgmt/seafile-gui/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seafile-client-4.1.0.tar.gz) = 7de5d09fa969c18a37d3f71ccafa82f7e678440616ce61819e245a98aded768d
-SIZE (seafile-client-4.1.0.tar.gz) = 1002057
+SHA256 (haiwen-seafile-client-v4.1.0_GH0.tar.gz) = 3e50ad0b3885b794e96c289aa90d138ab3ac09e82417f88cb48822916e8fca13
+SIZE (haiwen-seafile-client-v4.1.0_GH0.tar.gz) = 1002135
diff --git a/net-mgmt/seafile/Makefile b/net-mgmt/seafile/Makefile
index f7a5fefa7cb3..a66311246889 100644
--- a/net-mgmt/seafile/Makefile
+++ b/net-mgmt/seafile/Makefile
@@ -2,6 +2,8 @@
 
 PORTNAME=	seafile
 PORTVERSION=	4.0.6
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	-server
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	yan_jingfeng@yahoo.com
@@ -25,8 +27,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}eggtestinfo>0:${PORTSDIR}/devel/py-eggtestin
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	haiwen
-GH_TAGNAME=	v${PORTVERSION}-server
-GH_COMMIT=	adf9a87
 
 USES=		autoreconf iconv libtool pathfix pkgconfig python:2 shebangfix
 SHEBANG_FILES=	scripts/*.sh scripts/upgrade/*.sh
diff --git a/net-mgmt/seafile/distinfo b/net-mgmt/seafile/distinfo
index fa9aa289dc0e..6f2aadde96a7 100644
--- a/net-mgmt/seafile/distinfo
+++ b/net-mgmt/seafile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (seafile-4.0.6.tar.gz) = af1b568905a85ba2da06593f93a70226526ad310320c071bd70356fb77106bc9
-SIZE (seafile-4.0.6.tar.gz) = 1082450
+SHA256 (haiwen-seafile-v4.0.6-server_GH0.tar.gz) = 3f9aacc53c67aa165c66a4546a6f8c7ad3a002f741578a538b0c0965a73317bf
+SIZE (haiwen-seafile-v4.0.6-server_GH0.tar.gz) = 1082453