Fri Jan 16 11:49:07 2015 UTC ()
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


(wiz)
diff -r1.15 -r1.16 pkgsrc/textproc/diction/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/diction/distinfo
diff -r1.2 -r1.3 pkgsrc/textproc/diction/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/textproc/diction/patches/patch-ae
diff -r1.1 -r0 pkgsrc/textproc/diction/patches/patch-ag
cvs diff -r1.15 -r1.16 pkgsrc/textproc/diction/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/diction/Makefile 2012/10/25 06:55:46 1.15
+++ pkgsrc/textproc/diction/Makefile 2015/01/16 11:49:07 1.16
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1# $NetBSD: Makefile,v 1.15 2012/10/25 06:55:46 asau Exp $ 1# $NetBSD: Makefile,v 1.16 2015/01/16 11:49:07 wiz Exp $
2 2
3DISTNAME= diction-1.11 3DISTNAME= diction-1.13
4PKGREVISION= 3 
5CATEGORIES= textproc 4CATEGORIES= textproc
6MASTER_SITES= http://www.moria.de/~michael/diction/ 5MASTER_SITES= http://www.moria.de/~michael/diction/
7 6
8MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/diction/diction.html 8HOMEPAGE= http://www.gnu.org/software/diction/diction.html
10COMMENT= GNU version of diction and style 9COMMENT= GNU version of diction and style
 10LICENSE= gnu-gpl-v3
11 11
12USE_PKGLOCALEDIR= YES 12USE_PKGLOCALEDIR= YES
13GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= gmake msgfmt 15USE_TOOLS+= gmake msgfmt
16 16
17USE_FEATURES+= getopt_long regcomp snprintf 17USE_FEATURES+= getopt_long regcomp snprintf
18 18
19LIBS.SunOS+= -lintl 19LIBS.SunOS+= -lintl
20 20
21.include "options.mk" 21.include "options.mk"
22 22
23.include "../../devel/gettext-lib/buildlink3.mk" 23.include "../../devel/gettext-lib/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/diction/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/diction/distinfo 2011/08/05 15:40:47 1.5
+++ pkgsrc/textproc/diction/distinfo 2015/01/16 11:49:07 1.6
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1$NetBSD: distinfo,v 1.5 2011/08/05 15:40:47 reed Exp $ 1$NetBSD: distinfo,v 1.6 2015/01/16 11:49:07 wiz Exp $
2 2
3SHA1 (diction-1.11.tar.gz) = 30c7c778959120d30fa67be9261d41de894f498b 3SHA1 (diction-1.13.tar.gz) = 339462c27df2ee4138e1db57c221386d74f54932
4RMD160 (diction-1.11.tar.gz) = c054eb3eb2ffec54d1d48f9e33f138e41c0d4429 4RMD160 (diction-1.13.tar.gz) = 749e8879fb0a93eb22c758a5230de2231b07e927
5Size (diction-1.11.tar.gz) = 141062 bytes 5Size (diction-1.13.tar.gz) = 145971 bytes
6SHA1 (patch-aa) = 57653017395f331a5729cafffa91329996190858 6SHA1 (patch-aa) = 72e0cbc437b031720fe6e26a5a4a4220bbb4a82f
7SHA1 (patch-ab) = efd61a4276f7747d45dab1869566e223e693ca48 7SHA1 (patch-ab) = efd61a4276f7747d45dab1869566e223e693ca48
8SHA1 (patch-ac) = 922b77093e0cb8a95dfb150a6dfc3a1216f5d075 8SHA1 (patch-ac) = 922b77093e0cb8a95dfb150a6dfc3a1216f5d075
9SHA1 (patch-ad) = fb4491af3a75c9adf56ade31230fd294666702f0 9SHA1 (patch-ad) = fb4491af3a75c9adf56ade31230fd294666702f0
10SHA1 (patch-ae) = c5d14f461bf5643067dda72a49a4e988a9da5265 10SHA1 (patch-ae) = 026a5da0ff86a0de42d54a141a7069a7a0179f18
11SHA1 (patch-af) = b67aec42b60b0d0a226f8e2b5085270fdf9f7cce 11SHA1 (patch-af) = b67aec42b60b0d0a226f8e2b5085270fdf9f7cce
12SHA1 (patch-ag) = 973034567a03b0002ff9d1f487d157a2ebd25ab3 
cvs diff -r1.2 -r1.3 pkgsrc/textproc/diction/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/diction/patches/patch-aa 2011/08/05 15:40:47 1.2
+++ pkgsrc/textproc/diction/patches/patch-aa 2015/01/16 11:49:07 1.3
@@ -1,64 +1,56 @@ @@ -1,64 +1,56 @@
1$NetBSD: patch-aa,v 1.2 2011/08/05 15:40:47 reed Exp $ 1$NetBSD: patch-aa,v 1.3 2015/01/16 11:49:07 wiz Exp $
2 2
3--- Makefile.in.orig 2007-08-03 05:05:15.000000000 -0500 3--- Makefile.in.orig 2011-08-31 17:04:19.000000000 +0000
4+++ Makefile.in 2011-08-05 10:34:05.000000000 -0500 4+++ Makefile.in
5@@ -11,14 +11,14 @@ 5@@ -18,7 +18,7 @@ CFLAGS= @CFLAGS@
6 prefix= @prefix@ 
7 exec_prefix= @exec_prefix@ 
8 datarootdir= @datarootdir@ 
9-localedir= @localedir@ 
10+localedir= /usr/pkg/share/locale 
11  
12 CC= @CC@ 
13 CFLAGS= @CFLAGS@ 
14 CPPFLAGS= @CPPFLAGS@ -I. -DSHAREDIR=\"@datarootdir@\" -DLOCALEDIR=\"$(localedir)\" 6 CPPFLAGS= @CPPFLAGS@ -I. -DSHAREDIR=\"@datarootdir@\" -DLOCALEDIR=\"$(localedir)\"
15 LDFLAGS= @LDFLAGS@ 7 LDFLAGS= @LDFLAGS@
16 LIBM= -lm 8 LIBM= -lm
17-LIBS= @LIBS@ 9-LIBS= @LIBS@
18+LIBS= @LIBS@ ${LIBPCREPOSIX} 10+LIBS= @LIBS@ ${LIBPCREPOSIX}
19  11
20 CATALOGS= de.mo en_GB.mo nl.mo 12 CATALOGS= de.mo en_GB.mo nl.mo
21  13
22@@ -26,13 +26,13 @@ 14@@ -26,13 +26,13 @@ all: diction style all-po-@USE_NLS@
23 all-po-no: 15 all-po-no:
24 all-po-yes: $(CATALOGS) 16 all-po-yes: $(CATALOGS)
25  17
26-diction: diction.o sentence.o misc.o getopt.o getopt1.o 18-diction: diction.o sentence.o misc.o getopt.o getopt1.o
27- $(CC) -o $@ $(LDFLAGS) diction.o sentence.o misc.o \ 19- $(CC) -o $@ $(LDFLAGS) diction.o sentence.o misc.o \
28- getopt.o getopt1.o $(LIBS) 20- getopt.o getopt1.o $(LIBS)
29- 21-
30-style: style.o sentence.o misc.o getopt.o getopt1.o 22-style: style.o sentence.o misc.o getopt.o getopt1.o
31- $(CC) -o $@ $(LDFLAGS) style.o sentence.o misc.o \ 23- $(CC) -o $@ $(LDFLAGS) style.o sentence.o misc.o \
32- getopt.o getopt1.o $(LIBM) $(LIBS) 24- getopt.o getopt1.o $(LIBM) $(LIBS)
33+diction: diction.o sentence.o misc.o 25+diction: diction.o sentence.o misc.o
34+ ${LIBTOOL} --mode=link --tag=CC $(CC) -o $@ $(LDFLAGS) \ 26+ ${LIBTOOL} --mode=link --tag=CC $(CC) -o $@ $(LDFLAGS) \
35+ diction.lo sentence.lo misc.lo $(LIBS) 27+ diction.lo sentence.lo misc.lo $(LIBS)
36+ 28+
37+style: style.o sentence.o misc.o 29+style: style.o sentence.o misc.o
38+ ${LIBTOOL} --mode=link --tag=CC $(CC) -o $@ $(LDFLAGS) \ 30+ ${LIBTOOL} --mode=link --tag=CC $(CC) -o $@ $(LDFLAGS) \
39+ style.lo sentence.lo misc.lo $(LIBM) $(LIBS) 31+ style.lo sentence.lo misc.lo $(LIBM) $(LIBS)
40  32
41 check: diction 33 check: diction
42 for i in $(srcdir)/test/test*; do $$i || break; done 34 for i in $(srcdir)/test/test*; do $$i || break; done
43@@ -61,7 +61,7 @@ 35@@ -61,7 +61,7 @@ install-po-yes: $(CATALOGS)
44 done 36 done
45  37
46 .c.o: 38 .c.o:
47- $(CC) -c $(CPPFLAGS) $(CFLAGS) $< 39- $(CC) -c $(CPPFLAGS) $(CFLAGS) $<
48+ ${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) -prefer-pic $< 40+ ${LIBTOOL} --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) -prefer-pic $<
49  41
50 .SUFFIXES: .po .mo 42 .SUFFIXES: .po .mo
51  43
52@@ -110,10 +110,8 @@ 44@@ -110,10 +110,8 @@ tar: distclean
53 (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]*.*) 45 (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]*.*)
54 #}}} 46 #}}}
55 #{{{ dependencies 47 #{{{ dependencies
56-diction.o: diction.c config.h getopt.h misc.h sentence.h 48-diction.o: diction.c config.h getopt.h misc.h sentence.h
57-getopt.o: getopt.c getopt.h getopt_int.h 49-getopt.o: getopt.c getopt.h getopt_int.h
58-getopt1.o: getopt1.c getopt.h getopt_int.h 50-getopt1.o: getopt1.c getopt.h getopt_int.h
59+diction.o: diction.c config.h misc.h sentence.h 51+diction.o: diction.c config.h misc.h sentence.h
60 misc.o: misc.c config.h misc.h 52 misc.o: misc.c config.h misc.h
61 sentence.o: sentence.c config.h misc.h sentence.h 53 sentence.o: sentence.c config.h misc.h sentence.h
62-style.o: style.c config.h getopt.h misc.h sentence.h 54-style.o: style.c config.h getopt.h misc.h sentence.h
63+style.o: style.c config.h misc.h sentence.h 55+style.o: style.c config.h misc.h sentence.h
64 #}}} 56 #}}}
cvs diff -r1.1 -r1.2 pkgsrc/textproc/diction/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/textproc/diction/patches/patch-ae 2007/12/04 00:57:40 1.1
+++ pkgsrc/textproc/diction/patches/patch-ae 2015/01/16 11:49:07 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ae,v 1.1 2007/12/04 00:57:40 bjs Exp $ 1$NetBSD: patch-ae,v 1.2 2015/01/16 11:49:07 wiz Exp $
2 2
3--- sentence.h.orig 2007-07-30 16:44:18.000000000 -0400 3--- sentence.h.orig 2011-08-31 17:04:20.000000000 +0000
4+++ sentence.h 4+++ sentence.h
5@@ -25,7 +25,13 @@ with this program. If not, write to the 5@@ -25,7 +25,13 @@ with this program. If not, write to the
6 #define SENTENCE_H 6 #define SENTENCE_H
7  7
8 #include <sys/types.h> 8 #include <sys/types.h>
9+#if defined(HAVE_NBCOMPAT_H) 9+#if defined(HAVE_NBCOMPAT_H)
10+#include <nbcompat/config.h> 10+#include <nbcompat/config.h>
11+#include <nbcompat/cdefs.h> 11+#include <nbcompat/cdefs.h>
12+#include <nbcompat/stdio.h> 12+#include <nbcompat/stdio.h>
13+#else 13+#else
14 #include <stdio.h> 14 #include <stdio.h>
15+#endif 15+#endif
16  16
17 int endingInPossesiveS(const char *s, size_t length); 17 int endingInPossesiveS(const char *s, size_t length);
18 void sentence(const char *cmd, FILE *in, const char *file, void (*process)(const char *, size_t, const char *, int), const char *lang); 18 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);
File Deleted: pkgsrc/textproc/diction/patches/Attic/patch-ag