git: 4eb0b49d4734 - main - Cleanup: for ports under c* categories, drop redundant GH_{ACCOUNT, PROJECT}.

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4eb0b49d4734fdd51ab7df8bff6ca4de3059192c

commit 4eb0b49d4734fdd51ab7df8bff6ca4de3059192c
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-08-29 12:09:42 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-08-29 12:09:44 +0000

    Cleanup: for ports under c* categories, drop redundant GH_{ACCOUNT,PROJECT}.
---
 cad/py-cadquery/Makefile | 3 +--
 cad/py-ezdxf/Makefile    | 1 -
 comms/apitran/Makefile   | 1 -
 comms/digiham/Makefile   | 1 -
 comms/gnuradio/Makefile  | 5 +----
 comms/qico/Makefile      | 4 +---
 comms/svxlink/Makefile   | 1 -
 7 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/cad/py-cadquery/Makefile b/cad/py-cadquery/Makefile
index 68f755aa7212..ffa2a37387d2 100644
--- a/cad/py-cadquery/Makefile
+++ b/cad/py-cadquery/Makefile
@@ -1,4 +1,4 @@
-PORTNAME=	cadquery
+PORTNAME=	${GH_ACCOUNT:tl}
 DISTVERSION=	2.0.1
 CATEGORIES=	cad
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,6 @@ USE_PYTHON=	autoplist distutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	CadQuery
-GH_PROJECT=	cadquery
 
 post-extract:
 # Move into a sub-directory so that we don't pollute site-packages.
diff --git a/cad/py-ezdxf/Makefile b/cad/py-ezdxf/Makefile
index 4a2230ba706f..f0b628d99a57 100644
--- a/cad/py-ezdxf/Makefile
+++ b/cad/py-ezdxf/Makefile
@@ -21,7 +21,6 @@ USE_PYTHON=	concurrent distutils autoplist
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mozman
-GH_PROJECT=	ezdxf
 
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -m pytest -rs -v
diff --git a/comms/apitran/Makefile b/comms/apitran/Makefile
index 5d978d5dc239..3c8243103655 100644
--- a/comms/apitran/Makefile
+++ b/comms/apitran/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVO
 USES=		python:3.6+,run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsj56
-GH_PROJECT=	apitran
 GH_TAGNAME=	d209347
 
 NO_BUILD=	yes
diff --git a/comms/digiham/Makefile b/comms/digiham/Makefile
index 3f46c74ea8b3..5108fa6368dc 100644
--- a/comms/digiham/Makefile
+++ b/comms/digiham/Makefile
@@ -14,7 +14,6 @@ USES=		cmake
 USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	jketterl
-GH_PROJECT=	digiham
 
 post-install:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index 3750853e4312..302ff5595e9a 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -51,10 +51,6 @@ USES=		cmake compiler:c++11-lang desktop-file-utils fortran gnome \
 		iconv perl5 pkgconfig pyqt:5 python:3.5+ qt:5 shared-mime-info \
 		shebangfix
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	gnuradio
-GH_PROJECT=	gnuradio
-
 SHEBANG_FILES=	grc/scripts/freedesktop/grc_setup_freedesktop.in \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-ctrlport-monitor \
 		gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx
@@ -72,6 +68,7 @@ CMAKE_ARGS+=	-DCMAKE_INSTALL_RPATH:STRING="${LOCALBASE}/lib/gcc${_GCC_VER}" \
 # for detailed debugging uncomment the next line
 #CMAKE_ARGS+=	--debug-output --trace
 USE_CXXSTD=	c++11
+USE_GITHUB=	yes
 USE_PYQT=	core gui opengl
 USE_WX=		3.0
 USE_QT=		buildtools core gui xml qmake widgets
diff --git a/comms/qico/Makefile b/comms/qico/Makefile
index 67dd06c022d2..117e0f064871 100644
--- a/comms/qico/Makefile
+++ b/comms/qico/Makefile
@@ -11,13 +11,11 @@ LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		autoreconf
+GNU_CONFIGURE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	kosfango
-GH_PROJECT=	qico
 GH_TAGNAME=	15673bf
 
-GNU_CONFIGURE=	yes
-
 CONFDIR?=	${PREFIX}/etc/fido/qico
 QBASEDIR?=	/var/spool/fido/qico
 QLOGDIR?=	/var/log/fido/qico
diff --git a/comms/svxlink/Makefile b/comms/svxlink/Makefile
index dc4e9dfec03a..d4d2b09f4484 100644
--- a/comms/svxlink/Makefile
+++ b/comms/svxlink/Makefile
@@ -24,7 +24,6 @@ BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 USES+=		cmake:noninja compiler:c++11-lang groff pkgconfig tcl
 USE_GITHUB=	yes
 GH_ACCOUNT=	sm0svx
-GH_PROJECT=	svxlink
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
 CMAKE_ARGS+=	-DMAN_INSTALL_DIR:FILEPATH=${PREFIX}/share/man \