diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile
index 496f4ffc6642..9eb185060312 100644
--- a/databases/cassandra3/Makefile
+++ b/databases/cassandra3/Makefile
@@ -1,141 +1,140 @@
 PORTNAME=	cassandra
 DISTVERSION=	3.11.10
 CATEGORIES=	databases java
 MASTER_SITES=	LOCAL/nc:repo
 PKGNAMESUFFIX=	3
 DISTFILES=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
 
 MAINTAINER=	language.devel@gmail.com
 COMMENT=	Highly scalable distributed database
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
 		bash>0:shells/bash \
 		git>0:devel/git
 
 USES=		python:3.6+
 USE_ANT=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.8
 JAVA_VENDOR=	openjdk
 
 USE_RC_SUBR=	cassandra
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	polo-language
-GH_PROJECT=	cassandra
 GH_TAGNAME=	62fe1f7
 
 TEST_TARGET=	test
 
 CONFLICTS=	cassandra4
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 REINPLACE_ARGS=	-i ''
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 USERS=		cassandra
 GROUPS=		cassandra
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 PORTDOCS=		*
 
 OPTIONS_DEFINE=		SIGAR DOCS
 OPTIONS_DEFAULT=	SIGAR
 OPTIONS_SUB=		yes
 
 SIGAR_DESC=		Use SIGAR to collect system information
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 SIGAR_RUN_DEPENDS=	java-sigar>=1.6.4:java/sigar
 
 CONFIG_FILES=	cassandra-env.sh \
 		cassandra-jaas.config \
 		cassandra-rackdc.properties \
 		cassandra-topology.properties \
 		cassandra.yaml \
 		commitlog_archiving.properties \
 		hotspot_compiler \
 		jvm.options \
 		logback-tools.xml \
 		logback.xml
 
 DIST_DIR=	${WRKSRC}/build/dist
 REPO_DIR=	${WRKDIR}/repository
 
 SCRIPT_FILES=	cassandra \
 		cqlsh \
 		nodetool \
 		sstableloader \
 		sstablescrub \
 		sstableupgrade \
 		sstableutil \
 		sstableverify
 
 post-patch:
 	@${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh
 
 do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
 	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
 
 do-build-DOCS-off:
 	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}
 	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${DIST_DIR}/bin/${f}
 .endfor
 	@${REINPLACE_CMD} -e 's|`dirname "$$0"`/..|${DATADIR}|' ${DIST_DIR}/bin/cassandra.in.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/bin/cassandra.in.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${DIST_DIR}/conf/cassandra-env.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${DIST_DIR}/bin/cassandra.in.sh
 .for f in ${CONFIG_FILES}
 	@${MV} ${DIST_DIR}/conf/${f} ${DIST_DIR}/conf/${f}.sample
 .endfor
 	@${RM} ${DIST_DIR}/lib/licenses/sigar*
 	@${RMDIR} ${DIST_DIR}/lib/sigar-bin
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in CHANGES LICENSE NEWS NOTICE
 	cd ${DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/
 .endfor
 .for d in interface lib pylib tools
 	cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'"
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	cd ${DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/
 	cd ${DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR}
 	cd ${DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
 	cd ${DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/
 	cd ${DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
 .for f in ${SCRIPT_FILES}
 	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in doc javadoc
 	cd ${DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 post-install-SIGAR-on:
 	${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar
 
 do-test:
 	# A bare 'python' must be on PATH for test to succeed.
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh
 	@cd ${WRKSRC} && pylib/cassandra-cqlsh-tests.sh ${WRKSRC} python3 ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD}
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh
 
 .include <bsd.port.mk>
diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile
index fa0a01c42dd5..739120dfc3c8 100644
--- a/databases/foundationdb/Makefile
+++ b/databases/foundationdb/Makefile
@@ -1,79 +1,78 @@
 PORTNAME=	foundationdb
 DISTVERSION=	6.3.13
 CATEGORIES=	databases
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Distributed, transactional key-value store
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_11=	requires newer OpenSSL
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything else
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libeio.so:devel/libeio
 
 USES=		compiler:c++17-lang cmake mono:build python:build shebangfix ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	apple
-GH_PROJECT=	foundationdb
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	foundationdb
 
 SHEBANG_FILES=	bindings/c/generate_asm.py
 
 CMAKE_ARGS=	-DOPENSSL_ROOT_DIR=${OPENSSLLIB}
 CMAKE_OFF=	USE_DTRACE DISABLE_TLS
 
 USERS=		foundationdb
 GROUPS=		foundationdb
 DBDIR?=		/var/db/foundationdb
 LOGDIR?=	/var/log/foundationdb
 
 SUB_FDB=	DB_USER=${USERS} \
 		DB_GROUP=${GROUPS} \
 		DB_DIR=${DBDIR} \
 		LOG_DIR=${LOGDIR}
 SUB_FILES+=	foundationdb.conf
 SUB_LIST+=	${SUB_FDB}
 PLIST_SUB+=	${SUB_FDB}
 
 post-patch:
 		${REINPLACE_CMD} 's/OPENSSL_USE_STATIC_LIBS TRUE/OPENSSL_USE_STATIC_LIBS FALSE/' \
 		${WRKSRC}/cmake/FDBComponents.cmake
 do-install:
 	# commands on first line, dev tools on next two
 .for f in fdbbackup fdbcli fdbmonitor fdbserver \
 	    actor_flamegraph fdb_c_performance_test fdb_c_ryw_benchmark \
 	    fdb_c_txn_size_test fdb_flow_tester fdbconvert fdbdecode mako tutorial
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 	# confirm with upstream if these are actually needed
 .for s in backup_agent dr_agent fastrestore_agent fdbr fdbrestore
 	${RLN} ${STAGEDIR}${PREFIX}/bin/fdbbackup ${STAGEDIR}${PREFIX}/bin/${s}
 .endfor
 	# exposed libraries - confirm with upstream
 .for l in libfdb_c.so libfdb_flow.a libfdb_sqlite.a libfdbclient.a \
 	    libfdbrpc.a libflow.a libthirdparty.a
 	${STRIP_CMD} ${WRKDIR}/.build/lib/${l}
 	${INSTALL_DATA} ${WRKDIR}/.build/lib/${l} ${STAGEDIR}/${PREFIX}/lib/
 .endfor
 	# exposed headers - confirm with upstream
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/foundationdb
 	${INSTALL_DATA} ${WRKSRC}/bindings/c/foundationdb/fdb_c.h \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
 	${INSTALL_DATA} ${WRKSRC}/fdbclient/vexillographer/fdb.options \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
 	${INSTALL_DATA} ${WRKDIR}/.build/bindings/c/foundationdb/fdb_c_options.g.h \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
 	# runtime related
 	${MKDIR} ${STAGEDIR}${DBDIR} \
 	    ${STAGEDIR}${LOGDIR} \
 	    ${STAGEDIR}${PREFIX}/etc/foundationdb
 	${INSTALL_DATA} ${WRKDIR}/foundationdb.conf \
 	    ${STAGEDIR}${PREFIX}/etc/foundationdb/foundationdb.conf.sample
 
 .include <bsd.port.mk>
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index ca8fb072c760..1916f2b6ea38 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -1,49 +1,48 @@
 # Created by: Anders Nordby <anders@fix.no>
 
 PORTNAME=	mdbtools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.4
 CATEGORIES=	databases
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash-completion>=0:shells/bash-completion \
 		flex:textproc/flex \
 		gawk:lang/gawk
 LIB_DEPENDS=	libodbcinst.so:databases/unixODBC
 RUN_DEPENDS=	bash-completion>=0:shells/bash-completion
 
 USES=		autoreconf bison gettext gnome iconv libtool pathfix \
 		pkgconfig readline
 USE_GITHUB=	yes
-GH_ACCOUNT=	mdbtools
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-unixodbc=${LOCALBASE}
 
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${WRKSRC}/include
 
 OPTIONS_DEFINE=		DOCS MANPAGES LIBMSWSTR
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 LIBMSWSTR_DESC=	Read and parse JET 4 mdb file indices
 
 LIBMSWSTR_LIB_DEPENDS=	libmswstr.so:databases/libmswstr
 LIBMSWSTR_CONFIGURE_ENV_OFF=	ac_cv_lib_mswstr_DBLCMapStringW=no
 MANPAGES_CONFIGURE_OFF=		--disable-man
 
 DOCS=		AUTHORS HACKING.md NEWS README.md TODO.md
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,}  ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-shell-extension-windowoverlay-icons/Makefile b/deskutils/gnome-shell-extension-windowoverlay-icons/Makefile
index d25007f6589e..efb78df788f0 100644
--- a/deskutils/gnome-shell-extension-windowoverlay-icons/Makefile
+++ b/deskutils/gnome-shell-extension-windowoverlay-icons/Makefile
@@ -1,53 +1,51 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 
 PORTNAME=	gnome-shell-extension-windowoverlay-icons
 PORTVERSION=	36
 DISTVERSIONPREFIX=	v
 CATEGORIES=	deskutils gnome
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Show application icons on the windows overview
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
 		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
-RUN_DEPENDS=	gnome-shell>=0:x11/gnome-shell \
-		gsettings-desktop-schemas>=3.12.0:devel/gsettings-desktop-schemas
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gettext gmake gnome pkgconfig
 USE_GNOME=	glib20
 USE_GITHUB=	yes
 GLIB_SCHEMAS=	org.gnome.shell.extensions.windowoverlay-icons.gschema.xml
 
 GH_ACCOUNT=	sustmi
-GH_PROJECT=	gnome-shell-extension-windowoverlay-icons
 GH_TAGNAME=	ad7366d
 
 PKGMESSAGE=	../gnome-shell-extra-extensions/pkg-message.slaves
 
 FILES=	README.md convenience.js \
 	extension.js metadata.json \
 	prefs.js prefs.xml \
 	stylesheet.css
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|"3.26"|"3.26","3.28"|g' \
 		${WRKSRC}/metadata.json
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com
 	cd ${WRKSRC} && ${INSTALL_DATA} ${WRKSRC}/schemas/org.gnome.shell.extensions.windowoverlay-icons.gschema.xml \
 		${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/
 .for file in ${FILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} \
 		${STAGEDIR}${PREFIX}/share/gnome-shell/extensions/windowoverlay-icons@gnome-shell-extensions.sustmi.github.com/
 .endfor
 	cd ${WRKSRC}/locale && ${COPYTREE_SHARE} . \
 		${STAGEDIR}${PREFIX}/share/locale/
 	@${RM} ${STAGEDIR}${PREFIX}/share/locale/.gitkeep
 
 .include <bsd.port.mk>
diff --git a/deskutils/lumina-calculator/Makefile b/deskutils/lumina-calculator/Makefile
index c22b7d77133f..d6c7baea785e 100644
--- a/deskutils/lumina-calculator/Makefile
+++ b/deskutils/lumina-calculator/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	lumina-calculator
 DISTVERSION=	1.6.0
 PORTREVISION=	1
 CATEGORIES=	deskutils
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Scientific calculator from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
 USES=		compiler:c++11-lang gl qmake qt:5 xorg
 USE_GL=		gl
 USE_XORG=	x11
 USE_QT=		buildtools_build core gui svg widgets
 USE_GITHUB=	yes
 GH_ACCOUNT=	lumina-desktop
-GH_PROJECT=	lumina-calculator
 GH_TAGNAME=	ccb792fc713aa7163fffd37fc20c83ffe9ca7523
 
 OPTIONS_DEFINE=		NLS
 OPTIONS_SUB=		yes
 
 NLS_USE=	qt=linguist_build
 NLS_QMAKE_ON=	CONFIG+=WITH_I18N
 
 CONFLICTS_INSTALL=	lumina-1.2.*
 
 WRKSRC_SUBDIR=	src-qt5
 
 .include <bsd.port.mk>
diff --git a/deskutils/lumina-pdf/Makefile b/deskutils/lumina-pdf/Makefile
index 148476d06299..1acc0beb7e9d 100644
--- a/deskutils/lumina-pdf/Makefile
+++ b/deskutils/lumina-pdf/Makefile
@@ -1,46 +1,45 @@
 PORTNAME=	lumina-pdf
 DISTVERSION=	1.6.0
 PORTREVISION=	19
 CATEGORIES=	deskutils
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	PDF viewer from the Lumina Desktop
 
 LICENSE=	BSD3CLAUSE
 
 USES=		compiler:c++11-lang desktop-file-utils gl qmake qt:5
 USE_QT=		buildtools_build concurrent core gui \
 		multimedia network printsupport \
 		svg widgets x11extras
 USE_GL=		gl
 USE_GITHUB=	yes
 GH_ACCOUNT=	lumina-desktop
-GH_PROJECT=	lumina-pdf
 GH_TAGNAME=	645ed591ef91c3607d3ab87dd86f7acfd08b05c9
 
 OPTIONS_DEFINE=	NLS
 
 OPTIONS_SINGLE=	RENDERER
 OPTIONS_SINGLE_RENDERER=	POPPLER MUPDF
 
 OPTIONS_DEFAULT=	POPPLER
 OPTIONS_SUB=		yes
 
 POPPLER_DESC=		Use Poppler-qt5 backend renderer
 MUPDF_DESC=		Use MuPDF backend renderer (broken)
 
 MUPDF_BROKEN=		Does not build with MuPDF backend
 MUPDF_QMAKE_ON=		USE_MUPDF=true
 MUPDF_LIB_DEPENDS=	libmupdf.so:graphics/mupdf
 
 NLS_QMAKE_ON=		CONFIG+=WITH_I18N
 NLS_USE=		qt=linguist_build
 
 POPPLER_QMAKE_ON=	USE_POPPLER=true
 POPPLER_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
 
 WRKSRC_SUBDIR=	src-qt5
 
 CONFLICTS_INSTALL=	lumina-1.2.*
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-paperless/Makefile b/deskutils/py-paperless/Makefile
index 7714bd8909d0..f80911ff5b16 100644
--- a/deskutils/py-paperless/Makefile
+++ b/deskutils/py-paperless/Makefile
@@ -1,134 +1,133 @@
 PORTNAME=	paperless
 PORTVERSION=	2.7.0
 PORTREVISION=	9
 CATEGORIES=	deskutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	b122931185fb.patch:-p1 # https://github.com/the-paperless-project/paperless/pull/712
 PATCHFILES+=	b131c97d1d85.patch:-p1 # https://github.com/the-paperless-project/paperless/pull/716
 
 MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Index and archive scanned paper documents
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateparser>=0.7.1:devel/py-dateparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-cors-headers>=2.4.0:www/py-django-cors-headers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-crispy-forms>=1.7.2:www/py-django-crispy-forms@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-extensions>=2.1.6:www/py-django-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-filter>=2.0.0:www/py-django-filter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}djangoql>=0.12.4:www/py-djangoql@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.9.0:www/py-djangorestframework@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fuzzywuzzy>=0.15.1:devel/py-fuzzywuzzy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}langdetect>=1.0.7:textproc/py-langdetect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pdftotext>=2.1.1:textproc/py-pdftotext@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyocr>=0.5.3:graphics/py-pyocr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-dotenv>=0.10.1:www/py-python-dotenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-gnupg>=0.4.3:security/py-python-gnupg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}python-magic>=0.4.10:devel/py-python-magic@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 RUN_DEPENDS+=	gpg2:security/gnupg \
 		optipng:graphics/optipng \
 		tesseract:graphics/tesseract \
 		unpaper:graphics/unpaper
 
 USES=		python:3.5+ shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	the-paperless-project
-GH_PROJECT=	paperless
 USE_RC_SUBR=	paperless-consumer
 
 SHEBANG_FILES=	${WRKSRC}/src/manage.py
 
 SUB_FILES=	README nginx.conf paperless.7 pkg-message sshd_config uwsgi.ini
 SUB_LIST=	PKGBASE=${PKGBASE} PYTHON_CMD=${PYTHON_CMD} \
 		PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR} \
 		ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \
 		CHOWN=${CHOWN} RM=${RM:Q}
 
 NO_ARCH=	yes
 
 USERS=		paperless
 GROUPS=		paperless
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_SINGLE=		IMAGICK
 OPTIONS_SINGLE_IMAGICK=	IMAGICK6_NOX11 IMAGICK6_X11 IMAGICK7_NOX11 IMAGICK7_X11
 OPTIONS_DEFAULT=	IMAGICK6_X11
 
 IMAGICK_DESC=		${IMAGEMAGICK_DESC}
 IMAGICK6_NOX11_DESC=	ImageMagick6 without X11 support
 IMAGICK6_X11_DESC=	ImageMagick6 with X11 support
 IMAGICK7_NOX11_DESC=	ImageMagick7 without X11 support
 IMAGICK7_X11_DESC=	ImageMagick7 with X11 support
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.3,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_USES=		gmake
 
 IMAGICK6_X11_RUN_DEPENDS=	convert:graphics/ImageMagick6
 IMAGICK6_NOX11_RUN_DEPENDS=	convert:graphics/ImageMagick6-nox11
 IMAGICK7_X11_RUN_DEPENDS=	convert:graphics/ImageMagick7
 IMAGICK7_NOX11_RUN_DEPENDS=	convert:graphics/ImageMagick7-nox11
 
 PORTDOCS=	*
 
 PAPERLESS_STATICDIR=	${WRKSRC}/static
 
 do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-f ${WRKSRC}/src
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${PYTHONPREFIX_SITELIBDIR} \
 		-f ${WRKSRC}/src
 	@${RM} -r ${PAPERLESS_STATICDIR}
 	@${SETENV} \
 		PAPERLESS_STATICDIR=${PAPERLESS_STATICDIR} \
 		${PYTHON_CMD} ${WRKSRC}/src/manage.py collectstatic
 
 do-build-DOCS-on:
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} html SPHINXBUILD=sphinx-build-${PYTHON_VER}
 
 post-build-DOCS-on:
 	@${RM} ${WRKSRC}/docs/_build/html/.buildinfo
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/paperless
 	@cd ${WRKSRC}/resources && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC}/src && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/paperless
 	@${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/paperless/manage.py \
 		${STAGEDIR}${PREFIX}/bin/paperless
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	@cd ${WRKSRC} && \
 		${COPYTREE_SHARE} static ${STAGEDIR}${WWWDIR}
 	@${SED} -e 's|%%WWWDIR%%|${WWWDIR}|g;' \
 		${WRKSRC}/paperless.conf.example \
 		> ${STAGEDIR}${PREFIX}/etc/paperless.conf.sample
 	@${MKDIR} ${STAGEDIR}/var/db/paperless/consume/input \
 		${STAGEDIR}/var/db/paperless/media \
 		${STAGEDIR}/var/db/paperless/sqlite
 	${INSTALL_MAN} ${WRKDIR}/paperless.7 ${STAGEDIR}${MANPREFIX}/man/man7
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/presentation
 	@cd ${WRKSRC}/docs/_build/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC}/presentation && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/presentation
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} \
 		${WRKDIR}/README \
 		${WRKDIR}/nginx.conf \
 		${WRKDIR}/sshd_config \
 		${WRKDIR}/uwsgi.ini \
 		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/arduino18/Makefile b/devel/arduino18/Makefile
index 23bfc7d6ebdf..e31399f32722 100644
--- a/devel/arduino18/Makefile
+++ b/devel/arduino18/Makefile
@@ -1,112 +1,111 @@
-PORTNAME=	arduino
+PORTNAME=	${GH_PROJECT:tl}
 PORTVERSION=	1.8.5
 PORTREVISION=	1
 CATEGORIES=	devel java
 PKGNAMESUFFIX=	18
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Open-source electronics prototyping platform
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../license.txt
 
 JSSC_DEP=		${JAVA_HOME}/jre/lib/ext/jssc-2.8.0.jar:comms/java-simple-serial-connector
 BUILD_DEPENDS+=	${JSSC_DEP}
 LIB_DEPENDS=	liblistSerialsj.so:devel/listserialc \
 		libastylej-arduino.so:devel/libastylej-arduino
 RUN_DEPENDS=	arduino-builder:devel/arduino-builder \
 		arduino-tools>=1.6.12:devel/arduino-tools \
 		bash:shells/bash \
 		${JSSC_DEP}
 
 CONFLICTS=	arduino-[0-9]*
 
 BUNDLE_GH_ACCOUNT=	arduino-libraries
 BUNDLE_LIBRARIES=	Firmata:2.5.6:firmata \
 			Bridge:1.6.3:bridge \
 			Robot_Control:1.0.4:robotcontrol \
 			Robot_Motor:1.0.3:robotmotor \
 			RobotIRremote:2.0.0:robotir \
 			SpacebrewYun:1.0.1:spacebrew \
 			Temboo:1.2.1:temboo \
 			Esplora:1.0.4:esplora \
 			Mouse:1.0.1:mouse \
 			Keyboard:1.0.1:keyboard \
 			SD:1.1.1:sd \
 			Servo:1.1.2:servo \
 			LiquidCrystal:1.0.7:liquidcrystal
 
 GH_TUPLE+=	${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.9.2:wifi10/linux/work/tools/WiFi101
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	arduino
 GH_PROJECT=	Arduino
 
 .for blib in ${BUNDLE_LIBRARIES}
 GH_TUPLE+=	${BUNDLE_GH_ACCOUNT}:${blib}/linux/work/libraries/${blib:C/\:.*//}
 .endfor
 
 USES=		desktop-file-utils
 LIB_DIRS+=	${LOCALBASE}/lib ${LOCALBASE}/lib/jni
 WRKSRC_SUBDIR=	build
 PATCH_WRKSRC=	${WRKSRC}/../
 MAKE_ARGS+=	-Dlight_bundle=true -Dlocal_sources=true -Dno_arduino_builder=true
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 USE_ANT=	yes
 OS_DIR=		${WRKSRC}/linux
 BUILD_DIR=	${OS_DIR}/work
 INSLIST=	lib libraries revisions.txt tools
 STRIP=		# No Elfs here, only symlinks
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
 DOCS_MAKE_ARGS=		-Dno_docs=false
 DOCS_MAKE_ARGS_OFF=	-Dno_docs=true
 DOCS_MASTER_SITES=	http://downloads.arduino.cc/:ref,galileo,edison \
 			https://files.kyle-evans.net/arduino/:ref,galileo,edison
 DOCS_DISTFILES=		reference-1.6.6-3.zip:ref \
 			Galileo_help_files-1.6.2.zip:galileo \
 			Edison_help_files-1.6.2.zip:edison
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
 INSLIST+=	reference
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 INSLIST+=	examples
 .endif
 
 post-extract:
 	${MKDIR} ${BUILD_DIR}/reference
 	${MV} ${WRKDIR}/code.jquery.com ${BUILD_DIR}/reference
 	${MV} ${WRKDIR}/www.arduino.cc ${BUILD_DIR}/reference
 	${MV} ${WRKDIR}/Galileo_help_files ${BUILD_DIR}/reference
 	${MV} ${WRKDIR}/Edison_help_files ${BUILD_DIR}/reference
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${PATCH_WRKSRC}/arduino-core/src/processing/app/BaseNoGui.java
 	${REINPLACE_CMD} -e 's:<BINARY_LOCATION>:arduino:' -e 's:<ICON_NAME>:arduino:' \
 		${PATCH_WRKSRC}/build/linux/dist/desktop.template
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	(cd ${BUILD_DIR}/ && ${COPYTREE_SHARE} "${INSLIST}" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR})
 	(cd ${WRKSRC}/../ && ${COPYTREE_SHARE} "libraries" ${STAGEDIR}${PREFIX}/${PORTNAME} ${FIND_EXPR})
 	${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/libastylej.so
 	${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/liblistSerialsj.so
 	${RM} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/jssc-2.8.0-arduino1.jar
 	${LN} -s ../../lib/jni/libastylej-arduino.so ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/libastylej.so
 	${LN} -s ../../lib/jni/liblistSerialsj.so ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/liblistSerialsj.so
 	${INSTALL_SCRIPT} ${BUILD_DIR}/arduino ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${LN} -s ../${PORTNAME}/arduino ${STAGEDIR}${PREFIX}/bin/arduino
 	${LN} -s ../bin/arduino-builder ${STAGEDIR}${PREFIX}/arduino/arduino-builder
 	${CP} ${WRKSRC}/shared/icons/arduino.xpm ${STAGEDIR}/${PREFIX}/share/pixmaps
 	${CP} ${PATCH_WRKSRC}/build/linux/dist/desktop.template ${STAGEDIR}/${PREFIX}/share/applications/arduino.desktop
 	${REINPLACE_CMD}  -e 's|$${version}|${PORTVERSION}|' ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/version.txt
 
 .include <bsd.port.mk>
diff --git a/devel/capnproto/Makefile b/devel/capnproto/Makefile
index d04644bfc9a0..6c1be584b1a3 100644
--- a/devel/capnproto/Makefile
+++ b/devel/capnproto/Makefile
@@ -1,30 +1,27 @@
 # Created by: Felix Hanley
 
 PORTNAME=	capnproto
 PORTVERSION=	0.9.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	felix@userspace.com.au
 COMMENT=	Serialization/RPC system
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 USES=		autoreconf compiler:c++14-lang gmake libtool ssl
-
 USE_GITHUB=	yes
-GH_ACCOUNT=	capnproto
 USE_LDCONFIG=	yes
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	ac_cv_lib_ssl_OPENSSL_init_ssl=yes
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
 WRKSRC_SUBDIR=	c++
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 .include <bsd.port.mk>
diff --git a/devel/collada-dom/Makefile b/devel/collada-dom/Makefile
index 1a3c5230af92..e2b48a26fb1c 100644
--- a/devel/collada-dom/Makefile
+++ b/devel/collada-dom/Makefile
@@ -1,26 +1,23 @@
 PORTNAME=	collada-dom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.5.0
 PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	trueos@norwegianrockcat.com
 COMMENT=	COLLADA Document Object Model (DOM) C++ Library
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libminizip.so:archivers/minizip \
 		libpcre.so:devel/pcre \
 		libboost_filesystem.so:devel/boost-libs \
 		libboost_system.so:devel/boost-libs
 
-USES=	cmake gnome
+USES=		cmake gnome
 USE_LDCONFIG=	yes
-
 USE_GNOME=	libxml2
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	rdiankov
-GH_PROJECT=	collada-dom
 
 .include <bsd.port.mk>
diff --git a/devel/colorgcc/Makefile b/devel/colorgcc/Makefile
index 716b1a9efe3e..249ecf054ebc 100644
--- a/devel/colorgcc/Makefile
+++ b/devel/colorgcc/Makefile
@@ -1,31 +1,29 @@
 # Created by: Sofian Brabez <sbrabez@gmail.com>
 
 PORTNAME=	colorgcc
 PORTVERSION=	1.4.5
 CATEGORIES=	devel misc
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl script to colorize the terminal output of GCC
 
 LICENSE=	GPLv2
 
 USES=		shebangfix
 USE_GITHUB=	yes
-GH_ACCOUNT=	colorgcc
-
 SHEBANG_FILES=	colorgcc.pl
 
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/examples/${PORTNAME}/${PORTNAME}rc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}rc.txt \
 		${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}rc
 
 .include <bsd.port.mk>
diff --git a/devel/elm-format/Makefile b/devel/elm-format/Makefile
index 04be863128d8..5049ffe67884 100644
--- a/devel/elm-format/Makefile
+++ b/devel/elm-format/Makefile
@@ -1,49 +1,47 @@
 PORTNAME=	elm-format
 PORTVERSION=	0.8.3
 PORTREVISION=	3
 CATEGORIES=	devel textproc
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Elm source code formatter based on the official Elm Style Guide
 
 LICENSE=	BSD3CLAUSE
 
 USES=		cabal
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	avh4
-GH_PROJECT=	elm-format
 
 USE_CABAL=	ansi-terminal-0.8.2 \
 		ansi-wl-pprint-0.6.8.2_2 \
 		base-orphans-0.8.2 \
 		bifunctors-5.5.7 \
 		cabal-doctest-1.0.8_1 \
 		colour-2.3.5 \
 		comonad-5.0.6 \
 		concatenative-1.0.1 \
 		contravariant-1.5.2 \
 		distributive-0.6.1 \
 		exceptions-0.10.4_1 \
 		free-5.1.3 \
 		hashable-1.3.0.0_1 \
 		indents-0.3.3 \
 		json-0.10_1 \
 		optparse-applicative-0.15.1.0_1 \
 		profunctors-5.5.2 \
 		semigroupoids-5.3.4 \
 		split-0.2.3.4 \
 		StateVar-1.2 \
 		syb-0.7.1 \
 		tagged-0.8.6_2 \
 		th-abstraction-0.3.2.0 \
 		transformers-base-0.4.5.2 \
 		transformers-compat-0.6.5 \
 		unordered-containers-0.2.10.0_1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' \
 		${WRKSRC}/src/ElmFormat/Version.hs
 	${RM} ${WRKSRC}/cabal.config
 
 .include <bsd.port.mk>
diff --git a/devel/emscripten/Makefile b/devel/emscripten/Makefile
index 1919753f3658..251f36eb2d94 100644
--- a/devel/emscripten/Makefile
+++ b/devel/emscripten/Makefile
@@ -1,60 +1,59 @@
 PORTNAME=	emscripten
 DISTVERSION=	2.0.3
 PORTREVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	LLVM-to-Web Compiler
 
 LICENSE=	MIT NCSA
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	llvm-devel>0:devel/llvm-devel \
 		node:www/node \
 		bash:shells/bash \
 		binaryen>0:devel/binaryen
 		# the upstream requires to use either the latest llvm version, or their own llvm fork called emscripten-fastcomp
 
 USES=		python shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	emscripten-core
-GH_PROJECT=	emscripten
 SHEBANG_FILES=	${PYSCRIPTS} emcmake tools/emdump system/bin/sdl-config system/bin/sdl2-config third_party/websockify/run
 SHEBANG_GLOB=	*.py *.sh
 
 PYSCRIPTS=	em++ em-config emar embuilder emcc emcmake emconfigure emmake emranlib emrun emscons emsize
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PORTSCOUT=	limit:^\d+\. # prevent i64
 
 post-patch:
 	@${REINPLACE_CMD} -i '' -E " \
 			s|BINARYEN_ROOT = None|BINARYEN_ROOT = '${LOCALBASE}'| ; \
 			s|LLVM_ROOT = None|LLVM_ROOT = '${LOCALBASE}'| ; \
 			s|LLVM_ADD_VERSION = None|LLVM_ADD_VERSION = 'devel'| ; \
 			s|CLANG_ADD_VERSION = None|CLANG_ADD_VERSION = 'devel'| ; \
 			s|^__rootpath__ = .*|__rootpath__ = '${PREFIX}/lib/${PORTNAME}'| ; \
 			s|find_executable\('llvm-dis'\) or '/usr/bin/llvm-dis'|'${LOCALBASE}/bin/llvm-dis'|" \
 			${WRKSRC}/tools/shared.py
 	@${REINPLACE_CMD} -i '' -E " \
 			s|os.getenv\('BINARYEN', ''\)|os.getenv('BINARYEN', '${LOCALBASE}')|" \
 			${WRKSRC}/tools/settings_template.py
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}
 	cd ${WRKSRC} && ${CP} -r em* cmake site src system third_party tools ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
 	${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} \( -name "*.bat" -o -name "*.orig" \) -delete
 .for s in ${PYSCRIPTS}
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "${PYTHON_CMD} ${PREFIX}/lib/${PORTNAME}/${s}.py \"$$"@"\"" \
 	) > ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${s}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${s}
 	${RLN} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${s} ${STAGEDIR}${PREFIX}/bin/${s}
 .endfor
 	${RM} -rf ${STAGEDIR}${PREFIX}/lib/emscripten/system/lib/pkgconfig
 	${RM} -rf ${STAGEDIR}${PREFIX}/lib/emscripten/tools/websocket_to_posix_proxy
 
 .include <bsd.port.mk>
diff --git a/devel/hs-spago/Makefile b/devel/hs-spago/Makefile
index 31d3f47ab1b6..8d462244500a 100644
--- a/devel/hs-spago/Makefile
+++ b/devel/hs-spago/Makefile
@@ -1,208 +1,205 @@
 PORTNAME=	spago
 DISTVERSION=	0.20.3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/docs-search-app.js?dummy=/:dsa11 \
 		https://github.com/purescript/purescript-docs-search/releases/download/v0.0.11/purescript-docs-search?dummy=/:pds11 \
 		https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/docs-search-app.js?dummy=/:dsa10 \
 		https://github.com/purescript/purescript-docs-search/releases/download/v0.0.10/purescript-docs-search?dummy=/:pds10
 DISTFILES=	docs-search-app-0.0.11.js:dsa11 \
 		purescript-docs-search-0.0.11:pds11 \
 		docs-search-app-0.0.10.js:dsa10 \
 		purescript-docs-search-0.0.10:pds10
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	PureScript package manager and build tool
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss
 
 USES=		cabal
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	purescript
-GH_PROJECT=	spago
-
 USE_LOCALE=	en_US.UTF-8
 
 USE_CABAL=	Diff-0.4.0 \
 		Glob-0.10.1 \
 		StateVar-1.2.1 \
 		adjunctions-4.4_2 \
 		aeson-1.5.6.0_1 \
 		aeson-better-errors-0.9.1.0 \
 		aeson-pretty-0.8.8 \
 		ansi-terminal-0.11 \
 		ansi-wl-pprint-0.6.9_2 \
 		appar-0.1.8 \
 		asn1-encoding-0.9.6_2 \
 		asn1-parse-0.9.5 \
 		asn1-types-0.3.4 \
 		assoc-1.0.2_1 \
 		async-2.2.3 \
 		async-pool-0.9.1 \
 		atomic-write-0.2.0.7 \
 		attoparsec-0.14.1 \
 		auto-update-0.1.6 \
 		base-compat-0.11.2 \
 		base-compat-batteries-0.11.2 \
 		base-orphans-0.8.4 \
 		base64-bytestring-1.2.0.1 \
 		basement-0.0.12 \
 		basic-prelude-0.7.0 \
 		bifunctors-5.5.10 \
 		blaze-builder-0.4.2.1 \
 		bower-json-1.0.0.1 \
 		byteorder-1.0.4 \
 		cabal-doctest-1.0.8_2 \
 		case-insensitive-1.2.1.0 \
 		cborg-0.2.5.0 \
 		cborg-json-0.2.2.0_2 \
 		cereal-0.5.8.1 \
 		charset-0.3.8 \
 		chunked-data-0.3.1 \
 		classy-prelude-1.5.0 \
 		clock-0.8.2 \
 		colour-2.3.5 \
 		comonad-5.0.8 \
 		conduit-1.3.4.1 \
 		conduit-extra-1.3.5 \
 		connection-0.3.1_1 \
 		contravariant-1.5.3 \
 		cookie-0.4.5 \
 		cryptonite-0.28 \
 		data-default-class-0.1.2.0 \
 		data-fix-0.3.1 \
 		dhall-1.38.1 \
 		distributive-0.6.2.1 \
 		dlist-1.0 \
 		dlist-instances-0.1.1.1 \
 		dotgen-0.4.3 \
 		easy-file-0.2.2 \
 		either-5.0.1.1_1 \
 		fast-logger-3.0.3 \
 		fgl-5.7.0.3 \
 		file-embed-0.0.13.0 \
 		foldl-1.4.11 \
 		free-5.1.6 \
 		fsnotify-0.3.0.1_1 \
 		generic-lens-2.1.0.0 \
 		generic-lens-core-2.1.0.0 \
 		half-0.3.1 \
 		hashable-1.3.1.0 \
 		hostname-1.0 \
 		hourglass-0.2.12 \
 		hsc2hs-0.68.7_1 \
 		http-client-0.7.8 \
 		http-client-tls-0.3.5.3_1 \
 		http-conduit-2.3.8 \
 		http-types-0.12.3 \
 		indexed-profunctors-0.1.1 \
 		indexed-traversable-0.1.1 \
 		integer-logarithms-1.0.3.1 \
 		invariant-0.5.4 \
 		iproute-1.7.11 \
 		kan-extensions-5.2.2 \
 		keys-3.12.3 \
 		lens-family-core-2.1.0 \
 		lifted-base-0.2.3.12 \
 		managed-1.0.8 \
 		math-functions-0.3.4.2 \
 		megaparsec-7.0.5 \
 		memory-0.15.0_2 \
 		microlens-0.4.12.0 \
 		microlens-mtl-0.2.0.1 \
 		mime-types-0.1.0.9 \
 		mmorph-1.1.5_1 \
 		monad-control-1.0.2.3 \
 		monad-logger-0.3.36 \
 		monad-loops-0.4.3 \
 		mono-traversable-1.0.15.1 \
 		mono-traversable-instances-0.1.1.0 \
 		mutable-containers-0.3.4 \
 		mwc-random-0.15.0.1_2 \
 		network-3.1.2.1_1 \
 		network-uri-2.6.4.1 \
 		old-locale-1.0.0.7_2 \
 		old-time-1.1.0.3_2 \
 		open-browser-0.2.1.0 \
 		optional-args-1.0.2_1 \
 		optparse-applicative-0.16.1.0 \
 		parser-combinators-1.3.0 \
 		parsers-0.12.10_1 \
 		pem-0.2.4 \
 		pointed-5.0.2 \
 		pretty-simple-4.0.0.0 \
 		prettyprinter-1.7.0 \
 		prettyprinter-ansi-terminal-1.1.2 \
 		primitive-0.7.1.0_2 \
 		profunctors-5.6.2 \
 		random-1.2.0_5 \
 		repline-0.4.0.0 \
 		resourcet-1.2.4.2 \
 		retry-0.8.1.2 \
 		rio-0.1.20.0 \
 		rio-orphans-0.1.2.0 \
 		safe-0.3.19 \
 		safe-exceptions-0.1.7.1 \
 		say-0.1.0.1 \
 		scientific-0.3.6.2 \
 		semigroupoids-5.3.5 \
 		semigroups-0.19.1 \
 		semver-range-0.2.8 \
 		serialise-0.2.3.0_2 \
 		socks-0.6.1 \
 		split-0.2.3.4_1 \
 		splitmix-0.1.0.3 \
 		stm-chans-3.0.0.4_1 \
 		streaming-commons-0.2.2.1 \
 		strict-0.4.0.1 \
 		stringsearch-0.3.6.6_1 \
 		system-fileio-0.3.16.4 \
 		system-filepath-0.4.14_1 \
 		tagged-0.8.6.1_1 \
 		tar-0.5.1.1_3 \
 		temporary-1.3 \
 		text-manipulate-0.3.0.0 \
 		th-abstraction-0.4.2.0 \
 		th-compat-0.1.2 \
 		th-env-0.1.0.2 \
 		th-lift-0.8.2 \
 		th-lift-instances-0.1.18 \
 		these-1.1.1.1_1 \
 		time-compat-1.9.5_1 \
 		tls-1.5.5 \
 		transformers-base-0.4.5.2 \
 		transformers-compat-0.6.6 \
 		turtle-1.5.22 \
 		typed-process-0.2.6.0 \
 		unix-compat-0.5.3 \
 		unix-time-0.4.7 \
 		unliftio-0.2.14 \
 		unliftio-core-0.2.0.1_1 \
 		unordered-containers-0.2.13.0 \
 		uri-encode-1.5.0.7_1 \
 		utf8-string-1.0.2 \
 		uuid-types-1.0.4 \
 		vector-0.12.3.0 \
 		vector-algorithms-0.8.0.4_1 \
 		vector-instances-3.4 \
 		versions-4.0.3 \
 		void-0.7.3 \
 		with-utf8-1.0.2.2 \
 		x509-1.7.5_1 \
 		x509-store-1.6.7_1 \
 		x509-system-1.6.6 \
 		x509-validation-1.6.11 \
 		zlib-0.6.2.3
 
 PURESCRIPT_DOCS_SEARCH_VERSION=	0.0.11
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/docs-search-app-0.0.11.js ${WRKSRC}/templates/
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/purescript-docs-search-0.0.11 ${WRKSRC}/templates/
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/docs-search-app-0.0.10.js ${WRKSRC}/templates/
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/purescript-docs-search-0.0.10 ${WRKSRC}/templates/
 
 .include <bsd.port.mk>
diff --git a/devel/libcdb/Makefile b/devel/libcdb/Makefile
index 26baf00b5845..476d72c06edf 100644
--- a/devel/libcdb/Makefile
+++ b/devel/libcdb/Makefile
@@ -1,20 +1,19 @@
 PORTNAME=	libcdb
 PORTVERSION=	g2020082801
 CATEGORIES=	devel
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Constant database library
 
 USES=		compiler:c11 gmake libtool:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmind
-GH_PROJECT=	libcdb
 GH_TAGNAME=	a187cec
 WRKSRC_SUBDIR=	src
 USE_LDCONFIG=	yes
 MAKE_ENV=	DESTDIR=${STAGEDIR}${PREFIX} \
 		INCDIR=${LOCALBASE}/include \
 		LIBDIR=${LOCALBASE}/lib
 
 .include <bsd.port.mk>
diff --git a/devel/libibuddy/Makefile b/devel/libibuddy/Makefile
index 989bf5435868..2a1aac14a33a 100644
--- a/devel/libibuddy/Makefile
+++ b/devel/libibuddy/Makefile
@@ -1,21 +1,20 @@
 # Created by: Rodrigo OSORIO <rodrigo@FreeBSD.org>
 
 PORTNAME=	libibuddy
 PORTVERSION=	0.0.2
 CATEGORIES=	devel
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	C loadable library and CLI tool to control an i-buddy device
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cmake
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	rosorio
-GH_PROJECT=	libibuddy
 GH_TAGNAME=	919d309
 
 PLIST_FILES=	bin/ibuddy_test bin/ibuddycmd include/ibuddy.h lib/libibuddy.so
 
 .include <bsd.port.mk>
diff --git a/devel/liblpm/Makefile b/devel/liblpm/Makefile
index 963d8063f4f9..5ff6043c3939 100644
--- a/devel/liblpm/Makefile
+++ b/devel/liblpm/Makefile
@@ -1,30 +1,29 @@
 PORTNAME=	liblpm
 PORTVERSION=	g2020082801
 CATEGORIES=	devel
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Longest Prefix Match library
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 USES=		compiler:c11 gmake libtool:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmind
-GH_PROJECT=	liblpm
 GH_TAGNAME=	4119bb7
 WRKSRC_SUBDIR=	src
 USE_LDCONFIG=	yes
 MAKE_ENV=	DESTDIR=${STAGEDIR}${PREFIX} \
 		INCDIR=${LOCALBASE}/include \
 		LIBDIR=${LOCALBASE}/lib \
 		MANDIR=${LOCALBASE}/man
 
 PLIST_FILES=	include/lpm.h \
 		lib/liblpm.a \
 		lib/liblpm.so \
 		lib/liblpm.so.1 \
 		lib/liblpm.so.1.0.0
 
 .include <bsd.port.mk>
diff --git a/devel/libopencm3/Makefile b/devel/libopencm3/Makefile
index 50da54548498..724d75bda6c3 100644
--- a/devel/libopencm3/Makefile
+++ b/devel/libopencm3/Makefile
@@ -1,35 +1,32 @@
 PORTNAME=	libopencm3
 PORTVERSION=	0.8.0
 DISTVERSIONPREFIX=v
 PORTREVISION=	0
 CATEGORIES=	devel
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	LGPLv3 Cortex-M0/M3/M4 runtime library
 
 LICENSE=	LGPL3
 
 BUILD_DEPENDS=	${LOCALBASE}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}/bin/arm-none-eabi-gcc:devel/gcc-arm-embedded
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	libopencm3
-
 USES=		gmake python:build shebangfix
-
+USE_GITHUB=	yes
 SHEBANG_FILES=	scripts/irq2nvic_h \
 		scripts/lpcvtcksum
 
 TOOLCHAIN_FULL_VERSION?=10-2020-q4-major
 TOOLCHAIN_PORT_VERSION?=10.2.20201211
 TOOLCHAIN_TARGET?=arm-none-eabi
 
 DESTDIRNAME=	STAGEDIR
 MAKE_ENV=	PATH=${LOCALBASE}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}/bin:${PATH} \
 		DESTDIR=${STAGEDIR}${PREFIX}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}
 
 PLIST_SUB+=	TARGET=${TOOLCHAIN_TARGET} FULL_VERSION=${TOOLCHAIN_FULL_VERSION}
 
 do-configure:
 	${FIND} ${WRKSRC} -name Makefile -o -name \*.mk -type f | ${XARGS} ${REINPLACE_CMD} -e 's|PREFIX|TARGET|g'
 
 .include <bsd.port.mk>
diff --git a/devel/linenoise-ng/Makefile b/devel/linenoise-ng/Makefile
index cfe9f9a04a6d..552c26810c10 100644
--- a/devel/linenoise-ng/Makefile
+++ b/devel/linenoise-ng/Makefile
@@ -1,22 +1,21 @@
 # Created by: David Thiel <lx@freebsd.org>
 
 PORTNAME=	linenoise-ng
 PORTVERSION=	1.0.0
 PORTREVISION=	2
 DISTVERSIONPREFIX=v
 CATEGORIES=	devel
 
 MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Small, portable readline replacement
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake compiler:c++11-lang
 USE_GITHUB=	yes
 GH_ACCOUNT=	arangodb
-GH_PROJECT=	linenoise-ng
 
 CFLAGS+=	-fPIC
 
 .include <bsd.port.mk>
diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 0c0cb4383f0d..9afb445ea498 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -1,577 +1,576 @@
 # Created by: Hye-Shik Chang
 
 PORTNAME=	llvm
 PORTVERSION=	${LLVM_MAJOR}.0.d${SNAPDATE}
 PORTREVISION=	0
 CATEGORIES=	devel lang
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 
 LICENSE_DIR=	${WRKSRC}/llvm
 .include "Makefile.LICENSE"
 LICENSE+=	LLVM2
 LICENSE_FILE_LLVM2=	${LICENSE_DIR}/LICENSE.TXT
 LICENSE_NAME_LLVM2= 	Apache License 2.0 with LLVM Exceptions
 LICENSE_PERMS_LLVM2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE:=	${LICENSE:NARM}
 
 FLAVORS=	default lite
 FLAVOR?=	${FLAVORS:[1]}
 lite_PKGNAMESUFFIX=	${LLVM_SUFFIX}-lite
 
 LLVM_SUFFIX=	-devel
 LLVM_DIR=	llvm${LLVM_SUFFIX}
 LLVM_PREFIX=	${PREFIX}/${LLVM_DIR}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 
 BUILD_DEPENDS=
 
 USES=		cmake compiler:c++11-lib shebangfix
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 _USES_PYTHON?=	python:build,3.6+
 USES+=		${_USES_PYTHON}
 SHEBANG_FILES=	\
 		clang/tools/scan-build-py/bin/analyze-build \
 		clang/tools/scan-build-py/bin/intercept-build \
 		clang/tools/scan-build-py/bin/scan-build \
 		clang/tools/scan-build-py/libexec/analyze-cc \
 		clang/tools/scan-build-py/libexec/analyze-c++ \
 		clang/tools/scan-build-py/libexec/intercept-cc \
 		clang/tools/scan-build-py/libexec/intercept-c++ \
 		flang/tools/f18/flang \
 		llvm/tools/opt-viewer/optrecord.py \
 		llvm/tools/opt-viewer/opt-diff.py \
 		llvm/tools/opt-viewer/opt-stats.py \
 		llvm/tools/opt-viewer/opt-viewer.py \
 		llvm/utils/lit/lit.py \
 		llvm/utils/llvm-lit/llvm-lit.in
 
 SUB_FILES=	llvm-wrapper.sh
 SUB_LIST=	LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}"
 
 CMAKE_INSTALL_PREFIX=	${LLVM_PREFIX}
 CMAKE_SOURCE_PATH=	${WRKSRC}/llvm
 CMAKE_ARGS=	-DLLVM_BUILD_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DLLVM_LINK_LLVM_DYLIB=ON
 CMAKE_ARGS+=	-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON
 CMAKE_ARGS+=	-DLLVM_ENABLE_RTTI=ON
 CMAKE_ARGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=${CONFIGURE_TARGET}
 CMAKE_ARGS+=	-DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET}
 # Following commit https://github.com/kitware/cmake/commit/956054
 # we need to either change the whole man-shuffle below, or simply
 # redefine CMAKE_INSTALL_MANDIR
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR:PATH="share/man"
 CMAKE_ARGS+=	-DLLVM_PARALLEL_LINK_JOBS=1
 CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
 CMAKE_ARGS+=	-DLLVM_ENABLE_LIBXML2=OFF
 CMAKE_ARGS+=	-DLLVM_ENABLE_LIBEDIT=OFF
 CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
 		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}m.so
 
 # Disable assertions.  They should be disabled by cmake, but USES=cmake
 # overrides -DCMAKE_*_FLAGS_RELEASE.
 CFLAGS+=	-DNDEBUG
 CXXFLAGS+=	-DNDEBUG
 
 USE_GITHUB=	yes
 GH_PROJECT=	llvm-project
-GH_ACCOUNT=	llvm
 GH_TAGNAME=	${LLVM_PROJECT_COMMIT}
 
 .include "Makefile.snapshot"
 
 OPTIONS_DEFINE=		CLANG DOCS LLD STATIC_LIBS
 OPTIONS_DEFAULT=	CLANG LLD
 .if !${FLAVOR:Mlite}
 OPTIONS_DEFINE+=	EXTRAS FLANG LIT LLDB MLIR
 OPTIONS_DEFINE_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFINE_powerpc=	GOLD
 OPTIONS_DEFINE_powerpc64=	GOLD OPENMP
 OPTIONS_DEFINE_powerpc64le=	GOLD OPENMP
 OPTIONS_DEFAULT+=	EXTRAS FLANG LIT LLDB MLIR STATIC_LIBS
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT_powerpc=	GOLD
 OPTIONS_DEFAULT_powerpc64=	${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP
 OPTIONS_DEFAULT_powerpc64_13=	GOLD
 OPTIONS_DEFAULT_powerpc64_14=	GOLD
 OPTIONS_DEFAULT_powerpc64le=	GOLD OPENMP
 OPTIONS_EXCLUDE_i386=	FLANG
 OPTIONS_EXCLUDE_powerpc=	FLANG
 .endif
 OPTIONS_SUB=	yes
 _ALL_OPTIONS=	CLANG COMPILER_RT DOCS EXTRAS FLANG GOLD LIT LLD LLDB MLIR \
 		OPENMP STATIC_LIBS
 
 # Pre-declared for options framework
 LIB_DEPENDS=
 PLIST_DIRS=
 PLIST_FILES=
 PLIST_SUB_SED_EXCLUDE_VAL=	lib "3.0.0"
 
 CLANG_DESC=	Build clang
 CLANG_CONFLICTS_INSTALL=	clang-devel-3.[1234567]*
 CLANG_CMAKE_ON=		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \
 			-DCLANG_LINK_LLVM_DYLIB=ON
 CLANG_PORTDOCS=		clang
 CLANG_PLIST_FILES=	share/toolchains/llvm-devel.mk
 CLANG_SUB_FILES=	xtoolchain.mk
 CLANG_SUB_LIST=		XCC=clang${LLVM_SUFFIX} \
 			XCXX=clang++${LLVM_SUFFIX} \
 			XCPP=clang-cpp${LLVM_SUFFIX} \
 			XLD=ld.lld${LLVM_SUFFIX} \
 			X_COMPILER_TYPE=clang
 .if ${FLAVOR:Nlite}
 # Required by scan-build.  Users of lite can install by hand.
 CLANG_USES=		perl5
 CLANG_USE=		PERL5=run
 .endif
 COMPILER_RT_DESC=	Sanitizer libraries
 # An unwind.h is require to build.  I think an in-tree one should be used
 # but this seems to work as a workaround...
 COMPILER_RT_BUILD_DEPENDS=	libunwind>0:devel/libunwind
 COMPILER_RT_IMPLIES=	CLANG
 # Allow unwind.h to be found reliably
 COMPILER_RT_USES=	localbase
 COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \
 			${_COMPILER_RT_IGNORELISTS:S|^|${_CRTBLDIR}/|}
 DOCS_PORTDOCS=		llvm
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR}
 DOCS_CMAKE_ON=		-DLLVM_ENABLE_SPHINX=ON \
 			-DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \
 			-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 			-DLLVM_BUILD_DOCS=ON
 DOCS_PLIST_FILES=	${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|}
 EXTRAS_DESC=		Extra clang tools
 EXTRAS_IMPLIES=		CLANG
 EXTRAS_PLIST_DIRS=	${LLVM_DIR}/include/clang-tidy/plugin
 FLANG_DESC=		Flang FORTRAN compiler
 FLANG_IMPLIES=		MLIR
 #FLANG_PORTDOCS=		flang
 FLANG_PLIST_DIRS=	${LLVM_DIR}/include/flang/Config
 # Docs require sphinx-markdown-tables which requires py-markdown > 3.0.1
 FLANG_CMAKE_ON=		-DFLANG_INCLUDE_DOCS=OFF
 LIT_DESC=		Install lit and FileCheck test tools
 LLD_DESC=		Install lld, the LLVM linker
 LLDB_BUILD_DEPENDS=	swig:devel/swig
 LLDB_DESC=		Install lldb, the LLVM debugger
 LLDB_IMPLIES=		CLANG
 LLDB_USES=		lua:53 libedit
 LLDB_USE=		GNOME=libxml2
 LLDB_VARS=		_USES_PYTHON=python:3.6+
 MLIR_DESC=		Multi-Level Intermediate Representation
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_PORTDOCS=	openmp
 OPENMP_CONFLICTS_INSTALL=	libiomp5-devel-*
 OPENMP_USES=		perl5
 OPENMP_USE=		PERL5=build
 STATIC_LIBS_DESC=	Install static libraries (does not effect sanitizers)
 GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
 
 PLIST_SUB+=	LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE}
 
 COMMANDS=	${LLVM_COMMANDS}
 FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 MAN1SRCS+=	bugpoint.1 \
 		clang-tblgen.1 \
 		dsymutil.1 \
 		llc.1 \
 		lldb-tblgen.1 \
 		lli.1 \
 		llvm-addr2line.1 \
 		llvm-ar.1 \
 		llvm-as.1 \
 		llvm-bcanalyzer.1 \
 		llvm-config.1 \
 		llvm-cov.1 \
 		llvm-cxxfilt.1 \
 		llvm-cxxmap.1 \
 		llvm-diff.1 \
 		llvm-dis.1 \
 		llvm-dwarfdump.1 \
 		llvm-exegesis.1 \
 		llvm-extract.1 \
 		llvm-install-name-tool.1 \
 		llvm-lib.1 \
 		llvm-libtool-darwin.1 \
 		llvm-lipo.1 \
 		llvm-link.1 \
 		llvm-locstats.1 \
 		llvm-mca.1 \
 		llvm-nm.1 \
 		llvm-objcopy.1 \
 		llvm-objdump.1 \
 		llvm-otool.1 \
 		llvm-pdbutil.1 \
 		llvm-profdata.1 \
 		llvm-profgen.1 \
 		llvm-ranlib.1 \
 		llvm-readelf.1 \
 		llvm-readobj.1 \
 		llvm-size.1 \
 		llvm-stress.1 \
 		llvm-strings.1 \
 		llvm-strip.1 \
 		llvm-symbolizer.1 \
 		llvm-tblgen.1 \
 		mlir-tblgen.1 \
 		opt.1 \
 		tblgen.1
 
 STRIP_LIBS=	BugpointPasses.so \
 		LLVMHello.so \
 		${LIBNAME}.0 \
 		libLTO.so
 
 EXTRAS_LIBS=	\
 		libclangApplyReplacements \
 		libclangChangeNamespace \
 		libclangDaemon \
 		libclangDoc \
 		libclangIncludeFixer \
 		libclangMove \
 		libclangQuery \
 		libclangRename \
 		libclangReorderFields \
 		libclangTidy \
 		libclangTidyGoogleModule \
 		libclangTidyLLVMModule \
 		libclangTidyMiscModule \
 		libclangTidyReadabilityModule \
 		libclangTidyUtils \
 		libfindAllSymbols \
 		libmodernizeCore
 EXTRAS_FILES=	index.js
 EXTRAS_PATTERN=	${EXTRAS_COMMANDS:tW:C/  */|/g}|${EXTRAS_LIBS:tW:C/  */|/g}|${EXTRAS_FILES:tW:C/  */|/g}
 
 FLANG_PATTERN=	${FLANG_COMMANDS:S/^/bin./:tW:C/  */|/g}|flang|libFIROptimizer|libFortran
 
 MLIR_PATTERN=	${MLIR_COMMANDS:S/^/bin./:tW:C/  */|/g}|mlir|libMLIR
 
 .include <bsd.port.options.mk>
 
 # keep in sync with /usr/src/lib/clang/clang.build.mk
 # ----------- start of sync block ------------------
 # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it.
 # arm (for armv4 and armv5 CPUs) always uses the soft float ABI.
 # For all other targets, we stick with 'unknown'.
 .if ${ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "")
 TARGET_ABI=	-gnueabihf
 .elif ${ARCH:Marm*}
 TARGET_ABI=	-gnueabi
 .else
 TARGET_ABI=
 .endif
 
 CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${OSREL}${TARGET_ABI}
 # ----------- end of sync block --------------------
 
 .if ${PORT_OPTIONS:MCLANG}
 LLVM_ENABLE_PROJECTS+=	clang
 COMMANDS+=	${CLANG_COMMANDS}
 MAN1SRCS+=	clang.1 \
 		diagtool.1 \
 		scan-build.1
 CLANG_PATTERN=	(c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer)
 SHEBANG_FILES+= clang/tools/clang-format/git-clang-format \
 		clang/tools/clang-format/clang-format-diff.py \
 		clang/tools/scan-view/bin/scan-view \
 		clang/utils/hmaptool/hmaptool
 USES+=	gnome
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
 LLVM_ENABLE_PROJECTS+=	compiler-rt
 COMPILER_RT_PATTERN=	(sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc)
 .endif
 
 .if ${PORT_OPTIONS:MEXTRAS}
 LLVM_ENABLE_PROJECTS+=	clang-tools-extra
 COMMANDS+=	${EXTRAS_COMMANDS}
 MAN1SRCS+=	extraclangtools.1
 PORTDOCS+=	clang-tools
 SHEBANG_FILES+=	clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py \
 		clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py \
 		clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
 .endif
 
 .if ${PORT_OPTIONS:MFLANG}
 LLVM_ENABLE_PROJECTS+=	flang
 COMMANDS+=	${FLANG_COMMANDS}
 .endif
 
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=	lit.1 FileCheck.1
 .endif
 
 .if ${PORT_OPTIONS:MLLD}
 LLVM_ENABLE_PROJECTS+=	lld
 COMMANDS+=	${LLD_COMMANDS}
 PORTDOCS+=	lld
 .endif
 
 .if ${PORT_OPTIONS:MLLDB}
 LLVM_ENABLE_PROJECTS+=	lldb
 COMMANDS+=	${LLDB_COMMANDS}
 .endif
 
 .if ${PORT_OPTIONS:MMLIR}
 LLVM_ENABLE_PROJECTS+=	mlir
 COMMANDS+=	${MLIR_COMMANDS}
 .endif
 
 .if ${PORT_OPTIONS:MOPENMP}
 LLVM_ENABLE_PROJECTS+=	openmp
 MAN1SRCS+=	llvmopenmp.1
 COMMANDS+=	${OPENMP_COMMANDS}
 .endif
 OPENMP_PATTERN=	${OPENMP_COMMANDS:tW:C/  */|/g}|cmake\/openmp|libarcher|lib[ig]*omp|omp.h|ompt.h|ompt-multiplex.h|omp-tools.h
 
 .if defined(LLVM_ENABLE_PROJECTS)
 CMAKE_ARGS+=	-DLLVM_ENABLE_PROJECTS="${LLVM_ENABLE_PROJECTS:ts;}"
 .endif
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.COMMANDS"
 
 .if defined(WITH_DEBUG)
 CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
 _CRTLIBDIR=	${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd
 _CRTBLDIR=	${LLVM_DIR}/lib/clang/%%LLVM_RELEASE%%/share
 _COMPILER_RT_IGNORELISTS=	cfi_ignorelist.txt
 _COMPILER_RT_LIBS_i386= \
 	libclang_rt.asan-i386.a \
 	libclang_rt.asan-i386.so \
 	libclang_rt.asan-preinit-i386.a \
 	libclang_rt.asan_cxx-i386.a \
 	libclang_rt.builtins-i386.a \
 	libclang_rt.cfi-i386.a \
 	libclang_rt.cfi_diag-i386.a \
 	libclang_rt.profile-i386.a \
 	libclang_rt.safestack-i386.a \
 	libclang_rt.stats-i386.a \
 	libclang_rt.stats_client-i386.a \
 	libclang_rt.ubsan_minimal-i386.a \
 	libclang_rt.ubsan_minimal-i386.so \
 	libclang_rt.ubsan_standalone-i386.a \
 	libclang_rt.ubsan_standalone-i386.so \
 	libclang_rt.ubsan_standalone_cxx-i386.a
 .if ${ARCH} == "amd64"
 _COMPILER_RT_IGNORELISTS+=	asan_ignorelist.txt
 _COMPILER_RT_IGNORELISTS+=	msan_ignorelist.txt
 _COMPILER_RT_LIBS= \
 	libclang_rt.asan-preinit-x86_64.a \
 	libclang_rt.asan-x86_64.a \
 	libclang_rt.asan-x86_64.a.syms \
 	libclang_rt.asan-x86_64.so \
 	libclang_rt.asan_cxx-x86_64.a \
 	libclang_rt.asan_cxx-x86_64.a.syms \
 	libclang_rt.builtins-x86_64.a \
 	libclang_rt.cfi-x86_64.a \
 	libclang_rt.cfi_diag-x86_64.a \
 	libclang_rt.dd-x86_64.a \
 	libclang_rt.dyndd-x86_64.so \
 	libclang_rt.fuzzer-x86_64.a \
 	libclang_rt.fuzzer_interceptors-x86_64.a \
 	libclang_rt.fuzzer_no_main-x86_64.a \
 	libclang_rt.msan-x86_64.a \
 	libclang_rt.msan-x86_64.a.syms \
 	libclang_rt.msan_cxx-x86_64.a \
 	libclang_rt.msan_cxx-x86_64.a.syms \
 	libclang_rt.xray-basic-x86_64.a \
 	libclang_rt.xray-fdr-x86_64.a \
 	libclang_rt.xray-profiling-x86_64.a \
 	libclang_rt.xray-x86_64.a \
 	libclang_rt.orc-x86_64.a \
 	libclang_rt.profile-x86_64.a \
 	libclang_rt.safestack-x86_64.a \
 	libclang_rt.stats-x86_64.a \
 	libclang_rt.stats_client-x86_64.a \
 	libclang_rt.tsan-x86_64.a \
 	libclang_rt.tsan-x86_64.a.syms \
 	libclang_rt.tsan_cxx-x86_64.a \
 	libclang_rt.tsan_cxx-x86_64.a.syms \
 	libclang_rt.ubsan_minimal-x86_64.a \
 	libclang_rt.ubsan_minimal-x86_64.a.syms \
 	libclang_rt.ubsan_minimal-x86_64.so \
 	libclang_rt.ubsan_standalone-x86_64.a \
 	libclang_rt.ubsan_standalone-x86_64.a.syms \
 	libclang_rt.ubsan_standalone-x86_64.so \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a \
 	libclang_rt.ubsan_standalone_cxx-x86_64.a.syms
 .if exists(/usr/lib32/libc.so.7)
 _COMPILER_RT_LIBS+=	${_COMPILER_RT_LIBS_i386}
 .endif
 .endif
 .if ${ARCH} == "i386"
 _COMPILER_RT_IGNORELISTS+=	asan_ignorelist.txt
 _COMPILER_RT_LIBS+=	${_COMPILER_RT_LIBS_i386}
 .endif
 
 # Comment out plist entries for unsupported options.
 .for opt in ${_ALL_OPTIONS}
 .if !${OPTIONS_DEFINE:M${opt}}
 PLIST_SUB+=	${opt}="@comment "
 .endif
 .endfor
 
 post-patch:
 	${REINPLACE_CMD} -e 's|import lit|import lit${LLVM_SUFFIX}|' \
 	    -e 's|from lit|from lit${LLVM_SUFFIX}|' \
 	    -e 's|lit\.|lit${LLVM_SUFFIX}.|' \
 	    ${WRKSRC}/llvm/utils/lit/lit.py ${WRKSRC}/llvm/utils/lit/lit/*.py
 
 post-patch-CLANG-on:
 	${REINPLACE_CMD} -e 's|%%LLVM_PREFIX%%|${LLVM_PREFIX}|' \
 	    ${PATCH_WRKSRC}/clang/lib/Driver/ToolChains/CommonArgs.cpp
 	${REINPLACE_CMD} -e 's|%%LLVM_SUFFIX%%|${LLVM_SUFFIX}|' \
 	    ${PATCH_WRKSRC}/clang/tools/clang-format/clang-format.py \
 	    ${PATCH_WRKSRC}/clang/tools/clang-format/clang-format-sublime.py \
 	    ${PATCH_WRKSRC}/clang/tools/clang-format/git-clang-format
 
 post-patch-LLD-on:
 		${REINPLACE_CMD} -e "s|'indexsidebar.html'|['indexsidebar.html']|" \
 			${PATCH_WRKSRC}/lld/docs/conf.py
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/llvm-wrapper.sh \
 	    ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX}
 .for command in ${COMMANDS:C/^/XXXX/1:NXXXX*}
 	${LN} -f ${STAGEDIR}${PREFIX}/bin/${FIRST_COMMAND}${LLVM_SUFFIX} \
 	    ${STAGEDIR}${PREFIX}/bin/${command}${LLVM_SUFFIX}
 .endfor
 
 post-install-DOCS-on:
 	${RM} -r ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/doc/* ${STAGEDIR}${DOCSDIR}
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/doc
 .for _man in ${MAN1SRCS}
 	${MV} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/${_man} \
 	    ${STAGEDIR}${MANPREFIX}/man/man1/${_man:R}${LLVM_SUFFIX}.1
 .endfor
 .if ! ${PORT_OPTIONS:MLIT}
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/lit.1
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/FileCheck.1
 .endif
 	${RM} "${STAGEDIR}${LLVM_PREFIX}/share/man/man1/tblgen Family.1"
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 
 .if ${PORT_OPTIONS:MCLANG}
 post-install-DOCS-off:
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/scan-build.1
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/man1/
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/share/man/
 .endif
 
 post-install-CLANG-on:
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/clang \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/clang-cpp
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/toolchains/
 	${INSTALL_DATA} ${WRKDIR}/xtoolchain.mk \
 	    ${STAGEDIR}${PREFIX}/share/toolchains/llvm${LLVM_SUFFIX}.mk
 
 post-install-FLANG-on:
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CodeGen/CMakeFiles
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Dialect/CMakeFiles
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Transforms/CMakeFiles
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CMakeFiles
 	${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/CMakeFiles
 
 post-install-STATIC_LIBS-off:
 	${RM} ${STAGEDIR}${LLVM_PREFIX}/lib/lib*.a
 
 post-install-LIT-on:
 	${INSTALL_SCRIPT} ${PATCH_WRKSRC}/llvm/utils/lit/lit.py \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/lit
 	${LN} -f ${STAGEDIR}${LLVM_PREFIX}/bin/lit \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/llvm-lit
 	${LN} -fs ../${LLVM_DIR}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/lit${LLVM_SUFFIX}
 	${LN} -fs ../${LLVM_DIR}/bin/lit \
 	    ${STAGEDIR}${PREFIX}/bin/llvm-lit${LLVM_SUFFIX}
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_DATA} ${WRKSRC}/llvm/utils/lit/lit/*.py \
 	    ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/lit${LLVM_SUFFIX}
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/FileCheck \
 	    ${STAGEDIR}${LLVM_PREFIX}/bin/
 	${LN} -fs ../${LLVM_DIR}/bin/FileCheck \
 	    ${STAGEDIR}${PREFIX}/bin/FileCheck${LLVM_SUFFIX}
 
 post-install-LLD-on:
 	${LN} -s ld.lld ${STAGEDIR}${LLVM_PREFIX}/bin/ld
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} LD_LIBRARY_PATH=${WRKSRC}/Release/lib ${MAKE_CMD} check-local-lit)'
 do-test:
 	if [ `${ID} -u` = 0 ]; then \
 		${CHOWN} -R nobody ${WRKSRC}/test; \
 		su -m nobody -c ${TEST_CMD}; \
 	else \
 		${SH} -c ${TEST_CMD}; \
 	fi
 
 build-plist:
 	${RM} ${PLIST} ${PLIST}.tmp
 	${ECHO_CMD} "@comment >>>>> GENERATED FILE, DO NOT EDIT <<<<<" >> ${PLIST}.tmp
 	${ECHO_CMD} "@comment Alter build-plist target and regenerate as required" >> ${PLIST}.tmp
 .for command in ${COMMANDS}
 	${ECHO_CMD} bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
 .endfor
 .for command in ${LIT_COMMANDS}
 	${ECHO_CMD} %%LIT%%bin/${command}${LLVM_SUFFIX} >> ${PLIST}.tmp
 	${ECHO_CMD} %%LIT%%${LLVM_DIR}/bin/${command} >> ${PLIST}.tmp
 .endfor
 	${FIND} ${STAGEDIR}${LLVM_PREFIX} -type f -o -type l | \
 	    ${GREP} -v '_ignorelist.txt$$' | \
 	    ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \
 	    ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \
 	    -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${PORTVERSION}|%%PORTVERSION%%|' \
 	    -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR:C/\./\\./}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \
 	    -e 's|\([^0-9]\)${LLVM_MAJOR:C/\./\\./}$$|\1%%LLVM_MAJOR%%|' \
 	    | ${SORT} >> ${PLIST}.tmp
 	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \
 	    ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \
 	    -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \
 	    -e 's|${LLVM_MAJOR:C/\./\\./}|%%LLVM_MAJOR%%|' | \
 	    ${SORT} >> ${PLIST}.tmp
 	awk '{ \
 	    if ($$0 ~ /lib.lib[a-zA-Z].*\.a$$/) {printf "%%%%STATIC_LIBS%%%%"} \
 	    if ($$0 ~ /${CLANG_PATTERN}/ && $$0 !~ /${OPENMP_PATTERN}|${EXTRAS_PATTERN}|${COMPILER_RT_PATTERN}|libclang_rt/) {printf "%%%%CLANG%%%%"} \
 	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
 	    if ($$0 ~ /(${FLANG_PATTERN})/) {printf "%%%%FLANG%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
 	    if ($$0 ~ /(${MLIR_PATTERN})/) {printf "%%%%MLIR%%%%"} \
 	    if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \
 	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
 	    if ($$0 !~ /libclang_rt/) {print} \
 	}' ${PLIST}.tmp >> ${PLIST}
 	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${RM} ${PLIST}.tmp
 
 check-commands:
 .for command in ${COMMANDS}
 	test -e ${STAGEDIR}${LLVM_PREFIX}/bin/${command}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/devel/mergify/Makefile b/devel/mergify/Makefile
index accfd212f99b..45eac7c1ffaa 100644
--- a/devel/mergify/Makefile
+++ b/devel/mergify/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	mergify
 PORTVERSION=	g20180512
 PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	Merge changes from a branch one commit at a time
 
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	git:devel/git
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	brooksdavis
-GH_PROJECT=	mergify
 GH_TAGNAME=	606ffbe2df73e4c4edfe399573d2f1df782aefbc
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/mergify
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/mergify ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile
index ec3d8724f0de..d8ad16926f4f 100644
--- a/devel/objecthash/Makefile
+++ b/devel/objecthash/Makefile
@@ -1,32 +1,31 @@
 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 
 PORTNAME=	objecthash
 PORTVERSION=	20160802
 PORTREVISION=	14
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross-language way to cryptographically hash JSON objects
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libicudata.so:devel/icu \
 		libjson-c.so:devel/json-c
 
 USES=		pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	benlaurie
-GH_PROJECT=	objecthash
 GH_TAGNAME=	770874c
 
 USE_LDCONFIG=	yes
 
 ALL_TARGET=	libobjecthash.so
 
 PLIST_FILES=	include/objecthash.h lib/libobjecthash.so
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/libobjecthash.so ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/objecthash.h ${STAGEDIR}${PREFIX}/include
 
 .include <bsd.port.mk>
diff --git a/devel/pear-TheSeer_DirectoryScanner/Makefile b/devel/pear-TheSeer_DirectoryScanner/Makefile
index 35e182cc64f1..7f1d05d8884f 100644
--- a/devel/pear-TheSeer_DirectoryScanner/Makefile
+++ b/devel/pear-TheSeer_DirectoryScanner/Makefile
@@ -1,34 +1,33 @@
 # Created by: Gasol Wu <gasol.wu@gmail.com>
 
 PORTNAME=	DirectoryScanner
 PORTVERSION=	1.3.2
 CATEGORIES=	devel pear
 PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}TheSeer_
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Recursive directory scanner and filter
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	php:flavors pear:env
+USES=		php:flavors pear:env
 USE_GITHUB=	yes
 GH_ACCOUNT=	theseer
-GH_PROJECT=	DirectoryScanner
 
 USE_PHP=	fileinfo
 PEAR_CHANNEL=	theseer
 PEAR_CHANNEL_VER=	>=20120501
 
 NO_BUILD=	yes
 
 PHP_DIR=	share/PHP
 
 PLIST_FILES=	${PHP_DIR}/${PORTNAME}/directoryscanner.php
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/directoryscanner.php \
 		${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/pear-TheSeer_fDOMDocument/Makefile b/devel/pear-TheSeer_fDOMDocument/Makefile
index a134afc26d05..fd98df2a9423 100644
--- a/devel/pear-TheSeer_fDOMDocument/Makefile
+++ b/devel/pear-TheSeer_fDOMDocument/Makefile
@@ -1,34 +1,33 @@
 # Created by: Gasol Wu <gasol.wu@gmail.com>
 
 PORTNAME=	fDOMDocument
 PORTVERSION=	1.6.6
 CATEGORIES=	devel www pear
 PKGNAMEPREFIX=	${PEAR_PKGNAMEPREFIX}TheSeer_
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Extension to PHP standard DOM
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=	php:flavors pear:env
+USES=		php:flavors pear:env
 USE_GITHUB=	yes
 GH_ACCOUNT=	theseer
-GH_PROJECT=	fDOMDocument
 
 USE_PHP=	dom xml
 PEAR_CHANNEL=	theseer
 PEAR_CHANNEL_VER=	>=20120501
 
 NO_BUILD=	yes
 
 PHP_DIR=	share/PHP
 
 PLIST_FILES=	${PHP_DIR}/${PORTNAME}/fDOMDocument.php
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/fDOMDocument.php \
 		${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/py-bitarray/Makefile b/devel/py-bitarray/Makefile
index c5e6ba242024..38463d6f9659 100644
--- a/devel/py-bitarray/Makefile
+++ b/devel/py-bitarray/Makefile
@@ -1,45 +1,42 @@
 # Created by: Sofian Brabez <sbrabez@gmail.com>
 
 PORTNAME=	bitarray
 PORTVERSION=	2.1.3
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Efficient arrays of booleans
 
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.6+
-
 USE_GITHUB=	yes
-USE_PYTHON=	autoplist distutils
-
 GH_ACCOUNT=	ilanschnell
-GH_PROJECT=	bitarray
+USE_PYTHON=	autoplist distutils
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 
 PORTDOCS=	CHANGE_LOG README.rst
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/bitarray/_bitarray*.so
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/bitarray/_util*.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 do-test:
 	${SETENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -c "import ${PORTNAME}; ${PORTNAME}.test()"
 
 .include <bsd.port.mk>
diff --git a/devel/py-jsonform/Makefile b/devel/py-jsonform/Makefile
index 0a2b124145fe..ba458d15d914 100644
--- a/devel/py-jsonform/Makefile
+++ b/devel/py-jsonform/Makefile
@@ -1,21 +1,19 @@
 PORTNAME=	jsonform
 PORTVERSION=	0.0.2
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Form validation for JSON-like data
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.4.0:devel/py-jsonschema@${PY_FLAVOR}
 
 USES=		python:3.6+
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	RussellLuo
-GH_PROJECT=	jsonform
 GH_TAGNAME=	7ee5f95
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/rbenv/Makefile b/devel/rbenv/Makefile
index b781405b8ffa..1b90bbe497ed 100644
--- a/devel/rbenv/Makefile
+++ b/devel/rbenv/Makefile
@@ -1,38 +1,37 @@
 PORTNAME=	rbenv
 PORTVERSION=	1.1.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Manage multiple versions of ruby
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	bash:shells/bash
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	rbenv
 
 NO_BUILD=	yes
 
 REINPLACE_ARGS=	-i ''
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|\$${root}/completions|${DATADIR}/completions|g" \
 		${WRKSRC}/libexec/rbenv-init
 
 do-install:
 	CC="${CC}" ${WRKSRC}/src/${CONFIGURE_CMD}
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/src
 	( ${INSTALL_SCRIPT} ${WRKSRC}/libexec/* ${STAGEDIR}${PREFIX}/libexec/ )
 	@${LN} -sf ../libexec/rbenv ${STAGEDIR}${PREFIX}/bin/rbenv
 	@${MKDIR} ${STAGEDIR}${DATADIR}/completions
 	( cd ${WRKSRC}/completions && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}/completions )
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rbenv.d
 	( cd ${WRKSRC}/rbenv.d && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/etc/rbenv.d )
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/rbenv-realpath.dylib
 
 .include <bsd.port.mk>
diff --git a/devel/stack/Makefile b/devel/stack/Makefile
index d4e0485c6cc7..68d92627e695 100644
--- a/devel/stack/Makefile
+++ b/devel/stack/Makefile
@@ -1,202 +1,199 @@
 PORTNAME=	stack
 PORTVERSION=	2.7.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Cross-platform program for developing Haskell programs
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	ca_root_nss>0:security/ca_root_nss \
 		gmake:devel/gmake \
 		${LOCALBASE}/lib/compat/libffi.so.6:devel/libffi321
 
+USES=		cabal gmake perl5
 USE_GITHUB=	yes
 GH_ACCOUNT=	commercialhaskell
-GH_PROJECT=	stack
-
-USES=		cabal gmake perl5
-
 USE_PERL5=	run
 
 CABAL_FLAGS=	-support_aesni
 
 USE_CABAL=	Glob-0.10.1 \
 		StateVar-1.2.1 \
 		aeson-1.5.6.0_1 \
 		annotated-wl-pprint-0.7.0_1 \
 		ansi-terminal-0.11 \
 		ansi-wl-pprint-0.6.9_2 \
 		appar-0.1.8 \
 		asn1-encoding-0.9.6_2 \
 		asn1-parse-0.9.5 \
 		asn1-types-0.3.4 \
 		assoc-1.0.2_1 \
 		async-2.2.3 \
 		attoparsec-0.14.1 \
 		attoparsec-iso8601-1.0.2.0_1 \
 		auto-update-0.1.6 \
 		base-compat-0.11.2 \
 		base-compat-batteries-0.11.2 \
 		base-orphans-0.8.4 \
 		base16-bytestring-1.0.1.0 \
 		base64-bytestring-1.2.0.1 \
 		basement-0.0.12_1 \
 		bifunctors-5.5.11 \
 		blaze-builder-0.4.2.1 \
 		blaze-html-0.9.1.2_1 \
 		blaze-markup-0.8.2.8 \
 		byteorder-1.0.4 \
 		casa-client-0.0.1 \
 		casa-types-0.0.2 \
 		case-insensitive-1.2.1.0 \
 		cereal-0.5.8.1 \
 		clock-0.8.2 \
 		cmdargs-0.10.21 \
 		colour-2.3.5 \
 		comonad-5.0.8 \
 		conduit-1.3.4.1 \
 		conduit-combinators-1.3.0 \
 		conduit-extra-1.3.5 \
 		connection-0.3.1_1 \
 		contravariant-1.5.3 \
 		cookie-0.4.5 \
 		cryptohash-sha256-0.11.102.0 \
 		cryptonite-0.29 \
 		cryptonite-conduit-0.2.2_1 \
 		data-default-class-0.1.2.0 \
 		data-fix-0.3.1 \
 		digest-0.0.1.2 \
 		distributive-0.6.2.1 \
 		dlist-1.0 \
 		easy-file-0.2.2 \
 		echo-0.1.4 \
 		ed25519-0.0.5.0_3 \
 		either-5.0.1.1_1 \
 		extra-1.7.9 \
 		fast-logger-3.0.5 \
 		file-embed-0.0.14.0 \
 		filelock-0.1.1.5 \
 		filtrable-0.1.6.0 \
 		fsnotify-0.3.0.1_1 \
 		generic-deriving-1.14_1 \
 		githash-0.1.5.0 \
 		hackage-security-0.6.0.1_5 \
 		hashable-1.3.1.0 \
 		hi-file-parser-0.1.2.0 \
 		hourglass-0.2.12 \
 		hpack-0.34.4 \
 		hsc2hs-0.68.7_1 \
 		http-api-data-0.4.3_2 \
 		http-client-0.7.8 \
 		http-client-tls-0.3.5.3_1 \
 		http-conduit-2.3.8 \
 		http-download-0.2.0.0 \
 		http-types-0.12.3 \
 		indexed-traversable-0.1.1 \
 		infer-license-0.2.0 \
 		integer-logarithms-1.0.3.1 \
 		iproute-1.7.11 \
 		libyaml-0.1.2 \
 		lift-type-0.1.0.1 \
 		lifted-base-0.2.3.12 \
 		lukko-0.1.1.3_1 \
 		megaparsec-9.0.1_1 \
 		memory-0.16.0 \
 		microlens-0.4.12.0 \
 		microlens-mtl-0.2.0.1 \
 		microlens-th-0.4.3.10 \
 		mime-types-0.1.0.9 \
 		mintty-0.1.2 \
 		monad-control-1.0.2.3 \
 		monad-logger-0.3.36 \
 		monad-loops-0.4.3 \
 		mono-traversable-1.0.15.1 \
 		mustache-2.3.1 \
 		neat-interpolation-0.5.1.2 \
 		network-3.1.2.1_1 \
 		network-uri-2.6.4.1 \
 		old-locale-1.0.0.7_2 \
 		old-time-1.1.0.3_2 \
 		open-browser-0.2.1.0 \
 		optparse-applicative-0.16.1.0 \
 		optparse-simple-0.1.1.3 \
 		pantry-0.5.2.1 \
 		parser-combinators-1.3.0 \
 		path-0.8.0_1 \
 		path-io-1.6.2 \
 		path-pieces-0.2.1_1 \
 		pem-0.2.4 \
 		persistent-2.13.0.1 \
 		persistent-sqlite-2.13.0.0_1 \
 		persistent-template-2.12.0.0 \
 		primitive-0.7.1.0_2 \
 		profunctors-5.6.2 \
 		project-template-0.2.1.0 \
 		random-1.2.0_5 \
 		regex-applicative-0.3.4 \
 		regex-applicative-text-0.1.0.1_5 \
 		resource-pool-0.2.3.2 \
 		resourcet-1.2.4.2 \
 		retry-0.8.1.2 \
 		rio-0.1.20.0 \
 		rio-orphans-0.1.2.0 \
 		rio-prettyprint-0.1.1.0 \
 		safe-0.3.19 \
 		safe-exceptions-0.1.7.1 \
 		scientific-0.3.6.2 \
 		semigroupoids-5.3.5 \
 		semigroups-0.19.1 \
 		silently-1.2.5.1 \
 		socks-0.6.1 \
 		split-0.2.3.4_1 \
 		splitmix-0.1.0.3 \
 		stm-chans-3.0.0.4_1 \
 		streaming-commons-0.2.2.1 \
 		strict-0.4.0.1 \
 		syb-0.7.2.1 \
 		tagged-0.8.6.1_1 \
 		tar-0.5.1.1_3 \
 		tar-conduit-0.3.2 \
 		temporary-1.3 \
 		text-metrics-0.3.0_4 \
 		th-abstraction-0.4.2.0_1 \
 		th-compat-0.1.2 \
 		th-expand-syns-0.4.8.0 \
 		th-lift-0.8.2_1 \
 		th-lift-instances-0.1.18 \
 		th-reify-many-0.1.9 \
 		these-1.1.1.1_1 \
 		time-compat-1.9.5_1 \
 		tls-1.5.5 \
 		transformers-base-0.4.5.2 \
 		transformers-compat-0.6.6 \
 		typed-process-0.2.6.0 \
 		unicode-transforms-0.3.7.1_1 \
 		unix-compat-0.5.3 \
 		unix-time-0.4.7 \
 		unliftio-0.2.16 \
 		unliftio-core-0.2.0.1_1 \
 		unordered-containers-0.2.13.0 \
 		uuid-types-1.0.5 \
 		vector-0.12.3.0 \
 		vector-algorithms-0.8.0.4_1 \
 		x509-1.7.5_1 \
 		x509-store-1.6.7_1 \
 		x509-system-1.6.6 \
 		x509-validation-1.6.11 \
 		yaml-0.11.5.0 \
 		zip-archive-0.4.1_1 \
 		zlib-0.6.2.3
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 1300078 && ${ARCH} != powerpc64
 LIB_DEPENDS+=	libncursesw.so.8:misc/compat12x
 .endif
 
 #PLIST_FILES=	etc/bash_completion.d/_stack.bash \
 #		share/zsh/site-functions/_stack
 
 .include <bsd.port.post.mk>
diff --git a/devel/taskctl/Makefile b/devel/taskctl/Makefile
index aa214e5e7252..04f64cbaae53 100644
--- a/devel/taskctl/Makefile
+++ b/devel/taskctl/Makefile
@@ -1,46 +1,45 @@
 PORTNAME=	taskctl
 PORTVERSION=	1.4.2
 CATEGORIES=	devel
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Simple modern alternative to GNU Make
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		go:modules
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	taskctl
 GO_TARGET=	./cmd/taskctl
 GH_TUPLE=	bmatcuk:doublestar:v1.1.5:bmatcuk_doublestar/vendor/github.com/bmatcuk/doublestar \
 		briandowns:spinner:6dc224009eae:briandowns_spinner/vendor/github.com/briandowns/spinner \
 		chzyer:readline:2972be24d48e:chzyer_readline/vendor/github.com/chzyer/readline \
 		cpuguy83:go-md2man:f79a8a8ca69d:cpuguy83_go_md2man_v2/vendor/github.com/cpuguy83/go-md2man/v2 \
 		emicklei:dot:v0.10.2:emicklei_dot/vendor/github.com/emicklei/dot \
 		fatih:color:v1.7.0:fatih_color/vendor/github.com/fatih/color \
 		fsnotify:fsnotify:v1.4.9:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		go-yaml:yaml:v2.3.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		golang:sync:cd5d95a43a6e:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:9197077df867:golang_sys/vendor/golang.org/x/sys \
 		golang:term:ad39bd3f0407:golang_term/vendor/golang.org/x/term \
 		golang:xerrors:9bdfabe68543:golang_xerrors/vendor/golang.org/x/xerrors \
 		imdario:mergo:v0.3.8:imdario_mergo/vendor/github.com/imdario/mergo \
 		juju:ansiterm:720a0952cc2a:juju_ansiterm/vendor/github.com/juju/ansiterm \
 		konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
 		logrusorgru:aurora:dc85c304c434:logrusorgru_aurora/vendor/github.com/logrusorgru/aurora \
 		lunixbochs:vtclean:2d01aacdc34a:lunixbochs_vtclean/vendor/github.com/lunixbochs/vtclean \
 		manifoldco:promptui:v0.7.0:manifoldco_promptui/vendor/github.com/manifoldco/promptui \
 		mattn:go-colorable:v0.1.4:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
 		mattn:go-isatty:v0.0.10:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
 		mvdan:sh:v3.1.1:mvdan_sh/vendor/mvdan.cc/sh/v3 \
 		pelletier:go-toml:v1.8.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
 		russross:blackfriday:v2.0.1:russross_blackfriday_v2/vendor/github.com/russross/blackfriday/v2 \
 		shurcooL:sanitized_anchor_name:v1.0.0:shurcool_sanitized_anchor_name/vendor/github.com/shurcooL/sanitized_anchor_name \
 		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
 		urfave:cli:v2.2.0:urfave_cli_v2/vendor/github.com/urfave/cli/v2
 
 PLIST_FILES=	bin/taskctl
 
 .include <bsd.port.mk>
diff --git a/devel/termbox/Makefile b/devel/termbox/Makefile
index 4891eb78bd4f..3f86ae805996 100644
--- a/devel/termbox/Makefile
+++ b/devel/termbox/Makefile
@@ -1,28 +1,27 @@
 # Created by: Adam Saponara <as@php.net>
 
 PORTNAME=	termbox
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.1.3
 CATEGORIES=	devel
 
 MAINTAINER=	as@php.net
 COMMENT=	Legacy-free alternative to ncurses
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c11 gmake
 USE_GITHUB=	yes
-GH_ACCOUNT=	termbox
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	include/termbox.h \
 		lib/libtermbox.so.1.0.0 \
 		lib/libtermbox.so.1 \
 		lib/libtermbox.so \
 		lib/libtermbox.a
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtermbox.so.1.0.0
 
 .include <bsd.port.mk>
diff --git a/devel/tinycbor/Makefile b/devel/tinycbor/Makefile
index f0321ab0945b..47622645f047 100644
--- a/devel/tinycbor/Makefile
+++ b/devel/tinycbor/Makefile
@@ -1,35 +1,33 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	tinycbor
 PORTVERSION=	0.5.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Concise Binary Object Representation (CBOR) library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcjson.so:devel/libcjson
 
 USES=		gmake localbase pathfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	intel
 
 INSTALL_TARGET=	install-strip
 MAKE_ARGS=	SOVERSION=${PORTVERSION:R:R}
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-GH_ACCOUNT=	intel
-GH_PROJECT=	tinycbor
-USE_GITHUB=	yes
-
 do-configure:
 	@cd ${WRKSRC}/ && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} configure
 
 post-install:
 	${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so
 	${LN} -fs libtinycbor.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so.${PORTVERSION:R:R}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtinycbor.so
 
 .include <bsd.port.mk>
diff --git a/devel/zapcc/Makefile b/devel/zapcc/Makefile
index b5de45454db5..bdbc1970ecf3 100644
--- a/devel/zapcc/Makefile
+++ b/devel/zapcc/Makefile
@@ -1,29 +1,28 @@
 PORTNAME=	zapcc
 PORTVERSION=	g20180622
 PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	C++ caching compiler based on clang
 
 LICENSE=	NCSA
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BROKEN_riscv64=		fails to build: CMake Error at cmake/config-ix.cmake:407: Unknown architecture riscv64
 
 BUILD_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake compiler:c++11-lang gnome libedit python:3.4+ shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	yrnkrn
-GH_PROJECT=	zapcc
 GH_TAGNAME=	b4c31cc
 SHEBANG_GLOB=	*.sh *.py *.pl
 SHEBANG_FILES=	tools/clang/tools/clang-format/git-clang-format tools/clang/tools/scan-view/bin/scan-view utils/llvm-lit/llvm-lit.in
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	LLVM_ENABLE_WARNINGS LLVM_BUILD_EXAMPLES LLVM_INCLUDE_EXAMPLES LLVM_INCLUDE_TESTS LLVM_INCLUDE_GO_TESTS LLVM_ENABLE_OCAMLDOC LLVM_BUILD_TEST
 CMAKE_ON=	LLVM_ENABLE_CXX1Y LLVM_ENABLE_LLD BUILD_SHARED_LIBS
 
 .include <bsd.port.mk>
diff --git a/devel/zydis/Makefile b/devel/zydis/Makefile
index 43dfa84a0134..74e254d0a37b 100644
--- a/devel/zydis/Makefile
+++ b/devel/zydis/Makefile
@@ -1,22 +1,20 @@
 PORTNAME=	zydis
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.0
 CATEGORIES=	devel
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Fast and lightweight x86/x86-64 disassembler library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=		aarch64 amd64 armv6 armv7 i386
 ONLY_FOR_ARCHS_REASON=	see definitions in include/Zycore/Defines.h
 
 USES=		cmake localbase:ldflags
 USE_GITHUB=	yes
 GH_ACCOUNT=	zyantific
-GH_PROJECT=	zydis
-
 GH_TUPLE=	zyantific:zycore-c:273e26a:zydis/dependencies/zycore
 
 .include <bsd.port.mk>
diff --git a/dns/nextdns/Makefile b/dns/nextdns/Makefile
index f2765314a907..7894343b82f9 100644
--- a/dns/nextdns/Makefile
+++ b/dns/nextdns/Makefile
@@ -1,36 +1,35 @@
 PORTNAME=	nextdns
 PORTVERSION=	1.32.2
 CATEGORIES=	dns security
 
 MAINTAINER=	rs@nextdns.io
 COMMENT=	NextDNS DNS53 to DNS over HTTPS proxy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ca_root_nss>=3.35:security/ca_root_nss
 
 USES=		go:modules
 PLIST_FILES=	sbin/nextdns
 USE_GITHUB=	yes
 GO_TARGET=	.:${PREFIX}/sbin/nextdns
-GH_ACCOUNT=	nextdns
 GH_TAGNAME=	v1.32.2
 GH_TUPLE=	\
 		Microsoft:go-winio:v0.4.19:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
 		cespare:xxhash:v1.1.0:cespare_xxhash/vendor/github.com/cespare/xxhash \
 		cheekybits:genny:v1.0.0:cheekybits_genny/vendor/github.com/cheekybits/genny \
 		denisbrodbeck:machineid:v1.0.1:denisbrodbeck_machineid/vendor/github.com/denisbrodbeck/machineid \
 		golang:crypto:83a5a9bb288b:golang_crypto/vendor/golang.org/x/crypto \
 		golang:net:4e50805a0758:golang_net/vendor/golang.org/x/net \
 		golang:sys:33663a62ff08:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
 		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
 		lucas-clemente:quic-go:v0.20.1:lucas_clemente_quic_go/vendor/github.com/lucas-clemente/quic-go \
 		marten-seemann:qpack:v0.2.1:marten_seemann_qpack/vendor/github.com/marten-seemann/qpack \
 		marten-seemann:qtls-go1-15:v0.1.4:marten_seemann_qtls_go1_15/vendor/github.com/marten-seemann/qtls-go1-15 \
 		marten-seemann:qtls-go1-16:v0.1.3:marten_seemann_qtls_go1_16/vendor/github.com/marten-seemann/qtls-go1-16
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>