Upgrade to 1.9.11

Submitted by:	Andy Miller <andym@trit.org>

7 files changed, 28 insertions, 114 deletions

diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index b62d0b026d38..8f6beffbd789 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	dictd
-PORTVERSION=	1.9.7
-PORTREVISION=	1
+PORTVERSION=	1.9.11
+PORTREVISION=	0
 CATEGORIES+=	net textproc
-MASTER_SITES=	ftp://ftp.dict.org/pub/dict/ \
-		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=		dict
 
 MAINTAINER?=	dd@FreeBSD.org
diff --git a/net/dictd/distinfo b/net/dictd/distinfo
index fbf297418c12..a4bb5a1069d7 100644
--- a/net/dictd/distinfo
+++ b/net/dictd/distinfo
@@ -1,2 +1,2 @@
-MD5 (dictd-1.9.7.tar.gz) = baa8f18dd0373e7053658be99d40d5db
-SIZE (dictd-1.9.7.tar.gz) = 665250
+MD5 (dictd-1.9.11.tar.gz) = 4d06aabf573c862fd29e409984f71a67
+SIZE (dictd-1.9.11.tar.gz) = 695037
diff --git a/net/dictd/files/patch-Makefile_in b/net/dictd/files/patch-Makefile_in
deleted file mode 100644
index 2f601948ea8c..000000000000
--- a/net/dictd/files/patch-Makefile_in
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.in.orig	Tue Mar  4 03:14:35 2003
-+++ Makefile.in	Thu Oct  9 22:07:56 2003
-@@ -33,7 +33,7 @@
- srcdir=		@srcdir@
- VPATH=		@srcdir@
- prefix=		@prefix@
--subdirs=        @allsubdirs@ regex # doc -- use rfc2229 instead
-+subdirs=        @allsubdirs@ # regex # doc -- use rfc2229 instead
- exec_prefix=	@exec_prefix@
- man1_prefix=	@mandir@/man1
- man8_prefix=	@mandir@/man8
-@@ -70,9 +70,9 @@
- 
- SCFLAGS=        @SCFLAGS@
- LDFLAGS=        @LDFLAGS@
--XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. -Iregex
-+XTRACFLAGS=     @WCFLAGS@ @XTRACFLAGS@ @DEFS@ @CPPFLAGS@ -I. # -Iregex
- XTRALDFLAGS=    @WLDFLAGS@ @XTRALDFLAGS@
--LDLIBS=		    @LIBOBJS@ @LIBS@ -Lregex -lregex
-+LDLIBS=		    @LIBOBJS@ @LIBS@ -L%%PREFIX%%/lib -lltdl # -Lregex -lregex
- 
- EXES=	 	dict dictd dictzip dictfmt
- 
-@@ -114,17 +114,7 @@
- all $(EXES)::
- 	@for subdir in `echo $(subdirs)`; do \
- 		echo making in $$subdir; \
--	 	if [ "$$subdir" = "zlib" ]; then \
--			(cd $$subdir \
--			&& $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libz.a) \
--			|| exit 1; \
--		elif [ "$$subdir" = "regex" ]; then \
--			(cd $$subdir \
--			&& $(MAKE) CC="$(CC) $(CFLAGS)" lib) \
--			|| exit 1; \
--		else \
--			(cd $$subdir && $(MAKE)) || exit 1; \
--		fi; \
-+		(cd $$subdir && $(MAKE)) || exit 1; \
- 	done
- 
- all:: $(EXES) $(LIBRARIES) plugins
diff --git a/net/dictd/files/patch-break-utf8 b/net/dictd/files/patch-break-utf8
index b36b99d874f0..a1a30e1d431c 100644
--- a/net/dictd/files/patch-break-utf8
+++ b/net/dictd/files/patch-break-utf8
@@ -19,31 +19,13 @@
  }
  
  static void init (const char *fn)
---- index.c.orig	Mon Mar 10 01:06:16 2003
-+++ index.c	Fri Oct 10 00:20:22 2003
-@@ -123,6 +123,10 @@
-    const char *src, char *dest,
-    int allchars_mode)
- {
-+#include <osreldate.h>
-+#if __FreeBSD_version < 500000
-+    abort();
-+#else
-    wchar_t      ucs4_char;
-    size_t len;
-    int    len2;
-@@ -154,6 +158,7 @@
-    *dest = 0;
- 
-    return (src != NULL);
-+#endif
- }
- 
- static void dict_table_init(void)
-@@ -200,9 +205,11 @@
+--- index.c.orig	Mon Jan 26 02:52:14 2004
++++ index.c	Mon Jan 26 03:02:18 2004
+@@ -144,9 +144,12 @@
        p[i]         = &s[2 * i];
     }
                                  /* Sort those strings in the locale */
++#include <osreldate.h>
 +#if __FreeBSD_version > 499999
     if (utf8_mode)
        qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_utf8);
@@ -52,7 +34,7 @@
        qsort(p, UCHAR_MAX + 1, sizeof(p[0]), dict_table_init_compare_strcoll);
  
                                  /* Extract our unordered arrays */
-@@ -1258,6 +1265,9 @@
+@@ -1245,6 +1248,9 @@
  */
  static int stranagram_utf8 (char *str)
  {
@@ -62,11 +44,11 @@
     size_t len;
     char   *p;
  
-@@ -1280,6 +1290,7 @@
+@@ -1267,6 +1273,7 @@
  
     stranagram_8bit (str, -1);
     return 1;
 +#endif
  }
+ #endif
  
- /* makes anagram of utf-8 string 'str' */
diff --git a/net/dictd/files/patch-configure b/net/dictd/files/patch-configure
deleted file mode 100644
index 4056d59ee50f..000000000000
--- a/net/dictd/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure~	Fri Oct 17 17:54:05 2003
-+++ configure	Fri Oct 17 17:54:12 2003
-@@ -5023,7 +5023,7 @@
- EOF
- 
- if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
--  LIBOBJS="$LIBOBJS lstat.$ac_objext"
-+  LIBOBJS="$LIBOBJS"
- fi
- 
- echo "$as_me:5029: checking whether stat accepts an empty string" >&5
diff --git a/net/dictd/files/patch-dictd.c b/net/dictd/files/patch-dictd.c
deleted file mode 100644
index f18cabb964b8..000000000000
--- a/net/dictd/files/patch-dictd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- dictd.c.orig	Mon Jun 10 02:39:20 2002
-+++ dictd.c	Mon Jun 10 02:40:01 2002
-@@ -113,7 +113,7 @@
- 
- static void reaper( int dummy )
- {
--#if defined(__osf__) || (defined(__sparc) && defined(__SVR4))
-+#if defined(__FreeBSD__) || defined(__osf__) || (defined(__sparc) && defined(__SVR4))
-    int        status;
- #else
-    union wait status;
diff --git a/net/dictd/files/patch-dictd_8 b/net/dictd/files/patch-dictd_8
index 762442e1eaba..a033a67a2620 100644
--- a/net/dictd/files/patch-dictd_8
+++ b/net/dictd/files/patch-dictd_8
@@ -1,32 +1,29 @@
---- dictd.8.orig	Mon Jun 10 02:41:34 2002
-+++ dictd.8	Mon Jun 10 02:42:35 2002
-@@ -105,7 +105,7 @@
+--- dictd.8.orig	Mon Jan 26 06:41:05 2004
++++ dictd.8	Mon Jan 26 06:43:07 2004
+@@ -128,7 +128,7 @@
  .TP
  .BI \-c " file\fR or "  \-\-config " file"
  Specify configuration file.  The default is
--.IR /etc/dictd.conf ,
-+.IR %%PREFIX%%/etc/dictd.conf ,
- but may be changed in the
- .I dictd.h
- file at compile time (DICT_CONFIG_FILE).
-@@ -358,7 +358,7 @@
+-.I /etc/dictd.conf
++.I %%PREFIX%%/etc/dictd.conf
+ , but may be changed in the
+ .I defs.h
+ file at compile time (DICTD_CONFIG_FILE).
+@@ -444,7 +444,7 @@
  .TP
  .B Introduction
  The configuration file defaults to
--.IR /etc/dictd.conf ,
-+.IR %%PREFIX%%/etc/dictd.conf ,
+-.I /etc/dictd.conf 
++.I %%PREFIX%%/etc/dictd.conf 
  but can be specified on the command line with the
  .B \-c
- option (see above).  The configuration file has four distinct sections.
-@@ -755,9 +755,9 @@
- There is no way to get a running server to re-read the configuration file,
- so databases cannot be added or deleted on the fly.
+ option (see above).
+@@ -995,7 +995,7 @@
+ library you build dictd with.
+ 
  .SH "FILES"
 -.I /etc/dictd.conf
 +.I %%PREFIX%%/etc/dictd.conf
  .br
--.I /usr/sbin/dictd
-+.I %%PREFIX%%/sbin/dictd
+ .I /usr/sbin/dictd
  .SH "SEE ALSO"
- .BR dict (1),
- .BR dictzip (1),