Updated package to latest version, 0.8 (and changed it to work with the

latest ocaml.mk). Changes include:
* Use OASIS 0.4.x compiled_setup alpha feature
* Fixed _oasis file for the syntax extension
* Switched to git and github

3 files changed, 54 insertions, 64 deletions

diff --git a/textproc/ocaml-text/Makefile b/textproc/ocaml-text/Makefile
index 867243c6473..632e9cfaecf 100644
--- a/textproc/ocaml-text/Makefile
+++ b/textproc/ocaml-text/Makefile
@@ -1,46 +1,24 @@
-# $NetBSD: Makefile,v 1.11 2015/08/07 11:20:35 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2016/02/06 12:33:06 jaapb Exp $
 #
 
-DISTNAME=	ocaml-text-0.6
-PKGREVISION=	6
+DISTNAME=	ocaml-text-0.8
 CATEGORIES=	textproc
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/937/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=vbmithr/}
 
-MAINTAINER=	jaapb@kerguelen.org
-HOMEPAGE=	http://ocaml-text.forge.ocamlcore.org/
+MAINTAINER=	jaapb@NetBSD.org
+HOMEPAGE=	http://github.com/vbmithr/ocaml-text
 COMMENT=	OCaml Unicode library
 LICENSE=	modified-bsd
 
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+= 	--prefix ${PREFIX} --destdir ${DESTDIR}
 
-DEPENDS+=       ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
+#SUBST_CLASSES+=		destdir
+#SUBST_STAGE.destdir=	post-configure
+#SUBST_MESSAGE.destdir=	Changing install location to DESTDIR
+#SUBST_FILES.destdir=	setup.ml
+#SUBST_SED.destdir=	-e 's,"install" :: findlib_name,"install" :: "-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,'
 
-SUBST_CLASSES+=		destdir
-SUBST_STAGE.destdir=	post-configure
-SUBST_MESSAGE.destdir=	Changing install location to DESTDIR
-SUBST_FILES.destdir=	setup.ml
-SUBST_SED.destdir=	-e 's,"install" :: findlib_name,"install" :: "-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,'
+OCAML_USE_OASIS=	yes
 
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS=	opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST.opt=	yes
-.endif
-
-do-configure:
-	cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS}
-
-do-build:
-	cd ${WRKSRC} && ocaml setup.ml -build
-
-pre-install:
-	${MKDIR} ${DESTDIR}/${PREFIX}/lib/ocaml/site-lib
-
-do-install:
-	cd ${WRKSRC} && ocaml setup.ml -install
-
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ocaml-text/PLIST b/textproc/ocaml-text/PLIST
index 9f130ec7077..9a7ec8abe13 100644
--- a/textproc/ocaml-text/PLIST
+++ b/textproc/ocaml-text/PLIST
@@ -1,25 +1,37 @@
-@comment $NetBSD: PLIST,v 1.2 2012/08/15 08:23:10 wiz Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/text
-lib/ocaml/site-lib/text/META
-lib/ocaml/site-lib/text/dlltext-bigarray_stubs.so
-lib/ocaml/site-lib/text/dlltext_stubs.so
-lib/ocaml/site-lib/text/encoding.cmi
-${PLIST.opt}lib/ocaml/site-lib/text/encoding.cmx
-lib/ocaml/site-lib/text/encoding.mli
-lib/ocaml/site-lib/text/encoding_bigarray.cmi
-${PLIST.opt}lib/ocaml/site-lib/text/encoding_bigarray.cmx
-lib/ocaml/site-lib/text/encoding_bigarray.mli
-${PLIST.opt}lib/ocaml/site-lib/text/libtext-bigarray_stubs.a
-${PLIST.opt}lib/ocaml/site-lib/text/libtext_stubs.a
-${PLIST.opt}lib/ocaml/site-lib/text/text-bigarray.a
-lib/ocaml/site-lib/text/text-bigarray.cma
-${PLIST.opt}lib/ocaml/site-lib/text/text-bigarray.cmxa
-${PLIST.opt}lib/ocaml/site-lib/text/text-bigarray.cmxs
-${PLIST.opt}lib/ocaml/site-lib/text/text.a
-lib/ocaml/site-lib/text/text.cma
-lib/ocaml/site-lib/text/text.cmi
-${PLIST.opt}lib/ocaml/site-lib/text/text.cmx
-${PLIST.opt}lib/ocaml/site-lib/text/text.cmxa
-${PLIST.opt}lib/ocaml/site-lib/text/text.cmxs
-lib/ocaml/site-lib/text/text.mli
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/text
+@comment $NetBSD: PLIST,v 1.3 2016/02/06 12:33:06 jaapb Exp $
+@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/text
+${OCAML_SITELIB}/text/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/bigarray.a
+${OCAML_SITELIB}/text/bigarray.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/bigarray.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/bigarray.cmxs
+${OCAML_SITELIB}/text/dllbigarray_stubs.so
+${OCAML_SITELIB}/text/dlltext_stubs.so
+${OCAML_SITELIB}/text/encoding.annot
+${OCAML_SITELIB}/text/encoding.cmi
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/encoding.cmx
+${OCAML_SITELIB}/text/encoding.cmt
+${OCAML_SITELIB}/text/encoding.cmti
+${OCAML_SITELIB}/text/encoding.mli
+${OCAML_SITELIB}/text/encoding_bigarray.annot
+${OCAML_SITELIB}/text/encoding_bigarray.cmi
+${OCAML_SITELIB}/text/encoding_bigarray.cmt
+${OCAML_SITELIB}/text/encoding_bigarray.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/encoding_bigarray.cmx
+${OCAML_SITELIB}/text/encoding_bigarray.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/libbigarray_stubs.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/libtext_stubs.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/bigarray.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/bigarray.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/bigarray.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/text.a
+${OCAML_SITELIB}/text/text.annot
+${OCAML_SITELIB}/text/text.cma
+${OCAML_SITELIB}/text/text.cmi
+${OCAML_SITELIB}/text/text.cmt
+${OCAML_SITELIB}/text/text.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/text.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/text.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/text/text.cmxs
+${OCAML_SITELIB}/text/text.mli
+@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/text
diff --git a/textproc/ocaml-text/distinfo b/textproc/ocaml-text/distinfo
index 001a1cbe39b..7bde149cf8d 100644
--- a/textproc/ocaml-text/distinfo
+++ b/textproc/ocaml-text/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/04 01:59:42 agc Exp $
+$NetBSD: distinfo,v 1.4 2016/02/06 12:33:06 jaapb Exp $
 
-SHA1 (ocaml-text-0.6.tar.gz) = 72f767bc3b5e52ef9cc73b5f69f7b17e946cba5c
-RMD160 (ocaml-text-0.6.tar.gz) = 3044869456e099d755ace144266eed7aaeda4f22
-SHA512 (ocaml-text-0.6.tar.gz) = 83dffe6cb11634e81076d72a0ed4b1621705dae2657706c5629550e3a4a4b912258bb63cb913c5248ecb556c7484ab77be4d1063dc4c216ec680b363f854e305
-Size (ocaml-text-0.6.tar.gz) = 253162 bytes
+SHA1 (ocaml-text-0.8.tar.gz) = 589657ba661562c34fc25a07529021cb8f765380
+RMD160 (ocaml-text-0.8.tar.gz) = d582cfb597df8205f45dcb6a038d46612d7621a9
+SHA512 (ocaml-text-0.8.tar.gz) = 712afd21f615a81dc361ce7f5d89aff0c341ed91cd0e4cce6a2000361023b006b10731ce0cc6c025bde5f5fe7d07fa85ca2af65a8ad4d50647e8dfa8ff7ad81f
+Size (ocaml-text-0.8.tar.gz) = 80898 bytes