diff --git a/net/dico/Makefile b/net/dico/Makefile
index 43d6d5ec8e00..fa5acbe665eb 100644
--- a/net/dico/Makefile
+++ b/net/dico/Makefile
@@ -1,68 +1,65 @@
 PORTNAME=	dico
 DISTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	net textproc
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible modular implementation of DICT server
 WWW=		https://www.gnu.org/software/dico/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		gmake iconv libtool localbase ncurses pkgconfig readline tar:xz
 USE_LDCONFIG=	yes
+USE_RC_SUBR=	dicod
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
-
-INFO=		dico
-
 LDFLAGS+=	-lthr
-
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	dicod
+INFO=		dico
+PLIST_SUB=	VERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=	PYTHON GUILE PCRE GSASL PAM LDAP NLS TK
 OPTIONS_DEFAULT=	PYTHON PCRE
 OPTIONS_SUB=	yes
 GSASL_DESC=	GSASL support
 
 GSASL_LIB_DEPENDS=	libgsasl.so:security/libgsasl
 GSASL_CONFIGURE_WITH=	gsasl
 
 GUILE_USES=		guile:2.2,alias
 GUILE_CONFIGURE_WITH=	guile
 
 LDAP_USES=		ldap
 LDAP_CONFIGURE_OFF=	--without-ldap
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 PAM_CONFIGURE_ENABLE=	pam
 
 PCRE_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PCRE_CONFIGURE_OFF=	--without-pcre
 
 PYTHON_USES=		python
-PYTHON_CONFIGURE_ENV=	PYTHON_CONFIG=${PYTHON_CMD}-config
 PYTHON_CONFIGURE_OFF=	--without-python
+PYTHON_CONFIGURE_ENV=	PYTHON_CONFIG=${PYTHON_CMD}-config
 
 TK_USES=		tk
 TK_BINARY_ALIAS=	wish=${WISH}
 
 post-patch:
 	@${REINPLACE_CMD} 's/@bindir@/@sbindir@/' ${WRKSRC}/dicod/Makefile.in
 	@${REINPLACE_CMD} \
 		-e 's/mu_check_lib_save_LIBS/LIBS/' \
 		-e 's/python-config/$${PYTHON_CONFIG}/' \
 		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/dicod.conf ${STAGEDIR}${PREFIX}/etc/dicod.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net/dico/pkg-plist b/net/dico/pkg-plist
index b42875e8351d..f16549aea68b 100644
--- a/net/dico/pkg-plist
+++ b/net/dico/pkg-plist
@@ -1,72 +1,72 @@
 bin/dico
 %%TK%%bin/gcider
 etc/dicod.conf.sample
 include/dico/argcv.h
 include/dico/assoc.h
 include/dico/conv.h
 include/dico/diag.h
 include/dico/dico.h
 include/dico/filter.h
 include/dico/list.h
 include/dico/markup.h
 include/dico/parseopt.h
 include/dico/strat.h
 include/dico/stream.h
 include/dico/tokenize.h
 include/dico/types.h
 include/dico/udb.h
 include/dico/url.h
 include/dico/utf8.h
 include/dico/util.h
 include/dico/xlat.h
 lib/dico/dictorg.a
 lib/dico/dictorg.so
 lib/dico/echo.a
 lib/dico/echo.so
 lib/dico/gcide.a
 lib/dico/gcide.so
 lib/dico/greek_kbd.a
 lib/dico/greek_kbd.so
 %%GUILE%%lib/dico/guile.a
 %%GUILE%%lib/dico/guile.so
 %%LDAP%%lib/dico/ldap.a
 %%LDAP%%lib/dico/ldap.so
 lib/dico/metaphone2.a
 lib/dico/metaphone2.so
 lib/dico/nprefix.a
 lib/dico/nprefix.so
 lib/dico/outline.a
 lib/dico/outline.so
 %%PAM%%lib/dico/pam.a
 %%PAM%%lib/dico/pam.so
 %%PCRE%%lib/dico/pcre.a
 %%PCRE%%lib/dico/pcre.so
 %%PYTHON%%lib/dico/python.a
 %%PYTHON%%lib/dico/python.so
 lib/dico/stratall.a
 lib/dico/stratall.so
 lib/dico/substr.a
 lib/dico/substr.so
 lib/dico/word.a
 lib/dico/word.so
 lib/libdico.a
 lib/libdico.so
 lib/libdico.so.2
 lib/libdico.so.2.0.0
 libexec/idxgcide
 share/man/man1/dico.1.gz
 share/man/man5/dicod.conf.5.gz
 share/man/man8/dicod.8.gz
 sbin/dicod
-%%DATADIR%%/%%PORTVERSION%%/include/pp-setup
+%%DATADIR%%/%%VERSION%%/include/pp-setup
 %%NLS%%share/locale/da/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/de/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/es/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/dico.mo