4 files changed, 37 insertions, 13 deletions

diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index c3e2eef661c1..355fc497a823 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dico
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	net textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,6 +15,7 @@ PKGNAMEPREFIX=	gnu-
 MAINTAINER=	goran.tal@gmail.com
 COMMENT=	Flexible modular implementation of DICT server
 
+USE_XZ=		yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libltdl:22 libtool:22
@@ -26,7 +27,8 @@ CONFIGURE_ARGS=	--localstatedir=/var
 
 OPTIONS=	PYTHON	"With PYTHON support" on \
 		GUILE	"With GUILE support" on \
-		GSASL	"With GSASL support" off
+		GSASL	"With GSASL support" off \
+		LDAP	"With LDAP support" off
 
 .include <bsd.port.options.mk>
 
@@ -53,6 +55,14 @@ CONFIGURE_ARGS+=--with-gsasl
 CONFIGURE_ARGS+=--without-gsasl
 .endif
 
+.if defined(WITH_LDAP)
+USE_OPENLDAP=	yes
+PLIST_SUB+=	LDAP=""
+.else
+CONFIGURE_ARGS+=--without-ldap
+PLIST_SUB+=	LDAP="@comment "
+.endif
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
@@ -70,7 +80,7 @@ USE_RC_SUBR=	dicod.sh
 post-patch:
 	@${REINPLACE_CMD} 's/ENODATA/EIO/' ${WRKSRC}/lib/utf8.c
 	@${REINPLACE_CMD} 's/@bindir@/@sbindir@/' ${WRKSRC}/dicod/Makefile.in
-	@${REINPLACE_CMD} 's/(bindir)\//(bindir)\/g/' ${WRKSRC}/dico/Makefile.in
+	@${REINPLACE_CMD} 's/(bindir)..dir/&\/gdico/' ${WRKSRC}/dico/Makefile.in
 	@${REINPLACE_CMD} '/INSTALL.*charset/d' ${WRKSRC}/gnu/Makefile.in
 
 post-install:
diff --git a/net/gnu-dico/distinfo b/net/gnu-dico/distinfo
index 0b04f43dd3c6..76d346db93b8 100644
--- a/net/gnu-dico/distinfo
+++ b/net/gnu-dico/distinfo
@@ -1,3 +1,3 @@
-MD5 (dico-2.0.tar.gz) = 0dffe580c6fb687568be87e0ca117a08
-SHA256 (dico-2.0.tar.gz) = 7b26a51ce26502cf60963e28528640ebb6bb7d3d52fa5d13ec65eb254d78970d
-SIZE (dico-2.0.tar.gz) = 1717078
+MD5 (dico-2.1.tar.xz) = 5bc4a759fe4d75a4dabbc6f82c1496bd
+SHA256 (dico-2.1.tar.xz) = 9a909beaa26aaf96e80c5c313835265f34b347bcaf41409f479a21a569068c43
+SIZE (dico-2.1.tar.xz) = 1201836
diff --git a/net/gnu-dico/pkg-descr b/net/gnu-dico/pkg-descr
index 7dc8cdea1711..a362e604e63b 100644
--- a/net/gnu-dico/pkg-descr
+++ b/net/gnu-dico/pkg-descr
@@ -1,8 +1,9 @@
-Dico is an implementation of DICT server (RFC 2229).  It is fully
-modular: the daemon itself (dicod) provides only the server
-functionality, but it knows nothing about database formats.  Actual
-searches are performed by functions supplied in loadable modules.  A
-single module can serve one or more databases.  The package includes
-the following database modules: dictorg, guile, python, and outline.
+GNU Dico is a flexible modular implementation of DICT server (RFC 2229).
+It handles database accesses using loadable modules, and does not depend
+on particular database format. The package includes several loadable
+modules for interfacing with various database formats, among them a
+module for dict.org databases. New modules can be written in C, Guile or
+Python. The package also includes a console client program for querying
+remote dictionary servers.
 
 WWW: http://www.gnu.org/software/dico/
diff --git a/net/gnu-dico/pkg-plist b/net/gnu-dico/pkg-plist
index 654de816ac8f..1a3265c8a281 100644
--- a/net/gnu-dico/pkg-plist
+++ b/net/gnu-dico/pkg-plist
@@ -11,6 +11,7 @@ include/dico/parseopt.h
 include/dico/strat.h
 include/dico/stream.h
 include/dico/types.h
+include/dico/udb.h
 include/dico/url.h
 include/dico/utf8.h
 include/dico/util.h
@@ -21,16 +22,25 @@ lib/dico/dictorg.so
 %%GUILE%%lib/dico/guile.a
 %%GUILE%%lib/dico/guile.la
 %%GUILE%%lib/dico/guile.so
+%%LDAP%%lib/dico/ldap.a
+%%LDAP%%lib/dico/ldap.la
+%%LDAP%%lib/dico/ldap.so
 lib/dico/outline.a
 lib/dico/outline.la
 lib/dico/outline.so
 %%PYTHON%%lib/dico/python.a
 %%PYTHON%%lib/dico/python.la
 %%PYTHON%%lib/dico/python.so
+lib/dico/stratall.a
+lib/dico/stratall.la
+lib/dico/stratall.so
+lib/dico/substr.a
+lib/dico/substr.la
+lib/dico/substr.so
 lib/libdico.a
 lib/libdico.la
 lib/libdico.so
-lib/libdico.so.0
+lib/libdico.so.1
 sbin/dicod
 %%DATADIR%%/%%PORTVERSION%%/include/pp-setup
 %%DATADIR%%/gjdict.xbm
@@ -41,3 +51,6 @@ sbin/dicod
 @dirrm share/dico
 @dirrmtry lib/dico
 @dirrm include/dico
+%%GUILE%%@exec mkdir -p %D/share/guile/site/dico
+%%GUILE%%@dirrmtry share/guile/site/dico
+%%GUILE%%@dirrmtry share/guile/site