net/dico: Update to 2.11/Rename port

- Rename the port to match upstream naming
  Change the name from net/gnu-dico to net/dico, prefix gnu- was added
  to distinguish this port from the port french/dico no longer needed
  since the port french/dico was removed from ports few years ago

- Switch to DISTVERSION
- Strip binaries
- Add missing dependencies

ChangeLog:	https://git.savannah.gnu.org/cgit/dico.git/tree/NEWS
PR:		268796

The prefix gnu was added to distinguish this port from the port french/dico

This is no longer needed since the port french/dico was removed from ports few years ago

10 files changed, 13 insertions, 13 deletions

diff --git a/MOVED b/MOVED
index 2d62af0662cc..a3357df08fd1 100644
--- a/MOVED
+++ b/MOVED
@@ -7619,3 +7619,4 @@ sysutils/cfengine319||2023-06-03|Has expired: Upstream EOL reached on 2022-06-30
 sysutils/cfengine-masterfiles319||2023-06-03|Removed, part of expired sysutils/cfengine319
 net-mgmt/nrpe3|net-mgmt/nrpe|2023-06-03|Has expired: Fails to build with recent OpenSSL so use net-mgmt/nrpe
 games/spacezero||2023-06-03|Has expired: broken, abandoned upstream, depends on deprecated gtk2
+net/gnu-dico|net/dico|2023-06-03|Renamed to match upstream naming
diff --git a/net/Makefile b/net/Makefile
index 219224bd6c51..7eaf1cd1065f 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -125,6 +125,7 @@
     SUBDIR += dhcperf
     SUBDIR += dhcping
     SUBDIR += dhcprelya
+    SUBDIR += dico
     SUBDIR += dictd
     SUBDIR += dimes
     SUBDIR += downzemall
@@ -200,7 +201,6 @@
     SUBDIR += gnome-nettool
     SUBDIR += gnome-online-accounts
     SUBDIR += gnome-online-miners
-    SUBDIR += gnu-dico
     SUBDIR += gnu-radius
     SUBDIR += go-bapu
     SUBDIR += go-cs
diff --git a/net/gnu-dico/Makefile b/net/dico/Makefile
index ee74341e2631..13e36c355d22 100644
--- a/net/gnu-dico/Makefile
+++ b/net/dico/Makefile
@@ -1,9 +1,7 @@
 PORTNAME=	dico
-PORTVERSION=	2.10
-PORTREVISION=	1
+DISTVERSION=	2.11
 CATEGORIES=	net textproc
 MASTER_SITES=	GNU
-PKGNAMEPREFIX=	gnu-
 
 MAINTAINER=	info@dikt.tv
 COMMENT=	Flexible modular implementation of DICT server
@@ -14,10 +12,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
-USES=		gmake libtool localbase pkgconfig tar:xz
+USES=		gmake libtool localbase pkgconfig readline tar:xz
 USE_LDCONFIG=	yes
-
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 
 INFO=		dico
 
@@ -32,10 +30,12 @@ OPTIONS_DEFAULT=	PYTHON PCRE
 OPTIONS_SUB=	yes
 GSASL_DESC=	GSASL support
 
+GSASL_USES=		iconv
 GSASL_LIB_DEPENDS=	libgsasl.so:security/libgsasl
 GSASL_CONFIGURE_WITH=	gsasl
 
-GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2
+GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2 \
+			libgc-threaded.so:devel/boehm-gc-threaded
 GUILE_CONFIGURE_OFF=	--without-guile
 
 LDAP_USES=		ldap
@@ -55,7 +55,6 @@ PYTHON_CONFIGURE_OFF=	--without-python
 
 post-patch:
 	@${REINPLACE_CMD} 's/@bindir@/@sbindir@/' ${WRKSRC}/dicod/Makefile.in
-	@${REINPLACE_CMD} 's/(bindir)..dir/&\/gdico/' ${WRKSRC}/dico/Makefile.in
 	@${REINPLACE_CMD} \
 		-e 's/mu_check_lib_save_LIBS/LIBS/' \
 		-e 's/python-config/$${PYTHON_CONFIG}/' \
diff --git a/net/dico/distinfo b/net/dico/distinfo
new file mode 100644
index 000000000000..ab5934d8cfa8
--- /dev/null
+++ b/net/dico/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1673033889
+SHA256 (dico-2.11.tar.xz) = ac1f98e233d0facacaac1059f3b81384a5592e26fd4c3082aed003f65e252c5a
+SIZE (dico-2.11.tar.xz) = 1883752
diff --git a/net/gnu-dico/files/dicod.conf b/net/dico/files/dicod.conf
index ffa2962941af..ffa2962941af 100644
--- a/net/gnu-dico/files/dicod.conf
+++ b/net/dico/files/dicod.conf
diff --git a/net/gnu-dico/files/dicod.in b/net/dico/files/dicod.in
index d381fc1f4f08..d381fc1f4f08 100644
--- a/net/gnu-dico/files/dicod.in
+++ b/net/dico/files/dicod.in
diff --git a/net/gnu-dico/files/pkg-message.in b/net/dico/files/pkg-message.in
index 3ca0bd62e35f..a2b29c393c68 100644
--- a/net/gnu-dico/files/pkg-message.in
+++ b/net/dico/files/pkg-message.in
@@ -1,7 +1,7 @@
 [
 { type: install
   message: <<EOM
-This port installs Dict server dicod and Dict client gdico.
+This port installs Dict server dicod and Dict client dico.
 
 To enable the server, add the following line to /etc/rc.conf:
 
diff --git a/net/gnu-dico/pkg-descr b/net/dico/pkg-descr
index 9a352ccf4f3e..9a352ccf4f3e 100644
--- a/net/gnu-dico/pkg-descr
+++ b/net/dico/pkg-descr
diff --git a/net/gnu-dico/pkg-plist b/net/dico/pkg-plist
index abff148be927..0cce8a7ac544 100644
--- a/net/gnu-dico/pkg-plist
+++ b/net/dico/pkg-plist
@@ -1,4 +1,4 @@
-bin/gdico
+bin/dico
 etc/dicod.conf.sample
 include/dico/argcv.h
 include/dico/assoc.h
diff --git a/net/gnu-dico/distinfo b/net/gnu-dico/distinfo
deleted file mode 100644
index 8a7f76f4a7ef..000000000000
--- a/net/gnu-dico/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1599238266
-SHA256 (dico-2.10.tar.xz) = 74a37ec01056d75f9dcbbddc6dcc11c42b09724003d66ce1280d00fdeb214f61
-SIZE (dico-2.10.tar.xz) = 1830420