Updated package to newest version, 7.1.1. Package now also uses ocaml.mk.

Changes are mostly bugfixes, and major changes:
* Switched to Oasis for packaging
* Switched to OCamlBuild for the build process
* Added stricter compilation flags

7 files changed, 38 insertions, 67 deletions

diff --git a/devel/pcre-ocaml/Makefile b/devel/pcre-ocaml/Makefile
index b60891b1efe..47ed5481276 100644
--- a/devel/pcre-ocaml/Makefile
+++ b/devel/pcre-ocaml/Makefile
@@ -1,32 +1,29 @@
-# $NetBSD: Makefile,v 1.14 2013/11/01 11:30:22 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2014/10/09 19:39:24 jaapb Exp $
 
-DISTNAME=		pcre-ocaml-6.2.5
-PKGREVISION=		2
+DISTNAME=		pcre-ocaml-${VERSION}
+PKGNAME=	${DISTNAME} # avoid prefixing with ocaml
+VERSION=	7.1.1
 CATEGORIES=		devel
-MASTER_SITES=		http://www.ocaml.info/ocaml_sources/
+MASTER_SITES=		http://github.com/mmottl/pcre-ocaml/releases/download/v${VERSION}/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.ocaml.info/ocaml_sources/
+HOMEPAGE=		http://github.com/mmottl/pcre-ocaml
 COMMENT=		Perl compatible regular expressions for OCaml
 
-DEPENDS+=		ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
+OCAML_USE_OASIS=	yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "../../mk/ocaml.mk"
 
-USE_TOOLS+=		gmake pax
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST_SRC=		PLIST.opt PLIST
-.else
+.if ${OCAML_USE_OPT_COMPILER} != "yes"
 BUILD_TARGET=		byte
 .endif
 
 EGDIR=			${PREFIX}/share/examples/pcre-ocaml
-INSTALLATION_DIRS=	${EGDIR} lib/ocaml/site-lib/pcre
+INSTALLATION_DIRS+=	${EGDIR}
 
 post-install:
 	cd ${WRKSRC}/examples && pax -rw -pm . ${DESTDIR}${EGDIR}
 
 .include "../../devel/pcre/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pcre-ocaml/PLIST b/devel/pcre-ocaml/PLIST
index 18d3cb81734..95e24a0d8d9 100644
--- a/devel/pcre-ocaml/PLIST
+++ b/devel/pcre-ocaml/PLIST
@@ -1,27 +1,21 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:02 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/10/09 19:39:24 jaapb Exp $
 lib/ocaml/site-lib/pcre/META
 lib/ocaml/site-lib/pcre/dllpcre_stubs.so
 lib/ocaml/site-lib/pcre/libpcre_stubs.a
+${PLIST.ocaml-opt}lib/ocaml/site-lib/pcre/pcre.a
 lib/ocaml/site-lib/pcre/pcre.cma
+${PLIST.ocaml-opt}lib/ocaml/site-lib/pcre/pcre.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/pcre/pcre.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/pcre/pcre.cmxs
 lib/ocaml/site-lib/pcre/pcre.cmi
 lib/ocaml/site-lib/pcre/pcre.mli
-share/examples/pcre-ocaml/OMakefile
-share/examples/pcre-ocaml/cloc/Makefile
-share/examples/pcre-ocaml/cloc/OMakefile
-share/examples/pcre-ocaml/cloc/README
+share/examples/pcre-ocaml/cloc/README.md
 share/examples/pcre-ocaml/cloc/cloc.ml
-share/examples/pcre-ocaml/cloc/make_win32_cloc.bat
-share/examples/pcre-ocaml/count_hash/Makefile
-share/examples/pcre-ocaml/count_hash/OMakefile
-share/examples/pcre-ocaml/count_hash/README
+share/examples/pcre-ocaml/count_hash/README.md
 share/examples/pcre-ocaml/count_hash/count_hash.ml
-share/examples/pcre-ocaml/pcregrep/Makefile
-share/examples/pcre-ocaml/pcregrep/OMakefile
-share/examples/pcre-ocaml/pcregrep/README
+share/examples/pcre-ocaml/pcregrep/README.md
 share/examples/pcre-ocaml/pcregrep/pcregrep.ml
-share/examples/pcre-ocaml/subst/Makefile
-share/examples/pcre-ocaml/subst/OMakefile
-share/examples/pcre-ocaml/subst/README
+share/examples/pcre-ocaml/subst/README.md
 share/examples/pcre-ocaml/subst/subst.ml
 @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/pcre
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/pcre
diff --git a/devel/pcre-ocaml/PLIST.opt b/devel/pcre-ocaml/PLIST.opt
deleted file mode 100644
index f5b8aa70003..00000000000
--- a/devel/pcre-ocaml/PLIST.opt
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.opt,v 1.1 2007/06/09 11:05:00 rillig Exp $
-lib/ocaml/site-lib/pcre/pcre.a
-lib/ocaml/site-lib/pcre/pcre.cmxa
diff --git a/devel/pcre-ocaml/distinfo b/devel/pcre-ocaml/distinfo
index 9b6f68ba1b3..37682c54bad 100644
--- a/devel/pcre-ocaml/distinfo
+++ b/devel/pcre-ocaml/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.7 2012/03/04 09:42:31 asau Exp $
+$NetBSD: distinfo,v 1.8 2014/10/09 19:39:24 jaapb Exp $
 
-SHA1 (pcre-ocaml-6.2.5.tar.gz) = 921094ba7a810a364c119d1099952551c90d19ec
-RMD160 (pcre-ocaml-6.2.5.tar.gz) = 3cb71ae407e1396ab83fa08df9fcd41aacba817f
-Size (pcre-ocaml-6.2.5.tar.gz) = 60724 bytes
-SHA1 (patch-aa) = ca5d18ecd52cd4a8866eb0fe1dc5a99e6f7fe067
-SHA1 (patch-ab) = d8994bb6b523a51ad02217959209dfebdb12390f
+SHA1 (pcre-ocaml-7.1.1.tar.gz) = daf8b469f80bf6c391229ccf8fcf2336d5b59cd0
+RMD160 (pcre-ocaml-7.1.1.tar.gz) = bb8287ea053cb160d72f49fb9d32dc3c2c74f177
+Size (pcre-ocaml-7.1.1.tar.gz) = 86796 bytes
+SHA1 (patch-myocamlbuild.ml) = 85b920a2c09028466c5fe8462b1071fd3586e701
diff --git a/devel/pcre-ocaml/patches/patch-aa b/devel/pcre-ocaml/patches/patch-aa
deleted file mode 100644
index d04a7a30bd4..00000000000
--- a/devel/pcre-ocaml/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2012/03/04 09:42:31 asau Exp $
-
---- Makefile.orig	2012-01-04 20:28:16.000000000 +0400
-+++ Makefile	2012-03-04 13:33:24.000000000 +0400
-@@ -2,9 +2,12 @@
- 
- EXAMPLES = $(filter-out examples/OMakefile examples/CVS, $(wildcard examples/*))
- 
--.PHONY: all
--all:
--	@cd lib && $(MAKE) byte-code-library native-code-library
-+.PHONY: all byte
-+all: byte
-+	@cd lib && $(MAKE) native-code-library
-+
-+byte:
-+	@cd lib && $(MAKE) byte-code-library
- 
- .PHONY:	examples
- examples:
diff --git a/devel/pcre-ocaml/patches/patch-ab b/devel/pcre-ocaml/patches/patch-ab
deleted file mode 100644
index a6c5380fe8d..00000000000
--- a/devel/pcre-ocaml/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2012/03/04 09:42:31 asau Exp $
-
---- lib/Makefile.orig	2012-01-04 20:28:16.000000000 +0400
-+++ lib/Makefile	2012-03-04 13:34:16.000000000 +0400
-@@ -1,4 +1,5 @@
- OCAMLMAKEFILE = ../OCamlMakefile
-+OCAMLFIND_INSTFLAGS = -optional -destdir ${DESTDIR}`$(OCAMLC) -where `/site-lib -ldconf /dev/null
- 
- SOURCES := pcre.mli pcre.ml pcre_stubs.c
- CFLAGS := -O2 $(shell pcre-config --cflags)
diff --git a/devel/pcre-ocaml/patches/patch-myocamlbuild.ml b/devel/pcre-ocaml/patches/patch-myocamlbuild.ml
new file mode 100644
index 00000000000..ae84f88ee1e
--- /dev/null
+++ b/devel/pcre-ocaml/patches/patch-myocamlbuild.ml
@@ -0,0 +1,14 @@
+$NetBSD: patch-myocamlbuild.ml,v 1.1 2014/10/09 19:39:24 jaapb Exp $
+
+Deal with reorder issues by linking pcre_stubs statically
+--- myocamlbuild.ml.orig	2014-07-06 14:49:44.000000000 +0000
++++ myocamlbuild.ml
+@@ -539,7 +539,7 @@ module MyOCamlbuildBase = struct
+                         A("-l"^(nm_libstubs lib))]);
+ 
+                    flag ["link"; "library"; "ocaml"; "native"; tag_libstubs lib]
+-                     (S[A"-cclib"; A("-l"^(nm_libstubs lib))]);
++                     (S[A"-cclib"; A("lib/lib"^(nm_libstubs lib)^".a")]);
+ 
+                    flag ["link"; "program"; "ocaml"; "byte"; tag_libstubs lib]
+                      (S[A"-dllib"; A("dll"^(nm_libstubs lib))]);