Import of pkgsrc-2015Q2

2015-08-30 02:56:09 -07:00
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
--- a/textproc/CRF++/Makefile
+++ b/textproc/CRF++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/03/15 18:31:52 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.4 2015/05/11 14:58:24 mef Exp $
 #

 DISTNAME=	CRF++-0.58
@@ -6,7 +6,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://crfpp.googlecode.com/files/

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/crfpp
+HOMEPAGE=	http://taku910.github.io/crfpp/
 COMMENT=	Yet Another CRF toolkit
 LICENSE=	gnu-lgpl-v2.1 OR 2-clause-bsd

--- a/textproc/FlightCrew/Makefile
+++ b/textproc/FlightCrew/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2014/12/01 12:39:18 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2015/04/25 14:24:56 tnn Exp $
 #

 DISTNAME=	FlightCrew-0.7.2-Code
 PKGNAME=	${DISTNAME:S/-Code//}
-PKGREVISION=	24
+PKGREVISION=	26
 CATEGORIES=	textproc
 MASTER_SITES=	http://flightcrew.googlecode.com/files/
 EXTRACT_SUFX=	.zip
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.824 2015/03/10 19:57:18 bsiegert Exp $
+# $NetBSD: Makefile,v 1.833 2015/06/08 11:16:57 wiz Exp $
 #

 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -16,6 +16,7 @@ SUBDIR+=	R-stringr
 SUBDIR+=	WordNet
 SUBDIR+=	aiksaurus
 SUBDIR+=	antiword
+SUBDIR+=	artha
 SUBDIR+=	asciidoc
 SUBDIR+=	aspell
 SUBDIR+=	aspell-af
@@ -191,6 +192,7 @@ SUBDIR+=	heirloom-col
 SUBDIR+=	heirloom-comm
 SUBDIR+=	heirloom-cut
 SUBDIR+=	heirloom-diff3
+SUBDIR+=	heirloom-doctools
 SUBDIR+=	heirloom-ed
 SUBDIR+=	heirloom-fmt
 SUBDIR+=	heirloom-fold
@@ -535,6 +537,7 @@ SUBDIR+=	p5-Text-Wrapper
 SUBDIR+=	p5-Text-Xslate
 SUBDIR+=	p5-Text-vCard
 SUBDIR+=	p5-Text-vFile-asData
+SUBDIR+=	p5-Unicode-CaseFold
 SUBDIR+=	p5-Unicode-LineBreak
 SUBDIR+=	p5-XML-Atom
 SUBDIR+=	p5-XML-Atom-SimpleFeed
@@ -568,6 +571,7 @@ SUBDIR+=	p5-XML-NamespaceSupport
 SUBDIR+=	p5-XML-Node
 SUBDIR+=	p5-XML-NodeFilter
 SUBDIR+=	p5-XML-Parser
+SUBDIR+=	p5-XML-Parser-Lite
 SUBDIR+=	p5-XML-Parser-Lite-Tree
 SUBDIR+=	p5-XML-RAI
 SUBDIR+=	p5-XML-RSS
@@ -658,6 +662,7 @@ SUBDIR+=	py-empy
 SUBDIR+=	py-enchant
 SUBDIR+=	py-expat
 SUBDIR+=	py-feedparser
+SUBDIR+=	py-ftfy
 SUBDIR+=	py-generateDS
 SUBDIR+=	py-gnosis-utils
 SUBDIR+=	py-html2text
@@ -682,6 +687,7 @@ SUBDIR+=	py-phonenumbers
 SUBDIR+=	py-prettytable
 SUBDIR+=	py-pygments
 SUBDIR+=	py-pyquery
+SUBDIR+=	py-rdflib
 SUBDIR+=	py-relatorio
 SUBDIR+=	py-sphinx
 SUBDIR+=	py-sphinx-theme-cloud
@@ -782,9 +788,11 @@ SUBDIR+=	sary
 SUBDIR+=	saxon
 SUBDIR+=	scew
 SUBDIR+=	scrollkeeper-dtd
+SUBDIR+=	serd
 SUBDIR+=	sgrep
 SUBDIR+=	shared-desktop-ontologies
 SUBDIR+=	soprano
+SUBDIR+=	sord
 SUBDIR+=	source-highlight
 SUBDIR+=	sphinxsearch
 SUBDIR+=	stardic
@@ -807,6 +815,7 @@ SUBDIR+=	tex-makeindex
 SUBDIR+=	tex-makeindex-doc
 SUBDIR+=	tex-xmltex
 SUBDIR+=	tex-xmltex-doc
+SUBDIR+=	tex-xmltexconfig
 SUBDIR+=	texi2html
 SUBDIR+=	texi2mdoc
 SUBDIR+=	texi2roff
--- a/textproc/Markdown/Makefile
+++ b/textproc/Markdown/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/12 10:51:19 wiz Exp $
 #

 DISTNAME=	Markdown_1.0.1
 PKGNAME=	Markdown-1.0.1
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc converters
 MASTER_SITES=	http://daringfireball.net/projects/downloads/
 EXTRACT_SUFX=	.zip
--- a/textproc/OdfConverter/Makefile
+++ b/textproc/OdfConverter/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2014/10/07 16:47:36 adam Exp $
+# $NetBSD: Makefile,v 1.39 2015/05/23 06:43:00 kefren Exp $
 #

 DISTNAME=	OdfAddinForOffice-src-3.0
 PKGNAME=	OdfConverter-3.0
-PKGREVISION=	28
+PKGREVISION=	31
 CATEGORIES=	converters textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=odf-converter/}
 EXTRACT_SUFX=	.zip
@@ -70,6 +70,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/source/Shell/OdfConverter/README.TXT \
 		${DESTDIR}${PREFIX}/share/doc/OdfConverter/README.TXT

-.include "../../lang/mono2/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/textproc/OdfConverter/distinfo
+++ b/textproc/OdfConverter/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2011/09/25 20:11:11 joerg Exp $
+$NetBSD: distinfo,v 1.6 2015/05/23 06:43:00 kefren Exp $

 SHA1 (OdfAddinForOffice-src-3.0.zip) = 678d98672ecca9adabe1221b1725c255f4f88fe5
 RMD160 (OdfAddinForOffice-src-3.0.zip) = ff6ddab2784ef1d54261cde15abfb7e98e30b80a
 Size (OdfAddinForOffice-src-3.0.zip) = 34547426 bytes
-SHA1 (patch-aa) = 633d675ee3a2d12e99874da0c936e9c5a9b6f964
+SHA1 (patch-aa) = cf6b802a221f7dbec6a92a6c20e5892055fd03e4
 SHA1 (patch-ab) = 1240ea11736009463bf937ccc547e5037d411626
 SHA1 (patch-ac) = 5e48d1f5a0a40912f56154bbbaaeea74819cd202
+SHA1 (patch-build_common.mk) = 08f61bb2459aad674f2d9db20a44280e3702ab94
--- a/textproc/OdfConverter/patches/patch-aa
+++ b/textproc/OdfConverter/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2011/09/25 20:11:11 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2015/05/23 06:43:00 kefren Exp $

--- source/Shell/OdfConverter/Makefile.orig	2007-12-19 15:16:04.000000000 +0100
-+++ source/Shell/OdfConverter/Makefile
-@@ -54,7 +54,7 @@ OdfConverterTestStatic.exe : $(SOURCE) .
+--- source/Shell/OdfConverter/Makefile.orig	2008-09-26 21:49:32.000000000 +0300
+++ source/Shell/OdfConverter/Makefile	2015-05-23 09:10:54.000000000 +0300
+@@ -54,7 +54,7 @@
 		$(SOURCE)
 
 main.c bundle.o : OdfConverterTestStatic.exe Makefile
@@ -11,12 +11,13 @@ $NetBSD: patch-aa,v 1.5 2011/09/25 20:11:11 joerg Exp $
 
 OdfConverter$(EXEEXT) : main.c bundle.o $(ZLIBDEP) Makefile
 	rm -f $@
-@@ -64,16 +64,16 @@ ifeq ($(OS),Darwin)
+@@ -64,16 +64,17 @@
 	$(CC) -o OdfConverter -Wall `pkg-config --cflags mono` main.c \
 		`pkg-config --libs-only-L mono` -bind_at_load -all_load -lz \
 	    ../../AdditionalTools/zlib123/contrib/minizip/libzlibwapi.a \
 -		`pkg-config --libs-only-l mono` bundle.o
-+		`pkg-config --libs-only-l mono-2 gtk+-2.0 gthread-2.0` bundle.o
+		`pkg-config --libs-only-l mono-2 gtk+-2.0 gthread-2.0` \
+		`pkg-config --cflags mono-2` bundle.o
 else
 -	$(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono` main.c \
 +	$(CC) -o OdfConverter$(EXEEXT) -Wall `pkg-config --cflags mono-2 gtk+-2.0 gthread-2.0` main.c \
@@ -25,10 +26,10 @@ $NetBSD: patch-aa,v 1.5 2011/09/25 20:11:11 joerg Exp $
 	    $(EXPORTDYNAMIC) \
 	    -Wl,--undefined=$(ZIPOPEN) -Wl,--undefined=$(UNZOPEN) \
 -	    `pkg-config --libs-only-L mono` -L../../AdditionalTools/zlib123/contrib/minizip \
-+	    -L../../AdditionalTools/zlib123/contrib/minizip \
 -	    -Wl,-Bstatic -lmono -lzlibwapi -Wl,-Bdynamic  \
-+	    -Wl,-Bstatic -lmono-2.0 -lzlibwapi -Wl,-Bdynamic  \
 -	    `pkg-config --libs-only-l mono | sed -e "s/\-lmono //"` \
+	    -L../../AdditionalTools/zlib123/contrib/minizip \
+	    -Wl,-Bstatic -lmonoboehm-2.0 -lzlibwapi -Wl,-Bdynamic  \
 +	    `pkg-config --libs mono-2 gtk+-2.0 gthread-2.0 | sed -e "s/\-lmono-2.0 //"` \
 	    $(ZLIB) $(OTHERLIBS)
 endif
--- a/textproc/OdfConverter/patches/patch-build_common.mk
+++ b/textproc/OdfConverter/patches/patch-build_common.mk
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_common.mk,v 1.1 2015/05/23 06:43:00 kefren Exp $
+
+Build with mcs
+
+--- build/common.mk.orig	2015-05-22 19:54:31.000000000 +0300
+++ build/common.mk	2015-05-22 19:54:38.000000000 +0300
+@@ -9,7 +9,7 @@
+ 
+ CC=gcc
+ LD=ld
+-CSC=gmcs
+CSC=mcs
+ CSC_DEBUG=-d:DEBUG -debug+
+ RECURSIVE_TARGETS = check clean install uninstall
+ 
--- a/textproc/WordNet/buildlink3.mk
+++ b/textproc/WordNet/buildlink3.mk
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/06/08 11:12:08 wiz Exp $
+
+BUILDLINK_TREE+=	WordNet
+
+.if !defined(WORDNET_BUILDLINK3_MK)
+WORDNET_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.WordNet+=	WordNet>=3.0nb7
+BUILDLINK_PKGSRCDIR.WordNet?=	../../textproc/WordNet
+
+.include "../../x11/tk/buildlink3.mk"
+.endif	# WORDNET_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-WordNet
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2014/12/06 19:04:13 dholland Exp $
+# $NetBSD: Makefile,v 1.18 2015/04/25 14:24:56 tnn Exp $
 #

 DISTNAME=	aiksaurus-1.2.1
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=aiksaurus/}

--- a/textproc/artha/DESCR
+++ b/textproc/artha/DESCR
@@ -0,0 +1,6 @@
+Artha is a free cross-platform English thesaurus that works completely
+off-line and is based on WordNet. Artha is a handy thesaurus that
+focuses on high usability, without trading off simplicity and ease of
+use. It has the following distinct features that increases its
+usability: hot key lookup, regular expressions search, notifications,
+suggestions, relative to sense mapping.
--- a/textproc/artha/Makefile
+++ b/textproc/artha/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2015/06/08 11:16:38 wiz Exp $
+
+DISTNAME=       artha-1.0.3
+CATEGORIES=     textproc
+MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=artha/}
+EXTRACT_SUFX=   .tar.bz2
+
+MAINTAINER=     pkgsrc-users@NetBSD.org
+HOMEPAGE=       http://artha.sourceforge.net/
+COMMENT=        Open Source WordNet-based thesaurus
+LICENSE=        gnu-gpl-v2
+
+GNU_CONFIGURE=  yes
+USE_LIBTOOL=    yes
+USE_TOOLS+=     autoconf automake gmake pkg-config
+USE_LANGUAGES=  c
+
+.include "options.mk"
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/enchant/buildlink3.mk"
+.include "../../textproc/WordNet/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
--- a/textproc/artha/PLIST
+++ b/textproc/artha/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2015/06/08 11:16:38 wiz Exp $
+bin/artha
+man/man1/artha.1
+share/applications/artha.desktop
+share/artha/gui.glade
+share/pixmaps/artha.png
--- a/textproc/artha/distinfo
+++ b/textproc/artha/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/06/08 11:16:38 wiz Exp $
+
+SHA1 (artha-1.0.3.tar.bz2) = 8bced6357b425f74d4b13ec6d35b8a50236fae94
+RMD160 (artha-1.0.3.tar.bz2) = 22c6e454cb647a97be6ca06bd1980959f389926b
+Size (artha-1.0.3.tar.bz2) = 363674 bytes
--- a/textproc/artha/options.mk
+++ b/textproc/artha/options.mk
@@ -0,0 +1,11 @@
+# $NetBSD: options.mk,v 1.1 2015/06/08 11:16:38 wiz Exp $
+
+PKG_OPTIONS_VAR=                PKG_OPTIONS.artha
+PKG_SUPPORTED_OPTIONS=          libnotify
+PKG_SUGGESTED_OPTIONS=          libnotify
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlibnotify)
+.include "../../sysutils/libnotify/buildlink3.mk"
+.endif
--- a/textproc/aspell-ca/Makefile
+++ b/textproc/aspell-ca/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:41 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/12 08:47:30 mef Exp $
 #

-DISTNAME=	aspell6-ca-20040130-1
+DISTNAME=	aspell6-ca-2.1.5-1
 PKGNAME=	${DISTNAME:S/6-/-/1:S/-1/.1/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/ca/}
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://aspell.net/
 COMMENT=	Catalan language support for aspell
+LICENSE=	gnu-gpl-v1 AND gnu-gpl-v2

 CONFLICTS+=	aspell-catalan-[0-9]*
 HAS_CONFIGURE=	yes
--- a/textproc/aspell-ca/PLIST
+++ b/textproc/aspell-ca/PLIST
@@ -1,6 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:37 rodent Exp $
-lib/aspell/ca.multi
-lib/aspell/ca.rws
+@comment $NetBSD: PLIST,v 1.2 2015/04/12 08:47:30 mef Exp $
+lib/aspell/ca-common.rws
+lib/aspell/ca-general.multi
+lib/aspell/ca-valencia-mes.rws
+lib/aspell/ca-valencia.multi
+lib/aspell/ca.alias
+lib/aspell/catalan-general.alias
+lib/aspell/catalan-valencia.alias
 lib/aspell/catalan.alias
 share/aspell/ca.dat
 share/aspell/ca_affix.dat
--- a/textproc/aspell-ca/distinfo
+++ b/textproc/aspell-ca/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/04/09 02:33:37 rodent Exp $
+$NetBSD: distinfo,v 1.2 2015/04/12 08:47:30 mef Exp $

-SHA1 (aspell6-ca-20040130-1.tar.bz2) = 8704bd9f3b600b581f5a642c27752538a7a953ac
-RMD160 (aspell6-ca-20040130-1.tar.bz2) = cafc870c5c0639b5e5839c060a762252bf658e14
-Size (aspell6-ca-20040130-1.tar.bz2) = 222986 bytes
+SHA1 (aspell6-ca-2.1.5-1.tar.bz2) = abce32e6dffa420b7ae90ac277038591e7c32a90
+RMD160 (aspell6-ca-2.1.5-1.tar.bz2) = 8b34dc739240d5d7416c9fe3642775eab347b798
+Size (aspell6-ca-2.1.5-1.tar.bz2) = 227561 bytes
 SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
--- a/textproc/aspell-da/Makefile
+++ b/textproc/aspell-da/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/12 10:51:19 wiz Exp $

-DISTNAME=	aspell-da-1.7.30
-PKGREVISION=	2
+DISTNAME=	aspell-da-1.7.42
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://da.speling.org/filer/
 EXTRACT_SUFX=	.tar.bz2
@@ -9,6 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://da.speling.org/
 COMMENT=	Danish language support for aspell
+LICENSE=	gnu-gpl-v2

 CONFLICTS+=	aspell-danish-[0-9]*
 USE_TOOLS+=	perl
@@ -16,5 +17,11 @@ REPLACE_PERL=	unsq

 INSTALLATION_DIRS+=	lib/aspell share/aspell

+SUBST_CLASSES+=			avoid_patch
+SUBST_MESSAGE.avoid_patch=	Adjust before patch to absorb versioning (or avoid manual edit)
+SUBST_FILES.avoid_patch+=	Makefile
+SUBST_STAGE.avoid_patch=	pre-patch
+SUBST_SED.avoid_patch+=		-e 's/${PKGVERSION_NOREV}/@@PKGVERSION_NOREV@@/'
+
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/textproc/aspell-da/distinfo
+++ b/textproc/aspell-da/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2013/04/09 02:33:38 rodent Exp $
+$NetBSD: distinfo,v 1.2 2015/04/11 02:01:55 mef Exp $

-SHA1 (aspell-da-1.7.30.tar.bz2) = 7b629f8a87840571ef29bbf312210f8a0e6bcbe2
-RMD160 (aspell-da-1.7.30.tar.bz2) = 278335a74a65d0b18d4e7e57400f4afa7552257c
-Size (aspell-da-1.7.30.tar.bz2) = 229478 bytes
-SHA1 (patch-aa) = 93f01850310b6b39ca31b607bcd2525125277eb7
+SHA1 (aspell-da-1.7.42.tar.bz2) = 3f5403f0a32e90085d829986db7db009977100cc
+RMD160 (aspell-da-1.7.42.tar.bz2) = af3b8a8cab07776c11a647102b29616bf654552b
+Size (aspell-da-1.7.42.tar.bz2) = 238132 bytes
+SHA1 (patch-aa) = da8496bc1643cb291ca2db038d8d299e956243e8
--- a/textproc/aspell-da/patches/patch-aa
+++ b/textproc/aspell-da/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2013/04/09 02:33:38 rodent Exp $
+$NetBSD: patch-aa,v 1.2 2015/04/11 02:01:55 mef Exp $

--- Makefile.orig	2009-11-04 13:52:19.000000000 -0800
-+++ Makefile	2009-12-02 09:45:44.000000000 -0800
+--- Makefile.orig	2013-01-18 18:38:05.000000000 +0900
+++ Makefile	2015-04-11 10:43:20.000000000 +0900
@@ -9,16 +9,14 @@ country_code=DK
 lang=da
- version=1.7.30
+ version=@@PKGVERSION_NOREV@@
 
 -dictdir=`aspell dump config | grep '^\# dict-dir current: ' | cut -d' ' -f4`
 -datadir=`aspell dump config | grep '^\# data-dir current: ' | cut -d' ' -f4`
--- a/textproc/aspell-en/Makefile
+++ b/textproc/aspell-en/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2013/04/24 11:15:42 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2015/04/11 02:07:41 mef Exp $
 #

-DISTNAME=	aspell6-en-6.0-0
+DISTNAME=	aspell6-en-7.1-0
 PKGNAME=	${DISTNAME:S/6-/-/1:S/-0/.0/1}
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/en/}
--- a/textproc/aspell-en/PLIST
+++ b/textproc/aspell-en/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/09 02:33:40 rodent Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/04/11 02:07:41 mef Exp $
+lib/aspell/american-variant_0.alias
+lib/aspell/american-variant_1.alias
 lib/aspell/american-w_accents.alias
 lib/aspell/american-wo_accents.alias
 lib/aspell/american.alias
@@ -8,9 +10,13 @@ lib/aspell/british-ise.alias
 lib/aspell/british-ize-w_accents.alias
 lib/aspell/british-ize-wo_accents.alias
 lib/aspell/british-ize.alias
+lib/aspell/british-variant_0.alias
+lib/aspell/british-variant_1.alias
 lib/aspell/british-w_accents.alias
 lib/aspell/british-wo_accents.alias
 lib/aspell/british.alias
+lib/aspell/canadian-variant_0.alias
+lib/aspell/canadian-variant_1.alias
 lib/aspell/canadian-w_accents.alias
 lib/aspell/canadian-wo_accents.alias
 lib/aspell/canadian.alias
@@ -21,9 +27,15 @@ lib/aspell/en-variant_1.multi
 lib/aspell/en-variant_1.rws
 lib/aspell/en-variant_2.multi
 lib/aspell/en-variant_2.rws
+lib/aspell/en-w_accents-only.rws
 lib/aspell/en-w_accents.multi
+lib/aspell/en-wo_accents-only.rws
 lib/aspell/en-wo_accents.multi
 lib/aspell/en.multi
+lib/aspell/en_CA-variant_0.multi
+lib/aspell/en_CA-variant_0.rws
+lib/aspell/en_CA-variant_1.multi
+lib/aspell/en_CA-variant_1.rws
 lib/aspell/en_CA-w_accents-only.rws
 lib/aspell/en_CA-w_accents.multi
 lib/aspell/en_CA-wo_accents-only.rws
@@ -39,9 +51,15 @@ lib/aspell/en_GB-ize-w_accents.multi
 lib/aspell/en_GB-ize-wo_accents-only.rws
 lib/aspell/en_GB-ize-wo_accents.multi
 lib/aspell/en_GB-ize.multi
+lib/aspell/en_GB-variant_0.multi
+lib/aspell/en_GB-variant_0.rws
+lib/aspell/en_GB-variant_1.multi
+lib/aspell/en_GB-variant_1.rws
 lib/aspell/en_GB-w_accents.multi
 lib/aspell/en_GB-wo_accents.multi
 lib/aspell/en_GB.multi
+lib/aspell/en_US-variant_0.multi
+lib/aspell/en_US-variant_1.multi
 lib/aspell/en_US-w_accents-only.rws
 lib/aspell/en_US-w_accents.multi
 lib/aspell/en_US-wo_accents-only.rws
--- a/textproc/aspell-en/distinfo
+++ b/textproc/aspell-en/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2013/04/09 02:33:40 rodent Exp $
+$NetBSD: distinfo,v 1.2 2015/04/11 02:07:41 mef Exp $

-SHA1 (aspell6-en-6.0-0.tar.bz2) = 9723820a22340bcc3a12aae45df26d9ff0608829
-RMD160 (aspell6-en-6.0-0.tar.bz2) = 54eafdae618b241ca8fcc76898ddfcb3d04ee5b2
-Size (aspell6-en-6.0-0.tar.bz2) = 182442 bytes
+SHA1 (aspell6-en-7.1-0.tar.bz2) = d45ccda0c03e2a679c2936487ec851a1896b8150
+RMD160 (aspell6-en-7.1-0.tar.bz2) = ab44931ca3530073971f1aa1a966f6a81d934241
+Size (aspell6-en-7.1-0.tar.bz2) = 175360 bytes
 SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
 SHA1 (patch-ab) = 95767f553e37e39183ea5d26dc7ebfb488752cf5
--- a/textproc/aspell-fo/Makefile
+++ b/textproc/aspell-fo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/12 10:51:19 wiz Exp $

 DISTNAME=	aspell-fo-0.4.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://fo.speling.org/filer/

--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.65 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2015/06/12 10:51:19 wiz Exp $
 #

 DISTNAME=		aspell-0.60.6.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_GNU:=aspell/}

--- a/textproc/btparse/Makefile
+++ b/textproc/btparse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2014/10/09 14:07:01 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/12 10:51:19 wiz Exp $
 #

 DISTNAME=	btparse-0.35
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/A/AM/AMBS/btparse/}

--- a/textproc/c2html/Makefile
+++ b/textproc/c2html/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2015/06/12 10:51:19 wiz Exp $

 DISTNAME=		c2html-20070126
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		textproc devel
 MASTER_SITES=		http://gavare.se/c2html/src/

--- a/textproc/cabocha/Makefile.common
+++ b/textproc/cabocha/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2015/03/15 17:00:29 hiramatsu Exp $
+# $NetBSD: Makefile.common,v 1.9 2015/05/10 13:27:11 mef Exp $
 # used by textproc/cabocha/Makefile
 # used by textproc/p5-cabocha/Makefile
 # used by textproc/py-cabocha/Makefile
@@ -13,7 +13,8 @@ DISTINFO_FILE=	${.CURDIR}/../../textproc/cabocha/distinfo
 PATCHDIR=	${.CURDIR}/../../textproc/cabocha/patches

 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/cabocha/
+# (Japanese only page ?)
+HOMEPAGE=	http://taku910.github.io/cabocha/
 LICENSE=	gnu-lgpl-v2.1 OR modified-bsd

 RESTRICTED=	Included model is not re-distributed without prior permission.
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2015/02/27 14:35:02 tnn Exp $
+# $NetBSD: Makefile,v 1.28 2015/06/12 10:51:19 wiz Exp $
 #

 DISTNAME=		cdif-1.19
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		textproc
 MASTER_SITES=		http://ftp.freebsd.org/pub/FreeBSD/distfiles/
 EXTRACT_SUFX=		# empty
--- a/textproc/cmigemo/Makefile
+++ b/textproc/cmigemo/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2014/06/14 16:19:02 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/12 10:51:19 wiz Exp $
 #

 DISTNAME=	cmigemo-default-src-20110227
 PKGNAME=	${DISTNAME:S/-default-src-/-1.3e./}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://cmigemo.googlecode.com/files/
 EXTRACT_SUFX=	.zip
--- a/textproc/crush-tools/Makefile
+++ b/textproc/crush-tools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2015/06/12 10:51:20 wiz Exp $
 #

 DISTNAME=	crush-tools-2013-04
 PKGNAME=	${DISTNAME:C/-([0-9]+)$/.\1/}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://crush-tools.googlecode.com/files/

--- a/textproc/csvkit/Makefile
+++ b/textproc/csvkit/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2015/01/11 13:52:42 cheusov Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/18 18:27:16 cheusov Exp $

 DISTNAME=	0.9.0
+PKGREVISION=	1
 PKGNAME=	csvkit-${DISTNAME}
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/onyxfish/csvkit/archive/
@@ -22,19 +23,14 @@ DEPENDS+=	${PYPKGPREFIX}-simplejson>=3.6.3:../../converters/py-simplejson
 DEPENDS+=	${PYPKGPREFIX}-six>=1.6.1:../../lang/py-six
 #DEPENDS+=		${PYPKGPREFIX}-tox>=1.3:../../*/py-tox

-PYTHON_VERSIONS_INCOMPATIBLE=	26
-
 # csvkit publishes files like "0.9.0.tar.gz"
 DIST_SUBDIR=	${PKGNAME_NOREV}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}

 USE_LANGUAGES=	# none

-EGG_NAME=	${PKGNAME}
+EGG_NAME=	${PKGNAME_NOREV}

 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.if ${PYPKGPREFIX} == "py26"
-DEPENDS+=	${PYPKGPREFIX}-ordereddict>=1.1:../../devel/py-ordereddict
-.endif
 .include "../../mk/bsd.pkg.mk"
--- a/textproc/csvkit/distinfo
+++ b/textproc/csvkit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2015/01/11 13:35:16 cheusov Exp $
+$NetBSD: distinfo,v 1.2 2015/04/18 18:27:16 cheusov Exp $

 SHA1 (csvkit-0.9.0/0.9.0.tar.gz) = 9afc884d9af7b5c8c5277d6816384dd15a4968cf
 RMD160 (csvkit-0.9.0/0.9.0.tar.gz) = 2836ec7769e87ee0fe13829187069ebcbfcac26b
 Size (csvkit-0.9.0/0.9.0.tar.gz) = 3928467 bytes
 SHA1 (patch-csvkit_convert_____init____.py) = b2da7ef399cac88c9f4de737aa0b43ee61341ce0
-SHA1 (patch-setup.py) = d0f4f3b6bbe9b4adbdabbeb90d60d02a3e92cb61
+SHA1 (patch-setup.py) = 41b954a6d9f0bb815930acf12cea5cd487d0e48e
--- a/textproc/csvkit/patches/patch-setup.py
+++ b/textproc/csvkit/patches/patch-setup.py
@@ -1,8 +1,17 @@
-$NetBSD: patch-setup.py,v 1.1.1.1 2015/01/11 13:35:16 cheusov Exp $
+$NetBSD: patch-setup.py,v 1.2 2015/04/18 18:27:16 cheusov Exp $

 # Fix too strict requirements
 --- setup.py.orig	2014-09-09 00:22:49.000000000 +0000
 +++ setup.py
+@@ -8,7 +8,7 @@ install_requires = [
+     'sqlalchemy>=0.6.6',
+     'openpyxl>=2.0.3',
+     'six>=1.6.1',
+-    'python-dateutil==2.2'
+    'python-dateutil>=2.2'
+ ]
+ 
+ if sys.version_info < (2, 7):
@@ -16,8 +16,9 @@ if sys.version_info < (2, 7):
     install_requires.append('ordereddict>=1.1')
     install_requires.append('simplejson>=3.6.3')
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/12/10 12:27:27 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2015/05/06 10:25:40 markd Exp $

 DISTNAME=	dblatex-0.3.2
-PKGREVISION=	3
+PKGREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dblatex/}
 EXTRACT_SUFX=	.tar.bz2
@@ -12,9 +12,28 @@ COMMENT=	DocBook to LaTeX Publishing
 LICENSE=	gnu-gpl-v2

 DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
-DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX3-bin
+DEPENDS+=	tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+DEPENDS+=	makeindexk-[0-9]*:../../textproc/makeindexk
 DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+DEPENDS+=	texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
 DEPENDS+=	tex-ifxetex-[0-9]*:../../print/tex-ifxetex
+DEPENDS+=	tex-anysize-[0-9]*:../../print/tex-anysize
+DEPENDS+=	tex-appendix-[0-9]*:../../print/tex-appendix
+DEPENDS+=	tex-changebar-[0-9]*:../../print/tex-changebar
+DEPENDS+=	tex-fancybox-[0-9]*:../../print/tex-fancybox
+DEPENDS+=	tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb
+DEPENDS+=	tex-float-[0-9]*:../../print/tex-float
+DEPENDS+=	tex-footmisc-[0-9]*:../../print/tex-footmisc
+DEPENDS+=	tex-jknapltx-[0-9]*:../../print/tex-jknapltx
+DEPENDS+=	tex-listings-[0-9]*:../../print/tex-listings
+DEPENDS+=	tex-multirow-[0-9]*:../../print/tex-multirow
+DEPENDS+=	tex-overpic-[0-9]*:../../print/tex-overpic
+DEPENDS+=	tex-pdfpages-[0-9]*:../../print/tex-pdfpages
+DEPENDS+=	tex-rotating-[0-9]*:../../print/tex-rotating
+DEPENDS+=	tex-stmaryrd-[0-9]*:../../fonts/tex-stmaryrd
+DEPENDS+=	tex-subfigure-[0-9]*:../../print/tex-subfigure
+DEPENDS+=	tex-titlesec-[0-9]*:../../print/tex-titlesec
+DEPENDS+=	tex-wasysym-[0-9]*:../../fonts/tex-wasysym

 USE_LANGUAGES=	# none
 USE_TOOLS+=	gmake
--- a/textproc/dict-mueller7/Makefile
+++ b/textproc/dict-mueller7/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	Mueller7GPL
 PKGNAME=	dict-mueller7-1.2
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://dict.osdn.org.ua/ \
 		http://mova.org/~cheusov/pub/dict-mueller/
--- a/textproc/diffsplit/Makefile
+++ b/textproc/diffsplit/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2015/06/12 10:51:20 wiz Exp $
 # FreeBSD Id: ports/textproc/diffsplit/Makefile,v 1.7 2006/12/22 13:43:54 barner Exp

 DISTNAME=	diffsplit
 PKGNAME=	diffsplit-1.0
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	textproc devel misc
 MASTER_SITES=	http://www.pathname.com/~quinlan/software/diffsplit/
 EXTRACT_SUFX=
--- a/textproc/dikt/Makefile
+++ b/textproc/dikt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2014/11/07 19:39:42 adam Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:24:56 tnn Exp $
 #

 DISTNAME=	dikt-2j
-PKGREVISION=	14
+PKGREVISION=	16
 CATEGORIES=	textproc x11
 MASTER_SITES=	http://dikt.googlecode.com/files/
 EXTRACT_SUFX=	.txz
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2015/01/16 11:47:01 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2015/06/12 10:51:20 wiz Exp $

+PKGREVISION= 1
 .include "Makefile.common"

 COMMENT=	Docbook XSL modular stylesheet
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	docbook-dsssl-1.79
 PKGNAME=	dsssl-docbook-modular-1.79
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=docbook/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} docbook-dsssl-doc-1.79${EXTRACT_SUFX}
--- a/textproc/dtdparse/Makefile
+++ b/textproc/dtdparse/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2014/05/29 23:37:33 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2015/06/12 10:51:20 wiz Exp $
 #

 DISTNAME=	dtdparse-2.0beta6
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dtdparse/}

--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.50 2015/03/12 16:38:09 tnn Exp $
+# $NetBSD: Makefile,v 1.51 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	eb-4.3
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	textproc japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/appendix/ \
 		ftp://ftp.sra.co.jp/pub/misc/eb/
--- a/textproc/ebook-tools/Makefile
+++ b/textproc/ebook-tools/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2013/04/01 16:03:49 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/05/04 21:14:24 wiz Exp $
 #

 # also update lit2epub if you update this package.
 DISTNAME=	ebook-tools-0.1.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ebook-tools/}

--- a/textproc/ebook-tools/buildlink3.mk
+++ b/textproc/ebook-tools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2013/04/01 16:03:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/05/04 21:14:24 wiz Exp $

 BUILDLINK_TREE+=	ebook-tools

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ebook-tools
 EBOOK_TOOLS_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.ebook-tools+=	ebook-tools>=0.1.1
-BUILDLINK_ABI_DEPENDS.ebook-tools+=	ebook-tools>=0.1.1nb4
+BUILDLINK_ABI_DEPENDS.ebook-tools+=	ebook-tools>=0.1.1nb5
 BUILDLINK_PKGSRCDIR.ebook-tools?=	../../textproc/ebook-tools

 .include "../../archivers/libzip/buildlink3.mk"
--- a/textproc/ebview/Makefile
+++ b/textproc/ebview/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2014/08/21 08:47:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2015/04/25 14:24:56 tnn Exp $

 DISTNAME=		ebview-0.3.6
-PKGREVISION=		20
+PKGREVISION=		21
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ebview/}

--- a/textproc/enca/Makefile
+++ b/textproc/enca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/11/13 19:44:03 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2015/04/11 02:26:02 mef Exp $

 DISTNAME=		enca-1.15
 CATEGORIES=		converters
@@ -6,7 +6,7 @@ MASTER_SITES=		http://dl.cihar.com/enca/
 EXTRACT_SUFX=		.tar.bz2

 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://gitorious.org/enca
+HOMEPAGE=		https://github.com/nijel/enca
 COMMENT=		Extremely Naive Charset Analyser
 LICENSE=		gnu-gpl-v2

--- a/textproc/freepwing/Makefile
+++ b/textproc/freepwing/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/05/29 23:37:34 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	freepwing-1.4.4
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	japanese textproc
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/freepwing/

--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2014/05/05 00:48:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.65 2015/04/25 14:24:57 tnn Exp $

 DISTNAME=	gnome-spell-1.0.8
-PKGREVISION=	31
+PKGREVISION=	32
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-spell/1.0/}
 EXTRACT_SUFX=	.tar.bz2
--- a/textproc/gnome-spell/buildlink3.mk
+++ b/textproc/gnome-spell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.49 2014/05/05 00:48:23 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.50 2015/04/25 14:24:57 tnn Exp $

 BUILDLINK_TREE+=	gnome-spell

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnome-spell
 GNOME_SPELL_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.gnome-spell+=		gnome-spell>=1.0.5
-BUILDLINK_ABI_DEPENDS.gnome-spell+=	gnome-spell>=1.0.8nb31
+BUILDLINK_ABI_DEPENDS.gnome-spell+=	gnome-spell>=1.0.8nb32
 BUILDLINK_PKGSRCDIR.gnome-spell?=	../../textproc/gnome-spell

 .include "../../devel/libbonobo/buildlink3.mk"
--- a/textproc/gnome-subtitles/Makefile
+++ b/textproc/gnome-subtitles/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2014/10/07 16:47:36 adam Exp $
+# $NetBSD: Makefile,v 1.49 2015/05/23 14:54:12 kefren Exp $

-DISTNAME=	gnome-subtitles-1.1
-PKGREVISION=	31
+DISTNAME=	gnome-subtitles-1.3
 CATEGORIES=	multimedia textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnome-subtitles/}

@@ -10,6 +9,7 @@ HOMEPAGE=	http://gnome-subtitles.sourceforge.net/
 COMMENT=	Subtitle editor for the GNOME desktop
 LICENSE=	gnu-gpl-v2

+MAKE_JOBS_SAFE=		no
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share
@@ -23,8 +23,8 @@ DEPENDS+=	enchant>=1.3:../../textproc/enchant
 DEPENDS+=	gtkspell>=2.0:../../textproc/gtkspell

 .include "../../devel/GConf/schemas.mk"
-.include "../../lang/mono2/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../lang/mono/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
--- a/textproc/gnome-subtitles/PLIST
+++ b/textproc/gnome-subtitles/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/01/29 09:09:35 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/05/23 14:54:12 kefren Exp $
 bin/gnome-subtitles
 lib/gnome-subtitles/gnome-subtitles.exe
 lib/gnome-subtitles/gnome-subtitles.exe.config
@@ -10,6 +10,7 @@ share/gnome/help/gnome-subtitles/C/gnome-subtitles.xml
 share/gnome/help/gnome-subtitles/C/legal.xml
 share/gnome/help/gnome-subtitles/ca/gnome-subtitles.xml
 share/gnome/help/gnome-subtitles/cs/gnome-subtitles.xml
+share/gnome/help/gnome-subtitles/da/gnome-subtitles.xml
 share/gnome/help/gnome-subtitles/de/gnome-subtitles.xml
 share/gnome/help/gnome-subtitles/el/gnome-subtitles.xml
 share/gnome/help/gnome-subtitles/es/gnome-subtitles.xml
@@ -44,12 +45,17 @@ share/locale/pt_BR/LC_MESSAGES/gnome-subtitles.mo
 share/locale/ro/LC_MESSAGES/gnome-subtitles.mo
 share/locale/ru/LC_MESSAGES/gnome-subtitles.mo
 share/locale/sl/LC_MESSAGES/gnome-subtitles.mo
+share/locale/sr/LC_MESSAGES/gnome-subtitles.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-subtitles.mo
 share/locale/sv/LC_MESSAGES/gnome-subtitles.mo
 share/locale/tr/LC_MESSAGES/gnome-subtitles.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-subtitles.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-subtitles.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-subtitles.mo
 share/omf/gnome-subtitles/gnome-subtitles-C.omf
 share/omf/gnome-subtitles/gnome-subtitles-ca.omf
 share/omf/gnome-subtitles/gnome-subtitles-cs.omf
+share/omf/gnome-subtitles/gnome-subtitles-da.omf
 share/omf/gnome-subtitles/gnome-subtitles-de.omf
 share/omf/gnome-subtitles/gnome-subtitles-el.omf
 share/omf/gnome-subtitles/gnome-subtitles-es.omf
@@ -58,4 +64,4 @@ share/omf/gnome-subtitles/gnome-subtitles-oc.omf
 share/omf/gnome-subtitles/gnome-subtitles-ro.omf
 share/omf/gnome-subtitles/gnome-subtitles-sl.omf
 share/omf/gnome-subtitles/gnome-subtitles-sv.omf
-share/pixmaps/gnome-subtitles.png
+share/pixmaps/gnome-subtitles.svg
--- a/textproc/gnome-subtitles/distinfo
+++ b/textproc/gnome-subtitles/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2011/01/29 09:09:35 obache Exp $
+$NetBSD: distinfo,v 1.4 2015/05/23 14:54:12 kefren Exp $

-SHA1 (gnome-subtitles-1.1.tar.gz) = 500442c266d4440f68099d76b97ca80f906e3415
-RMD160 (gnome-subtitles-1.1.tar.gz) = 299c2593f148c29aeae44b528f35950c1d6b7d03
-Size (gnome-subtitles-1.1.tar.gz) = 1033533 bytes
+SHA1 (gnome-subtitles-1.3.tar.gz) = 9edfa12403a4563a53d4a7758fec36bbac223720
+RMD160 (gnome-subtitles-1.3.tar.gz) = 41eda3170a78c55436f37d5f5d95e2dbdf72be30
+Size (gnome-subtitles-1.3.tar.gz) = 1182246 bytes
 SHA1 (patch-aa) = e425f50e137f9b9b0ab46b0188c77874bce72897
--- a/textproc/grep/Makefile
+++ b/textproc/grep/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2014/11/25 20:19:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	grep-2.21
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=grep/}
 EXTRACT_SUFX=	.tar.xz
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2015/03/08 23:29:23 joerg Exp $
+# $NetBSD: Makefile,v 1.79 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	groff-1.22.3
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}

--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2015/03/15 19:42:33 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.55 2015/06/11 17:37:09 taca Exp $
 #

 DISTNAME=	groonga-4.1.1
@@ -10,8 +10,6 @@ HOMEPAGE=	http://groonga.org/
 COMMENT=	Fulltext search engine and column store
 LICENSE=	gnu-lgpl-v2.1

-RUBY_VERSION_SUPPORTED=	21 200 193
-.include "../../lang/ruby/rubyversion.mk"
 DEPENDS+=	${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}

 GNU_CONFIGURE=	yes
@@ -53,8 +51,8 @@ REPLACE_RUBY+=	data/munin/groonga_n_records_
 REPLACE_RUBY+=	data/munin/groonga_query_performance_
 REPLACE_RUBY+=	data/munin/groonga_status_
 REPLACE_RUBY+=	data/munin/groonga_throughput_
-.include "../../lang/ruby/replace.mk"

+.include "../../lang/ruby/replace.mk"
 .include "../../devel/editline/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2015/01/10 15:21:41 prlw1 Exp $
+# $NetBSD: Makefile,v 1.56 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	gtk-doc-1.21
+PKGREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.xz
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2014/05/05 00:48:23 ryoon Exp $
+# $NetBSD: Makefile,v 1.60 2015/04/25 14:24:57 tnn Exp $

 DISTNAME=	gtkspell-2.0.16
-PKGREVISION=	20
+PKGREVISION=	21
 CATEGORIES=	textproc devel
 MASTER_SITES=	http://gtkspell.sourceforge.net/download/

--- a/textproc/gtkspell/buildlink3.mk
+++ b/textproc/gtkspell/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.34 2014/05/05 00:48:23 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.35 2015/04/25 14:24:57 tnn Exp $

 BUILDLINK_TREE+=	gtkspell

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtkspell
 GTKSPELL_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.gtkspell+=	gtkspell>=2.0.13
-BUILDLINK_ABI_DEPENDS.gtkspell+=	gtkspell>=2.0.16nb20
+BUILDLINK_ABI_DEPENDS.gtkspell+=	gtkspell>=2.0.16nb21
 BUILDLINK_PKGSRCDIR.gtkspell?=	../../textproc/gtkspell

 .include "../../textproc/enchant/buildlink3.mk"
--- a/textproc/halibut/Makefile
+++ b/textproc/halibut/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2014/12/30 14:14:48 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	halibut-1.1
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.chiark.greenend.org.uk/~sgtatham/halibut/

--- a/textproc/heirloom-doctools/DESCR
+++ b/textproc/heirloom-doctools/DESCR
@@ -0,0 +1,5 @@
+The Heirloom Documentation Tools provide troff, nroff, and related
+utilities to format manual pages and other documents for output on
+terminals and printers.  They are portable and enhanced versions
+of the utilities released by Sun as part of OpenSolaris, and, for
+pic, grap, mpm, and some minor parts, by Lucent as part of Plan 9.
--- a/textproc/heirloom-doctools/MESSAGE
+++ b/textproc/heirloom-doctools/MESSAGE
@@ -0,0 +1,24 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2015/04/09 09:35:05 wiz Exp $
+
+Running ${PKGNAME} binaries
+===========================
+
+Most of the ${PKGNAME} binaries have the same name as their respective
+counterpart in groff.  To avoid conflicts the ${PKGNAME} binaries have
+been installed to ${PREFIX}/heirloom-doctools/bin.  To use these tools
+you should add this directory to your PATH variable (for e.g. ksh):
+
+export PATH=${PREFIX}/heirloom-doctools/bin:$PATH
+
+Reading ${PKGNAME} manpages
+===========================
+
+The manpages are installed to ${PREFIX}/heirloom-doctools/man.  Since
+manpages with the same name are use by groff adding this path to
+man.conf(5) may not make sense.  Instead set (ksh example)
+
+export MANPATH=${PREFIX}/heirloom-doctools/man:
+
+in the terminal where you want to read the manuals.
+===========================================================================
--- a/textproc/heirloom-doctools/Makefile
+++ b/textproc/heirloom-doctools/Makefile
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.2 2015/04/22 09:06:28 jperkin Exp $
+
+V=		150406
+DISTNAME=	heirloom-doctools-${V}
+CATEGORIES=	textproc
+MASTER_SITES=	http://github.com/n-t-roff/heirloom-doctools/releases/download/${V}/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	carsten.kunze@arcor.de
+HOMEPAGE=	http://n-t-roff.github.io/heirloom/doctools.html
+COMMENT=	Modernized troff implementation
+LICENSE=	cddl-1.0
+
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	lex yacc
+MAKE_JOBS_SAFE=	no
+
+MAKE_FLAGS =	CC="${CC}" \
+		CCC="${CXX}" \
+		CFLAGS="${CFLAGS}" \
+		RANLIB=ranlib \
+		INSTALL=install \
+		ROOT=${DESTDIR} \
+		BINDIR=${PREFIX}/heirloom-doctools/bin \
+		MANDIR=${PREFIX}/heirloom-doctools/man \
+		LIBDIR=${PREFIX}/libexec/heirloom-doctools \
+		MACDIR=${PREFIX}/share/heirloom-doctools/tmac \
+		FNTDIR=${PREFIX}/share/heirloom-doctools/font \
+		TABDIR=${PREFIX}/share/heirloom-doctools/nterm \
+		HYPDIR=${PREFIX}/share/heirloom-doctools/hyphen \
+		PUBDIR=${PREFIX}/share/heirloom-doctools/pub \
+		PSTDIR=${PREFIX}/share/heirloom-doctools/font/devpost/postscript \
+		REFDIR=${PREFIX}/libexec/heirloom-doctools/reftools
+
+MAKE_FILE=	makefile
+BUILD_TARGET=	dummy
+
+.include "../../mk/bsd.pkg.mk"
--- a/textproc/heirloom-doctools/PLIST
+++ b/textproc/heirloom-doctools/PLIST
@@ -0,0 +1,373 @@
+@comment $NetBSD: PLIST,v 1.1 2015/04/09 09:35:05 wiz Exp $
+heirloom-doctools/bin/addbib
+heirloom-doctools/bin/checkeq
+heirloom-doctools/bin/checknr
+heirloom-doctools/bin/col
+heirloom-doctools/bin/dpost
+heirloom-doctools/bin/eqn
+heirloom-doctools/bin/grap
+heirloom-doctools/bin/indxbib
+heirloom-doctools/bin/lookbib
+heirloom-doctools/bin/neqn
+heirloom-doctools/bin/nroff
+heirloom-doctools/bin/otf_info
+heirloom-doctools/bin/pic
+heirloom-doctools/bin/picpack
+heirloom-doctools/bin/ptx
+heirloom-doctools/bin/refer
+heirloom-doctools/bin/roffbib
+heirloom-doctools/bin/soelim
+heirloom-doctools/bin/sortbib
+heirloom-doctools/bin/ta
+heirloom-doctools/bin/tbl
+heirloom-doctools/bin/troff
+heirloom-doctools/bin/vgrind
+heirloom-doctools/man/man1/addbib.1
+heirloom-doctools/man/man1/checkeq.1
+heirloom-doctools/man/man1/checknr.1
+heirloom-doctools/man/man1/dpost.1
+heirloom-doctools/man/man1/eqn.1
+heirloom-doctools/man/man1/grap.1
+heirloom-doctools/man/man1/indxbib.1
+heirloom-doctools/man/man1/lookbib.1
+heirloom-doctools/man/man1/neqn.1
+heirloom-doctools/man/man1/nroff.1
+heirloom-doctools/man/man1/otf_info.1
+heirloom-doctools/man/man1/pic.1
+heirloom-doctools/man/man1/picpack.1
+heirloom-doctools/man/man1/ptx.1
+heirloom-doctools/man/man1/refer.1
+heirloom-doctools/man/man1/roffbib.1
+heirloom-doctools/man/man1/soelim.1
+heirloom-doctools/man/man1/sortbib.1
+heirloom-doctools/man/man1/tbl.1
+heirloom-doctools/man/man1/troff.1
+heirloom-doctools/man/man1/vgrind.1
+heirloom-doctools/man/man7/eqnchar.7
+heirloom-doctools/man/man7/mcolor.7
+heirloom-doctools/man/man7/mpictures.7
+libexec/heirloom-doctools/eign
+libexec/heirloom-doctools/grap.defines
+libexec/heirloom-doctools/pm
+libexec/heirloom-doctools/reftools/hunt
+libexec/heirloom-doctools/reftools/inv
+libexec/heirloom-doctools/reftools/mkey
+libexec/heirloom-doctools/reftools/papers/Ind.ia
+libexec/heirloom-doctools/reftools/papers/Ind.ib
+libexec/heirloom-doctools/reftools/papers/Ind.ic
+libexec/heirloom-doctools/reftools/papers/Rbstjissue
+libexec/heirloom-doctools/reftools/papers/Rv7man
+libexec/heirloom-doctools/reftools/papers/runinv
+libexec/heirloom-doctools/vfontedpr
+libexec/heirloom-doctools/vgrindefs
+share/heirloom-doctools/font/devpost/AB
+share/heirloom-doctools/font/devpost/AB.name
+share/heirloom-doctools/font/devpost/AI
+share/heirloom-doctools/font/devpost/AI.name
+share/heirloom-doctools/font/devpost/AR
+share/heirloom-doctools/font/devpost/AR.name
+share/heirloom-doctools/font/devpost/AX
+share/heirloom-doctools/font/devpost/AX.name
+share/heirloom-doctools/font/devpost/B
+share/heirloom-doctools/font/devpost/B.name
+share/heirloom-doctools/font/devpost/BI
+share/heirloom-doctools/font/devpost/BI.name
+share/heirloom-doctools/font/devpost/CB
+share/heirloom-doctools/font/devpost/CB.name
+share/heirloom-doctools/font/devpost/CI
+share/heirloom-doctools/font/devpost/CI.name
+share/heirloom-doctools/font/devpost/CO
+share/heirloom-doctools/font/devpost/CO.name
+share/heirloom-doctools/font/devpost/CW
+share/heirloom-doctools/font/devpost/CW.name
+share/heirloom-doctools/font/devpost/CX
+share/heirloom-doctools/font/devpost/CX.name
+share/heirloom-doctools/font/devpost/DESC
+share/heirloom-doctools/font/devpost/DESC.big
+share/heirloom-doctools/font/devpost/DESC.small
+share/heirloom-doctools/font/devpost/G
+share/heirloom-doctools/font/devpost/GI
+share/heirloom-doctools/font/devpost/GR
+share/heirloom-doctools/font/devpost/GR.name
+share/heirloom-doctools/font/devpost/H
+share/heirloom-doctools/font/devpost/H.name
+share/heirloom-doctools/font/devpost/HB
+share/heirloom-doctools/font/devpost/HB.name
+share/heirloom-doctools/font/devpost/HI
+share/heirloom-doctools/font/devpost/HI.name
+share/heirloom-doctools/font/devpost/HK
+share/heirloom-doctools/font/devpost/HL
+share/heirloom-doctools/font/devpost/HM
+share/heirloom-doctools/font/devpost/HX
+share/heirloom-doctools/font/devpost/HX.name
+share/heirloom-doctools/font/devpost/Hb
+share/heirloom-doctools/font/devpost/Hb.name
+share/heirloom-doctools/font/devpost/Hi
+share/heirloom-doctools/font/devpost/Hi.name
+share/heirloom-doctools/font/devpost/Hr
+share/heirloom-doctools/font/devpost/Hr.name
+share/heirloom-doctools/font/devpost/Hx
+share/heirloom-doctools/font/devpost/Hx.name
+share/heirloom-doctools/font/devpost/I
+share/heirloom-doctools/font/devpost/I.name
+share/heirloom-doctools/font/devpost/KB
+share/heirloom-doctools/font/devpost/KB.name
+share/heirloom-doctools/font/devpost/KI
+share/heirloom-doctools/font/devpost/KI.name
+share/heirloom-doctools/font/devpost/KR
+share/heirloom-doctools/font/devpost/KR.name
+share/heirloom-doctools/font/devpost/KX
+share/heirloom-doctools/font/devpost/KX.name
+share/heirloom-doctools/font/devpost/NB
+share/heirloom-doctools/font/devpost/NB.name
+share/heirloom-doctools/font/devpost/NI
+share/heirloom-doctools/font/devpost/NI.name
+share/heirloom-doctools/font/devpost/NR
+share/heirloom-doctools/font/devpost/NR.name
+share/heirloom-doctools/font/devpost/NX
+share/heirloom-doctools/font/devpost/NX.name
+share/heirloom-doctools/font/devpost/PA
+share/heirloom-doctools/font/devpost/PA.name
+share/heirloom-doctools/font/devpost/PB
+share/heirloom-doctools/font/devpost/PB.name
+share/heirloom-doctools/font/devpost/PI
+share/heirloom-doctools/font/devpost/PI.name
+share/heirloom-doctools/font/devpost/PX
+share/heirloom-doctools/font/devpost/PX.name
+share/heirloom-doctools/font/devpost/R
+share/heirloom-doctools/font/devpost/R.name
+share/heirloom-doctools/font/devpost/S
+share/heirloom-doctools/font/devpost/S.name
+share/heirloom-doctools/font/devpost/S1
+share/heirloom-doctools/font/devpost/S1.name
+share/heirloom-doctools/font/devpost/VB
+share/heirloom-doctools/font/devpost/VB.name
+share/heirloom-doctools/font/devpost/VI
+share/heirloom-doctools/font/devpost/VI.name
+share/heirloom-doctools/font/devpost/VR
+share/heirloom-doctools/font/devpost/VR.name
+share/heirloom-doctools/font/devpost/VX
+share/heirloom-doctools/font/devpost/VX.name
+share/heirloom-doctools/font/devpost/ZD
+share/heirloom-doctools/font/devpost/ZD.name
+share/heirloom-doctools/font/devpost/ZI
+share/heirloom-doctools/font/devpost/ZI.name
+share/heirloom-doctools/font/devpost/charlib/12
+share/heirloom-doctools/font/devpost/charlib/14
+share/heirloom-doctools/font/devpost/charlib/34
+share/heirloom-doctools/font/devpost/charlib/BRACKETS_NOTE
+share/heirloom-doctools/font/devpost/charlib/Fi
+share/heirloom-doctools/font/devpost/charlib/Fl
+share/heirloom-doctools/font/devpost/charlib/L1
+share/heirloom-doctools/font/devpost/charlib/L1.map
+share/heirloom-doctools/font/devpost/charlib/LH
+share/heirloom-doctools/font/devpost/charlib/LH.map
+share/heirloom-doctools/font/devpost/charlib/Lb
+share/heirloom-doctools/font/devpost/charlib/Lb.map
+share/heirloom-doctools/font/devpost/charlib/OLD_LH
+share/heirloom-doctools/font/devpost/charlib/OLD_LH.map
+share/heirloom-doctools/font/devpost/charlib/README
+share/heirloom-doctools/font/devpost/charlib/Sl
+share/heirloom-doctools/font/devpost/charlib/bx
+share/heirloom-doctools/font/devpost/charlib/ci
+share/heirloom-doctools/font/devpost/charlib/ff
+share/heirloom-doctools/font/devpost/charlib/lc
+share/heirloom-doctools/font/devpost/charlib/lf
+share/heirloom-doctools/font/devpost/charlib/lh
+share/heirloom-doctools/font/devpost/charlib/ob
+share/heirloom-doctools/font/devpost/charlib/rc
+share/heirloom-doctools/font/devpost/charlib/rf
+share/heirloom-doctools/font/devpost/charlib/rh
+share/heirloom-doctools/font/devpost/charlib/sq
+share/heirloom-doctools/font/devpost/charlib/~=
+share/heirloom-doctools/font/devpost/postscript/aps.ps
+share/heirloom-doctools/font/devpost/postscript/baseline.ps
+share/heirloom-doctools/font/devpost/postscript/color.ps
+share/heirloom-doctools/font/devpost/postscript/cutmarks.ps
+share/heirloom-doctools/font/devpost/postscript/dpost.ps
+share/heirloom-doctools/font/devpost/postscript/draw.ps
+share/heirloom-doctools/font/devpost/postscript/fatcourier.ps
+share/heirloom-doctools/font/devpost/postscript/forms.ps
+share/heirloom-doctools/font/devpost/postscript/ps.requests
+share/heirloom-doctools/font/devpost/postscript/ps_include.ps
+share/heirloom-doctools/font/devps/B
+share/heirloom-doctools/font/devps/B.afm
+share/heirloom-doctools/font/devps/BI
+share/heirloom-doctools/font/devps/BI.afm
+share/heirloom-doctools/font/devps/CB
+share/heirloom-doctools/font/devps/CB.afm
+share/heirloom-doctools/font/devps/CI
+share/heirloom-doctools/font/devps/CI.afm
+share/heirloom-doctools/font/devps/CW
+share/heirloom-doctools/font/devps/CW.afm
+share/heirloom-doctools/font/devps/CX
+share/heirloom-doctools/font/devps/CX.afm
+share/heirloom-doctools/font/devps/DESC
+share/heirloom-doctools/font/devps/H
+share/heirloom-doctools/font/devps/H.afm
+share/heirloom-doctools/font/devps/HB
+share/heirloom-doctools/font/devps/HB.afm
+share/heirloom-doctools/font/devps/HI
+share/heirloom-doctools/font/devps/HI.afm
+share/heirloom-doctools/font/devps/HX
+share/heirloom-doctools/font/devps/HX.afm
+share/heirloom-doctools/font/devps/I
+share/heirloom-doctools/font/devps/I.afm
+share/heirloom-doctools/font/devps/MustRead.html
+share/heirloom-doctools/font/devps/R
+share/heirloom-doctools/font/devps/R.afm
+share/heirloom-doctools/font/devps/S
+share/heirloom-doctools/font/devps/S.afm
+share/heirloom-doctools/font/devps/S1
+share/heirloom-doctools/font/devps/S1.afm
+share/heirloom-doctools/font/devps/ZD
+share/heirloom-doctools/font/devps/ZD.afm
+share/heirloom-doctools/font/devps/charlib
+share/heirloom-doctools/font/devps/postscript
+share/heirloom-doctools/font/devpslow/B
+share/heirloom-doctools/font/devpslow/B.afm
+share/heirloom-doctools/font/devpslow/BI
+share/heirloom-doctools/font/devpslow/BI.afm
+share/heirloom-doctools/font/devpslow/CB
+share/heirloom-doctools/font/devpslow/CB.afm
+share/heirloom-doctools/font/devpslow/CI
+share/heirloom-doctools/font/devpslow/CI.afm
+share/heirloom-doctools/font/devpslow/CW
+share/heirloom-doctools/font/devpslow/CW.afm
+share/heirloom-doctools/font/devpslow/CX
+share/heirloom-doctools/font/devpslow/CX.afm
+share/heirloom-doctools/font/devpslow/DESC
+share/heirloom-doctools/font/devpslow/H
+share/heirloom-doctools/font/devpslow/H.afm
+share/heirloom-doctools/font/devpslow/HB
+share/heirloom-doctools/font/devpslow/HB.afm
+share/heirloom-doctools/font/devpslow/HI
+share/heirloom-doctools/font/devpslow/HI.afm
+share/heirloom-doctools/font/devpslow/HX
+share/heirloom-doctools/font/devpslow/HX.afm
+share/heirloom-doctools/font/devpslow/I
+share/heirloom-doctools/font/devpslow/I.afm
+share/heirloom-doctools/font/devpslow/MustRead.html
+share/heirloom-doctools/font/devpslow/R
+share/heirloom-doctools/font/devpslow/R.afm
+share/heirloom-doctools/font/devpslow/S
+share/heirloom-doctools/font/devpslow/S.afm
+share/heirloom-doctools/font/devpslow/S1
+share/heirloom-doctools/font/devpslow/S1.afm
+share/heirloom-doctools/font/devpslow/ZD
+share/heirloom-doctools/font/devpslow/ZD.afm
+share/heirloom-doctools/font/devpslow/charlib
+share/heirloom-doctools/font/devpslow/postscript
+share/heirloom-doctools/font/devpsmed/B
+share/heirloom-doctools/font/devpsmed/B.afm
+share/heirloom-doctools/font/devpsmed/BI
+share/heirloom-doctools/font/devpsmed/BI.afm
+share/heirloom-doctools/font/devpsmed/CB
+share/heirloom-doctools/font/devpsmed/CB.afm
+share/heirloom-doctools/font/devpsmed/CI
+share/heirloom-doctools/font/devpsmed/CI.afm
+share/heirloom-doctools/font/devpsmed/CW
+share/heirloom-doctools/font/devpsmed/CW.afm
+share/heirloom-doctools/font/devpsmed/CX
+share/heirloom-doctools/font/devpsmed/CX.afm
+share/heirloom-doctools/font/devpsmed/DESC
+share/heirloom-doctools/font/devpsmed/H
+share/heirloom-doctools/font/devpsmed/H.afm
+share/heirloom-doctools/font/devpsmed/HB
+share/heirloom-doctools/font/devpsmed/HB.afm
+share/heirloom-doctools/font/devpsmed/HI
+share/heirloom-doctools/font/devpsmed/HI.afm
+share/heirloom-doctools/font/devpsmed/HX
+share/heirloom-doctools/font/devpsmed/HX.afm
+share/heirloom-doctools/font/devpsmed/I
+share/heirloom-doctools/font/devpsmed/I.afm
+share/heirloom-doctools/font/devpsmed/MustRead.html
+share/heirloom-doctools/font/devpsmed/R
+share/heirloom-doctools/font/devpsmed/R.afm
+share/heirloom-doctools/font/devpsmed/S
+share/heirloom-doctools/font/devpsmed/S.afm
+share/heirloom-doctools/font/devpsmed/S1
+share/heirloom-doctools/font/devpsmed/S1.afm
+share/heirloom-doctools/font/devpsmed/ZD
+share/heirloom-doctools/font/devpsmed/ZD.afm
+share/heirloom-doctools/font/devpsmed/charlib
+share/heirloom-doctools/font/devpsmed/postscript
+share/heirloom-doctools/hyphen/hyph_de_DE.dic
+share/heirloom-doctools/hyphen/hyph_de_DE@traditional.dic
+share/heirloom-doctools/hyphen/hyph_en_US.dic
+share/heirloom-doctools/hyphen/hyph_fr_FR.dic
+share/heirloom-doctools/hyphen/hyph_it_IT.dic
+share/heirloom-doctools/hyphen/hyph_la_VA.dic
+share/heirloom-doctools/hyphen/hyph_nl_NL.dic
+share/heirloom-doctools/nterm/tab.2631
+share/heirloom-doctools/nterm/tab.2631-c
+share/heirloom-doctools/nterm/tab.2631-e
+share/heirloom-doctools/nterm/tab.300
+share/heirloom-doctools/nterm/tab.300-12
+share/heirloom-doctools/nterm/tab.300S
+share/heirloom-doctools/nterm/tab.300S-12
+share/heirloom-doctools/nterm/tab.300s
+share/heirloom-doctools/nterm/tab.300s-12
+share/heirloom-doctools/nterm/tab.37
+share/heirloom-doctools/nterm/tab.382
+share/heirloom-doctools/nterm/tab.4000A
+share/heirloom-doctools/nterm/tab.4000a
+share/heirloom-doctools/nterm/tab.450
+share/heirloom-doctools/nterm/tab.450-12
+share/heirloom-doctools/nterm/tab.832
+share/heirloom-doctools/nterm/tab.8510
+share/heirloom-doctools/nterm/tab.X
+share/heirloom-doctools/nterm/tab.lp
+share/heirloom-doctools/nterm/tab.tn300
+share/heirloom-doctools/nterm/tab.utf8
+share/heirloom-doctools/pub/ascii
+share/heirloom-doctools/pub/eqnchar
+share/heirloom-doctools/pub/greek
+share/heirloom-doctools/pub/iso
+share/heirloom-doctools/pub/utf-8
+share/heirloom-doctools/tmac/acm.me
+share/heirloom-doctools/tmac/an
+share/heirloom-doctools/tmac/andoc
+share/heirloom-doctools/tmac/bib
+share/heirloom-doctools/tmac/chars.me
+share/heirloom-doctools/tmac/color
+share/heirloom-doctools/tmac/deltext.me
+share/heirloom-doctools/tmac/doc
+share/heirloom-doctools/tmac/doc-common
+share/heirloom-doctools/tmac/doc-ditroff
+share/heirloom-doctools/tmac/doc-nroff
+share/heirloom-doctools/tmac/doc-syms
+share/heirloom-doctools/tmac/e
+share/heirloom-doctools/tmac/eqn.me
+share/heirloom-doctools/tmac/float.me
+share/heirloom-doctools/tmac/footnote.me
+share/heirloom-doctools/tmac/g
+share/heirloom-doctools/tmac/index.me
+share/heirloom-doctools/tmac/local.me
+share/heirloom-doctools/tmac/m
+share/heirloom-doctools/tmac/mmn
+share/heirloom-doctools/tmac/mmt
+share/heirloom-doctools/tmac/ms.acc
+share/heirloom-doctools/tmac/ms.cov
+share/heirloom-doctools/tmac/ms.eqn
+share/heirloom-doctools/tmac/ms.ref
+share/heirloom-doctools/tmac/ms.tbl
+share/heirloom-doctools/tmac/ms.ths
+share/heirloom-doctools/tmac/ms.toc
+share/heirloom-doctools/tmac/naa
+share/heirloom-doctools/tmac/null.me
+share/heirloom-doctools/tmac/padj
+share/heirloom-doctools/tmac/pictures
+share/heirloom-doctools/tmac/pm
+share/heirloom-doctools/tmac/ptx
+share/heirloom-doctools/tmac/refer.me
+share/heirloom-doctools/tmac/s
+share/heirloom-doctools/tmac/safe
+share/heirloom-doctools/tmac/sh.me
+share/heirloom-doctools/tmac/srefs
+share/heirloom-doctools/tmac/taa
+share/heirloom-doctools/tmac/tbl.me
+share/heirloom-doctools/tmac/thesis.me
+share/heirloom-doctools/tmac/tmac.gchar
+share/heirloom-doctools/tmac/v
+share/heirloom-doctools/tmac/vgrind
--- a/textproc/heirloom-doctools/distinfo
+++ b/textproc/heirloom-doctools/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2015/04/09 09:35:05 wiz Exp $
+
+SHA1 (heirloom-doctools-150406.tar.bz2) = 2a347b9460af4dd3093d031abfed492e10202217
+RMD160 (heirloom-doctools-150406.tar.bz2) = 2cbea0499001cba5f51f95ff1cd9801e6bd944da
+Size (heirloom-doctools-150406.tar.bz2) = 921406 bytes
--- a/textproc/hevea/DESCR
+++ b/textproc/hevea/DESCR
@@ -1,18 +1,16 @@
    HEVEA is a LaTeX to HTML translator.  The input language is a fairly
    complete subset of LaTeX2e (old LaTeX style is also accepted) and the
    output language is HTML that is (hopefully) correct with respect to
-    version 4.0 (transitional)
+    version 5.

-    Exotic symbols are translated into symbols pertaining to the
-    symbol font of the HTML browser, using the FACE attribute of the FONT
-    tag. This allows the translation to HTML of quite a lot of the symbols
-    used in LaTeX.
+    Exotic symbols are translated into the so-called HTML 'entities',
+    in other words into references to UNICODE chararacters.

    HEVEA understands LaTeX macro definitions. Simple user style
    files are understood with little or no modifications.
    Furthermore, HEVEA customization is done by writing LaTeX code.

-    HEVEA is written in Objective Caml, as many lexers. It is quite fast
+    HEVEA is written in OCaml, as many lexers. It is quite fast
    and flexible. Using HEVEA it is possible to translate large documents
    such as manuals, books, etc. very quickly. All documents are
    translated as one single HTML file. Then, the output file can be cut
--- a/textproc/hevea/Makefile
+++ b/textproc/hevea/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.20 2012/10/25 06:55:53 asau Exp $
+# $NetBSD: Makefile,v 1.21 2015/05/06 20:45:43 tonio Exp $

-DISTNAME=	hevea-1.10
+DISTNAME=	hevea-2.23
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/moscova/hevea/
+MASTER_SITES=	http://hevea.inria.fr/distri/

 MAINTAINER=	tonio@NetBSD.org
-HOMEPAGE=	http://pauillac.inria.fr/~maranget/hevea/
+HOMEPAGE=	http://hevea.inria.fr/
 COMMENT=	LaTeX to HTML translator
+LICENSE=	qpl-v1.0

-BUILD_DEPENDS+=	ocaml>=3.07:../../lang/ocaml
 MAKE_ENV+=	DESTDIR=${DESTDIR}

-DIST_SUBDIR=	${PKGNAME_NOREV}
 .include "../../mk/bsd.prefs.mk"

-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
+BUILD_DEPENDS+=	ocaml>=3.12:../../lang/ocaml
 MAKE_ENV+=	TARGET=opt
 .else
+DEPENDS+=	ocaml>=3.12:../../lang/ocaml
 MAKE_ENV+=	TARGET=byte
 .endif

--- a/textproc/hevea/PLIST
+++ b/textproc/hevea/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:17:17 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2015/05/06 20:45:43 tonio Exp $
 bin/bibhva
 bin/esponja
 bin/hacha
@@ -9,11 +9,14 @@ share/hevea/amsmath.hva
 share/hevea/articlecommon.hva
 share/hevea/babel.hva
 share/hevea/bookcommon.hva
+share/hevea/booktabs.hva
 share/hevea/chapterbib.hva
 share/hevea/chngcntr.hva
+share/hevea/cleveref.hva
 share/hevea/comment.hva
 share/hevea/compat.hva
 share/hevea/contents_motif.gif
+share/hevea/crlang.hva
 share/hevea/czech.hva
 share/hevea/deepcut.hva
 share/hevea/english.hva
@@ -22,7 +25,9 @@ share/hevea/eurosym.hva
 share/hevea/figcut.hva
 share/hevea/french-common.hva
 share/hevea/german-common.hva
+share/hevea/hanging.hva
 share/hevea/hevea.sty
+share/hevea/hrlang.hva
 share/hevea/html/amsfonts.hva
 share/hevea/html/amssymb.hva
 share/hevea/html/article.hva
@@ -36,6 +41,7 @@ share/hevea/html/fancysection.hva
 share/hevea/html/fancyvrb.hva
 share/hevea/html/french.hva
 share/hevea/html/german.hva
+share/hevea/html/gif.hva
 share/hevea/html/graphics.hva
 share/hevea/html/graphicx.hva
 share/hevea/html/hevea.hva
@@ -50,12 +56,14 @@ share/hevea/html/symb-ent.hva
 share/hevea/html/symb-fra.hva
 share/hevea/html/symb-mathml.hva
 share/hevea/html/symb-text.hva
+share/hevea/html/undersection.hva
 share/hevea/html/urlhref.hva
 share/hevea/html/xypic.hva
 share/hevea/hyperref.hva
 share/hevea/ifpdf.hva
 share/hevea/ifthen.hva
 share/hevea/imagen
+share/hevea/import.hva
 share/hevea/index.hva
 share/hevea/info/article.hva
 share/hevea/info/book.hva
@@ -68,13 +76,17 @@ share/hevea/iso-symb.hva
 share/hevea/iso-text.hva
 share/hevea/isolatin1.hva
 share/hevea/keyval.hva
+share/hevea/labeltype.hva
 share/hevea/latexcommon.hva
 share/hevea/latexsym.hva
 share/hevea/listings.hva
 share/hevea/longtable.hva
 share/hevea/lstlang1.hva
+share/hevea/lstlang1.sty
 share/hevea/lstlang2.hva
+share/hevea/lstlang2.sty
 share/hevea/lstlang3.hva
+share/hevea/lstlang3.sty
 share/hevea/makeidx.hva
 share/hevea/mappings/ISO-8859-1.map
 share/hevea/mappings/ISO-8859-10.map
@@ -106,6 +118,7 @@ share/hevea/natbib-common.hva
 share/hevea/next_motif.gif
 share/hevea/packages.hva
 share/hevea/plain.hva
+share/hevea/portuguese.hva
 share/hevea/previous_motif.gif
 share/hevea/program.hva
 share/hevea/ragged2e.hva
--- a/textproc/hevea/distinfo
+++ b/textproc/hevea/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2010/03/15 21:00:56 tonio Exp $
+$NetBSD: distinfo,v 1.13 2015/05/06 20:45:43 tonio Exp $

-SHA1 (hevea-1.10/hevea-1.10.tar.gz) = d3b07ad59b815899d953d18b480faa856b77077b
-RMD160 (hevea-1.10/hevea-1.10.tar.gz) = 651e8799bc4e8ca0c893cf7668df4ff1bf15d9d7
-Size (hevea-1.10/hevea-1.10.tar.gz) = 305269 bytes
-SHA1 (patch-aa) = fb4ce715523f9092122d143670cf382237c73e1f
+SHA1 (hevea-2.23.tar.gz) = f3b60029849ec7509f68ec0ec7e2bbb166940d7a
+RMD160 (hevea-2.23.tar.gz) = 8b6080f775de7d47a67a117c600e3f9a7bccbd44
+Size (hevea-2.23.tar.gz) = 968938 bytes
+SHA1 (patch-Makefile) = 5a3f1a76d055d892a66db9fe73cc7912a2f09b43
--- a/textproc/hevea/patches/patch-Makefile
+++ b/textproc/hevea/patches/patch-Makefile
@@ -1,23 +1,22 @@
-$NetBSD: patch-aa,v 1.10 2010/03/15 21:00:57 tonio Exp $
+$NetBSD: patch-Makefile,v 1.1 2015/05/06 20:45:43 tonio Exp $

--- Makefile.orig	2007-06-11 15:23:08.000000000 +0000
-+++ Makefile
-@@ -1,16 +1,16 @@
+Modify Makefile appropriately for pkgsrc.
+
+--- Makefile.orig	2014-09-23 07:03:10.000000000 +0000
+++ Makefile	2015-05-06 15:27:05.000000000 +0000
+@@ -1,14 +1,14 @@
 #### Standard configuration parameters
 # Compile using ocamlopt, to use ocamlc set TARGET=byte
 -TARGET=opt
 +#TARGET=opt
 # Install prefix
-PREFIX=/usr/local
-+#PREFIX=/usr/local
+-PREFIX?=/usr/local
+#PREFIX?=/usr/local
 # Library directory of hevea
 -LIBDIR=$(PREFIX)/lib/hevea
 +LIBDIR=$(PREFIX)/share/hevea
 # Where to install programms
 BINDIR=$(PREFIX)/bin
- # Install prefix prefix
-DESTDIR=
-+#DESTDIR=
 #Where to install hevea.sty
 -LATEXLIBDIR=$(PREFIX)/lib/hevea
 +LATEXLIBDIR=$(LIBDIR)
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2015/01/07 13:21:55 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/08 20:56:15 szptvlfn Exp $

 DISTNAME=	attoparsec-0.12.1.2
-PKGREVISION=	5
+PKGREVISION=	7
 CATEGORIES=	textproc

 MAINTAINER=	pho@cielonegro.org
--- a/textproc/hs-attoparsec/buildlink3.mk
+++ b/textproc/hs-attoparsec/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2015/01/07 13:21:55 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2015/06/08 20:56:15 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-attoparsec

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-attoparsec
 HS_ATTOPARSEC_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-attoparsec+=	hs-attoparsec>=0.12.1
-BUILDLINK_ABI_DEPENDS.hs-attoparsec+=	hs-attoparsec>=0.12.1.2nb5
+BUILDLINK_ABI_DEPENDS.hs-attoparsec+=	hs-attoparsec>=0.12.1.2nb7
 BUILDLINK_PKGSRCDIR.hs-attoparsec?=	../../textproc/hs-attoparsec

 .include "../../math/hs-scientific/buildlink3.mk"
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 DISTNAME=	blaze-html-0.7.0.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc

 MAINTAINER=	pho@cielonegro.org
--- a/textproc/hs-blaze-html/buildlink3.mk
+++ b/textproc/hs-blaze-html/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-blaze-html

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-blaze-html
 HS_BLAZE_HTML_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-blaze-html+=	hs-blaze-html>=0.7.0
-BUILDLINK_ABI_DEPENDS.hs-blaze-html+=	hs-blaze-html>=0.7.0.3nb2
+BUILDLINK_ABI_DEPENDS.hs-blaze-html+=	hs-blaze-html>=0.7.0.3nb3
 BUILDLINK_PKGSRCDIR.hs-blaze-html?=	../../textproc/hs-blaze-html

 .include "../../devel/hs-blaze-builder/buildlink3.mk"
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 DISTNAME=	blaze-markup-0.6.1.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	textproc

 MAINTAINER=	szptvlfn@NetBSD.org
--- a/textproc/hs-blaze-markup/buildlink3.mk
+++ b/textproc/hs-blaze-markup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-blaze-markup

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-blaze-markup
 HS_BLAZE_MARKUP_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-blaze-markup+=	hs-blaze-markup>=0.6.1
-BUILDLINK_ABI_DEPENDS.hs-blaze-markup+=	hs-blaze-markup>=0.6.1.1nb2
+BUILDLINK_ABI_DEPENDS.hs-blaze-markup+=	hs-blaze-markup>=0.6.1.1nb3
 BUILDLINK_PKGSRCDIR.hs-blaze-markup?=	../../textproc/hs-blaze-markup

 .include "../../devel/hs-blaze-builder/buildlink3.mk"
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/08 20:56:15 szptvlfn Exp $

 DISTNAME=	case-insensitive-1.2.0.1
-PKGREVISION=	2
+PKGREVISION=	4
 CATEGORIES=	textproc

 MAINTAINER=	pho@cielonegro.org
--- a/textproc/hs-case-insensitive/buildlink3.mk
+++ b/textproc/hs-case-insensitive/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/06/08 20:56:15 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-case-insensitive

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-case-insensitive
 HS_CASE_INSENSITIVE_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-case-insensitive+=	hs-case-insensitive>=1.2.0
-BUILDLINK_ABI_DEPENDS.hs-case-insensitive+=	hs-case-insensitive>=1.2.0.1nb2
+BUILDLINK_ABI_DEPENDS.hs-case-insensitive+=	hs-case-insensitive>=1.2.0.1nb4
 BUILDLINK_PKGSRCDIR.hs-case-insensitive?=	../../textproc/hs-case-insensitive

 .include "../../devel/hs-hashable/buildlink3.mk"
--- a/textproc/hs-cgrep/Makefile
+++ b/textproc/hs-cgrep/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.12 2015/06/08 20:56:15 szptvlfn Exp $

 DISTNAME=	cgrep-6.4.5
-PKGREVISION=	7
+PKGREVISION=	11
 CATEGORIES=	textproc

 MAINTAINER=	szptvlfn@NetBSD.org
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2015/01/07 13:21:55 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.12 2015/06/08 20:56:15 szptvlfn Exp $

 DISTNAME=	pandoc-types-1.12.4.1
-PKGREVISION=	7
+PKGREVISION=	11
 CATEGORIES=	textproc

 MAINTAINER=	szptvlfn@NetBSD.org
--- a/textproc/hs-pandoc-types/buildlink3.mk
+++ b/textproc/hs-pandoc-types/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2015/01/07 13:21:55 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2015/06/08 20:56:15 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-pandoc-types

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-pandoc-types
 HS_PANDOC_TYPES_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-pandoc-types+=	hs-pandoc-types>=1.12.4
-BUILDLINK_ABI_DEPENDS.hs-pandoc-types+=	hs-pandoc-types>=1.12.4.1nb7
+BUILDLINK_ABI_DEPENDS.hs-pandoc-types+=	hs-pandoc-types>=1.12.4.1nb11
 BUILDLINK_PKGSRCDIR.hs-pandoc-types?=	../../textproc/hs-pandoc-types

 .include "../../converters/hs-aeson/buildlink3.mk"
--- a/textproc/hs-parsec/DESCR
+++ b/textproc/hs-parsec/DESCR
@@ -1,5 +1,5 @@
-Parsec is designed from scratch as an industrial-strength parser
-library. It is simple, safe, well documented (on the package
-homepage), has extensive libraries and good error messages, and is
-also fast. It is defined as a monad transformer that can be stacked on
-arbitrary monads, and it is also parametric in the input stream type.
+Parsec is designed from scratch as an industrial-strength parser library. It is
+simple, safe, well documented (on the package homepage), has extensive
+libraries, good error messages, and is fast. It is defined as a monad
+transformer that can be stacked on arbitrary monads, and it is also parametric
+in the input stream type.
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.10 2015/06/09 22:08:41 szptvlfn Exp $

-DISTNAME=	parsec-3.1.7
-PKGREVISION=	3
+DISTNAME=	parsec-3.1.9
 CATEGORIES=	textproc

 MAINTAINER=	pho@cielonegro.org
--- a/textproc/hs-parsec/buildlink3.mk
+++ b/textproc/hs-parsec/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.7 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2015/06/09 22:08:41 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-parsec

 .if !defined(HS_PARSEC_BUILDLINK3_MK)
 HS_PARSEC_BUILDLINK3_MK:=

-BUILDLINK_API_DEPENDS.hs-parsec+=	hs-parsec>=3.1.7
-BUILDLINK_ABI_DEPENDS.hs-parsec+=	hs-parsec>=3.1.7nb3
+BUILDLINK_API_DEPENDS.hs-parsec+=	hs-parsec>=3.1.9
+BUILDLINK_ABI_DEPENDS.hs-parsec+=	hs-parsec>=3.1.9
 BUILDLINK_PKGSRCDIR.hs-parsec?=	../../textproc/hs-parsec

 .include "../../devel/hs-mtl/buildlink3.mk"
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2014/10/19 21:25:47 szptvlfn Exp $
+$NetBSD: distinfo,v 1.4 2015/06/09 22:08:41 szptvlfn Exp $

-SHA1 (parsec-3.1.7.tar.gz) = d342559a7d4117d8b7e3b4ee36980aaf64ba13c5
-RMD160 (parsec-3.1.7.tar.gz) = a4da38b8c74c529bfb2c75f92027d4b2f4470c8a
-Size (parsec-3.1.7.tar.gz) = 29556 bytes
+SHA1 (parsec-3.1.9.tar.gz) = 52eb8bf530111a2e92f710d14f0cf6e43eaaf741
+RMD160 (parsec-3.1.9.tar.gz) = 366255e648b0b9e20a555e942c71f53014a5a513
+Size (parsec-3.1.9.tar.gz) = 29668 bytes
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 DISTNAME=	polyparse-1.9
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	textproc

 MAINTAINER=	szptvlfn@NetBSD.org
--- a/textproc/hs-polyparse/buildlink3.mk
+++ b/textproc/hs-polyparse/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/12/12 22:55:25 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-polyparse

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-polyparse
 HS_POLYPARSE_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-polyparse+=	hs-polyparse>=1.9
-BUILDLINK_ABI_DEPENDS.hs-polyparse+=	hs-polyparse>=1.9nb4
+BUILDLINK_ABI_DEPENDS.hs-polyparse+=	hs-polyparse>=1.9nb5
 BUILDLINK_PKGSRCDIR.hs-polyparse?=	../../textproc/hs-polyparse

 .include "../../devel/hs-text/buildlink3.mk"
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/12/12 22:55:26 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 DISTNAME=	tagsoup-0.13.1
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	textproc

 MAINTAINER=	pho@cielonegro.org
--- a/textproc/hs-tagsoup/buildlink3.mk
+++ b/textproc/hs-tagsoup/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/12/12 22:55:26 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-tagsoup

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-tagsoup
 HS_TAGSOUP_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-tagsoup+=	hs-tagsoup>=0.13.1
-BUILDLINK_ABI_DEPENDS.hs-tagsoup+=	hs-tagsoup>=0.13.1nb4
+BUILDLINK_ABI_DEPENDS.hs-tagsoup+=	hs-tagsoup>=0.13.1nb5
 BUILDLINK_PKGSRCDIR.hs-tagsoup?=	../../textproc/hs-tagsoup

 .include "../../devel/hs-text/buildlink3.mk"
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2015/01/07 13:21:55 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.14 2015/06/09 22:09:42 szptvlfn Exp $

 DISTNAME=	texmath-0.8
-PKGREVISION=	8
+PKGREVISION=	13
 CATEGORIES=	textproc

 MAINTAINER=	szptvlfn@NetBSD.org
--- a/textproc/hs-texmath/buildlink3.mk
+++ b/textproc/hs-texmath/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2015/01/07 13:21:55 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2015/06/09 22:09:42 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-texmath

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-texmath
 HS_TEXMATH_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-texmath+=	hs-texmath>=0.8
-BUILDLINK_ABI_DEPENDS.hs-texmath+=	hs-texmath>=0.8nb8
+BUILDLINK_ABI_DEPENDS.hs-texmath+=	hs-texmath>=0.8nb13
 BUILDLINK_PKGSRCDIR.hs-texmath?=	../../textproc/hs-texmath

 .include "../../devel/hs-mtl/buildlink3.mk"
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/12/12 22:55:26 szptvlfn Exp $
+# $NetBSD: Makefile,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 DISTNAME=	xml-1.3.13
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	textproc

 MAINTAINER=	pho@cielonegro.org
--- a/textproc/hs-xml/buildlink3.mk
+++ b/textproc/hs-xml/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/12/12 22:55:26 szptvlfn Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/06/04 20:09:00 szptvlfn Exp $

 BUILDLINK_TREE+=	hs-xml

@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	hs-xml
 HS_XML_BUILDLINK3_MK:=

 BUILDLINK_API_DEPENDS.hs-xml+=	hs-xml>=1.3.13
-BUILDLINK_ABI_DEPENDS.hs-xml+=	hs-xml>=1.3.13nb4
+BUILDLINK_ABI_DEPENDS.hs-xml+=	hs-xml>=1.3.13nb5
 BUILDLINK_PKGSRCDIR.hs-xml?=	../../textproc/hs-xml

 .include "../../devel/hs-text/buildlink3.mk"
--- a/textproc/html2wml/Makefile
+++ b/textproc/html2wml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2014/05/29 23:37:34 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2015/06/12 10:51:20 wiz Exp $

 DISTNAME=	html2wml-0.4.8r2
 PKGNAME=	html2wml-0.4.8.2
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	textproc converters
 MASTER_SITES=	http://maddingue.free.fr/softwares/download/Html2Wml/html2wml-0.4.x/	\
 		${MASTER_SITE_SOURCEFORGE:=htmlwml/}
--- a/textproc/hunspell-de/Makefile
+++ b/textproc/hunspell-de/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2014/05/29 23:37:34 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2015/06/12 10:51:21 wiz Exp $

 DISTNAME=	igerman98-20131206
 PKGNAME=	${DISTNAME:S/igerman98/hunspell-de/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.j3e.de/ispell/igerman98/dict/
 EXTRACT_SUFX=	.tar.bz2
--- a/textproc/hunspell-it_IT/Makefile
+++ b/textproc/hunspell-it_IT/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2012/10/25 06:55:55 asau Exp $
+# $NetBSD: Makefile,v 1.3 2015/06/07 03:40:19 joerg Exp $

 DISTNAME=	italiano_2_4_2007_09_01
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=linguistico/}
 EXTRACT_SUFX=	.zip
--- a/textproc/hunspell-it_IT/PLIST
+++ b/textproc/hunspell-it_IT/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/12 21:49:37 ahoka Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/06/07 03:40:19 joerg Exp $
 share/doc/hunspell-${DICTNAME}/${DICTNAME}_AUTHORS
 share/doc/hunspell-${DICTNAME}/${DICTNAME}_COPYING
 share/doc/hunspell-${DICTNAME}/${DICTNAME}_ChangeLog
@@ -10,5 +10,3 @@ share/doc/hunspell-${DICTNAME}/${DICTNAME}_statistiche.ods
 share/doc/hunspell-${DICTNAME}/${DICTNAME}_todo.txt
 share/hunspell/${DICTNAME}.aff
 share/hunspell/${DICTNAME}.dic
-@unexec ${RMDIR} %D/share/hunspell 2>/dev/null || ${TRUE}
-@dirrm share/doc/hunspell-${DICTNAME}
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2014/05/29 23:37:34 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.19 2015/06/12 10:51:20 wiz Exp $

-DISTNAME=	hunspell-1.3.2
-PKGREVISION=	3
+DISTNAME=	hunspell-1.3.3
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hunspell/}

--- a/textproc/hunspell/PLIST
+++ b/textproc/hunspell/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/02/13 14:42:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/06/07 08:22:24 wiz Exp $
 bin/affixcompress
 bin/analyze
 bin/chmorph
@@ -30,14 +30,12 @@ include/hunspell/replist.hxx
 include/hunspell/suggestmgr.hxx
 include/hunspell/w_char.hxx
 lib/libhunspell-1.3.la
-lib/libparsers.a
 lib/pkgconfig/hunspell.pc
 man/hu/man1/hunspell.1
-man/hu/man4/hunspell.4
 man/man1/hunspell.1
 man/man1/hunzip.1
 man/man1/hzip.1
 man/man3/hunspell.3
-man/man4/hunspell.4
+man/man5/hunspell.5
 share/locale/hu/LC_MESSAGES/hunspell.mo
 share/locale/it/LC_MESSAGES/hunspell.mo
--- a/textproc/hunspell/distinfo
+++ b/textproc/hunspell/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2012/02/13 14:42:59 wiz Exp $
+$NetBSD: distinfo,v 1.7 2015/06/07 08:22:24 wiz Exp $

-SHA1 (hunspell-1.3.2.tar.gz) = 902c76d2b55a22610e2227abc4fd26cbe606a51c
-RMD160 (hunspell-1.3.2.tar.gz) = f193de180f9ac29cfb54824a45366ba57b27e5c4
-Size (hunspell-1.3.2.tar.gz) = 975917 bytes
+SHA1 (hunspell-1.3.3.tar.gz) = 219b20f305d6690f666ff3864a16e4674908a553
+RMD160 (hunspell-1.3.3.tar.gz) = 6e45fdf0c602f0694f414b0cb33de34a5bf95683
+Size (hunspell-1.3.3.tar.gz) = 986081 bytes
 SHA1 (patch-aa) = b03a51d88bd57786f4a0ac01a3b760b4d8ba385a
 SHA1 (patch-ab) = 01ff90fc2ebf1049d791a0669ddcc3f5495729c0
 SHA1 (patch-ac) = 27cad6078b55bce7144f462ddebac9887392c93b
--- a/Show More
+++ b/Show More