Index: head/net/gnu-dico/Makefile
===================================================================
--- head/net/gnu-dico/Makefile	(revision 481522)
+++ head/net/gnu-dico/Makefile	(revision 481523)
@@ -1,64 +1,65 @@
 # Created by: Goran Tal
 # $FreeBSD$
 
 PORTNAME=	dico
-PORTVERSION=	2.4
+PORTVERSION=	2.7
 CATEGORIES=	net textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu-
 
 MAINTAINER=	goran.tal@gmail.com
 COMMENT=	Flexible modular implementation of DICT server
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USE_LDCONFIG=	yes
 USES=		tar:xz gmake libtool localbase pkgconfig
 
 GNU_CONFIGURE=	yes
 
 INFO=		dico
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	dicod
 
 OPTIONS_DEFINE=	PYTHON GUILE PCRE GSASL PAM LDAP NLS
 OPTIONS_DEFAULT=	PYTHON PCRE
 OPTIONS_SUB=	yes
 GSASL_DESC=	GSASL support
 
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENV=	PYTHON_CONFIG=${PYTHON_CMD}-config
 PYTHON_CONFIGURE_OFF=	--without-python
 
 GUILE_LIB_DEPENDS=	libguile-2.0.so:lang/guile2
 GUILE_CONFIGURE_OFF=	--without-guile
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_OFF=	--without-pcre
 
 GSASL_LIB_DEPENDS=	libgsasl.so:security/gsasl
 GSASL_CONFIGURE_WITH=	gsasl
 
 PAM_CONFIGURE_ENABLE=	pam
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_OFF=	--without-ldap
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} 's/@bindir@/@sbindir@/' ${WRKSRC}/dicod/Makefile.in
 	@${REINPLACE_CMD} 's/(bindir)..dir/&\/gdico/' ${WRKSRC}/dico/Makefile.in
 	@${REINPLACE_CMD} '/INSTALL.*charset/d' ${WRKSRC}/gnu/Makefile.in
 	@${REINPLACE_CMD} \
 		-e 's/mu_check_lib_save_LIBS/LIBS/' \
 		-e 's/python-config/$${PYTHON_CONFIG}/' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} 's/mergesort/xmergesort/' ${WRKSRC}/lib/mergesort.c
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/dicod.conf ${STAGEDIR}${PREFIX}/etc/dicod.conf.sample
 
 .include <bsd.port.mk>
Index: head/net/gnu-dico/distinfo
===================================================================
--- head/net/gnu-dico/distinfo	(revision 481522)
+++ head/net/gnu-dico/distinfo	(revision 481523)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490736071
-SHA256 (dico-2.4.tar.xz) = 4f94f73d1f596552894df2decb72df5b71ed2a23edc985c68247b6e5a0daa78e
-SIZE (dico-2.4.tar.xz) = 1694884
+TIMESTAMP = 1538311741
+SHA256 (dico-2.7.tar.xz) = 58af9a14bae85bd4f5aa01943011fe9d10533e82bc9da6b5a4c3d16a9952e435
+SIZE (dico-2.7.tar.xz) = 1674928
Index: head/net/gnu-dico/pkg-plist
===================================================================
--- head/net/gnu-dico/pkg-plist	(revision 481522)
+++ head/net/gnu-dico/pkg-plist	(revision 481523)
@@ -1,65 +1,66 @@
 bin/gdico
 etc/dicod.conf.sample
 include/dico/argcv.h
 include/dico/assoc.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
 %%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.1
-lib/libdico.so.1.0.0
+lib/libdico.so.2
+lib/libdico.so.2.0.0
 libexec/idxgcide
 man/man1/dico.1.gz
 man/man5/dicod.conf.5.gz
 man/man8/dicod.8.gz
 sbin/dicod
 %%DATADIR%%/%%PORTVERSION%%/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/sr/LC_MESSAGES/dico.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/dico.mo