Cleanup: for ports under m* categories, drop redundant GH_{ACCOUNT,PROJECT}.

12 files changed, 5 insertions, 22 deletions

diff --git a/mail/astroid/Makefile b/mail/astroid/Makefile
index e5ecc35a5f2f..c195b3552b7b 100644
--- a/mail/astroid/Makefile
+++ b/mail/astroid/Makefile
@@ -29,9 +29,8 @@ USES=		cmake compiler:c11 desktop-file-utils gettext-runtime gnome \
 		pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	astroidmail
-GH_PROJECT=	astroid
-USE_GNOME=	atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk30 gtkmm30 introspection libsigc++20 pango pangomm vte3
-
+USE_GNOME=	atk atkmm cairo cairomm gdkpixbuf2 glib20 glibmm gtk30 \
+		gtkmm30 introspection libsigc++20 pango pangomm vte3
 INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 67362998f27e..01ffd0e8b0e1 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
 		xmlto:textproc/xmlto \
 		docbook-sgml>0:textproc/docbook-sgml
 
-USES=		autoreconf gmake gnome libtool localbase pkgconfig shebangfix ssl
+USES=		autoreconf gmake gnome libtool localbase pkgconfig \
+		shebangfix ssl
 USE_GITHUB=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	${PREFIX}/lib/dbmail
@@ -28,8 +29,6 @@ USE_RC_SUBR=	dbmail-pop3d dbmail-lmtpd dbmail-imapd dbmail-timsieved
 
 CONFLICTS=	dbmail22-[0-9]*
 
-GH_ACCOUNT=	dbmail
-
 OPTIONS_DEFINE=	DOCS LDAP SIEVE
 OPTIONS_DEFAULT=	SIEVE
 OPTIONS_SUB=	yes
diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile
index eb5f57db3a46..d1bb2b5309ed 100644
--- a/mail/imapsync/Makefile
+++ b/mail/imapsync/Makefile
@@ -34,7 +34,6 @@ RUN_DEPENDS=	p5-Crypt-OpenSSL-RSA>0:security/p5-Crypt-OpenSSL-RSA \
 USES=		cpe perl5 tar:tgz shebangfix
 SHEBANG_FILES=	${PORTNAME}
 USE_GITHUB=	yes
-GH_ACCOUNT=	imapsync
 GH_TAGNAME=	1d08afa
 
 CPE_VENDOR=	gilles_lamiral
diff --git a/mail/ratelimit-policyd/Makefile b/mail/ratelimit-policyd/Makefile
index a43e98af8b22..35f31bdbbe64 100644
--- a/mail/ratelimit-policyd/Makefile
+++ b/mail/ratelimit-policyd/Makefile
@@ -13,7 +13,6 @@ USES+=		perl5 shebangfix
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MirLach
-GH_PROJECT=	ratelimit-policyd
 #GH_TAGNAME=	65154a2
 
 RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
diff --git a/mail/rss2email3/Makefile b/mail/rss2email3/Makefile
index f076ebbf51ea..eff1c805b3b2 100644
--- a/mail/rss2email3/Makefile
+++ b/mail/rss2email3/Makefile
@@ -15,7 +15,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=6.0.0:textproc/py-feedparser@${P
 
 USES=		python:3.6+
 USE_GITHUB=	yes
-GH_ACCOUNT=	rss2email
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
diff --git a/math/fcl05/Makefile b/math/fcl05/Makefile
index f9739ce68b08..c4cb398bef40 100644
--- a/math/fcl05/Makefile
+++ b/math/fcl05/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	libccd.so:math/libccd \
 USES=		cmake compiler:c++11-lang eigen:3 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	flexible-collision-library
-GH_PROJECT=	fcl
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	FCL_BUILD_TESTS BUILD_TESTING
diff --git a/math/openlibm/Makefile b/math/openlibm/Makefile
index 53424992a5bc..5c77056d71ee 100644
--- a/math/openlibm/Makefile
+++ b/math/openlibm/Makefile
@@ -22,8 +22,6 @@ BROKEN_riscv64=	fails to compile: No rule to make target riscv64/Make.files
 USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	JuliaMath
-GH_PROJECT=	openlibm
-
 USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
diff --git a/misc/lxi-tools/Makefile b/misc/lxi-tools/Makefile
index d60435dfc098..8621a825917e 100644
--- a/misc/lxi-tools/Makefile
+++ b/misc/lxi-tools/Makefile
@@ -14,8 +14,6 @@ LIB_DEPENDS=	liblxi.so:misc/liblxi
 
 USES=		autoreconf libtool localbase lua:52 pkgconfig readline
 USE_GITHUB=	yes
-GH_ACCOUNT=	lxi-tools
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--with-bash-completion-dir=${PREFIX}/etc/bash_completion.d
diff --git a/misc/xdelta3/Makefile b/misc/xdelta3/Makefile
index be097d49df5b..50a2b82714b2 100644
--- a/misc/xdelta3/Makefile
+++ b/misc/xdelta3/Makefile
@@ -14,15 +14,12 @@ COMMENT=	Open-source binary diff, VCDIFF/RFC 3284 delta compression
 LICENSE=	GPLv2+
 
 USES=		autoreconf compiler:c++11-lang gmake
-
+GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	jmacd
-GH_PROJECT=	xdelta
 
 WRKSRC_SUBDIR=	xdelta3
 
-GNU_CONFIGURE=	yes
-
 PLIST_FILES=	bin/xdelta3 man/man1/xdelta3.1.gz
 
 post-patch:
diff --git a/multimedia/aravis/Makefile b/multimedia/aravis/Makefile
index 3805ece25d7d..37e66241df2c 100644
--- a/multimedia/aravis/Makefile
+++ b/multimedia/aravis/Makefile
@@ -25,7 +25,6 @@ INSTALLS_ICONS=		yes
 
 USE_GITHUB=		yes
 GH_ACCOUNT=		AravisProject
-GH_PROJECT=		aravis
 
 CONFIGURE_ARGS=		--enable-packet-socket=no --enable-viewer=yes	\
 			--enable-gst-plugin=no --enable-gst-0.10-plugin=no \
diff --git a/multimedia/gpac-libgpac/Makefile b/multimedia/gpac-libgpac/Makefile
index a005a77e75e1..a487fd5d8e0a 100644
--- a/multimedia/gpac-libgpac/Makefile
+++ b/multimedia/gpac-libgpac/Makefile
@@ -21,8 +21,6 @@ USES=		gmake dos2unix shebangfix
 SHEBANG_FILES=	check_revision.sh
 bash_OLD_CMD+=	/bin/sh
 USE_GITHUB=	yes
-GH_ACCOUNT=	gpac
-GH_PROJECT= gpac
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 DOS2UNIX_FILES=	src/utils/os_config_init.c
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index df10c4b30480..638fbf7a7e15 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -37,7 +37,6 @@ RUN_DEPENDS=	${ZM_DEPENDS} \
 
 USES=		cmake:insource,noninja jpeg mysql perl5 php shebangfix ssl
 USE_GITHUB=	yes
-GH_PROJECT=	zoneminder
 GH_TUPLE=	FriendsOfCake:crud:0bd63fb:crud/web/api/app/Plugin/Crud \
 		ZoneMinder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin/web/api/app/Plugin/CakePHP-Enum-Behavior \
 		ZoneMinder:RtspServer:cd7fd49:rtsp_server/dep/RtspServer