Update to version 1.11. While here: libtoolize, switch to gmake

(generating po files properly seems to need this), add pcre support.

Changes before version 1.10 are unavailable.

The following things have been changed compared to version 1.10:

o  Bugfix in ellipsis processing
o  Support for Dutch
o  GPL 3.0
o  Use autoconf 2.61

11 files changed, 304 insertions, 10 deletions

diff --git a/textproc/diction/Makefile b/textproc/diction/Makefile
index 63e0fa9d294..a948921e367 100644
--- a/textproc/diction/Makefile
+++ b/textproc/diction/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2006/04/13 18:23:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/12/04 00:57:37 bjs Exp $
 
-DISTNAME=	diction-1.08
-PKGREVISION=	1
+DISTNAME=	diction-1.11
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.moria.de/~michael/diction/
 
@@ -9,10 +8,16 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/diction/diction.html
 COMMENT=	GNU version of diction and style
 
-USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		msgfmt
+PKG_DESTDIR_SUPPORT=	user-destdir
 
+USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake msgfmt
+
+USE_FEATURES+=		getopt_long regcomp snprintf
+
+.include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
diff --git a/textproc/diction/PLIST b/textproc/diction/PLIST
index eea064ea172..eb4300b869f 100644
--- a/textproc/diction/PLIST
+++ b/textproc/diction/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:35 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/12/04 00:57:37 bjs Exp $
 bin/diction
 bin/style
 man/man1/diction.1
@@ -6,5 +6,9 @@ man/man1/style.1
 share/diction/C
 share/diction/de
 share/diction/en
+share/diction/en_GB
+share/diction/nl
 share/locale/de/LC_MESSAGES/diction.mo
+share/locale/en_GB/LC_MESSAGES/diction.mo
+share/locale/nl/LC_MESSAGES/diction.mo
 @dirrm share/diction
diff --git a/textproc/diction/distinfo b/textproc/diction/distinfo
index 2136676f8fa..23b1f442a3a 100644
--- a/textproc/diction/distinfo
+++ b/textproc/diction/distinfo
@@ -1,5 +1,12 @@
-$NetBSD: distinfo,v 1.3 2005/06/01 03:01:58 snj Exp $
+$NetBSD: distinfo,v 1.4 2007/12/04 00:57:37 bjs Exp $
 
-SHA1 (diction-1.08.tar.gz) = bce77da24d7550715dacf4f13065d5ac2d8ea3bd
-RMD160 (diction-1.08.tar.gz) = 6f16e7b2fc800a52858eda77e245e0d725843a8e
-Size (diction-1.08.tar.gz) = 144440 bytes
+SHA1 (diction-1.11.tar.gz) = 30c7c778959120d30fa67be9261d41de894f498b
+RMD160 (diction-1.11.tar.gz) = c054eb3eb2ffec54d1d48f9e33f138e41c0d4429
+Size (diction-1.11.tar.gz) = 141062 bytes
+SHA1 (patch-aa) = 6f8feacca5bcefb514d8e0fd8fd9c14e66cc5895
+SHA1 (patch-ab) = efd61a4276f7747d45dab1869566e223e693ca48
+SHA1 (patch-ac) = 922b77093e0cb8a95dfb150a6dfc3a1216f5d075
+SHA1 (patch-ad) = fb4491af3a75c9adf56ade31230fd294666702f0
+SHA1 (patch-ae) = c5d14f461bf5643067dda72a49a4e988a9da5265
+SHA1 (patch-af) = b67aec42b60b0d0a226f8e2b5085270fdf9f7cce
+SHA1 (patch-ag) = 973034567a03b0002ff9d1f487d157a2ebd25ab3
diff --git a/textproc/diction/options.mk b/textproc/diction/options.mk
new file mode 100644
index 00000000000..68a62ffc6d6
--- /dev/null
+++ b/textproc/diction/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2007/12/04 00:57:38 bjs Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.diction
+PKG_SUPPORTED_OPTIONS=	pcre
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpcre)
+LIBPCREPOSIX=	-lpcreposix
+MAKE_ENV+=	LIBPCREPOSIX=${LIBPCREPOSIX:Q}
+.  include "../../devel/pcre/buildlink3.mk"
+.endif
diff --git a/textproc/diction/patches/patch-aa b/textproc/diction/patches/patch-aa
new file mode 100644
index 00000000000..28bc531ceec
--- /dev/null
+++ b/textproc/diction/patches/patch-aa
@@ -0,0 +1,64 @@
+$NetBSD: patch-aa,v 1.1 2007/12/04 00:57:38 bjs Exp $
+
+--- Makefile.in.orig	2007-08-03 06:05:15.000000000 -0400
++++ Makefile.in
+@@ -11,14 +11,14 @@ VPATH=		@srcdir@
+ prefix=		@prefix@
+ exec_prefix=	@exec_prefix@
+ datarootdir=	@datarootdir@
+-localedir=	@localedir@
++localedir= /usr/pkg/share/locale
+ 
+ CC=		@CC@
+ CFLAGS=		@CFLAGS@
+ CPPFLAGS=	@CPPFLAGS@ -I. -DSHAREDIR=\"@datarootdir@\" -DLOCALEDIR=\"$(localedir)\"
+ LDFLAGS=	@LDFLAGS@
+ LIBM=		-lm
+-LIBS=		@LIBS@
++LIBS=		@LIBS@ ${LIBPCREPOSIX}
+ 
+ CATALOGS=	de.mo en_GB.mo nl.mo
+ 
+@@ -26,13 +26,13 @@ all:		diction style all-po-@USE_NLS@
+ all-po-no:
+ all-po-yes:	$(CATALOGS)
+ 
+-diction:	diction.o sentence.o misc.o getopt.o getopt1.o
+-		$(CC) -o $@ $(LDFLAGS) diction.o sentence.o misc.o \
+-		getopt.o getopt1.o $(LIBS)
+-
+-style:		style.o sentence.o misc.o getopt.o getopt1.o
+-		$(CC) -o $@ $(LDFLAGS) style.o sentence.o misc.o \
+-		getopt.o getopt1.o $(LIBM) $(LIBS)
++diction:	diction.o sentence.o misc.o
++		${LIBTOOL} --mode=link --tag=CC $(CC) -o $@ $(LDFLAGS) \
++		diction.lo sentence.lo misc.lo $(LIBS)
++
++style:		style.o sentence.o misc.o
++		${LIBTOOL} --mode=link --tag=CC $(CC) -o $@ $(LDFLAGS) \
++		diction.lo sentence.lo misc.lo $(LIBM) $(LIBS)
+ 
+ check:		diction
+ 		for i in $(srcdir)/test/test*; do $$i || break; done
+@@ -61,7 +61,7 @@ install-po-yes:	$(CATALOGS)
+ 		done
+ 
+ .c.o:
+-		$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
++		${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) -prefer-pic $<
+ 
+ .SUFFIXES:	.po .mo
+ 
+@@ -110,10 +110,8 @@ tar:		distclean
+ 		(b=`pwd`; b=`basename $$b`; cd ..; tar zcvf $$b.tar.gz $$b/COPYING $$b/INSTALL $$b/Makefile.in $$b/README $$b/NEWS $$b/configure $$b/install-sh $$b/de $$b/en $$b/en_GB $$b/nl $$b/test $$b/[a-z]*.*)
+ #}}}
+ #{{{ dependencies
+-diction.o:	diction.c config.h getopt.h misc.h sentence.h
+-getopt.o:	getopt.c getopt.h getopt_int.h
+-getopt1.o:	getopt1.c getopt.h getopt_int.h
++diction.o:	diction.c config.h misc.h sentence.h
+ misc.o:	misc.c config.h misc.h
+ sentence.o:	sentence.c config.h misc.h sentence.h
+-style.o:	style.c config.h getopt.h misc.h sentence.h
++style.o:	style.c config.h misc.h sentence.h
+ #}}}
diff --git a/textproc/diction/patches/patch-ab b/textproc/diction/patches/patch-ab
new file mode 100644
index 00000000000..8fdda35d167
--- /dev/null
+++ b/textproc/diction/patches/patch-ab
@@ -0,0 +1,27 @@
+$NetBSD: patch-ab,v 1.1 2007/12/04 00:57:39 bjs Exp $
+
+--- diction.c.orig	2007-07-30 16:42:41.000000000 -0400
++++ diction.c
+@@ -35,13 +35,21 @@ with this program.  If not, write to the
+ #else
+ #define _(String) String
+ #endif
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/getopt.h>
++#include <nbcompat/regex.h>
++#include <nbcompat/stdio.h>
++#else
++#include <getopt.h>
+ #include <regex.h>
+ #include <stdio.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#include "getopt.h"
+ #include "misc.h"
+ #include "sentence.h"
+ /*}}}*/
diff --git a/textproc/diction/patches/patch-ac b/textproc/diction/patches/patch-ac
new file mode 100644
index 00000000000..e95e38829b0
--- /dev/null
+++ b/textproc/diction/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2007/12/04 00:57:39 bjs Exp $
+
+--- misc.c.orig	2007-07-31 18:08:55.000000000 -0400
++++ misc.c
+@@ -26,7 +26,13 @@ implied warranty of MERCHANTABILITY or F
+ #include <sys/types.h>
+ #include <assert.h>
+ #include <errno.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/stdio.h>
++#else
+ #include <stdio.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
diff --git a/textproc/diction/patches/patch-ad b/textproc/diction/patches/patch-ad
new file mode 100644
index 00000000000..1d382553b32
--- /dev/null
+++ b/textproc/diction/patches/patch-ad
@@ -0,0 +1,20 @@
+$NetBSD: patch-ad,v 1.1 2007/12/04 00:57:40 bjs Exp $
+
+--- sentence.c.orig	2007-08-09 09:00:25.000000000 -0400
++++ sentence.c
+@@ -40,8 +40,15 @@ with this program.  If not, write to the
+ #else
+ #define _(String) String
+ #endif
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/regex.h>
++#include <nbcompat/stdio.h>
++#else
+ #include <regex.h>
+ #include <stdio.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
diff --git a/textproc/diction/patches/patch-ae b/textproc/diction/patches/patch-ae
new file mode 100644
index 00000000000..f9e5ea6c57a
--- /dev/null
+++ b/textproc/diction/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.1 2007/12/04 00:57:40 bjs Exp $
+
+--- sentence.h.orig	2007-07-30 16:44:18.000000000 -0400
++++ sentence.h
+@@ -25,7 +25,13 @@ with this program.  If not, write to the
+ #define SENTENCE_H
+ 
+ #include <sys/types.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/stdio.h>
++#else
+ #include <stdio.h>
++#endif
+ 
+ int endingInPossesiveS(const char *s, size_t length);
+ void sentence(const char *cmd, FILE *in, const char *file, void (*process)(const char *, size_t, const char *, int), const char *lang);
diff --git a/textproc/diction/patches/patch-af b/textproc/diction/patches/patch-af
new file mode 100644
index 00000000000..527052d3722
--- /dev/null
+++ b/textproc/diction/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1 2007/12/04 00:57:41 bjs Exp $
+
+--- style.c.orig	2007-08-09 09:45:54.000000000 -0400
++++ style.c
+@@ -40,11 +40,18 @@ with this program.  If not, write to the
+ #define _(String) String
+ #endif
+ #include <math.h>
++#if defined(HAVE_NBCOMPAT_H)
++#include <nbcompat/config.h>
++#include <nbcompat/cdefs.h>
++#include <nbcompat/getopt.h>
++#include <nbcompat/stdio.h>
++#else
++#include <getopt.h>
+ #include <stdio.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "getopt.h"
+ #include "misc.h"
+ #include "sentence.h"
+ /*}}}*/
diff --git a/textproc/diction/patches/patch-ag b/textproc/diction/patches/patch-ag
new file mode 100644
index 00000000000..cea4ad48583
--- /dev/null
+++ b/textproc/diction/patches/patch-ag
@@ -0,0 +1,95 @@
+$NetBSD: patch-ag,v 1.1 2007/12/04 00:57:41 bjs Exp $
+
+--- configure.orig	2007-08-30 04:06:24.000000000 -0400
++++ configure
+@@ -2935,90 +2935,6 @@ _ACEOF
+ fi
+ done
+ 
+-{ echo "$as_me:$LINENO: checking for library containing regcomp" >&5
+-echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6; }
+-if test "${ac_cv_search_regcomp+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char regcomp ();
+-int
+-main ()
+-{
+-return regcomp ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-for ac_lib in '' regex pcre; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ac_cv_search_regcomp=$ac_res
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext
+-  if test "${ac_cv_search_regcomp+set}" = set; then
+-  break
+-fi
+-done
+-if test "${ac_cv_search_regcomp+set}" = set; then
+-  :
+-else
+-  ac_cv_search_regcomp=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
+-echo "${ECHO_T}$ac_cv_search_regcomp" >&6; }
+-ac_res=$ac_cv_search_regcomp
+-if test "$ac_res" != no; then
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+-
+-fi
+-
+-
+ { echo "$as_me:$LINENO: checking for broken realloc" >&5
+ echo $ECHO_N "checking for broken realloc... $ECHO_C" >&6; }
+ if test "$cross_compiling" = yes; then