Updated package to latest version, 1.2.8, and made package compatible with

latest version of ocaml and its framework. Discussed on packages@ and
OK'd by jperkin.

Changes include:
1.2.8: Build against ocamlnet-4.1. Support -safe-string
1.2.7: tweaking support for oasis.
1.2.6: Adding _oasis file.
1.2.5: Build against ocamlnet-4.
1.2.4: Fixed bug in namespace-aware parsing (thanks to ygrek and Thomas
       Leonard)

3 files changed, 27 insertions, 17 deletions

diff --git a/textproc/pxp/Makefile b/textproc/pxp/Makefile
index 29d5fab1b36..b131b53c1b7 100644
--- a/textproc/pxp/Makefile
+++ b/textproc/pxp/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2016/05/05 11:45:42 jaapb Exp $
+# $NetBSD: Makefile,v 1.16 2016/06/25 13:59:20 jaapb Exp $
 #
 
-DISTNAME=		pxp-1.2.3
-PKGREVISION=		6
+DISTNAME=		pxp-1.2.8
 CATEGORIES=		textproc
 MASTER_SITES=		http://download.camlcity.org/download/
 
@@ -14,7 +13,7 @@ LICENSE=		mit
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS=		-with-lex -with-wlex -lexlist utf8,iso88591
-INSTALL_ENV=		OCAMLFIND_INSTALL_ARGS="install -destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib"
+INSTALL_ENV=		OCAMLFIND_INSTALL_ARGS="install -destdir ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}"
 BUILD_TARGET=		all
 
 MAKE_JOBS_SAFE=		no
@@ -29,21 +28,17 @@ SUBST_FILES.ocamlfind=			\
 	gensrc/pxp-wlex/Makefile
 SUBST_SED.ocamlfind=	-e 's|\($$(OCAMLFIND)\) install|\1 $$(OCAMLFIND_INSTALL_ARGS)|'
 
-INSTALLATION_DIRS=	lib/ocaml/site-lib/pxp
+INSTALLATION_DIRS=	${OCAML_SITELIBDIR}/pxp
+OCAML_USE_FINDLIB=	yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../mk/ocaml.mk"
 
-PLIST_VARS=     opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "arm")
-PLIST.opt=      yes
+.if (${OCAML_USE_OPT_COMPILER} == "yes")
 BUILD_TARGET+=	opt
 .endif
 
-.include "../../lang/ocaml/buildlink3.mk"
 .include "../../lang/camlp4/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 --git a/textproc/pxp/distinfo b/textproc/pxp/distinfo
index ecc7c06ee19..4d8625144ba 100644
--- a/textproc/pxp/distinfo
+++ b/textproc/pxp/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 02:00:00 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/06/25 13:59:20 jaapb Exp $
 
-SHA1 (pxp-1.2.3.tar.gz) = 4d0846f9f22d354740bb5a6c638da170e7a04e36
-RMD160 (pxp-1.2.3.tar.gz) = 276b19d06d89927c751518a36a36cef4f3f62fe8
-SHA512 (pxp-1.2.3.tar.gz) = 44ba4dbbd1ceec152f286976df6d948fd2ffc238d30a3abb31fcc54e8d37ae4281e9303294b1a79668e7402c5003cd6fbc0714700862f0e2e77c99a1e0af3e36
-Size (pxp-1.2.3.tar.gz) = 702592 bytes
+SHA1 (pxp-1.2.8.tar.gz) = f8482217db665a8d9b25023ee231f6419c127142
+RMD160 (pxp-1.2.8.tar.gz) = 8b15bc7529a46f533fa258c837359ef7d69a2086
+SHA512 (pxp-1.2.8.tar.gz) = 3292bfbda494066e454331a9cfc56b03f55afe8548bdf24fea09d9bc0a03c333c027f7b527983bd9b4d659458c95acf7e3fc251c72d26ab3502f52067c9f2549
+Size (pxp-1.2.8.tar.gz) = 619689 bytes
+SHA1 (patch-src_pxp-engine_pxp-document.ml) = c9c4bcdb102ca44e4fc676a11059fffc46e672de
 SHA1 (patch-tools_src_m2parsergen_Makefile) = 115700c42eb1a2204eb395e4840681c4663f0a76
 SHA1 (patch-tools_src_odoc_Makefile) = 1c7b769bd9d145b6e12850428af2eb61720f2334
diff --git a/textproc/pxp/patches/patch-src_pxp-engine_pxp-document.ml b/textproc/pxp/patches/patch-src_pxp-engine_pxp-document.ml
new file mode 100644
index 00000000000..523c488e22d
--- /dev/null
+++ b/textproc/pxp/patches/patch-src_pxp-engine_pxp-document.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_pxp-engine_pxp-document.ml,v 1.1 2016/06/25 13:59:21 jaapb Exp $
+
+Comment out multiply-defined exception
+--- src/pxp-engine/pxp_document.ml.orig	2016-03-03 13:46:50.000000000 +0000
++++ src/pxp-engine/pxp_document.ml
+@@ -3398,7 +3398,7 @@ let find_all_elements ?deeply eltype bas
+ ;;
+ 
+ 
+-exception Skip;;
++(* exception Skip;; *)
+ 
+ let map_tree ~pre ?(post=(fun x -> x)) base =
+   let rec map_rec n =