Update to 1.13. Set LICENSE. Remove unnecessary chunk in Makefile patch.

The following things have been changed compared to version 1.12:

o  Corrected German message catalog
o  Changes to English diction file
o  Fixed ellipsis handling

5 files changed, 19 insertions, 123 deletions

diff --git a/textproc/diction/Makefile b/textproc/diction/Makefile
index dbc2e0fdb5c..8b83307ab87 100644
--- a/textproc/diction/Makefile
+++ b/textproc/diction/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2012/10/25 06:55:46 asau Exp $
+# $NetBSD: Makefile,v 1.16 2015/01/16 11:49:07 wiz Exp $
 
-DISTNAME=	diction-1.11
-PKGREVISION=	3
+DISTNAME=	diction-1.13
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.moria.de/~michael/diction/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/diction/diction.html
 COMMENT=	GNU version of diction and style
+LICENSE=	gnu-gpl-v3
 
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
diff --git a/textproc/diction/distinfo b/textproc/diction/distinfo
index 0ae02b80dd5..70de98b4f14 100644
--- a/textproc/diction/distinfo
+++ b/textproc/diction/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.5 2011/08/05 15:40:47 reed Exp $
+$NetBSD: distinfo,v 1.6 2015/01/16 11:49:07 wiz Exp $
 
-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) = 57653017395f331a5729cafffa91329996190858
+SHA1 (diction-1.13.tar.gz) = 339462c27df2ee4138e1db57c221386d74f54932
+RMD160 (diction-1.13.tar.gz) = 749e8879fb0a93eb22c758a5230de2231b07e927
+Size (diction-1.13.tar.gz) = 145971 bytes
+SHA1 (patch-aa) = 72e0cbc437b031720fe6e26a5a4a4220bbb4a82f
 SHA1 (patch-ab) = efd61a4276f7747d45dab1869566e223e693ca48
 SHA1 (patch-ac) = 922b77093e0cb8a95dfb150a6dfc3a1216f5d075
 SHA1 (patch-ad) = fb4491af3a75c9adf56ade31230fd294666702f0
-SHA1 (patch-ae) = c5d14f461bf5643067dda72a49a4e988a9da5265
+SHA1 (patch-ae) = 026a5da0ff86a0de42d54a141a7069a7a0179f18
 SHA1 (patch-af) = b67aec42b60b0d0a226f8e2b5085270fdf9f7cce
-SHA1 (patch-ag) = 973034567a03b0002ff9d1f487d157a2ebd25ab3
diff --git a/textproc/diction/patches/patch-aa b/textproc/diction/patches/patch-aa
index f93dc4d43ad..5948ed799cd 100644
--- a/textproc/diction/patches/patch-aa
+++ b/textproc/diction/patches/patch-aa
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2011/08/05 15:40:47 reed Exp $
+$NetBSD: patch-aa,v 1.3 2015/01/16 11:49:07 wiz Exp $
 
---- Makefile.in.orig	2007-08-03 05:05:15.000000000 -0500
-+++ Makefile.in	2011-08-05 10:34:05.000000000 -0500
-@@ -11,14 +11,14 @@
- prefix=		@prefix@
- exec_prefix=	@exec_prefix@
- datarootdir=	@datarootdir@
--localedir=	@localedir@
-+localedir= /usr/pkg/share/locale
- 
- CC=		@CC@
- CFLAGS=		@CFLAGS@
+--- Makefile.in.orig	2011-08-31 17:04:19.000000000 +0000
++++ Makefile.in
+@@ -18,7 +18,7 @@ CFLAGS=		@CFLAGS@
  CPPFLAGS=	@CPPFLAGS@ -I. -DSHAREDIR=\"@datarootdir@\" -DLOCALEDIR=\"$(localedir)\"
  LDFLAGS=	@LDFLAGS@
  LIBM=		-lm
@@ -19,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2011/08/05 15:40:47 reed Exp $
  
  CATALOGS=	de.mo en_GB.mo nl.mo
  
-@@ -26,13 +26,13 @@
+@@ -26,13 +26,13 @@ all:		diction style all-po-@USE_NLS@
  all-po-no:
  all-po-yes:	$(CATALOGS)
  
@@ -40,7 +32,7 @@ $NetBSD: patch-aa,v 1.2 2011/08/05 15:40:47 reed Exp $
  
  check:		diction
  		for i in $(srcdir)/test/test*; do $$i || break; done
-@@ -61,7 +61,7 @@
+@@ -61,7 +61,7 @@ install-po-yes:	$(CATALOGS)
  		done
  
  .c.o:
@@ -49,7 +41,7 @@ $NetBSD: patch-aa,v 1.2 2011/08/05 15:40:47 reed Exp $
  
  .SUFFIXES:	.po .mo
  
-@@ -110,10 +110,8 @@
+@@ -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
diff --git a/textproc/diction/patches/patch-ae b/textproc/diction/patches/patch-ae
index f9e5ea6c57a..d34923eb221 100644
--- a/textproc/diction/patches/patch-ae
+++ b/textproc/diction/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2007/12/04 00:57:40 bjs Exp $
+$NetBSD: patch-ae,v 1.2 2015/01/16 11:49:07 wiz Exp $
 
---- sentence.h.orig	2007-07-30 16:44:18.000000000 -0400
+--- sentence.h.orig	2011-08-31 17:04:20.000000000 +0000
 +++ sentence.h
 @@ -25,7 +25,13 @@ with this program.  If not, write to the
  #define SENTENCE_H
@@ -15,4 +15,4 @@ $NetBSD: patch-ae,v 1.1 2007/12/04 00:57:40 bjs Exp $
 +#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);
+ void sentence(const char *cmd, FILE *in, const char *file, void (*process)(const char *, size_t, const char *, int, int, int, int), const char *lang);
diff --git a/textproc/diction/patches/patch-ag b/textproc/diction/patches/patch-ag
deleted file mode 100644
index cea4ad48583..00000000000
--- a/textproc/diction/patches/patch-ag
+++ /dev/null
@@ -1,95 +0,0 @@
-$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