- Update ocaml-pcre to 7.0.2

- Remove patch that is no longer necessary
- Cleanup Makefile

4 files changed, 8 insertions, 52 deletions

diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index 8f9de58c0af0..9ea153237c52 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -1,32 +1,23 @@
-# New ports collection makefile for:   ocaml-pcre
-# Date created:        21 April 2002
-# Whom:                Henrik Motakef <henrik.motakef@web.de>
-#
+# Created by: Henrik Motakef <henrik.motakef@web.de>
 # $FreeBSD$
-#
 
 PORTNAME=	pcre
-PORTVERSION=	6.2.5
-PORTREVISION=	2
+PORTVERSION=	7.0.2
 CATEGORIES=	devel
-MASTER_SITES=	http://hg.ocaml.info/release/pcre-ocaml/archive/
+MASTER_SITES=	http://cdn.bitbucket.org/mmottl/pcre-ocaml/downloads/
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	release-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Perl compatible regular expressions for Objective Caml
 
-LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
-WRKSRC=		${WRKDIR}/pcre-ocaml-${DISTNAME}
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
-USE_BZIP2=	yes
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	LIBDIRS="${LOCALBASE}/lib"
 
-USE_GMAKE=	yes
+PORTEXAMPLES=	*
 EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
 
 post-install:
diff --git a/devel/ocaml-pcre/distinfo b/devel/ocaml-pcre/distinfo
index 310bd44765b0..b62c8a230d5a 100644
--- a/devel/ocaml-pcre/distinfo
+++ b/devel/ocaml-pcre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (release-6.2.5.tar.bz2) = 7c999e2cd9bccd815682eee155ad76e78c99d790f855b1ce562ddd54ae803d72
-SIZE (release-6.2.5.tar.bz2) = 53406
+SHA256 (pcre-ocaml-7.0.2.tar.gz) = 052a2fdd8da597724ac8ca474fdd40772b461888e3ff8ef75cc71e43a65766ea
+SIZE (pcre-ocaml-7.0.2.tar.gz) = 81910
diff --git a/devel/ocaml-pcre/files/patch-lib_Makefile b/devel/ocaml-pcre/files/patch-lib_Makefile
deleted file mode 100644
index d9c1b6c3e86c..000000000000
--- a/devel/ocaml-pcre/files/patch-lib_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.orig	2009-03-09 09:14:29.000000000 +0100
-+++ lib/Makefile	2009-03-09 09:14:35.000000000 +0100
-@@ -1,7 +1,7 @@
- OCAMLMAKEFILE = ../OCamlMakefile
- 
- SOURCES := pcre.mli pcre.ml pcre_stubs.c
--CFLAGS := -O2 $(shell pcre-config --cflags)
-+CFLAGS += $(shell pcre-config --cflags)
- PCRE_FLAGS := $(shell pcre-config --libs)
- OCAMLLDFLAGS := -cclib "$(PCRE_FLAGS)"
- OCAMLMKLIB_FLAGS := $(PCRE_FLAGS)
diff --git a/devel/ocaml-pcre/pkg-plist b/devel/ocaml-pcre/pkg-plist
index a362f1039a81..7eef1ba612ad 100644
--- a/devel/ocaml-pcre/pkg-plist
+++ b/devel/ocaml-pcre/pkg-plist
@@ -6,27 +6,3 @@
 %%OCAML_SITELIBDIR%%/pcre/pcre.cmi
 %%OCAML_SITELIBDIR%%/pcre/pcre.cmxa
 %%OCAML_SITELIBDIR%%/pcre/pcre.mli
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OMakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cloc/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cloc/OMakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cloc/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cloc/cloc.ml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cloc/make_win32_cloc.bat
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/count_hash/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/count_hash/OMakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/count_hash/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/count_hash/count_hash.ml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcregrep/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcregrep/OMakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcregrep/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pcregrep/pcregrep.ml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subst/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subst/OMakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subst/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/subst/subst.ml
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/subst
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/pcregrep
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/count_hash
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cloc
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTEXAMPLES%%@dirrmtry share/examples/ocaml