svn commit: r349273 - head/devel/ocaml-findlib

[John Marino]

Author: marino
Date: Wed Mar 26 17:51:23 2014
New Revision: 349273
URL: http://svnweb.freebsd.org/changeset/ports/349273
QAT: https://qat.redports.org/buildarchive/r349273/

Log:
  Ocaml update 2/4: devel/ocaml-findlib adjust for Ocaml 4
  
  Tweak plist and support stage after Ocaml update.
  
  Urged by: portmgr (bapt)

Modified:
  head/devel/ocaml-findlib/Makefile
  head/devel/ocaml-findlib/pkg-plist

Modified: head/devel/ocaml-findlib/Makefile
==============================================================================
--- head/devel/ocaml-findlib/Makefile	Wed Mar 26 17:50:28 2014	(r349272)
+++ head/devel/ocaml-findlib/Makefile	Wed Mar 26 17:51:23 2014	(r349273)
@@ -3,6 +3,7 @@
 
 PORTNAME=	findlib
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
@@ -29,11 +30,16 @@ MAKE_JOBS_UNSAFE=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,path="@SITELIB@,&:${PREFIX}/${OCAML_LIBDIR},' \
 		${WRKSRC}/findlib.conf.in
 
 post-install:
+.if ${PORT_OPTIONS:MTOOLBOX}
+	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard
+.endif
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
 		"! -regex .*ref-man.*"

Modified: head/devel/ocaml-findlib/pkg-plist
==============================================================================
--- head/devel/ocaml-findlib/pkg-plist	Wed Mar 26 17:50:28 2014	(r349272)
+++ head/devel/ocaml-findlib/pkg-plist	Wed Mar 26 17:51:23 2014	(r349273)
@@ -3,7 +3,7 @@ bin/safe_camlp4
 etc/findlib.conf
 lib/ocaml/site-lib/bigarray/META
 lib/ocaml/site-lib/camlp4/META
-lib/ocaml/site-lib/dbm/META
+lib/ocaml/site-lib/compiler-libs/META
 lib/ocaml/site-lib/dynlink/META
 lib/ocaml/site-lib/findlib/META
 lib/ocaml/site-lib/findlib/Makefile.config
@@ -18,9 +18,7 @@ lib/ocaml/site-lib/findlib/fl_metascanne
 lib/ocaml/site-lib/findlib/fl_metatoken.cmi
 lib/ocaml/site-lib/findlib/fl_package_base.cmi
 lib/ocaml/site-lib/findlib/fl_package_base.mli
- at mode 755
 %%TOOLBOX%%lib/ocaml/site-lib/findlib/make_wizard
- at mode
 %%TOOLBOX%%lib/ocaml/site-lib/findlib/make_wizard.pattern
 lib/ocaml/site-lib/findlib/topfind.cmi
 lib/ocaml/site-lib/findlib/topfind.mli
@@ -139,8 +137,8 @@ man/man5/site-lib.5.gz
 @dirrm lib/ocaml/site-lib/graphics
 @dirrm lib/ocaml/site-lib/findlib
 @dirrm lib/ocaml/site-lib/dynlink
- at dirrm lib/ocaml/site-lib/dbm
 @dirrm lib/ocaml/site-lib/camlp4
+ at dirrm lib/ocaml/site-lib/compiler-libs
 @dirrm lib/ocaml/site-lib/bigarray
 @dirrmtry lib/ocaml/site-lib/labltk
 @dirrmtry lib/ocaml/site-lib