diff options
| -rw-r--r-- | textproc/pxp/Makefile | 36 | ||||
| -rw-r--r-- | textproc/pxp/PLIST | 65 | ||||
| -rw-r--r-- | textproc/pxp/PLIST.opt | 11 | ||||
| -rw-r--r-- | textproc/pxp/distinfo | 10 | ||||
| -rw-r--r-- | textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile | 14 | ||||
| -rw-r--r-- | textproc/pxp/patches/patch-tools_src_odoc_Makefile | 14 |
6 files changed, 101 insertions, 49 deletions
diff --git a/textproc/pxp/Makefile b/textproc/pxp/Makefile index b0ccdb3549d..fbfa3c569bd 100644 --- a/textproc/pxp/Makefile +++ b/textproc/pxp/Makefile @@ -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 -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_STAGE.ocamlfind= do-configure 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 --git a/textproc/pxp/PLIST b/textproc/pxp/PLIST index ddbbad166b7..b458f358172 100644 --- a/textproc/pxp/PLIST +++ b/textproc/pxp/PLIST @@ -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/META 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_reader.mli 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 --git a/textproc/pxp/PLIST.opt b/textproc/pxp/PLIST.opt deleted file mode 100644 index bbfccbe31d9..00000000000 --- a/textproc/pxp/PLIST.opt +++ /dev/null @@ -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 --git a/textproc/pxp/distinfo b/textproc/pxp/distinfo index 5d75a732098..a60b8ebeb1b 100644 --- a/textproc/pxp/distinfo +++ b/textproc/pxp/distinfo @@ -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 --git a/textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile b/textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile new file mode 100644 index 00000000000..e1433108c33 --- /dev/null +++ b/textproc/pxp/patches/patch-tools_src_m2parsergen_Makefile @@ -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 --git a/textproc/pxp/patches/patch-tools_src_odoc_Makefile b/textproc/pxp/patches/patch-tools_src_odoc_Makefile new file mode 100644 index 00000000000..1ec5cedac99 --- /dev/null +++ b/textproc/pxp/patches/patch-tools_src_odoc_Makefile @@ -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 + |