5 files changed, 58 insertions, 46 deletions

diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index bc6b08dacc60..b78ca86521a2 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pcre
-PORTVERSION=	5.11.1
+PORTVERSION=	5.11.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.ocaml.info/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
@@ -15,45 +15,30 @@ DISTNAME=	pcre-ocaml-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl compatible regular expressions for Objective Caml
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre-utf8
 
-USE_GMAKE=	yes
-MAKE_ENV=	OCAML_LIB_INSTALL="${PREFIX}/lib/ocaml/site-lib/pcre" \
-		INCDIRS="${LOCALBASE}/include" LIBDIRS="${LOCALBASE}/lib" \
-		OCAMLFIND_DESTDIR="${PREFIX}/lib/ocaml/site-lib"
-.if !defined(WITH_CUSTOM)
-MAKE_ENV+=	NO_CUSTOM=y
-.endif
-ALL_TARGET=	all
-
-.if defined(WITH_DOCS)
-BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX
-USE_GHOSTSCRIPT_BUILD=	yes
-ALL_TARGET+=	doc
-PORTDOCS=	*
+USE_OCAML=	yes
+USE_OCAML_FINDLIB=	yes
+USE_OCAML_LDCONFIG=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+MAKE_ENV+=	LIBDIRS="${LOCALBASE}/lib"
 
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
-.endif
+USE_GMAKE=	yes
+EXAMPLESDIR=	${OCAML_EXAMPLESDIR}/${PORTNAME}
 
-PKGDEINSTALL=	${PKGINSTALL}
+# XXX: exists untill it will be committed to bsd.port.mk
+COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
+		2>&1) && \
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
+		${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \
+		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
 
 post-install:
-	@${FIND} ${PREFIX}/lib/ocaml/site-lib/pcre -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/pcre" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ocamlfind remove pcre 2>/dev/null || true" >> ${TMPPLIST}
-.if defined(WITH_DOCS)
-	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
-	@${FIND} ${EXAMPLESDIR} -type f | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/)
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk"
+.include <bsd.port.post.mk>
diff --git a/devel/ocaml-pcre/distinfo b/devel/ocaml-pcre/distinfo
index bd79b79501f6..10783c7c5541 100644
--- a/devel/ocaml-pcre/distinfo
+++ b/devel/ocaml-pcre/distinfo
@@ -1,3 +1,3 @@
-MD5 (pcre-ocaml-5.11.1.tar.gz) = ac84976d5f579f396f06704297cc7f0d
-SHA256 (pcre-ocaml-5.11.1.tar.gz) = 9335374b0de7268a23e23ccd2cdf48be10e2628f8a731408d4c2e8cd745e20cb
-SIZE (pcre-ocaml-5.11.1.tar.gz) = 52950
+MD5 (pcre-ocaml-5.11.2.tar.gz) = 45e2f94341a3ba3625edd092be9d044a
+SHA256 (pcre-ocaml-5.11.2.tar.gz) = e1f38b513fed407d00b490641f86b3adfea31cb650a88a8843ac26592c3b911c
+SIZE (pcre-ocaml-5.11.2.tar.gz) = 53037
diff --git a/devel/ocaml-pcre/files/patch-lib_Makefile b/devel/ocaml-pcre/files/patch-lib_Makefile
new file mode 100644
index 000000000000..23dce841ce20
--- /dev/null
+++ b/devel/ocaml-pcre/files/patch-lib_Makefile
@@ -0,0 +1,10 @@
+--- lib/Makefile.orig	Sat Dec  9 20:39:45 2006
++++ lib/Makefile	Sat Dec  9 20:39:49 2006
+@@ -1,7 +1,6 @@
+ OCAMLMAKEFILE = ../OCamlMakefile
+ 
+ SOURCES   = pcre.mli pcre.ml pcre_stubs.c
+-CFLAGS    = -O2
+ CLIBS	  = pcre
+ RESULT    = pcre
+ 
diff --git a/devel/ocaml-pcre/pkg-install b/devel/ocaml-pcre/pkg-install
deleted file mode 100644
index 0e6794709dfd..000000000000
--- a/devel/ocaml-pcre/pkg-install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-INSTALL" ]; then
-  echo "${PKG_PREFIX}/lib/ocaml/site-lib/pcre" >> ${PKG_PREFIX}/lib/ocaml/ld.conf
-elif [ "$2" = "DEINSTALL" ]; then
-  mv ${PKG_PREFIX}/lib/ocaml/ld.conf ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
-  grep -v pcre ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp > ${PKG_PREFIX}/lib/ocaml/ld.conf
-  rm -f ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
-fi
diff --git a/devel/ocaml-pcre/pkg-plist b/devel/ocaml-pcre/pkg-plist
new file mode 100644
index 000000000000..6537724fc253
--- /dev/null
+++ b/devel/ocaml-pcre/pkg-plist
@@ -0,0 +1,26 @@
+%%OCAML_SITELIBDIR%%/pcre/META
+%%OCAML_SITELIBDIR%%/pcre/dllpcre_stubs.so
+%%OCAML_SITELIBDIR%%/pcre/libpcre_stubs.a
+%%OCAML_SITELIBDIR%%/pcre/pcre.a
+%%OCAML_SITELIBDIR%%/pcre/pcre.cma
+%%OCAML_SITELIBDIR%%/pcre/pcre.cmi
+%%OCAML_SITELIBDIR%%/pcre/pcre.cmxa
+%%OCAML_SITELIBDIR%%/pcre/pcre.mli
+%%PORTDOCS%%%%EXAMPLESDIR%%/cloc/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/cloc/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/cloc/cloc.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/count_hash/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/count_hash/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/count_hash/count_hash.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/pcregrep/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/pcregrep/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/pcregrep/pcregrep.ml
+%%PORTDOCS%%%%EXAMPLESDIR%%/subst/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/subst/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/subst/subst.ml
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/subst
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/pcregrep
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/count_hash
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/cloc
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry share/examples/ocaml