html-xml-utils: Import html-xml-utils-7.4 as wip/html-xml-utils

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Dec 19 21:29:36 2017 +0100
Changeset:	1f4d8eb9c8ace2a81ec455c6e5872a41f212c459

Modified Files:
	Makefile
Added Files:
	html-xml-utils/DESCR
	html-xml-utils/Makefile
	html-xml-utils/PLIST
	html-xml-utils/distinfo
	html-xml-utils/patches/patch-fopencookie.c

Log Message:
html-xml-utils: Import html-xml-utils-7.4 as wip/html-xml-utils

A number of simple utilities for manipulating HTML and XML files.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1f4d8eb9c8ace2a81ec455c6e5872a41f212c459

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                   |  1 +
 html-xml-utils/DESCR                       |  1 +
 html-xml-utils/Makefile                    | 22 ++++++++++
 html-xml-utils/PLIST                       | 64 ++++++++++++++++++++++++++++++
 html-xml-utils/distinfo                    |  7 ++++
 html-xml-utils/patches/patch-fopencookie.c | 29 ++++++++++++++
 6 files changed, 124 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index b2d85c3d9a..302df60560 100644
--- a/Makefile
+++ b/Makefile
@@ -1395,6 +1395,7 @@ SUBDIR+=	hs-yaml
 SUBDIR+=	hs-zip-archive
 SUBDIR+=	ht2html
 SUBDIR+=	html2latex
+SUBDIR+=	html-xml-utils
 SUBDIR+=	htslib
 SUBDIR+=	httrack
 SUBDIR+=	hu-go
diff --git a/html-xml-utils/DESCR b/html-xml-utils/DESCR
new file mode 100644
index 0000000000..63fe6dba64
--- /dev/null
+++ b/html-xml-utils/DESCR
@@ -0,0 +1 @@
+A number of simple utilities for manipulating HTML and XML files.
diff --git a/html-xml-utils/Makefile b/html-xml-utils/Makefile
new file mode 100644
index 0000000000..7d50aaeb9f
--- /dev/null
+++ b/html-xml-utils/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD$
+
+DISTNAME=	html-xml-utils-7.4
+CATEGORIES=	textproc
+MASTER_SITES=	https://www.w3.org/Tools/HTML-XML-utils/
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://www.w3.org/Tools/HTML-XML-utils/
+COMMENT=	Simple utilities for manipulating HTML and XML files
+LICENSE=	w3c
+
+GNU_CONFIGURE=	yes
+USE_TOOLS+=	lex yacc
+
+USE_LANGUAGES=	c99
+
+REPLACE_SH+=	hxcite-mkbib
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libidn2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/html-xml-utils/PLIST b/html-xml-utils/PLIST
new file mode 100644
index 0000000000..099ce3ed3a
--- /dev/null
+++ b/html-xml-utils/PLIST
@@ -0,0 +1,64 @@
+@comment $NetBSD$
+bin/asc2xml
+bin/hxaddid
+bin/hxcite
+bin/hxcite-mkbib
+bin/hxclean
+bin/hxcopy
+bin/hxcount
+bin/hxextract
+bin/hxincl
+bin/hxindex
+bin/hxmkbib
+bin/hxmultitoc
+bin/hxname2id
+bin/hxnormalize
+bin/hxnsxml
+bin/hxnum
+bin/hxpipe
+bin/hxprintlinks
+bin/hxprune
+bin/hxref
+bin/hxremove
+bin/hxselect
+bin/hxtabletrans
+bin/hxtoc
+bin/hxuncdata
+bin/hxunent
+bin/hxunpipe
+bin/hxunxmlns
+bin/hxwls
+bin/hxxmlns
+bin/xml2asc
+man/man1/asc2xml.1
+man/man1/hxaddid.1
+man/man1/hxcite-mkbib.1
+man/man1/hxcite.1
+man/man1/hxclean.1
+man/man1/hxcopy.1
+man/man1/hxcount.1
+man/man1/hxextract.1
+man/man1/hxincl.1
+man/man1/hxindex.1
+man/man1/hxmkbib.1
+man/man1/hxmultitoc.1
+man/man1/hxname2id.1
+man/man1/hxnormalize.1
+man/man1/hxnsxml.1
+man/man1/hxnum.1
+man/man1/hxpipe.1
+man/man1/hxprintlinks.1
+man/man1/hxprune.1
+man/man1/hxref.1
+man/man1/hxremove.1
+man/man1/hxselect.1
+man/man1/hxtabletrans.1
+man/man1/hxtoc.1
+man/man1/hxuncdata.1
+man/man1/hxunent.1
+man/man1/hxunpipe.1
+man/man1/hxunxmlns.1
+man/man1/hxwls.1
+man/man1/hxxmlns.1
+man/man1/xml2asc.1
+share/doc/html-xml-utils/COPYING
diff --git a/html-xml-utils/distinfo b/html-xml-utils/distinfo
new file mode 100644
index 0000000000..f9655f58f4
--- /dev/null
+++ b/html-xml-utils/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (html-xml-utils-7.4.tar.gz) = 694a67b723be500112217cd808789e837ae84bee
+RMD160 (html-xml-utils-7.4.tar.gz) = 9185eaf4ba6f93fbb07f4c029e6ae57abaaad5f4
+SHA512 (html-xml-utils-7.4.tar.gz) = 88a527c29ef23b34ecb778085aafd399943764a18a3e4b39ff27b3e2cc3effa84b9ffe7c2a0df80fb27a38a7e4d4ceef6db91da46cbb2b4f9fd59903d4868a20
+Size (html-xml-utils-7.4.tar.gz) = 343008 bytes
+SHA1 (patch-fopencookie.c) = 58a464521e323a87806d46b83902c74b846b8f26
diff --git a/html-xml-utils/patches/patch-fopencookie.c b/html-xml-utils/patches/patch-fopencookie.c
new file mode 100644
index 0000000000..731d80947a
--- /dev/null
+++ b/html-xml-utils/patches/patch-fopencookie.c
@@ -0,0 +1,29 @@
+$NetBSD$
+
+`fpos_t' can be a complex object, use `off64_t' instead.
+
+This fixes:
+
+ fopencookie.c: In function 'seekfn':
+ fopencookie.c:55:3: error: aggregate value used where an integer was expected
+    return (fpos_t)(c->seek(c->cookie, (off64_t)offset, whence));
+    ^
+ fopencookie.c:55:3: error: conversion to non-scalar type requested
+
+at least on NetBSD.
+
+--- fopencookie.c.orig	2017-11-24 09:41:14.000000000 +0000
++++ fopencookie.c
+@@ -49,10 +49,10 @@ static int writefn(void *sc, const char 
+ }
+ 
+ /* seekfn -- callback that in turn calls sc->seek with proper typecasts */
+-static fpos_t seekfn(void *sc, fpos_t offset, int whence)
++static off64_t seekfn(void *sc, off64_t offset, int whence)
+ {
+   cookiewrapper *c = (cookiewrapper*)sc;
+-  return (fpos_t)(c->seek(c->cookie, (off64_t)offset, whence));
++  return (off64_t)(c->seek(c->cookie, (off64_t)offset, whence));
+ }
+ 
+ /* closefn -- callback that in turn calls sc->close and then frees memory */