aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorJohan van Selst <johans@FreeBSD.org>2012-07-13 08:32:10 +0000
committerJohan van Selst <johans@FreeBSD.org>2012-07-13 08:32:10 +0000
commitc2f1835b18f40902502f40917bb2ad619fda2fe5 (patch)
treec9f707538e71a14023dc014357df44f08833a9dd /devel
parent67d4569bfd476517de71401960828a37fe45e47e (diff)
downloadports-c2f1835b18f40902502f40917bb2ad619fda2fe5.tar.gz
ports-c2f1835b18f40902502f40917bb2ad619fda2fe5.zip
Notes
Diffstat (limited to 'devel')
-rw-r--r--devel/ocaml-findlib/Makefile26
-rw-r--r--devel/ocaml-findlib/distinfo4
2 files changed, 18 insertions, 12 deletions
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 1a3508784b90..dcf6cf734bc3 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= findlib
-PORTVERSION= 1.3.2
+PORTVERSION= 1.3.3
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/
PKGNAMEPREFIX= ocaml-
@@ -28,6 +28,10 @@ CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \
-sitelib "${PREFIX}/lib/ocaml/site-lib" \
-config "${PREFIX}/etc/findlib.conf"
+OPTIONS_DEFINE= TOOLBOX
+OPTIONS_DEFAULT=TOOLBOX
+TOOLBOX_DESC= Include toolbox interface (requires OCaml with TK)
+
DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}
PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]]
@@ -48,27 +52,29 @@ post-patch:
-e 's,path="@SITELIB@,&:${PREFIX}/lib/ocaml,' \
${WRKSRC}/findlib.conf.in
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if !exists(${LOCALBASE}/lib/ocaml/labltk)
-WITHOUT_TK= yes
+.if ${PORT_OPTIONS:MTOOLBOX} && \
+ exists(${LOCALBASE}/bin/ocaml) && \
+ !exists(${LOCALBASE}/lib/ocaml/labltk)
+IGNORE= either build OCaml with TK support or disable TOOLBOX
.endif
-.if defined(WITHOUT_TK)
-PLIST_SUB+= TK="@comment "
-.else
+.if ${PORT_OPTIONS:MTOOLBOX}
CONFIGURE_ARGS+=-with-toolbox
PLIST_SUB+= TK=""
+.else
+PLIST_SUB+= TK="@comment "
.endif
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DOCSDIR} \
"! -regex .*ref-man.*")
.endif
-.if !defined(WITHOUT_TK)
+.if ${PORT_OPTIONS:MTOOLBOX}
@${CHMOD} +x ${PREFIX}/lib/ocaml/site-lib/findlib/make_wizard
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ocaml-findlib/distinfo b/devel/ocaml-findlib/distinfo
index 778723ddd4fd..143e0ae8b345 100644
--- a/devel/ocaml-findlib/distinfo
+++ b/devel/ocaml-findlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (findlib-1.3.2.tar.gz) = 056450c2449aee2a61335cfa1d96f2fb1a14ad50bcd99d7ddf9308307ba90bc3
-SIZE (findlib-1.3.2.tar.gz) = 230556
+SHA256 (findlib-1.3.3.tar.gz) = 981f5c67118a2be015efa79f3af3cb0063376b93123b5d695e7cb5c586b1d45c
+SIZE (findlib-1.3.3.tar.gz) = 231414