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

8 files changed, 5 insertions, 15 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 \