Cleanup: for ports under n* categories, drop redundant GH_* knobs.

25 files changed, 29 insertions, 69 deletions

diff --git a/net-im/coyim/Makefile b/net-im/coyim/Makefile
index b77199a3020d..e52bad1480fd 100644
--- a/net-im/coyim/Makefile
+++ b/net-im/coyim/Makefile
@@ -14,8 +14,9 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		gnome go pkgconfig
-
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 pango
+USE_GITHUB=	yes
+GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
@@ -23,10 +24,6 @@ OPTIONS_SUB=	yes
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	coyim
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
-
 GO_BUILDFLAGS=	-tags ${GTK_BUILD_TAG}
 
 SUB_LIST=	PORTNAME=${PORTNAME}
diff --git a/net-im/diligent/Makefile b/net-im/diligent/Makefile
index 2b64648ba47b..c1b3e3aaf864 100644
--- a/net-im/diligent/Makefile
+++ b/net-im/diligent/Makefile
@@ -21,7 +21,7 @@ QMAKE_ARGS=	CONFIG+="configure"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
-GH_PROJECT=	diligent
+
 PLIST_FILES=	bin/diligent \
 		share/applications/diligent.desktop \
 		share/icons/diligent.png
diff --git a/net-im/gitterdone/Makefile b/net-im/gitterdone/Makefile
index 223e1a8f2b44..afb454908056 100644
--- a/net-im/gitterdone/Makefile
+++ b/net-im/gitterdone/Makefile
@@ -12,19 +12,17 @@ USES=		compiler:c++11-lang gl qmake qt:5 shebangfix tar:xz
 USE_QT=		core gui network linguist_build \
 		buildtools_build widgets webkit svg
 USE_GL+=	gl
+USE_LDCONFIG=	yes
 
 MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
 MAKE_JOBS_UNSAFE=	yes
 
-USE_LDCONFIG=	yes
-
 WRKSRC_SUBDIR=	src-qt5
 
 QMAKE_ARGS=	CONFIG+="configure"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
-GH_PROJECT=	gitterdone
 GH_TAGNAME=	23eaadb70baeffb22ab035e08fc4675907707590
 
 .include <bsd.port.mk>
diff --git a/net-im/jicofo/Makefile b/net-im/jicofo/Makefile
index b3a7339954e2..2307a54167bb 100644
--- a/net-im/jicofo/Makefile
+++ b/net-im/jicofo/Makefile
@@ -12,9 +12,8 @@ BUILD_DEPENDS=	${LOCALBASE}/share/java/maven/bin/mvn:devel/maven
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
-USE_GITHUB=     yes
+USE_GITHUB=	yes
 GH_ACCOUNT=	jitsi
-GH_PROJECT=     jicofo
 GH_TAGNAME=	ec1b29e
 USE_JAVA=	yes
 
diff --git a/net-im/matterhorn/Makefile b/net-im/matterhorn/Makefile
index be7f5872a0fa..f970156d3799 100644
--- a/net-im/matterhorn/Makefile
+++ b/net-im/matterhorn/Makefile
@@ -12,7 +12,6 @@ USES=		cabal
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	matterhorn-chat
-GH_PROJECT=	matterhorn
 
 USE_CABAL=	HTTP-4000.3.15_2 \
 		Hclip-3.0.0.4 \
diff --git a/net-im/oysttyer/Makefile b/net-im/oysttyer/Makefile
index fd8d0cb47477..dc030e433f7d 100644
--- a/net-im/oysttyer/Makefile
+++ b/net-im/oysttyer/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	curl:ftp/curl \
 
 USES=		perl5 shebangfix
 USE_GITHUB=	yes
-GH_ACCOUNT=	oysttyer
 SHEBANG_FILES=	oysttyer.pl
 PLIST_FILES=	bin/oysttyer
 
diff --git a/net-im/profanity/Makefile b/net-im/profanity/Makefile
index 7187fbd73467..3328e27faf3f 100644
--- a/net-im/profanity/Makefile
+++ b/net-im/profanity/Makefile
@@ -25,7 +25,6 @@ USES=		ncurses pkgconfig ssl python readline autoreconf libtool gnome
 USE_GNOME=	glib20
 USE_GITHUB=	yes
 GH_ACCOUNT=	profanity-im
-GH_PROJECT=	profanity
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-otr --enable-python-plugins --enable-c-plugins \
diff --git a/net-im/tg_owt/Makefile b/net-im/tg_owt/Makefile
index 8076dae0a7d4..ef15ca56e3d3 100644
--- a/net-im/tg_owt/Makefile
+++ b/net-im/tg_owt/Makefile
@@ -27,7 +27,6 @@ USES=		cmake pkgconfig xorg
 USE_XORG=	x11 xcomposite xdamage xrender xrandr
 USE_GITHUB=	yes
 GH_ACCOUNT=	desktop-app
-GH_PROJECT=	tg_owt
 GH_TAGNAME=	91d836d
 # libyuv cloned from https://chromium.googlesource.com/libyuv/libyuv
 GH_TUPLE=	webmproject:libvpx:5b63f0f:libvpx/src/third_party/libvpx/source/libvpx \
diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile
index 9b3f35a34385..dcd8692f9e17 100644
--- a/net-mgmt/irrtoolset/Makefile
+++ b/net-mgmt/irrtoolset/Makefile
@@ -15,8 +15,6 @@ LICENSE_PERMS_RIPE_NCC=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 USES=		autoreconf bison gmake libtool
 GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
-GH_ACCOUNT=	irrtoolset
-GH_PROJECT=	irrtoolset
 
 PLIST_FILES=	bin/rpslcheck bin/peval bin/rtconfig \
 		man/man1/rtconfig.1.gz man/man1/peval.1.gz \
diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
index 6fb6b845c6dd..bb269408592e 100644
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -23,13 +23,10 @@ RUN_DEPENDS+=	${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVO
 		sudo:security/sudo
 
 USES=		cpe php python shebangfix
-
 USE_GITHUB=	yes
-GH_ACCOUNT=	librenms
-
 USE_PHP=	ctype curl dom fileinfo filter gd hash json ldap mbstring \
-		mysqli openssl pdo pdo_mysql phar posix session simplexml snmp \
-		sockets tokenizer xml xmlwriter zip
+		mysqli openssl pdo pdo_mysql phar posix session simplexml \
+		snmp sockets tokenizer xml xmlwriter zip
 USE_RC_SUBR=	librenms
 
 SHEBANG_FILES=	../${PORTNAME}-vendor-${PORTVERSION}/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \
diff --git a/net-mgmt/py-gstat_exporter/Makefile b/net-mgmt/py-gstat_exporter/Makefile
index 221a4f9706af..858cafa03caa 100644
--- a/net-mgmt/py-gstat_exporter/Makefile
+++ b/net-mgmt/py-gstat_exporter/Makefile
@@ -14,16 +14,14 @@ IGNORE_FreeBSD_11=	needs "gstat -C", available since FreeBSD 12.0
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}prometheus-client>=0.7.1:net-mgmt/py-prometheus-client@${PY_FLAVOR}
 
 USES=		python:3.6+
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	tykling
-GH_PROJECT=	gstat_exporter
 GH_TAGNAME=	3c1858a52544b2eec56f5470e4042a7171e5448a
+USE_RC_SUBR=	gstat_exporter
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-USE_RC_SUBR=	gstat_exporter
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 PLIST_FILES=	bin/${PORTNAME}.py
diff --git a/net-mgmt/softflowd/Makefile b/net-mgmt/softflowd/Makefile
index 2bbca191f7ae..f5ae3ce796c2 100644
--- a/net-mgmt/softflowd/Makefile
+++ b/net-mgmt/softflowd/Makefile
@@ -11,12 +11,9 @@ COMMENT=	Flow-based network traffic analyzer and exporter
 LICENSE=	BSD2CLAUSE
 
 USES=		gmake autoreconf
-
+GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	irino
-GH_PROJECT=	softflowd
-
-GNU_CONFIGURE=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 PLIST_FILES=	bin/softflowd bin/softflowctl \
diff --git a/net-mgmt/subcalc/Makefile b/net-mgmt/subcalc/Makefile
index 6b73e68b0c58..c21cb7a19d72 100644
--- a/net-mgmt/subcalc/Makefile
+++ b/net-mgmt/subcalc/Makefile
@@ -8,9 +8,8 @@ CATEGORIES=	net-mgmt
 MAINTAINER=	csjp@FreeBSD.org
 COMMENT=	Advanced IP/IPv6 subnet calculation and discovery
 
-USE_GITHUB=     yes
-GH_ACCOUNT=     csjayp
-GH_PROJECT=     subcalc
+USE_GITHUB=	yes
+GH_ACCOUNT=	csjayp
 
 PLIST_FILES=	bin/subcalc man/man1/subcalc.1.gz
 
diff --git a/net-mgmt/unifi-poller/Makefile b/net-mgmt/unifi-poller/Makefile
index c41f74bea3bc..9d6f70646e72 100644
--- a/net-mgmt/unifi-poller/Makefile
+++ b/net-mgmt/unifi-poller/Makefile
@@ -16,7 +16,6 @@ USERS=	unifi-poller
 GROUPS=	unifi-poller
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	unifi-poller
 GH_TUPLE=	\
 		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
@@ -49,6 +48,7 @@ GH_TUPLE=	\
 		unifi-poller:webserver:b4db5feaea83:unifi_poller_webserver/vendor/github.com/unifi-poller/webserver
 
 OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.options.mk>
 
 post-build:
diff --git a/net-p2p/uhub/Makefile b/net-p2p/uhub/Makefile
index 14f568a76bbd..fdb677ce6e16 100644
--- a/net-p2p/uhub/Makefile
+++ b/net-p2p/uhub/Makefile
@@ -3,10 +3,6 @@
 PORTNAME=	uhub
 PORTVERSION=	0.5.1
 CATEGORIES=	net-p2p
-USE_GITHUB=	yes
-GH_ACCOUNT=	janvidar
-GH_PROJECT=	uhub
-GH_TAGNAME=	a8ee6e7
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance peer-to-peer hub for the ADC network
@@ -17,8 +13,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_aarch64=	fails to compile: CPUINFO not defined
 
 USES=		cmake:insource perl5 sqlite
-USE_RC_SUBR=	uhub
 USE_PERL5=	build
+USE_GITHUB=	yes
+GH_ACCOUNT=	janvidar
+GH_TAGNAME=	a8ee6e7
+USE_RC_SUBR=	uhub
 
 USERS=		uhub
 GROUPS=		uhub
diff --git a/net/csync2/Makefile b/net/csync2/Makefile
index ac3ad7256063..0d62acff04d0 100644
--- a/net/csync2/Makefile
+++ b/net/csync2/Makefile
@@ -14,10 +14,8 @@ LIB_DEPENDS=	libgnutls.so:security/gnutls \
 		libsqlite3.so:databases/sqlite3
 
 USES=		autoreconf pkgconfig shebangfix
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	LINBIT
-GH_PROJECT=	csync2
 GH_TAGNAME=	a8d38eb
 USE_RC_SUBR=	csync2
 
diff --git a/net/file2pcap/Makefile b/net/file2pcap/Makefile
index 048baee1d509..acf028f4068d 100644
--- a/net/file2pcap/Makefile
+++ b/net/file2pcap/Makefile
@@ -11,9 +11,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
-
 GH_ACCOUNT=	Cisco-Talos
-GH_PROJECT=	file2pcap
 
 ALL_TARGET=	file2pcap
 
diff --git a/net/h323plus/Makefile b/net/h323plus/Makefile
index 5d47a4ded53f..17524f33f974 100644
--- a/net/h323plus/Makefile
+++ b/net/h323plus/Makefile
@@ -11,14 +11,12 @@ LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libpt.so:devel/ptlib
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	willamowius
-GH_PROJECT=	h323plus
-
 USES=		gmake ssl
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_GITHUB=	yes
+GH_ACCOUNT=	willamowius
 
-GNU_CONFIGURE=	yes
 # ptlib-config --libs returns bogus dependencies on expat and SDL-1.2
 CFLAGS+=	-DH323_H46017 -DH323_TLS
 LDFLAGS+=	-Wl,--as-needed
diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 1f2b686a73ab..221e779b0ff5 100644
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -16,18 +16,16 @@ LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libfmt.so:devel/libfmt
 
 USES=		autoreconf compiler:c11 gmake libtool pkgconfig
-USE_RC_SUBR=	knxd
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-systemd --disable-usb \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-I${LOCALBASE}/include -L/${LOCALBASE}/lib"
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
+USE_RC_SUBR=	knxd
 
 INSTALL_TARGET=	install-strip
-GH_ACCOUNT=	knxd
-GH_PROJECT=	knxd
 GH_TAGNAME=	746a8d85dfdc4c456a9b832eca358a062a2b351d
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS?=--disable-systemd --disable-usb \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-I${LOCALBASE}/include -L/${LOCALBASE}/lib"
 
 post-patch:
 	# Replace script for version detection with PORTREVISION as the repository does not have a .git repo and therefor the script fails
diff --git a/net/nats-top/Makefile b/net/nats-top/Makefile
index b558fba66ae9..41ebb3ed49a0 100644
--- a/net/nats-top/Makefile
+++ b/net/nats-top/Makefile
@@ -12,7 +12,6 @@ LICENSE=	MIT
 USES=		go:modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	nats-io
-GH_PROJECT=	nats-top
 GH_TUPLE=	davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		gizak:termui:e62b5929642a:gizak_termui/vendor/gopkg.in/gizak/termui.v1 \
 		golang:crypto:0ec3e9974c59:golang_crypto/vendor/golang.org/x/crypto \
diff --git a/net/ptpd2/Makefile b/net/ptpd2/Makefile
index 0655c9d42d8b..729f1c50f0a9 100644
--- a/net/ptpd2/Makefile
+++ b/net/ptpd2/Makefile
@@ -10,21 +10,18 @@ COMMENT=	Implementation of the precision time protocol IEEE 1588-2008
 
 LICENSE=	BSD2CLAUSE
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	ptpd
-GH_TAGNAME=	d27a6e0
-
 CONFLICTS=	ptpd2-devel.*
 
 ETCDIR=	${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX}
 
-GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool
+GNU_CONFIGURE=	yes
+USE_GITHUB=	yes
+GH_TAGNAME=	d27a6e0
+USE_RC_SUBR=	ptpd2
 
 PORTDOCS=	*
 
-USE_RC_SUBR=	ptpd2
-
 OPTIONS_DEFINE=	DOCS SNMP
 OPTIONS_DEFAULT=SNMP
 
diff --git a/net/wakeonlan/Makefile b/net/wakeonlan/Makefile
index 385aab44b0e8..9d104d9110ef 100644
--- a/net/wakeonlan/Makefile
+++ b/net/wakeonlan/Makefile
@@ -12,7 +12,6 @@ LICENSE=	ART20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jpoliv
-GH_PROJECT=	wakeonlan
 GH_TAGNAME=	4beb45d
 
 USES=		perl5
diff --git a/net/xrdp-devel/Makefile b/net/xrdp-devel/Makefile
index f1b46709fe08..41950734d887 100644
--- a/net/xrdp-devel/Makefile
+++ b/net/xrdp-devel/Makefile
@@ -29,7 +29,6 @@ USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 GH_ACCOUNT=	neutrinolabs
-GH_PROJECT=	xrdp
 GH_TUPLE=	neutrinolabs:librfxcodec:v0.1.5:librfxcodec/librfxcodec \
 		neutrinolabs:libpainter:v0.1.1:libpainter/libpainter
 
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index f919df4411fb..984793774484 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -28,7 +28,6 @@ USE_GITHUB=	yes
 
 GNU_CONFIGURE=	yes
 GH_ACCOUNT=	neutrinolabs
-GH_PROJECT=	xrdp
 GH_TUPLE=	neutrinolabs:librfxcodec:v0.1.5:librfxcodec/librfxcodec \
 		neutrinolabs:libpainter:v0.1.1:libpainter/libpainter
 
diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile
index 928ab4bb4767..bed2662cb44b 100644
--- a/news/fidogate/Makefile
+++ b/news/fidogate/Makefile
@@ -10,12 +10,9 @@ COMMENT=	Fido-Internet Gateway and Tosser
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=	autoreconf perl5 iconv
-
+USES=		autoreconf perl5 iconv
 USE_GITHUB=	yes
 GH_ACCOUNT=	ykaliuta
-GH_PROJECT=	fidogate
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libexec=${PREFIX}/libexec/fidogate \
 		--sysconfdir=${PREFIX}/etc/fido/gate \