7 files changed, 16 insertions, 60 deletions

diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 50c8d3649dc8..71276a0ea7d4 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dictd
-PORTVERSION=	1.10.1
+PORTVERSION=	1.10.4
 PORTREVISION=	0
 CATEGORIES+=	net textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -36,20 +36,13 @@ ALL_TARGET=	dictd dictzip
 INSTALL_TARGET=	install.dictd install.dictzip
 
 post-patch:
-.for i in Makefile.in dict.1 dictd.8
+.for i in Makefile.in dict.1.in dictd.8.in
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/$i
 .endfor
-.for i in example.conf
-	@${REINPLACE_CMD} -e "s|/usr|${PREFIX}|g" ${WRKSRC}/$i
-.endfor
-	@${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/zlib/Makefile
 	@${REINPLACE_CMD} -e "s|\([\ \t(]\)T_USER|\1T_USERNAME|g" ${WRKSRC}/*.[chly]
 
 post-install:
 	@${MKDIR} ${DATADIR}
-.for i in example.conf example.dictrc example.site example2.conf example3.conf
-	${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR}
-.endfor
 	@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/${PORTNAME}.conf > ${PREFIX}/etc/${PORTNAME}.conf.sample
 	@[ -f ${PREFIX}/etc/${PORTNAME}.conf ] || ${CP} ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${FILESDIR}/${PORTNAME}.sh > ${PREFIX}/etc/rc.d/${PORTNAME}.sh
diff --git a/net/dictd/distinfo b/net/dictd/distinfo
index d17d0e2190c2..bc65b5d5465a 100644
--- a/net/dictd/distinfo
+++ b/net/dictd/distinfo
@@ -1,2 +1,2 @@
-MD5 (dictd-1.10.1.tar.gz) = 08280dcfc2eed73acf0a4be4872a72d5
-SIZE (dictd-1.10.1.tar.gz) = 749233
+MD5 (dictd-1.10.4.tar.gz) = 1c0b7583e6fa25fd27fca5fca9ddb91f
+SIZE (dictd-1.10.4.tar.gz) = 647901
diff --git a/net/dictd/files/patch-dictd_8 b/net/dictd/files/patch-dictd.8.in
index a033a67a2620..ce2b1825cfed 100644
--- a/net/dictd/files/patch-dictd_8
+++ b/net/dictd/files/patch-dictd.8.in
@@ -1,6 +1,6 @@
---- dictd.8.orig	Mon Jan 26 06:41:05 2004
-+++ dictd.8	Mon Jan 26 06:43:07 2004
-@@ -128,7 +128,7 @@
+--- dictd.8.in.orig	Sat Dec  3 22:08:02 2005
++++ dictd.8.in	Thu Dec 29 20:23:40 2005
+@@ -120,7 +120,7 @@
  .TP
  .BI \-c " file\fR or "  \-\-config " file"
  Specify configuration file.  The default is
@@ -9,21 +9,21 @@
  , but may be changed in the
  .I defs.h
  file at compile time (DICTD_CONFIG_FILE).
-@@ -444,7 +444,7 @@
+@@ -295,7 +295,7 @@
  .TP
  .B Introduction
  The configuration file defaults to
 -.I /etc/dictd.conf 
-+.I %%PREFIX%%/etc/dictd.conf 
++.I %%PREFIX%%/etc/dictd.conf
  but can be specified on the command line with the
  .B \-c
  option (see above).
-@@ -995,7 +995,7 @@
+@@ -1407,7 +1407,7 @@
  library you build dictd with.
- 
  .SH "FILES"
--.I /etc/dictd.conf
+ .TP
+-.I @SYSCONFDIR@/dictd.conf
 +.I %%PREFIX%%/etc/dictd.conf
- .br
- .I /usr/sbin/dictd
- .SH "SEE ALSO"
+ .B dictd
+ configuration file
+ .TP
diff --git a/net/dictd/files/patch-dictfmt.c b/net/dictd/files/patch-dictfmt.c
deleted file mode 100644
index 751420a45ff5..000000000000
--- a/net/dictd/files/patch-dictfmt.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- dictfmt.c.orig	Sun Jun 26 23:20:02 2005
-+++ dictfmt.c	Sun Jun 26 23:20:37 2005
-@@ -356,7 +356,7 @@
- 	 len = mbtowc__ (&mbc, s, MB_CUR_MAX__);
- 	 assert (len >= 0);
- 
--	 if (len == 0 || !iswspace (mbc))
-+	 if (len == 0 || !iswspace__ (mbc))
- 	    break;
- 
- 	 s += len;
-@@ -393,7 +393,7 @@
- 	 len = mbtowc__ (&mbc, s, MB_CUR_MAX__);
- 	 assert (len >= 0);
- 
--	 if (len == 0 || !iswspace (mbc))
-+	 if (len == 0 || !iswspace__ (mbc))
- 	    break;
- 
- 	 s += len;
diff --git a/net/dictd/files/patch-str.c b/net/dictd/files/patch-str.c
deleted file mode 100644
index d969e63b228e..000000000000
--- a/net/dictd/files/patch-str.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- str.c.orig	Sun Jun 26 23:19:54 2005
-+++ str.c	Sun Jun 26 23:20:19 2005
-@@ -74,7 +74,7 @@
-       if ((int) len < 0)
- 	 return errno;
- 
--      if (iswspace (ucs4_char)){
-+      if (iswspace__ (ucs4_char)){
- 	 *dest++ = ' ';
-       }else if (allchars_mode || iswalnum__ (ucs4_char)){
- 	 len2 = wcrtomb__ (dest, towlower__ (ucs4_char), &ps2);
diff --git a/net/dictd/pkg-descr b/net/dictd/pkg-descr
index c494fcafdac4..2cc0f8dcfbe3 100644
--- a/net/dictd/pkg-descr
+++ b/net/dictd/pkg-descr
@@ -5,7 +5,7 @@ RFC 2229 is a finished document, we plan to clarify and enhance the
 protocol definition as we gain more experience with large dictionary
 database servers. By default, the DICT protocol uses TCP port 2628. 
 
-WWW: http://www.dict.org/bin/Dict
+WWW: http://www.dict.org/
 
 -- Ying-Chieh Liao
    ijliao@FreeBSD.org
diff --git a/net/dictd/pkg-plist b/net/dictd/pkg-plist
index 6f952cb88bb2..efecc2caf95d 100644
--- a/net/dictd/pkg-plist
+++ b/net/dictd/pkg-plist
@@ -1,12 +1,6 @@
 bin/dictzip
 sbin/dictd
-share/dictd/example.conf
-share/dictd/example.dictrc
-share/dictd/example.site
-share/dictd/example2.conf
-share/dictd/example3.conf
 @unexec if cmp -s %D/etc/dictd.conf %D/etc/dictd.conf.sample; then rm -f %D/etc/dictd.conf; fi
 etc/dictd.conf.sample
 @exec [ -f %B/dictd.conf ] || cp %B/%f %B/dictd.conf
 etc/rc.d/dictd.sh
-@dirrm share/dictd