- Update findlib to 1.3.3 (bugfix release)

- Convert to new style OPTIONS

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>

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