Index: head/graphics/photoflare/Makefile
===================================================================
--- head/graphics/photoflare/Makefile	(revision 500485)
+++ head/graphics/photoflare/Makefile	(revision 500486)
@@ -1,24 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	photoflare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.8.1
 CATEGORIES=	graphics
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Quick, simple but powerful cross-platform image editor
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick
 
 USES=		compiler:c++17-lang desktop-file-utils gl qmake qt:5 localbase pkgconfig
-USE_GITHUB=	PhotoFlare
+USE_GITHUB=	yes
 USE_QT=		core gui network printsupport widgets buildtools_build linguisttools_build
 USE_GL=		gl
 
 CXXFLAGS+=	`pkg-config --cflags GraphicsMagick++`
 LDFLAGS+=	`pkg-config --libs GraphicsMagick++`
 
 .include <bsd.port.mk>
Index: head/multimedia/gpodder/Makefile
===================================================================
--- head/multimedia/gpodder/Makefile	(revision 500485)
+++ head/multimedia/gpodder/Makefile	(revision 500486)
@@ -1,53 +1,51 @@
 # Created by: Chess Griffin <chess@chessgriffin.com>
 # $FreeBSD$
 
 PORTNAME=	gpodder
 DISTVERSION=	3.10.8
 CATEGORIES=	multimedia python
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Media aggregator and podcast client
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	intltool-extract:textproc/intltool \
 		help2man:misc/help2man
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mygpoclient>=1.7:devel/py-mygpoclient@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}podcastparser>=0.6.0:devel/py-podcastparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR}
 #		${PYTHON_PKGNAMEPREFIX}eyed3>=0:audio/py-eyed3@${PY_FLAVOR}
 
 USES=		gettext gmake python:3.5+ shebangfix
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	gpodder
-GH_PROJECT=	gpodder
 
 OPTIONS_DEFINE=		GTK3
 OPTIONS_DEFAULT=	GTK3
 OPTIONS_SUB=		yes
 OPTIONS_EXCLUDE=	NLS
 
 ALL_TARGET=	messages
 MAKE_ENV=	PYTHON=${PYTHON_CMD} GPODDER_MANPATH_NO_SHARE="yes"
 MAKEFILE=	makefile
 NO_ARCH=	yes
 
 SHEBANG_FILES=	src/gpodder/*.py
 INSTALLS_ICONS=	yes
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 GTK3_VARS=	MAKE_ENV+=GPODDER_INSTALL_UIS="cli gtk"
 GTK3_RUN_DEPENDS+=	xdg-open:devel/xdg-utils
 GTK3_USES=	gnome
 GTK3_USE=	GNOME=pygobject3
 
 .if empty(GTK3)
 MAKE_ENV+=	GPODDER_INSTALL_UIS="cli"
 .endif
 
 .include <bsd.port.mk>
Index: head/net/macchanger/Makefile
===================================================================
--- head/net/macchanger/Makefile	(revision 500485)
+++ head/net/macchanger/Makefile	(revision 500486)
@@ -1,24 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	macchanger
 PORTVERSION=	1.7.0
 PORTREVISION=	2
 CATEGORIES=	net
 
 MAINTAINER=	clutton@zoho.com
 COMMENT=	GNU MAC Changer
 
 LICENSE=	GPLv3
 
-USE_GITHUB=	true
+USE_GITHUB=	yes
 GH_ACCOUNT=	alobbs
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf makeinfo
 
 INFO=		macchanger
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz \
 		%%DATADIR%%/OUI.list %%DATADIR%%/wireless.list
 
 .include <bsd.port.mk>
Index: head/sysutils/incron/Makefile
===================================================================
--- head/sysutils/incron/Makefile	(revision 500485)
+++ head/sysutils/incron/Makefile	(revision 500486)
@@ -1,42 +1,42 @@
 # Created by: mi@aldan.algebra.com
 # $FreeBSD$
 
 PORTNAME=	incron
 DISTVERSION=	2017-11-13
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	joh.hendriks@gmail.com
 COMMENT=	Handle filesystem-events the way cron handles time ones
 
 LICENSE=	GPLv2 LGPL21 MIT
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE-GPL
 LICENSE_FILE_LGPL21=	${WRKSRC}/LICENSE-LGPL
 LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-X11
 
 LIB_DEPENDS=	libinotify.so:devel/libinotify
 
-USE_GITHUB=	indeed
+USE_GITHUB=	yes
 GH_ACCOUNT=	ar-
 GH_TAGNAME=	81421d3a8bde0989d7e167d8a814d5232896c930
 CPPFLAGS+=	-I${LOCALBASE}/include -D__NR_inotify_init
 LDFLAGS+=	-L${LOCALBASE}/lib -linotify
 MAKE_ARGS=	PREFIX="${PREFIX}" USER=${UID}	\
 		DOCDIR="${PREFIX}/etc"	\
 		MANPATH=${MANPREFIX}/man
 USE_RC_SUBR=	${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's,/etc/incron,${PREFIX}/etc/incron,'	\
 		${WRKSRC}/*conf* ${WRKSRC}/Makefile ${WRKSRC}/*.[158h]	\
 		${WRKSRC}/*.cpp
 	${REINPLACE_CMD} -e '/INITDIR/d' ${WRKSRC}/Makefile
 .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64
 	${REINPLACE_CMD} -e '/pragma/d' ${WRKSRC}/inotify-cxx.cpp \
 		${WRKSRC}/usertable.cpp
 .endif
 
 .include <bsd.port.post.mk>