diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 34874731cc04..50943293c96c 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -1,113 +1,113 @@
 PORTNAME=	gnats
 PORTVERSION=	4.1.0
 PORTREVISION=	19
 CATEGORIES=	databases devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNATS, the GNU Problem Report Management System
 WWW=		https://www.gnu.org/software/gnats/
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BROKEN_mips=		Does not build: error: conflicting types for yy_scan_string
 BROKEN_mips64=		Does not build: error: conflicting types for yy_scan_string
 BROKEN_FreeBSD_12_powerpc64=	fails to build on powerpc64 elfv1: conflicting types for yy_scan_string
 
-GNU_CONFIGURE=	yes
-USES=		cpe gmake makeinfo
-USE_GCC=	yes
-USERS=		gnats
-
+USES=		cpe gettext-runtime gmake
 CPE_VENDOR=	gnu
+USE_GCC=	yes
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGINSTALL=	${WRKDIR}/pkg-install
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
 
 .ifdef WANT_FREEFALL_CFG
 EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-*
 GNATSDBDIR=		${DATADIR}
 CONFIGURE_ARGS+=	--with-gnats-default-db=${GNATSDBDIR}/gnats-db
 WITH_SUBMITTER_ID=	current-users
 WITH_ORGANIZATION=	FreeBSD
 WITH_GNATSD_SERVICE=	support
 .endif
 
-GNATSDBDIR?=		/var/db/gnats
-
-CONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
-
 .ifdef WITH_SUBMITTER_ID
 CONFIGURE_ARGS+=	--with-submitter=${WITH_SUBMITTER_ID}
 .endif
 
 .ifdef WITH_ORGANIZATION
 CONFIGURE_ARGS+=	--with-organization=${WITH_ORGANIZATION:Q}
 .endif
 
 .ifdef WITH_GNATSD_SERVICE
 CONFIGURE_ARGS+=	--with-gnats-service=${WITH_GNATSD_SERVICE}
 .endif
 
-PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
+USERS=		gnats
+
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGMESSAGE=	${WRKDIR}/pkg-message
 INFO=		gnats-faq gnats
+PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
 PORTDOCS=	NEWS UPGRADING
 
 OPTIONS_DEFINE=	DOCS EMACS SERVER
 OPTIONS_DEFAULT=SERVER
 OPTIONS_SUB=	yes
-EMACS_USES=	emacs
+
 EMACS_DESC=	Install Emacs Lisp support file
-EMACS_VARS=	EMACS_NO_DEPENDS=yes
 SERVER_DESC=	Install the gnats server too
 
-.include <bsd.port.options.mk>
+EMACS_USES=	emacs
+EMACS_CONFIGURE_ON=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
+EMACS_PLIST_SUB_OFF=	EMACS_SITE_LISPDIR="@comment "
+EMACS_VARS=	EMACS_NO_DEPENDS=yes
+SERVER_ALL_TARGET_OFF=	all-tools
+SERVER_INSTALL_TARGET_OFF=	install-tools
 
-.if ! ${PORT_OPTIONS:MSERVER}
-ALL_TARGET=	all-tools
-INSTALL_TARGET=	install-tools
-.endif
+GNATSDBDIR?=		/var/db/gnats
 
-.if ${PORT_OPTIONS:MEMACS}
-CONFIGURE_ARGS+=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
-.else
-PLIST_SUB+=	EMACS_SITE_LISPDIR="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 pre-everything::
 .if !defined(PACKAGE_BUILDING) && !defined(WANT_FREEFALL_CFG)
 	@${ECHO} "============================================================="
 	@${ECHO}
 	@${ECHO} "You can build ${PKGNAME} with the following options:"
 	@${ECHO}
 	@${ECHO} "WITH_SUBMITTER_ID=unknown        default submitter-id"
 	@${ECHO} "WITH_ORGANIZATION='unknown'      default organization"
 	@${ECHO} "WITH_GNATSD_SERVICE=support      default gnatsd port name"
 	@${ECHO}
 	@${ECHO} "============================================================="
 	@${ECHO}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|info man|man|g' ${WRKSRC}/doc/Makefile.in
+
 pre-configure:
 	@${ECHO_CMD} 'RELEASE_TAG="\`uname -srm\`"' > ${WRKSRC}/release-info
 
 post-build:
 	@for doc in pkg-message pkg-install; do \
 		${SED} -e 's,%%PREFIX%%,${STAGEDIR}${PREFIX},g' \
 			-e 's,%%GNATSDBDIR%%,${GNATSDBDIR},g' \
 			${PKGDIR}/$${doc} >${WRKDIR}/$${doc}; \
 	done
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gnats
 
-post-install:
-.if ${PORT_OPTIONS:MSERVER}
+post-install-SERVER-on:
 	${MV} ${STAGEDIR}${ETCDIR}/databases.default \
 		${STAGEDIR}${ETCDIR}/databases.sample
 	${MV} ${STAGEDIR}${ETCDIR}/gnatsd.host_access.default \
 		${STAGEDIR}${ETCDIR}/gnatsd.host_access.sample
-.endif
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>