[pkgsrc/trunk]: pkgsrc/textproc/pxp Updated package to its latest version, 1....

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/textproc/pxp Updated package to its latest version, 1....
From: jaapb <jaapb%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 13:08:09 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d16573790fb
branches:  trunk
changeset: 610422:9d16573790fb
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Wed Oct 24 13:15:32 2012 +0000

description:
Updated package to its latest version, 1.2.3, and cleaned up package by
adding license, making native code support conditional on the architecture as
in other OCaml packages and adding PLIST_VARS support.

Changelog (excluding bugfixes and changes to deal with new versions of other
packages):
-  1.2.1: Revised documentation
   Addition: Pxp_event.unwrap_document
   Addition: Pxp_dtd.Entity.lookup
   Addition: node method entity_id
   Addition: Pxp_event.close_entities
   Removed: Pxp_core_types_type, Pxp_type_anchor. Pxp_core_types  has now three
   submodules A, S, I taking over the roles
   Removed: E_pinstr_member. Instead, E_pinstr events are emitted
   Renaming, and addition: `Entry_content has been renamed to
   `Entry_element_content. A new `Entry_content with different  semantics has
   been added, now conforming to a standard production.
   Improvement: The parser also accepts a BOM as UTF-8 sequence.  Also, the
   autodetection of the encoding for UTF-16 has been  enhanced
-  1.2.0test*: New ~minimization option for the  [write] and [display] methods
   (user wish).
   Improvement: better control what is printed as DTD for  document#write and
   #display
-  1.1.95: Addition of ulex lexing.
   Revised namespace handling: There are now namespace_scope  objects keeping
   the scoping structure of the namespaces.  The namespace_info stuff has been
   removed. The "display"  methods can print XML while respecting the scoping
   structure.
   New exceptions Namespace_not_managed, Namespace_prefix_not_managed,
   Namespace_not_in_scope (all replacing Not_found). Methods  of
   namespace_manager may raise these exceptions.
   The event-based representation of XML is now symmetrical  to the tree-based
   representation, such that it is possible  to convert one representation into
   the other without loss.  The type of events had to be changed to achieve
   this effect.
   The new module Pxp_event contains functions for the event-based
   representation.
   Addition of pxp-pp, the PXP preprocessor.
-  1.1.94: The Pxp_reader module has been completely rewritten. This fixes some
   problems with relative URLs. - Pxp_yacc has been split up into four modules:
   Pxp_tree_parser contains now the parser API returning object trees,
   Pxp_dtd_parser is the parser API returning DTDs, Pxp_ev_parser is the
   event-based API, and Pxp_core_parser is the core of the parser. Pxp_yacc is
   still available as compatibility API. As part of the module redesign,
   Pxp_types includes now parts of its interface from Pxp_core_types_type. I
   hope this style of programming is comprehensible. - The event-based parser
   can now preprocess namespaces.
   Furthermore, there are normalization filters.
-  1.1.92: The whole lexing stuff has been restructured. There is a new tool,
   lexpp, that generates the lexers from only five files. Furthermore, much
   more 8 bit character sets are now supported as internal encodings. In
   previous versions of PXP, the internal representation of the XML trees was
   restricted to either UTF-8 or ISO-8859-1. Now, a number of additional
   encodings are supported, including the whole ISO-8859 series.
-  1.1.91: The curly braces can now even be used inside attributes, and escape
   from normal XML parsing.
   There is a new entry point Entry_expr for event-based parsing that expects
   either a single element, a single processing instruction, or a single
   comment, or whitespace. This allows more fine-grained control of what is
   parsed.
   There is now a "pull parser". In contrast to the "push parser" introduced in
   1.1.90, the calling order of parser and parser user have been inverted, i.e.
   the user calls the parser to get ("pull") the next event instead of letting
   the parser call back a user function ("push"). An interesting application is
   that O'Caml's lazy streams can be used to analyze events. An example can be
   found in examles/pullparser.
-  1.1.90: This version introduces a new event-based interface in Pxp_yacc. For
   start tags, end tags, data strings, and several other things that are found
   in the XML source so-called events are generated, and a user function is
   called for every event. See the directory examples/eventparser for examples.
   Another innovation is support for curly braces as escape characters. Inside
   elements, the left curly brace escapes from XML parsing and starts a foreign
   parser until the matching right curly brace is found:

   <element> ... { foreign syntax } ... </element>

   The curly braces are borrowed from the XQuery draft standard. They cannot
   yet be used inside attribute values. Curly braces are mostly useful in
   conjunction with event-based parsing, because it is not yet possible to
   include the "value" of the curly brace expression into XML trees.
   It is even possible to call the XML parser from the foreign parser as
   subparser. However, there not yet enough entry points for the event-based
   parser (e.g. you cannot parse just the following processing instruction,
   only misc* element misc* or whole documents are possible).

diffstat:

 textproc/pxp/Makefile                                     |  36 +++++---
 textproc/pxp/PLIST                                        |  65 ++++++++++----
 textproc/pxp/PLIST.opt                                    |  11 --
 textproc/pxp/distinfo                                     |  10 +-
 textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile |  14 +++
 textproc/pxp/patches/patch-tools_src_odoc_Makefile        |  14 +++
 6 files changed, 101 insertions(+), 49 deletions(-)

diffs (237 lines):

diff -r ceac2b350f1c -r 9d16573790fb textproc/pxp/Makefile
--- a/textproc/pxp/Makefile     Wed Oct 24 09:01:40 2012 +0000
+++ b/textproc/pxp/Makefile     Wed Oct 24 13:15:32 2012 +0000
@@ -1,25 +1,22 @@
-# $NetBSD: Makefile,v 1.6 2012/10/08 15:18:24 jaapb Exp $
+# $NetBSD: Makefile,v 1.7 2012/10/24 13:15:32 jaapb Exp $
 #
 
-DISTNAME=              pxp-1.1.6
-PKGREVISION=           2
+DISTNAME=              pxp-1.2.3
 CATEGORIES=            textproc
-MASTER_SITES=          http://www.ocaml-programming.de/packages/
+MASTER_SITES=          http://download.camlcity.org/download/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.ocaml-programming.de/packages/
+HOMEPAGE=              http://projects.camlcity.org/projects/pxp.html
 COMMENT=               Polymorphic XML parser, a validating XML-1.0 parser (OCaml)
+LICENSE=               mit
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-DEPENDS+=              ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-DEPENDS+=              ocamlnet-[0-9]*:../../net/ocamlnet
-
 USE_TOOLS+=            gmake
-BUILD_TARGET=          all opt
 HAS_CONFIGURE=         yes
-PLIST_SRC=             PLIST.opt PLIST
+CONFIGURE_ARGS=                -with-lex -with-wlex -lexlist utf8,iso88591
 INSTALL_ENV=           OCAMLFIND_INSTALL_ARGS="install -destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib"
+BUILD_TARGET=          all
 
 MAKE_JOBS_SAFE=                no
 
@@ -28,12 +25,25 @@
 SUBST_FILES.ocamlfind=                 \
        src/pxp/Makefile                \
        src/pxp-engine/Makefile         \
-       src/pxp-lex-iso88591/Makefile   \
-       src/pxp-lex-utf8/Makefile       \
-       src/pxp-wlex/Makefile
+       gensrc/pxp-lex-iso88591/Makefile        \
+       gensrc/pxp-lex-utf8/Makefile    \
+       gensrc/pxp-wlex/Makefile
 SUBST_SED.ocamlfind=   -e 's|\($$(OCAMLFIND)\) install|\1 $$(OCAMLFIND_INSTALL_ARGS)|'
 
 INSTALLATION_DIRS=     lib/ocaml/site-lib/pxp
 
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS=     opt
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
+    (${MACHINE_ARCH} == "arm")
+PLIST.opt=      yes
+BUILD_TARGET+= opt
+.endif
+
 .include "../../lang/ocaml/buildlink3.mk"
+.include "../../devel/ocaml-findlib/buildlink3.mk"
+.include "../../net/ocamlnet/buildlink3.mk"
+.include "../../devel/pcre-ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r ceac2b350f1c -r 9d16573790fb textproc/pxp/PLIST
--- a/textproc/pxp/PLIST        Wed Oct 24 09:01:40 2012 +0000
+++ b/textproc/pxp/PLIST        Wed Oct 24 13:15:32 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/10/24 13:15:32 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/pxp
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/pxp-lex-utf8
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/pxp-lex-iso88591
@@ -7,14 +7,28 @@
 lib/ocaml/site-lib/pxp-engine/pxp_aux.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_codewriter.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_codewriter.mli
+lib/ocaml/site-lib/pxp-engine/pxp_core_parser.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_core_parser.mli
+lib/ocaml/site-lib/pxp-engine/pxp_core_types.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_core_types.mli
 lib/ocaml/site-lib/pxp-engine/pxp_dfa.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_dfa.mli
 lib/ocaml/site-lib/pxp-engine/pxp_document.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_document.mli
 lib/ocaml/site-lib/pxp-engine/pxp_dtd.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_dtd.mli
+lib/ocaml/site-lib/pxp-engine/pxp_dtd_parser.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_dtd_parser.mli
+${PLIST.opt}lib/ocaml/site-lib/pxp-engine/pxp_engine.a
 lib/ocaml/site-lib/pxp-engine/pxp_engine.cma
+${PLIST.opt}lib/ocaml/site-lib/pxp-engine/pxp_engine.cmxa
 lib/ocaml/site-lib/pxp-engine/pxp_entity.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_entity_manager.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_ev_parser.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_ev_parser.mli
+lib/ocaml/site-lib/pxp-engine/pxp_event.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_event.mli
+lib/ocaml/site-lib/pxp-engine/pxp_lex_aux.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_lexer_types.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_lexer_types.mli
 lib/ocaml/site-lib/pxp-engine/pxp_lexers.cmi
@@ -30,38 +44,47 @@
 lib/ocaml/site-lib/pxp-engine/pxp_top.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_top.cmo
 lib/ocaml/site-lib/pxp-engine/pxp_top.mli
+lib/ocaml/site-lib/pxp-engine/pxp_tree_parser.cmi
+lib/ocaml/site-lib/pxp-engine/pxp_tree_parser.mli
 lib/ocaml/site-lib/pxp-engine/pxp_types.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_types.mli
 lib/ocaml/site-lib/pxp-engine/pxp_yacc.cmi
 lib/ocaml/site-lib/pxp-engine/pxp_yacc.mli
 lib/ocaml/site-lib/pxp-lex-iso88591/META
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_aux_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_content_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_content_string_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_declaration_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_document_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_document_type_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_dtd_string_iso88591.cmi
+${PLIST.opt}lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591.a
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591.cma
+${PLIST.opt}lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591.cmxa
+lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591_01.cmi
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.cmi
 lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.cmo
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_misc_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_name_string_iso88591.cmi
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_within_tag_iso88591.cmi
+${PLIST.opt}lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.cmx
+${PLIST.opt}lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.o
 lib/ocaml/site-lib/pxp-lex-utf8/META
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_aux_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_content_string_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_content_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_declaration_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_document_type_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_document_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_dtd_string_utf8.cmi
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.cmi
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.cmo
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_misc_utf8.cmi
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_name_string_utf8.cmi
+${PLIST.opt}lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.cmx
+${PLIST.opt}lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.o
+${PLIST.opt}lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8.a
 lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8.cma
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_within_tag_utf8.cmi
+${PLIST.opt}lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8.cmxa
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_01.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_02.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_03.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_04.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_05.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_06.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_07.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_08.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_09.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_10.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_11.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_12.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_13.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_14.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_15.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_16.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_17.cmi
+lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8_18.cmi
 lib/ocaml/site-lib/pxp/META
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/pxp-engine
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/pxp-lex-iso88591
diff -r ceac2b350f1c -r 9d16573790fb textproc/pxp/PLIST.opt
--- a/textproc/pxp/PLIST.opt    Wed Oct 24 09:01:40 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST.opt,v 1.1.1.1 2006/08/11 15:44:33 wiz Exp $
-lib/ocaml/site-lib/pxp-engine/pxp_engine.a
-lib/ocaml/site-lib/pxp-engine/pxp_engine.cmxa
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591.a
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_iso88591.cmxa
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.cmx
-lib/ocaml/site-lib/pxp-lex-iso88591/pxp_lex_link_iso88591.o
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.cmx
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_link_utf8.o
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8.a
-lib/ocaml/site-lib/pxp-lex-utf8/pxp_lex_utf8.cmxa
diff -r ceac2b350f1c -r 9d16573790fb textproc/pxp/distinfo
--- a/textproc/pxp/distinfo     Wed Oct 24 09:01:40 2012 +0000
+++ b/textproc/pxp/distinfo     Wed Oct 24 13:15:32 2012 +0000
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/11 15:44:33 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/10/24 13:15:32 jaapb Exp $
 
-SHA1 (pxp-1.1.6.tar.gz) = 49ca3cc02f87eb6c6cf26a6cc0ed386f86161c72
-RMD160 (pxp-1.1.6.tar.gz) = d4569f9e40b151f494a5e8744ba0713ad740b8ad
-Size (pxp-1.1.6.tar.gz) = 615236 bytes
+SHA1 (pxp-1.2.3.tar.gz) = 4d0846f9f22d354740bb5a6c638da170e7a04e36
+RMD160 (pxp-1.2.3.tar.gz) = 276b19d06d89927c751518a36a36cef4f3f62fe8
+Size (pxp-1.2.3.tar.gz) = 702592 bytes
+SHA1 (patch-tools_src_m2parsergen_Makefile) = 115700c42eb1a2204eb395e4840681c4663f0a76
+SHA1 (patch-tools_src_odoc_Makefile) = 1c7b769bd9d145b6e12850428af2eb61720f2334
diff -r ceac2b350f1c -r 9d16573790fb textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile Wed Oct 24 13:15:32 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-tools_src_m2parsergen_Makefile,v 1.1 2012/10/24 13:15:32 jaapb Exp $
+
+Fix error with empty PACKAGES variable
+--- tools/src/m2parsergen/Makefile.orig        2012-06-11 11:15:30.000000000 +0000
++++ tools/src/m2parsergen/Makefile
+@@ -10,6 +10,8 @@ include $(TOP_DIR)/Makefile.rules
+ SRC = ast.ml lexer.ml parser.ml generator.ml
+ OBJ = $(SRC:.ml=.cmo)
+ 
++PACKAGES = stdlib
++
+ #----------------------------------------------------------------------
+ 
+ .PHONY: all
diff -r ceac2b350f1c -r 9d16573790fb textproc/pxp/patches/patch-tools_src_odoc_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/pxp/patches/patch-tools_src_odoc_Makefile        Wed Oct 24 13:15:32 2012 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-tools_src_odoc_Makefile,v 1.1 2012/10/24 13:15:32 jaapb Exp $
+
+Fix error with empty PACKAGES variable
+--- tools/src/odoc/Makefile.orig       2012-06-11 11:15:30.000000000 +0000
++++ tools/src/odoc/Makefile
+@@ -6,6 +6,8 @@ OBJ = $(SRC:.ml=.cmo)
+ OCAMLC_OPTIONS += -I +ocamldoc
+ CLEAN_LIST += chtml.ml
+ 
++PACKAGES=stdlib
++
+ .PHONY: all
+ all: chtml.cmo
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/print/tex-bagpipetex Make tex-bagpipetex build with re...
Next by Date: [pkgsrc/trunk]: pkgsrc/security/py-itsdangerous Update py-itsdangerous to 0.22.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/print/tex-bagpipetex Make tex-bagpipetex build with re...
Next by Thread: [pkgsrc/trunk]: pkgsrc/security/py-itsdangerous Update py-itsdangerous to 0.22.
Indexes:
Home | Main Index | Thread Index | Old Index