Index: head/ports-mgmt/portfmt/Makefile
===================================================================
--- head/ports-mgmt/portfmt/Makefile	(revision 568919)
+++ head/ports-mgmt/portfmt/Makefile	(revision 568920)
@@ -1,33 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	portfmt
-PORTVERSION=	g20210122
+DISTVERSION=	g20210321
 CATEGORIES=	ports-mgmt
+MASTER_SITES=	https://github.com/t6/portfmt/releases/download/${DISTVERSION}/
 
-MAINTAINER=	dmgk@FreeBSD.org
+MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Format FreeBSD Ports Makefiles
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	dmgk
-GH_TAGNAME=	910eaa3ff4edf03bfc2ce78d82e064c822ba1e02
-USE_LDCONFIG=	yes
-
+USES=		tar:lz
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		PREFIX="${PREFIX}"
-MAKE_ARGS=	INSTALL_LIB="${INSTALL_LIB}" \
-		INSTALL_MAN="${INSTALL_MAN}" \
+MAKE_ARGS=	INSTALL_MAN="${INSTALL_MAN}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 TEST_TARGET=	test
 
 OPTIONS_DEFINE=	SUBPACKAGES
 
 SUBPACKAGES_DESC=	Subpackages support (D16457)
 
 SUBPACKAGES_CPPFLAGS_OFF=	-DPORTFMT_SUBPACKAGES=0
 
 .include <bsd.port.mk>
Index: head/ports-mgmt/portfmt/distinfo
===================================================================
--- head/ports-mgmt/portfmt/distinfo	(revision 568919)
+++ head/ports-mgmt/portfmt/distinfo	(revision 568920)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613758706
-SHA256 (dmgk-portfmt-g20210122-910eaa3ff4edf03bfc2ce78d82e064c822ba1e02_GH0.tar.gz) = 7e0fffed3923ec41916abbcc1bfc46282de0ed7c07deae604598440024b04de4
-SIZE (dmgk-portfmt-g20210122-910eaa3ff4edf03bfc2ce78d82e064c822ba1e02_GH0.tar.gz) = 121084
+TIMESTAMP = 1616335023
+SHA256 (portfmt-g20210321.tar.lz) = 1df59f39fac2ed216515f3665e6dfec0b3f62f9403b130513d56f2b4fc13a15b
+SIZE (portfmt-g20210321.tar.lz) = 111226
Index: head/ports-mgmt/portfmt/pkg-descr
===================================================================
--- head/ports-mgmt/portfmt/pkg-descr	(revision 568919)
+++ head/ports-mgmt/portfmt/pkg-descr	(revision 568920)
@@ -1,25 +1,25 @@
 Portfmt is a collection of tools for editing, formatting, and linting
 FreeBSD Ports Collection Makefiles.
 
 It comes with several tools:
 
 - portfmt formats Makefiles
 - portclippy is a linter that checks if variables are in the correct
   order in a more comprehensive way than portlint
 - portedit edits Makefiles.  It comes with several commands
   that can be used as a basis for your own port update scripts:
   - bump-epoch: bumps PORTEPOCH or inserts it at the right place
   - bump-revision: bumps PORTREVISION or inserts it at the right place
   - get: lookup unevaluated variable values
   - merge: Generic command to set/update variables while also
     formatting the updated variables properly and inserting them
     in the right places if necessary.  Useful for merging output
     of other tools like make cargo-crates, modules2tuple, or make
     stage-qa.  For example to mark a port deprecated:
 
 	printf "DEPRECATED=%s\nEXPIRATION_DATE=%s" \
 		Abandonware 2019-08-15 | portedit merge -i Makefile
 
   - set-version: resets PORTREVISION, sets DISTVERSION or PORTVERSION
 
-WWW: https://github.com/dmgk/portfmt
+WWW: https://github.com/t6/portfmt
Index: head/ports-mgmt/portfmt/pkg-plist
===================================================================
--- head/ports-mgmt/portfmt/pkg-plist	(revision 568919)
+++ head/ports-mgmt/portfmt/pkg-plist	(revision 568920)
@@ -1,25 +1,8 @@
 bin/portclippy
 bin/portedit
 bin/portfmt
 bin/portscan
-lib/libportfmt.so
-lib/portfmt/plugin.edit.bump-revision.so
-lib/portfmt/plugin.edit.merge.so
-lib/portfmt/plugin.edit.set-version.so
-lib/portfmt/plugin.kakoune.select-object-on-line.so
-lib/portfmt/plugin.lint.clones.so
-lib/portfmt/plugin.lint.order.so
-lib/portfmt/plugin.output.unknown-targets.so
-lib/portfmt/plugin.output.unknown-variables.so
-lib/portfmt/plugin.output.variable-value.so
-lib/portfmt/plugin.refactor.collapse-adjacent-variables.so
-lib/portfmt/plugin.refactor.dedup-tokens.so
-lib/portfmt/plugin.refactor.remove-consecutive-empty-lines.so
-lib/portfmt/plugin.refactor.sanitize-append-modifier.so
-lib/portfmt/plugin.refactor.sanitize-cmake-args.so
-lib/portfmt/plugin.refactor.sanitize-comments.so
-lib/portfmt/plugin.refactor.sanitize-eol-comments.so
 share/man/man1/portclippy.1.gz
 share/man/man1/portedit.1.gz
 share/man/man1/portfmt.1.gz
 share/man/man1/portscan.1.gz