5 files changed, 241 insertions, 249 deletions

diff --git a/textproc/galax/Makefile b/textproc/galax/Makefile
index 56aab4415be4..815d0a3a9305 100644
--- a/textproc/galax/Makefile
+++ b/textproc/galax/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galax
-PORTVERSION=	0.3.0
+PORTVERSION=	0.3.5
 CATEGORIES=	textproc
 MASTER_SITES=	http://db.bell-labs.com/galax/Downloads/
 
@@ -17,14 +17,18 @@ BUILD_DEPENDS=	ocaml:${PORTSDIR}/lang/ocaml
 
 WRKSRC=		${WRKDIR}/galax
 
+INSTALLS_SHLIBS=yes
+LDCONFIG_DIRS=	${LOCALBASE}/%%GALAX%%/lib/c
 USE_GMAKE=	yes
 ALL_TARGET=	world
-MAKE_ENV=	PREFIX=${PREFIX} JAVA_HOME=${JAVE_HOME}
+MAKE_ARGS=	JAVAHOME=${JAVA_HOME} OCAMLHOME=${LOCALBASE}/lib/ocaml OCAMLBIN=${LOCALBASE}/bin \
+		GALAXHOME=${PREFIX}/Galax-${PORTVERSION} APIS="c" OPTAPIS="c" WITH_CLIBS="-lm -lcurses" \
+		CC=${CC} CPP=${CPP}
 
 PLIST_SUB=	GALAX=Galax-${PORTVERSION}
 
 pre-patch:
-	${SED} s,%%GALAXHOME%%,'$(PREFIX)/Galax-${PORTVERSION}', ${FILESDIR}/Makefile >${WRKSRC}/config/Makefile
+	${CP} ${WRKSRC}/config/Makefile.unix ${WRKSRC}/config/Makefile
 
 post-install:
 	@${SED} 's,PREFIX,${PREFIX},; s,GALAX,Galax-${PORTVERSION},' ${PKGMESSAGE}
diff --git a/textproc/galax/distinfo b/textproc/galax/distinfo
index 12fb80fad387..fd79057deea8 100644
--- a/textproc/galax/distinfo
+++ b/textproc/galax/distinfo
@@ -1 +1 @@
-MD5 (galax-0.3.0.tar.gz) = 71712a91def98e0edcf3f1bd809466e0
+MD5 (galax-0.3.5.tar.gz) = 9e7bde17a52b0b54265eee5ef21451a7
diff --git a/textproc/galax/files/Makefile b/textproc/galax/files/Makefile
deleted file mode 100644
index ceadf5f76219..000000000000
--- a/textproc/galax/files/Makefile
+++ /dev/null
@@ -1,129 +0,0 @@
-#########################################################################
-#                                                                       #
-#                                  GALAX                                #
-#                             XML Query Engine                          #
-#                                                                       #
-#   Copyright 2000, Lucent Technologies.                                #
-#   Distributed only by permission.                                     #
-#                                                                       #
-#########################################################################
-
-# $Id: Makefile.unix,v 1.8 2002/10/12 00:33:30 simeon Exp $ #
-# $FreeBSD$ #
-
-# This config should work under Unix
-
-########################################################################
-# Location of O'Caml compilers and libraries
-
-OCAMLHOME=$(PREFIX)/lib/ocaml
-OCAMLBIN=$(PREFIX)/bin
-
-########################################################################
-# Where do you want to install Galax after it has been compiled?
-
-GALAXHOME=%%GALAXHOME%%
-
-BINDIR=$(GALAXHOME)/bin
-LIBDIR=$(GALAXHOME)/lib
-MANDIR=$(GALAXHOME)
-
-###########################################################################
-# Character encoding configuration
-
-ENCODINGS=utf8 #iso88591 utf8
-# The list of currently available encodings is: iso88591 and utf8
-
-# Note that support for each encoding does add to the size of the
-# resulting Galax executables.
-
-###########################################################################
-# APIs configuration
-
-#
-# Notes:
-#	- the Java API is not available in native mode
-#	- the Java API requires the C API
-#
-
-APIS=c #java
-OPTAPIS=c
-
-# C & C++ compilers (only required if you want to use the C and C++ APIs)
-
-CC?=gcc
-CPP?=g++
-LD=ld
-
-# Compiling the C & C++ APIs often requires additional libaries,
-# depending on your compiler.
-#
-# A good hint is to look for the BYTECCLIBS variable inside
-# ./config/Makefile in the Objective Caml source after it has been
-# configured.
-
-# Works with Linux i386 + gcc
-WITH_CLIBS=-lm -lcurses
-
-# Works with Solaris 2.6 + cc
-#WITH_CLIBS=-lcurses -lnsl -lsocket -lm -ldl -lunix -lstr
-
-# Which parameters to ld to create a shared library?
-
-SHARED=-shared --whole-archive
-#SHARED=-G -z allextract
-
-# Java compilers (only required if you want to use the Java API)
-
-JAVAC=javac
-#JAVAH=javah
-
-# For the Java library, the Java home directory and include directory
-# where jni.h is located
-
-JAVAHOME=$(JAVA_HOME)
-
-# Works for IBM jdk
-JAVAINCLUDE=$(JAVAHOME)/include
-
-# Reported to work for SUN jdk
-#JAVAINCLUDE=$(JAVAHOME)/include/linux
-
-
-##########################################################################
-# The following is only needed if you are running the regression tests
-#
-# Location of Perl
-
-PERL=perl
-
-###########################################################################
-# YOU SHOULD NOT NEED TO MODIFY BELOW THIS LINE
-
-###########################################################################
-# Architecture
-
-ARCH=FreeBSD
-
-###########################################################################
-# Executable extension's configuration
-
-EXE=             # Extension for executables
-OPT=.opt         # Extension for native code executables
-BYTE=.byte       # Extension for bytecode code executables
-CGI=.cgi         # Extension for byte code CGI scripts
-OPTCGI=opt.cgi   # Extension for native code CGI scripts
-ZIPEXT=.tar.gz   # Extension for packages
-
-###########################################################################
-# Command-line tools
-
-CP=cp
-MKDIR=mkdir -p
-RANLIB=ranlib
-AR=ar
-LN=ln -s -f
-RM=rm -f
-TOUCH=touch
-ZIP=tar cvf
-ZIPOPT=--gzip
diff --git a/textproc/galax/files/patch-tools::pxp-engine::Makefile b/textproc/galax/files/patch-tools::pxp-engine::Makefile
new file mode 100644
index 000000000000..bec9274051cf
--- /dev/null
+++ b/textproc/galax/files/patch-tools::pxp-engine::Makefile
@@ -0,0 +1,11 @@
+--- tools/pxp-engine/Makefile.orig	Thu Jan 15 10:28:06 2004
++++ tools/pxp-engine/Makefile	Thu Jan 15 10:28:17 2004
+@@ -26,7 +26,7 @@
+ #generate: pxp_yacc.ml pxp_lexing.ml
+ 
+ pxp_lexing.ml: pxp_lexing.mlp
+-	ifdef -D LEXBUF_$(OCAMLVERSION) pxp_lexing.mlp
++	./ifdef -D LEXBUF_$(OCAMLVERSION) pxp_lexing.mlp
+ 
+ depend: 
+ 	$(OCAMLDEP) *.ml *.mli >depend
diff --git a/textproc/galax/pkg-plist b/textproc/galax/pkg-plist
index 4d8702a23cb6..a0a1fe2b5ad4 100644
--- a/textproc/galax/pkg-plist
+++ b/textproc/galax/pkg-plist
@@ -1,33 +1,41 @@
 %%GALAX%%/bin/galax.byte
-%%GALAX%%/bin/mapschema.byte
-%%GALAX%%/bin/validate.byte
-%%GALAX%%/bin/wf-sax.byte
 %%GALAX%%/bin/galax
+%%GALAX%%/bin/mapschema.byte
 %%GALAX%%/bin/mapschema
+%%GALAX%%/bin/validate.byte
 %%GALAX%%/bin/validate
-%%GALAX%%/bin/wf-sax
 %%GALAX%%/bin/galaxtop
 %%GALAX%%/bin/galax.opt
 %%GALAX%%/bin/mapschema.opt
 %%GALAX%%/bin/validate.opt
-%%GALAX%%/bin/wf-sax.opt
-%%GALAX%%/lib/pervasive.xq
 %%GALAX%%/lib/caml/glx.cma
 %%GALAX%%/lib/caml/conf.mli
 %%GALAX%%/lib/caml/conf.cmi
 %%GALAX%%/lib/caml/error.mli
 %%GALAX%%/lib/caml/error.cmi
-%%GALAX%%/lib/caml/datamodel.mli
-%%GALAX%%/lib/caml/datamodel.cmi
 %%GALAX%%/lib/caml/glx.a
 %%GALAX%%/lib/caml/glx.cmxa
+%%GALAX%%/lib/caml/datamodel_api.mli
+%%GALAX%%/lib/caml/datamodel_api.cmi
+%%GALAX%%/lib/caml/galapi.mli
+%%GALAX%%/lib/caml/galapi.cmi
+%%GALAX%%/lib/c/libunix.a
+%%GALAX%%/lib/c/libstr.a
+%%GALAX%%/lib/c/libnums.a
+%%GALAX%%/lib/c/libunix.so
+%%GALAX%%/lib/c/libstr.so
+%%GALAX%%/lib/c/libnums.so
 %%GALAX%%/lib/c/libglx.a
-%%GALAX%%/lib/c/glx_CPP.h
+%%GALAX%%/lib/c/libglx.so
+%%GALAX%%/lib/c/itemlist.h
 %%GALAX%%/lib/c/glx.h
 %%GALAX%%/lib/c/libglxopt.a
+%%GALAX%%/lib/c/libglxopt.so
+%%GALAX%%/lib/pervasive.xq
 %%GALAX%%/lib/caml-devel/glx.cma
 %%GALAX%%/lib/caml-devel/glx.a
 %%GALAX%%/lib/caml-devel/glx.cmxa
+%%GALAX%%/lib/caml-devel/http.cmi
 %%GALAX%%/lib/caml-devel/base64.cmi
 %%GALAX%%/lib/caml-devel/netstring_top.mli
 %%GALAX%%/lib/caml-devel/netstring_str.mli
@@ -45,6 +53,7 @@
 %%GALAX%%/lib/caml-devel/neturl.cmi
 %%GALAX%%/lib/caml-devel/netstring_str.cmi
 %%GALAX%%/lib/caml-devel/netstream.cmi
+%%GALAX%%/lib/caml-devel/cgi.cmi
 %%GALAX%%/lib/caml-devel/netmappings.cmi
 %%GALAX%%/lib/caml-devel/nethtml_scanner.cmi
 %%GALAX%%/lib/caml-devel/nethtml.cmi
@@ -53,70 +62,123 @@
 %%GALAX%%/lib/caml-devel/netconversion.cmi
 %%GALAX%%/lib/caml-devel/netbuffer.cmi
 %%GALAX%%/lib/caml-devel/mimestring.cmi
-%%GALAX%%/lib/caml-devel/cgi.cmi
 %%GALAX%%/lib/caml-devel/neturl.mli
+%%GALAX%%/lib/caml-devel/pxp_aux.cmi
+%%GALAX%%/lib/caml-devel/pxp_reader.mli
+%%GALAX%%/lib/caml-devel/pxp_lib.mli
+%%GALAX%%/lib/caml-devel/pxp_lexing.mli
+%%GALAX%%/lib/caml-devel/pxp_lexers.mli
+%%GALAX%%/lib/caml-devel/pxp_lexer_types.mli
+%%GALAX%%/lib/caml-devel/pxp_types.cmi
+%%GALAX%%/lib/caml-devel/pxp_reader.cmi
+%%GALAX%%/lib/caml-devel/pxp_lib.cmi
+%%GALAX%%/lib/caml-devel/pxp_lexing.cmi
+%%GALAX%%/lib/caml-devel/pxp_lexers.cmi
+%%GALAX%%/lib/caml-devel/pxp_lexer_types.cmi
+%%GALAX%%/lib/caml-devel/id.mli
+%%GALAX%%/lib/caml-devel/pxp_types.mli
 %%GALAX%%/lib/caml-devel/args.cmi
-%%GALAX%%/lib/caml-devel/sym.mli
-%%GALAX%%/lib/caml-devel/resolve.mli
 %%GALAX%%/lib/caml-devel/pool.mli
 %%GALAX%%/lib/caml-devel/pervasive.mli
-%%GALAX%%/lib/caml-devel/namespace.mli
-%%GALAX%%/lib/caml-devel/monitor.mli
-%%GALAX%%/lib/caml-devel/id.mli
+%%GALAX%%/lib/caml-devel/occurrence.mli
 %%GALAX%%/lib/caml-devel/gmisc.mli
+%%GALAX%%/lib/caml-devel/glx_pxp.mli
+%%GALAX%%/lib/caml-devel/glx_http.mli
 %%GALAX%%/lib/caml-devel/finfo.mli
 %%GALAX%%/lib/caml-devel/error.mli
-%%GALAX%%/lib/caml-devel/decimal.mli
+%%GALAX%%/lib/caml-devel/encoding.mli
 %%GALAX%%/lib/caml-devel/conf.mli
 %%GALAX%%/lib/caml-devel/args.mli
 %%GALAX%%/lib/caml-devel/whitespace.cmi
-%%GALAX%%/lib/caml-devel/sym.cmi
-%%GALAX%%/lib/caml-devel/resolve.cmi
 %%GALAX%%/lib/caml-devel/pool.cmi
 %%GALAX%%/lib/caml-devel/pervasive.cmi
-%%GALAX%%/lib/caml-devel/namespace.cmi
+%%GALAX%%/lib/caml-devel/occurrence.cmi
 %%GALAX%%/lib/caml-devel/id.cmi
 %%GALAX%%/lib/caml-devel/gmisc.cmi
+%%GALAX%%/lib/caml-devel/glx_pxp.cmi
+%%GALAX%%/lib/caml-devel/glx_http.cmi
 %%GALAX%%/lib/caml-devel/finfo.cmi
 %%GALAX%%/lib/caml-devel/error.cmi
-%%GALAX%%/lib/caml-devel/decimal.cmi
 %%GALAX%%/lib/caml-devel/conf.cmi
+%%GALAX%%/lib/caml-devel/encoding.cmi
 %%GALAX%%/lib/caml-devel/whitespace.mli
-%%GALAX%%/lib/caml-devel/xml_ast.mli
-%%GALAX%%/lib/caml-devel/closing_tag_lexer_utf8.cmi
-%%GALAX%%/lib/caml-devel/xquery_astutil.mli
+%%GALAX%%/lib/caml-devel/namespace.cmi
+%%GALAX%%/lib/caml-devel/resolve.mli
+%%GALAX%%/lib/caml-devel/qname_lexer.mli
+%%GALAX%%/lib/caml-devel/namespace.mli
+%%GALAX%%/lib/caml-devel/sym.cmi
+%%GALAX%%/lib/caml-devel/resolve.cmi
+%%GALAX%%/lib/caml-devel/qname_lexer_utf8.cmi
+%%GALAX%%/lib/caml-devel/qname_lexer_iso88591.cmi
+%%GALAX%%/lib/caml-devel/qname_lexer.cmi
+%%GALAX%%/lib/caml-devel/sym.mli
+%%GALAX%%/lib/caml-devel/anyURI.cmi
+%%GALAX%%/lib/caml-devel/dateTime.mli
+%%GALAX%%/lib/caml-devel/datatypes.mli
+%%GALAX%%/lib/caml-devel/anyURI.mli
+%%GALAX%%/lib/caml-devel/decimal.cmi
+%%GALAX%%/lib/caml-devel/dateTime.cmi
+%%GALAX%%/lib/caml-devel/datatypes_lexer.cmi
+%%GALAX%%/lib/caml-devel/datatypes.cmi
+%%GALAX%%/lib/caml-devel/decimal.mli
+%%GALAX%%/lib/caml-devel/print.cmi
 %%GALAX%%/lib/caml-devel/xquery_ast.mli
 %%GALAX%%/lib/caml-devel/xml_astutil.mli
+%%GALAX%%/lib/caml-devel/xml_ast.mli
 %%GALAX%%/lib/caml-devel/tokens.mli
-%%GALAX%%/lib/caml-devel/sax.mli
 %%GALAX%%/lib/caml-devel/print.mli
-%%GALAX%%/lib/caml-devel/parseutil.mli
-%%GALAX%%/lib/caml-devel/lexutil.mli
-%%GALAX%%/lib/caml-devel/lexers_utf8.mli
-%%GALAX%%/lib/caml-devel/lexers_iso88591.mli
-%%GALAX%%/lib/caml-devel/xquery_parser.cmi
-%%GALAX%%/lib/caml-devel/xquery_lexer.cmi
 %%GALAX%%/lib/caml-devel/xquery_astutil.cmi
 %%GALAX%%/lib/caml-devel/xquery_ast.cmi
-%%GALAX%%/lib/caml-devel/xmldecl_lexer.cmi
 %%GALAX%%/lib/caml-devel/xml_astutil.cmi
 %%GALAX%%/lib/caml-devel/xml_ast.cmi
-%%GALAX%%/lib/caml-devel/type_lexer.cmi
 %%GALAX%%/lib/caml-devel/tokens.cmi
-%%GALAX%%/lib/caml-devel/sax.cmi
+%%GALAX%%/lib/caml-devel/xquery_astutil.mli
+%%GALAX%%/lib/caml-devel/closing_tag_lexer_iso88591.cmi
+%%GALAX%%/lib/caml-devel/xquery_lexer.cmi
+%%GALAX%%/lib/caml-devel/xmldecl_lexer.cmi
+%%GALAX%%/lib/caml-devel/type_lexer.cmi
 %%GALAX%%/lib/caml-devel/text_lexer_utf8.cmi
-%%GALAX%%/lib/caml-devel/print.cmi
-%%GALAX%%/lib/caml-devel/parseutil.cmi
+%%GALAX%%/lib/caml-devel/text_lexer_iso88591.cmi
 %%GALAX%%/lib/caml-devel/opening_tag_lexer_utf8.cmi
+%%GALAX%%/lib/caml-devel/opening_tag_lexer_iso88591.cmi
 %%GALAX%%/lib/caml-devel/lexutil.cmi
-%%GALAX%%/lib/caml-devel/lexers_utf8.cmi
+%%GALAX%%/lib/caml-devel/entity_lexer_utf8.cmi
+%%GALAX%%/lib/caml-devel/entity_lexer_iso88591.cmi
+%%GALAX%%/lib/caml-devel/dtd_lexer_utf8.cmi
+%%GALAX%%/lib/caml-devel/dtd_lexer_iso88591.cmi
 %%GALAX%%/lib/caml-devel/document_lexer_utf8.cmi
+%%GALAX%%/lib/caml-devel/document_lexer_iso88591.cmi
+%%GALAX%%/lib/caml-devel/closing_tag_lexer_utf8.cmi
+%%GALAX%%/lib/caml-devel/lexutil.mli
+%%GALAX%%/lib/caml-devel/lexers_iso88591.cmi
+%%GALAX%%/lib/caml-devel/parseutil.mli
+%%GALAX%%/lib/caml-devel/parse_context.mli
+%%GALAX%%/lib/caml-devel/lexers_utf8.mli
+%%GALAX%%/lib/caml-devel/lexers_iso88591.mli
+%%GALAX%%/lib/caml-devel/xquery_parser.cmi
+%%GALAX%%/lib/caml-devel/parseutil.cmi
+%%GALAX%%/lib/caml-devel/parse_context.cmi
+%%GALAX%%/lib/caml-devel/lexers_utf8.cmi
 %%GALAX%%/lib/caml-devel/xquery_parser.mli
+%%GALAX%%/lib/caml-devel/sax_parser.cmi
+%%GALAX%%/lib/caml-devel/sax_typesutil.mli
+%%GALAX%%/lib/caml-devel/sax_types.mli
+%%GALAX%%/lib/caml-devel/sax_parser.mli
+%%GALAX%%/lib/caml-devel/stream_ops.cmi
+%%GALAX%%/lib/caml-devel/sax_typesutil.cmi
+%%GALAX%%/lib/caml-devel/sax_types.cmi
+%%GALAX%%/lib/caml-devel/stream_ops.mli
+%%GALAX%%/lib/caml-devel/monitor.mli
+%%GALAX%%/lib/caml-devel/monitor.cmi
 %%GALAX%%/lib/caml-devel/dfa.cmi
-%%GALAX%%/lib/caml-devel/glushkov.mli
+%%GALAX%%/lib/caml-devel/nfa.mli
+%%GALAX%%/lib/caml-devel/fsautil.mli
 %%GALAX%%/lib/caml-devel/dfa.mli
+%%GALAX%%/lib/caml-devel/regexp.cmi
+%%GALAX%%/lib/caml-devel/nfa.cmi
+%%GALAX%%/lib/caml-devel/fsautil.cmi
+%%GALAX%%/lib/caml-devel/regexp.mli
 %%GALAX%%/lib/caml-devel/glushkov.cmi
-%%GALAX%%/lib/caml-devel/schema.cmi
 %%GALAX%%/lib/caml-devel/theta.mli
 %%GALAX%%/lib/caml-devel/subsumption.mli
 %%GALAX%%/lib/caml-devel/simplification.mli
@@ -124,115 +186,157 @@
 %%GALAX%%/lib/caml-devel/schemamapping.mli
 %%GALAX%%/lib/caml-devel/schema.mli
 %%GALAX%%/lib/caml-devel/intersection.mli
+%%GALAX%%/lib/caml-devel/glushkov.mli
 %%GALAX%%/lib/caml-devel/typeutil.cmi
 %%GALAX%%/lib/caml-devel/theta.cmi
 %%GALAX%%/lib/caml-devel/subsumption.cmi
 %%GALAX%%/lib/caml-devel/simplification.cmi
 %%GALAX%%/lib/caml-devel/schemautil.cmi
 %%GALAX%%/lib/caml-devel/schemamapping.cmi
+%%GALAX%%/lib/caml-devel/schema.cmi
 %%GALAX%%/lib/caml-devel/typeutil.mli
-%%GALAX%%/lib/caml-devel/mapping.mli
-%%GALAX%%/lib/caml-devel/xadepend.mli
+%%GALAX%%/lib/caml-devel/norm_context.mli
 %%GALAX%%/lib/caml-devel/maputil.mli
-%%GALAX%%/lib/caml-devel/xatenv.mli
-%%GALAX%%/lib/caml-devel/xatenv.cmi
+%%GALAX%%/lib/caml-devel/mapping.mli
+%%GALAX%%/lib/caml-devel/norm_context.cmi
 %%GALAX%%/lib/caml-devel/maputil.cmi
 %%GALAX%%/lib/caml-devel/mapping.cmi
-%%GALAX%%/lib/caml-devel/path_analysis.cmi
+%%GALAX%%/lib/caml-devel/analysis_context.cmi
+%%GALAX%%/lib/caml-devel/project_context.mli
+%%GALAX%%/lib/caml-devel/path_structutil.mli
 %%GALAX%%/lib/caml-devel/path_struct.mli
-%%GALAX%%/lib/caml-devel/path_env.mli
 %%GALAX%%/lib/caml-devel/path_analysis.mli
-%%GALAX%%/lib/caml-devel/path_varlists.cmi
+%%GALAX%%/lib/caml-devel/optim_vars.mli
+%%GALAX%%/lib/caml-devel/function_analysis.mli
+%%GALAX%%/lib/caml-devel/analysis_context.mli
+%%GALAX%%/lib/caml-devel/stream_project.cmi
+%%GALAX%%/lib/caml-devel/project_context.cmi
+%%GALAX%%/lib/caml-devel/path_structutil.cmi
 %%GALAX%%/lib/caml-devel/path_struct.cmi
-%%GALAX%%/lib/caml-devel/path_env.cmi
-%%GALAX%%/lib/caml-devel/path_varlists.mli
+%%GALAX%%/lib/caml-devel/path_analysis.cmi
+%%GALAX%%/lib/caml-devel/optim_vars.cmi
+%%GALAX%%/lib/caml-devel/function_analysis.cmi
+%%GALAX%%/lib/caml-devel/stream_project.mli
 %%GALAX%%/lib/caml-devel/datamodel.cmi
 %%GALAX%%/lib/caml-devel/validation-sax.mli
+%%GALAX%%/lib/caml-devel/serialization_context.mli
+%%GALAX%%/lib/caml-devel/serialization.mli
 %%GALAX%%/lib/caml-devel/nodeid.mli
+%%GALAX%%/lib/caml-devel/load_context.mli
 %%GALAX%%/lib/caml-devel/load.mli
+%%GALAX%%/lib/caml-devel/export_datamodel.mli
+%%GALAX%%/lib/caml-devel/export_context.mli
 %%GALAX%%/lib/caml-devel/datamodel.mli
 %%GALAX%%/lib/caml-devel/validation.cmi
+%%GALAX%%/lib/caml-devel/serialization_context.cmi
+%%GALAX%%/lib/caml-devel/serialization.cmi
 %%GALAX%%/lib/caml-devel/nodeid.cmi
+%%GALAX%%/lib/caml-devel/load_context.cmi
 %%GALAX%%/lib/caml-devel/load.cmi
+%%GALAX%%/lib/caml-devel/export_datamodel.cmi
+%%GALAX%%/lib/caml-devel/export_context.cmi
 %%GALAX%%/lib/caml-devel/validation.mli
-%%GALAX%%/lib/caml-devel/store.mli
-%%GALAX%%/lib/caml-devel/bltin.mli
+%%GALAX%%/lib/caml-devel/cast_as.cmi
+%%GALAX%%/lib/caml-devel/overloaded.mli
+%%GALAX%%/lib/caml-devel/fn_static.mli
+%%GALAX%%/lib/caml-devel/fn_error.mli
+%%GALAX%%/lib/caml-devel/fn_dynamic.mli
+%%GALAX%%/lib/caml-devel/cast_as.mli
 %%GALAX%%/lib/caml-devel/store.cmi
-%%GALAX%%/lib/caml-devel/bltin.cmi
-%%GALAX%%/lib/caml-devel/typing.mli
+%%GALAX%%/lib/caml-devel/overloaded.cmi
+%%GALAX%%/lib/caml-devel/fn_static.cmi
+%%GALAX%%/lib/caml-devel/fn_error.cmi
+%%GALAX%%/lib/caml-devel/fn_dynamic.cmi
+%%GALAX%%/lib/caml-devel/store.mli
+%%GALAX%%/lib/caml-devel/commontype.cmi
 %%GALAX%%/lib/caml-devel/tpath.mli
+%%GALAX%%/lib/caml-devel/static_context.mli
 %%GALAX%%/lib/caml-devel/commontype.mli
 %%GALAX%%/lib/caml-devel/typing.cmi
 %%GALAX%%/lib/caml-devel/tpath.cmi
-%%GALAX%%/lib/caml-devel/commontype.cmi
-%%GALAX%%/lib/caml-devel/cast.cmi
-%%GALAX%%/lib/caml-devel/xaeenv.mli
-%%GALAX%%/lib/caml-devel/optimrules.mli
-%%GALAX%%/lib/caml-devel/optimjudge.mli
-%%GALAX%%/lib/caml-devel/cast.mli
-%%GALAX%%/lib/caml-devel/xaeval.cmi
-%%GALAX%%/lib/caml-devel/xaeenv.cmi
-%%GALAX%%/lib/caml-devel/optimrules.cmi
-%%GALAX%%/lib/caml-devel/optimjudge.cmi
-%%GALAX%%/lib/caml-devel/xaeval.mli
+%%GALAX%%/lib/caml-devel/static_context.cmi
+%%GALAX%%/lib/caml-devel/typing.mli
+%%GALAX%%/lib/caml-devel/dynamic_context.cmi
+%%GALAX%%/lib/caml-devel/rewrite_rules.mli
+%%GALAX%%/lib/caml-devel/rewrite_main.mli
+%%GALAX%%/lib/caml-devel/rewrite_judge.mli
+%%GALAX%%/lib/caml-devel/eval_util.mli
+%%GALAX%%/lib/caml-devel/eval_update.mli
+%%GALAX%%/lib/caml-devel/eval_top.mli
+%%GALAX%%/lib/caml-devel/eval_expr.mli
+%%GALAX%%/lib/caml-devel/dynamic_context.mli
+%%GALAX%%/lib/caml-devel/rewrite_walker.cmi
+%%GALAX%%/lib/caml-devel/rewrite_rules.cmi
+%%GALAX%%/lib/caml-devel/rewrite_main.cmi
+%%GALAX%%/lib/caml-devel/rewrite_judge.cmi
+%%GALAX%%/lib/caml-devel/eval_util.cmi
+%%GALAX%%/lib/caml-devel/eval_update.cmi
+%%GALAX%%/lib/caml-devel/eval_top.cmi
+%%GALAX%%/lib/caml-devel/eval_expr.cmi
+%%GALAX%%/lib/caml-devel/rewrite_walker.mli
 %%GALAX%%/lib/caml-devel/toputils.mli
 %%GALAX%%/lib/caml-devel/xmlquery.cmi
-%%GALAX%%/lib/caml-devel/wf-sax.cmi
 %%GALAX%%/lib/caml-devel/validate.cmi
 %%GALAX%%/lib/caml-devel/toputils.cmi
 %%GALAX%%/lib/caml-devel/mapschema.cmi
-%%GALAX%%/lib/caml-devel/glx_wrap.mli
 %%GALAX%%/lib/caml-devel/galapi.mli
-%%GALAX%%/lib/caml-devel/glx_wrap.cmi
+%%GALAX%%/lib/caml-devel/datamodel_api.mli
+%%GALAX%%/lib/caml-devel/galapi.cmi
+%%GALAX%%/lib/caml-devel/datamodel_api.cmi
 %%GALAX%%/LICENSE
 %%GALAX%%/README
+%%GALAX%%/RELEASE_NOTES
 %%GALAX%%/STATUS
 %%GALAX%%/INSTALL
-%%GALAX%%/DEVELOPERS
-%%GALAX%%/Changes
-%%GALAX%%/examples/c-api/Makefile
-%%GALAX%%/examples/c-api/glx_main.c
-%%GALAX%%/examples/c-api/glx_main_cpp.C
-%%GALAX%%/examples/c-api/glx_test1.xq
-%%GALAX%%/examples/c-api/glx_test2.xq
-%%GALAX%%/examples/ml-api/Makefile
-%%GALAX%%/examples/ml-api/README
-%%GALAX%%/examples/ml-api/ml-example.ml
-%%GALAX%%/examples/ml-api/xml-example.xml
-%%GALAX%%/examples/ml-api/xq-example1.xq
-%%GALAX%%/examples/ml-api/xq-example2.xq
-%%GALAX%%/lib/caml-devel/occurrence.mli
-%%GALAX%%/lib/caml-devel/occurrence.cmi
-%%GALAX%%/lib/caml-devel/qname_lexer.mli
-%%GALAX%%/lib/caml-devel/qname_lexer_utf8.cmi
-%%GALAX%%/lib/caml-devel/qname_lexer.cmi
-%%GALAX%%/lib/caml-devel/anyURI.cmi
-%%GALAX%%/lib/caml-devel/dateTime.mli
-%%GALAX%%/lib/caml-devel/datatypes.mli
-%%GALAX%%/lib/caml-devel/anyURI.mli
-%%GALAX%%/lib/caml-devel/dateTime.cmi
-%%GALAX%%/lib/caml-devel/datatypes_lexer.cmi
-%%GALAX%%/lib/caml-devel/datatypes.cmi
-%%GALAX%%/lib/caml-devel/dtd_lexer_utf8.cmi
-%%GALAX%%/lib/caml-devel/monitor.cmi
-%%GALAX%%/lib/caml-devel/nfa.mli
-%%GALAX%%/lib/caml-devel/fsautil.mli
-%%GALAX%%/lib/caml-devel/regexp.cmi
-%%GALAX%%/lib/caml-devel/nfa.cmi
-%%GALAX%%/lib/caml-devel/fsautil.cmi
-%%GALAX%%/lib/caml-devel/regexp.mli
-%%GALAX%%/lib/caml-devel/function_analysis.cmi
-%%GALAX%%/lib/caml-devel/function_analysis.mli
-%%GALAX%%/lib/caml-devel/optimwalker.mli
-%%GALAX%%/lib/caml-devel/optimmain.mli
-%%GALAX%%/lib/caml-devel/xerror.cmi
-%%GALAX%%/lib/caml-devel/optimwalker.cmi
-%%GALAX%%/lib/caml-devel/optimmain.cmi
-%%GALAX%%/lib/caml-devel/xerror.mli
-%%GALAX%%/lib/caml-devel/datamodel_api.mli
-%%GALAX%%/lib/caml-devel/datamodel_api.cmi
-%%GALAX%%/RELEASE_NOTES
 %%GALAX%%/BUGS
+%%GALAX%%/Changes
+%%GALAX%%/README_API
+%%GALAX%%/examples/caml_api/xq-example2.xq
+%%GALAX%%/examples/caml_api/hispo.xml
+%%GALAX%%/examples/caml_api/hispo.xsd
+%%GALAX%%/examples/caml_api/htmlpath.xq
+%%GALAX%%/examples/caml_api/ml-example.ml
+%%GALAX%%/examples/caml_api/ml-test.ml
+%%GALAX%%/examples/caml_api/report.xml
+%%GALAX%%/examples/caml_api/seq.xq
+%%GALAX%%/examples/caml_api/seq_context.xq
+%%GALAX%%/examples/caml_api/xml-example.xml
+%%GALAX%%/examples/caml_api/xmlschema.xq
+%%GALAX%%/examples/caml_api/xmlschema_context.xq
+%%GALAX%%/examples/caml_api/xq-example1.xq
+%%GALAX%%/examples/caml_api/Makefile
+%%GALAX%%/examples/c_api/xq-example2.xq
+%%GALAX%%/examples/c_api/c-example.c
+%%GALAX%%/examples/c_api/c-test.c
+%%GALAX%%/examples/c_api/glx_test1.xq
+%%GALAX%%/examples/c_api/glx_test2.xq
+%%GALAX%%/examples/c_api/hispo.xml
+%%GALAX%%/examples/c_api/hispo.xsd
+%%GALAX%%/examples/c_api/htmlpath.xq
+%%GALAX%%/examples/c_api/report.xml
+%%GALAX%%/examples/c_api/seq.xq
+%%GALAX%%/examples/c_api/seq_context.xq
+%%GALAX%%/examples/c_api/xml-example.xml
+%%GALAX%%/examples/c_api/xmlschema.xq
+%%GALAX%%/examples/c_api/xmlschema_context.xq
+%%GALAX%%/examples/c_api/xq-example1.xq
+%%GALAX%%/examples/c_api/Makefile
+%%GALAX%%/examples/java_api/xq-example2.xq
+%%GALAX%%/examples/java_api/Makefile
+%%GALAX%%/examples/java_api/Test.java
+%%GALAX%%/examples/java_api/glx_test1.xq
+%%GALAX%%/examples/java_api/glx_test2.xq
+%%GALAX%%/examples/java_api/hispo.xml
+%%GALAX%%/examples/java_api/hispo.xsd
+%%GALAX%%/examples/java_api/htmlpath.xq
+%%GALAX%%/examples/java_api/report.xml
+%%GALAX%%/examples/java_api/seq.xq
+%%GALAX%%/examples/java_api/seq_context.xq
+%%GALAX%%/examples/java_api/xml-example.xml
+%%GALAX%%/examples/java_api/xmlschema.xq
+%%GALAX%%/examples/java_api/xmlschema_context.xq
+%%GALAX%%/examples/java_api/xq-example1.xq
+%%GALAX%%/examples/java_api/Example.java
 %%GALAX%%/usecases/docs/auction.xml
 %%GALAX%%/usecases/docs/xmpbib.xml
 %%GALAX%%/usecases/docs/xmark.xml
@@ -258,6 +362,7 @@
 %%GALAX%%/usecases/docs/xmpreviews.xml
 %%GALAX%%/usecases/confusion.xq
 %%GALAX%%/usecases/README
+%%GALAX%%/usecases/Makefile
 %%GALAX%%/usecases/xmp_documents.txt
 %%GALAX%%/usecases/xmlschema_documents.txt
 %%GALAX%%/usecases/xmark_documents.txt
@@ -292,14 +397,15 @@
 %%GALAX%%/usecases/ns_context.xq
 %%GALAX%%/usecases/confusion_context.xq
 %%GALAX%%/usecases/STATUS
-@dirrm %%GALAX%%/bin
-@dirrm %%GALAX%%/lib/caml
-@dirrm %%GALAX%%/lib/c
-@dirrm %%GALAX%%/lib/caml-devel
-@dirrm %%GALAX%%/lib
 @dirrm %%GALAX%%/usecases/docs
 @dirrm %%GALAX%%/usecases
-@dirrm %%GALAX%%/examples/c-api
-@dirrm %%GALAX%%/examples/ml-api
+@dirrm %%GALAX%%/examples/java_api
+@dirrm %%GALAX%%/examples/c_api
+@dirrm %%GALAX%%/examples/caml_api
 @dirrm %%GALAX%%/examples
+@dirrm %%GALAX%%/lib/caml-devel
+@dirrm %%GALAX%%/lib/c
+@dirrm %%GALAX%%/lib/caml
+@dirrm %%GALAX%%/lib
+@dirrm %%GALAX%%/bin
 @dirrm %%GALAX%%