svn commit: r353041 - in head/math/ocaml-ocamlgraph: . files

[Johan van Selst]

Author: johans
Date: Mon May  5 20:59:40 2014
New Revision: 353041
URL: http://svnweb.freebsd.org/changeset/ports/353041
QAT: https://qat.redports.org/buildarchive/r353041/

Log:
  - Update to ocamlgraph 1.8.5
  - Remove patch that is now included upstream
  - Stagify

Deleted:
  head/math/ocaml-ocamlgraph/files/
Modified:
  head/math/ocaml-ocamlgraph/Makefile
  head/math/ocaml-ocamlgraph/distinfo
  head/math/ocaml-ocamlgraph/pkg-plist

Modified: head/math/ocaml-ocamlgraph/Makefile
==============================================================================
--- head/math/ocaml-ocamlgraph/Makefile	Mon May  5 20:47:22 2014	(r353040)
+++ head/math/ocaml-ocamlgraph/Makefile	Mon May  5 20:59:40 2014	(r353041)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ocamlgraph
-PORTVERSION=	1.8.3
+PORTVERSION=	1.8.5
 CATEGORIES=	math
 MASTER_SITES=	http://ocamlgraph.lri.fr/download/ \
 		ftp://ftp.stack.nl/pub/users/johans/ocamlgraph/
@@ -13,13 +13,17 @@ COMMENT=	Graph manipulation library for 
 
 OPTIONS_DEFINE=	GUI
 OPTIONS_DEFAULT=GUI
-GUI_DESC=	Include GUI user programs: viewer and editor
+OPTIONS_SUB=	yes
+GUI_DESC=		Include GUI user programs: viewer and editor
+GUI_BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+GUI_RUN_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+GUI_CONFIGURE_OFF=	LABLGTK2=no
 
+USES=		gmake
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAMLFIND_PLIST=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 PLIST_SUB+=	OCAMLGRAPHDIR="${OCAML_LIBDIR}/${PORTNAME}"
@@ -29,22 +33,11 @@ INSTALL_TARGET=	install install-findlib
 
 MAKE_JOBS_UNSAFE=	yes
 
-PORTSCOUT=	skipv:1.81
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGUI}
-BUILD_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-RUN_DEPENDS+=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
-PLIST_SUB+=	GUI=""
-.else
-CONFIGURE_ARGS+=	LABLGTK2=no
-PLIST_SUB+=		GUI="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MDOCS}
 ALL_TARGET+=	doc
+DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	*
 
 post-patch:
@@ -55,8 +48,8 @@ post-patch:
 .endif
 
 post-install:
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} * ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Modified: head/math/ocaml-ocamlgraph/distinfo
==============================================================================
--- head/math/ocaml-ocamlgraph/distinfo	Mon May  5 20:47:22 2014	(r353040)
+++ head/math/ocaml-ocamlgraph/distinfo	Mon May  5 20:59:40 2014	(r353041)
@@ -1,2 +1,2 @@
-SHA256 (ocamlgraph-1.8.3.tar.gz) = 0df7114b6b6a57125b9c998cc08870b6595fcfd6f2376a0e84cb666c1fd345bd
-SIZE (ocamlgraph-1.8.3.tar.gz) = 262876
+SHA256 (ocamlgraph-1.8.5.tar.gz) = d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f
+SIZE (ocamlgraph-1.8.5.tar.gz) = 269438

Modified: head/math/ocaml-ocamlgraph/pkg-plist
==============================================================================
--- head/math/ocaml-ocamlgraph/pkg-plist	Mon May  5 20:47:22 2014	(r353040)
+++ head/math/ocaml-ocamlgraph/pkg-plist	Mon May  5 20:59:40 2014	(r353041)
@@ -24,7 +24,9 @@
 %%OCAMLGRAPHDIR%%/graph.cmi
 %%OCAMLGRAPHDIR%%/graph.cmo
 %%OCAMLGRAPHDIR%%/graph.cmx
+%%OCAMLGRAPHDIR%%/graph.cmxs
 %%OCAMLGRAPHDIR%%/graph.cmxa
+%%OCAMLGRAPHDIR%%/graph.o
 %%OCAMLGRAPHDIR%%/graphml.mli
 %%OCAMLGRAPHDIR%%/graphviz.mli
 %%OCAMLGRAPHDIR%%/imperative.mli
@@ -39,6 +41,7 @@
 %%OCAMLGRAPHDIR%%/pack.mli
 %%OCAMLGRAPHDIR%%/path.mli
 %%OCAMLGRAPHDIR%%/persistent.mli
+%%OCAMLGRAPHDIR%%/prim.mli
 %%OCAMLGRAPHDIR%%/rand.mli
 %%OCAMLGRAPHDIR%%/sig.mli
 %%OCAMLGRAPHDIR%%/sig_pack.mli