4 files changed, 97 insertions, 27 deletions

diff --git a/textproc/galax/Makefile b/textproc/galax/Makefile
index 0b0d25431834..891d44772c92 100644
--- a/textproc/galax/Makefile
+++ b/textproc/galax/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	galax
-PORTVERSION=	0.2.0
+PORTVERSION=	0.3.0
 CATEGORIES=	textproc
 MASTER_SITES=	http://db.bell-labs.com/galax/Downloads/
 
@@ -23,7 +23,7 @@ MAKE_ENV=	PREFIX=${PREFIX} JAVA_HOME=${JAVE_HOME}
 PLIST_SUB=	GALAX=Galax-${PORTVERSION}
 
 pre-patch:
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}/config
+	${SED} s,%%GALAXHOME%%,'$(PREFIX)/Galax-${PORTVERSION}', ${FILESDIR}/Makefile >${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 eba0532d0de9..12fb80fad387 100644
--- a/textproc/galax/distinfo
+++ b/textproc/galax/distinfo
@@ -1 +1 @@
-MD5 (galax-0.2.0.tar.gz) = 49af659233f90ab7c22a4b330ac21673
+MD5 (galax-0.3.0.tar.gz) = 71712a91def98e0edcf3f1bd809466e0
diff --git a/textproc/galax/files/Makefile b/textproc/galax/files/Makefile
index 8df0783de120..ceadf5f76219 100644
--- a/textproc/galax/files/Makefile
+++ b/textproc/galax/files/Makefile
@@ -22,7 +22,7 @@ OCAMLBIN=$(PREFIX)/bin
 ########################################################################
 # Where do you want to install Galax after it has been compiled?
 
-GALAXHOME=$(PREFIX)/Galax-0.2.0
+GALAXHOME=%%GALAXHOME%%
 
 BINDIR=$(GALAXHOME)/bin
 LIBDIR=$(GALAXHOME)/lib
diff --git a/textproc/galax/pkg-plist b/textproc/galax/pkg-plist
index c55efa8870d7..4d8702a23cb6 100644
--- a/textproc/galax/pkg-plist
+++ b/textproc/galax/pkg-plist
@@ -19,8 +19,6 @@
 %%GALAX%%/lib/caml/error.cmi
 %%GALAX%%/lib/caml/datamodel.mli
 %%GALAX%%/lib/caml/datamodel.cmi
-%%GALAX%%/lib/caml/galapi.mli
-%%GALAX%%/lib/caml/galapi.cmi
 %%GALAX%%/lib/caml/glx.a
 %%GALAX%%/lib/caml/glx.cmxa
 %%GALAX%%/lib/c/libglx.a
@@ -58,10 +56,7 @@
 %%GALAX%%/lib/caml-devel/cgi.cmi
 %%GALAX%%/lib/caml-devel/neturl.mli
 %%GALAX%%/lib/caml-devel/args.cmi
-%%GALAX%%/lib/caml-devel/uri.mli
 %%GALAX%%/lib/caml-devel/sym.mli
-%%GALAX%%/lib/caml-devel/simple_lexer.mli
-%%GALAX%%/lib/caml-devel/simple.mli
 %%GALAX%%/lib/caml-devel/resolve.mli
 %%GALAX%%/lib/caml-devel/pool.mli
 %%GALAX%%/lib/caml-devel/pervasive.mli
@@ -72,16 +67,10 @@
 %%GALAX%%/lib/caml-devel/finfo.mli
 %%GALAX%%/lib/caml-devel/error.mli
 %%GALAX%%/lib/caml-devel/decimal.mli
-%%GALAX%%/lib/caml-devel/datetime.mli
 %%GALAX%%/lib/caml-devel/conf.mli
-%%GALAX%%/lib/caml-devel/bound.mli
 %%GALAX%%/lib/caml-devel/args.mli
 %%GALAX%%/lib/caml-devel/whitespace.cmi
-%%GALAX%%/lib/caml-devel/uri.cmi
 %%GALAX%%/lib/caml-devel/sym.cmi
-%%GALAX%%/lib/caml-devel/simple_lexer_utf8.cmi
-%%GALAX%%/lib/caml-devel/simple_lexer.cmi
-%%GALAX%%/lib/caml-devel/simple.cmi
 %%GALAX%%/lib/caml-devel/resolve.cmi
 %%GALAX%%/lib/caml-devel/pool.cmi
 %%GALAX%%/lib/caml-devel/pervasive.cmi
@@ -91,9 +80,7 @@
 %%GALAX%%/lib/caml-devel/finfo.cmi
 %%GALAX%%/lib/caml-devel/error.cmi
 %%GALAX%%/lib/caml-devel/decimal.cmi
-%%GALAX%%/lib/caml-devel/datetime.cmi
 %%GALAX%%/lib/caml-devel/conf.cmi
-%%GALAX%%/lib/caml-devel/bound.cmi
 %%GALAX%%/lib/caml-devel/whitespace.mli
 %%GALAX%%/lib/caml-devel/xml_ast.mli
 %%GALAX%%/lib/caml-devel/closing_tag_lexer_utf8.cmi
@@ -126,15 +113,9 @@
 %%GALAX%%/lib/caml-devel/document_lexer_utf8.cmi
 %%GALAX%%/lib/caml-devel/xquery_parser.mli
 %%GALAX%%/lib/caml-devel/dfa.cmi
-%%GALAX%%/lib/caml-devel/intersectfsa.mli
 %%GALAX%%/lib/caml-devel/glushkov.mli
-%%GALAX%%/lib/caml-devel/fsa.mli
 %%GALAX%%/lib/caml-devel/dfa.mli
-%%GALAX%%/lib/caml-devel/reachability.cmi
-%%GALAX%%/lib/caml-devel/intersectfsa.cmi
 %%GALAX%%/lib/caml-devel/glushkov.cmi
-%%GALAX%%/lib/caml-devel/fsa.cmi
-%%GALAX%%/lib/caml-devel/reachability.mli
 %%GALAX%%/lib/caml-devel/schema.cmi
 %%GALAX%%/lib/caml-devel/theta.mli
 %%GALAX%%/lib/caml-devel/subsumption.mli
@@ -188,13 +169,11 @@
 %%GALAX%%/lib/caml-devel/xaeenv.mli
 %%GALAX%%/lib/caml-devel/optimrules.mli
 %%GALAX%%/lib/caml-devel/optimjudge.mli
-%%GALAX%%/lib/caml-devel/optimgen.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/optimgen.cmi
 %%GALAX%%/lib/caml-devel/xaeval.mli
 %%GALAX%%/lib/caml-devel/toputils.mli
 %%GALAX%%/lib/caml-devel/xmlquery.cmi
@@ -205,10 +184,8 @@
 %%GALAX%%/lib/caml-devel/glx_wrap.mli
 %%GALAX%%/lib/caml-devel/galapi.mli
 %%GALAX%%/lib/caml-devel/glx_wrap.cmi
-%%GALAX%%/lib/caml-devel/galapi.cmi
 %%GALAX%%/LICENSE
 %%GALAX%%/README
-%%GALAX%%/NEW
 %%GALAX%%/STATUS
 %%GALAX%%/INSTALL
 %%GALAX%%/DEVELOPERS
@@ -224,11 +201,104 @@
 %%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%%/usecases/docs/auction.xml
+%%GALAX%%/usecases/docs/xmpbib.xml
+%%GALAX%%/usecases/docs/xmark.xml
+%%GALAX%%/usecases/docs/users.xml
+%%GALAX%%/usecases/docs/string.xml
+%%GALAX%%/usecases/docs/sgml.xml
+%%GALAX%%/usecases/docs/report1.xml
+%%GALAX%%/usecases/docs/prices.xml
+%%GALAX%%/usecases/docs/personStrict.xml
+%%GALAX%%/usecases/docs/personLoose.xml
+%%GALAX%%/usecases/docs/person.xml
+%%GALAX%%/usecases/docs/parts.xml
+%%GALAX%%/usecases/docs/items.xml
+%%GALAX%%/usecases/docs/hispo2.xml
+%%GALAX%%/usecases/docs/hispo.xsd
+%%GALAX%%/usecases/docs/hispo.xml
+%%GALAX%%/usecases/docs/herpo.xsd
+%%GALAX%%/usecases/docs/confusion.xml
+%%GALAX%%/usecases/docs/company-data.xml
+%%GALAX%%/usecases/docs/books.xml
+%%GALAX%%/usecases/docs/book1.xml
+%%GALAX%%/usecases/docs/bids.xml
+%%GALAX%%/usecases/docs/xmpreviews.xml
+%%GALAX%%/usecases/confusion.xq
+%%GALAX%%/usecases/README
+%%GALAX%%/usecases/xmp_documents.txt
+%%GALAX%%/usecases/xmlschema_documents.txt
+%%GALAX%%/usecases/xmark_documents.txt
+%%GALAX%%/usecases/tree_documents.txt
+%%GALAX%%/usecases/string_documents.txt
+%%GALAX%%/usecases/sgml_documents.txt
+%%GALAX%%/usecases/seq_documents.txt
+%%GALAX%%/usecases/rel_documents.txt
+%%GALAX%%/usecases/parts_documents.txt
+%%GALAX%%/usecases/ns_documents.txt
+%%GALAX%%/usecases/confusion_documents.txt
+%%GALAX%%/usecases/xmp_usecase.xq
+%%GALAX%%/usecases/xmp_context.xq
+%%GALAX%%/usecases/xmlschema_usecase.xq
+%%GALAX%%/usecases/xmlschema_context.xq
+%%GALAX%%/usecases/xmark_usecase.xq
+%%GALAX%%/usecases/xmark_context.xq
+%%GALAX%%/usecases/tree_usecase.xq
+%%GALAX%%/usecases/tree_context.xq
+%%GALAX%%/usecases/string_usecase.xq
+%%GALAX%%/usecases/string_context.xq
+%%GALAX%%/usecases/sgml_usecase.xq
+%%GALAX%%/usecases/sgml_context.xq
+%%GALAX%%/usecases/seq_usecase.xq
+%%GALAX%%/usecases/seq_context.xq
+%%GALAX%%/usecases/seq.xq
+%%GALAX%%/usecases/rel_usecase.xq
+%%GALAX%%/usecases/rel_context.xq
+%%GALAX%%/usecases/parts_usecase.xq
+%%GALAX%%/usecases/parts_context.xq
+%%GALAX%%/usecases/ns_usecase.xq
+%%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