Index: head/math/ocaml-ocamlgraph/Makefile
===================================================================
--- head/math/ocaml-ocamlgraph/Makefile	(revision 564014)
+++ head/math/ocaml-ocamlgraph/Makefile	(revision 564015)
@@ -1,58 +1,53 @@
 # Created by: Joseph Koshy <jkoshy@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ocamlgraph
 PORTVERSION=	1.8.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	http://ocamlgraph.lri.fr/download/ \
 		ftp://ftp.stack.nl/pub/users/johans/ocamlgraph/
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graph manipulation library for OCaml
 
 USES=		gmake
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAMLFIND_PLIST=	yes
 OCAML_LDLIBS=	${OCAML_LIBDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install
 
 MAKE_JOBS_UNSAFE=	yes
 PORTSCOUT=	skipv:1.81
 
 PLIST_SUB=	OCAMLGRAPHDIR="${OCAML_LDLIBS}"
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	GUI DOCS
-OPTIONS_DEFAULT=GUI
+OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
-GUI_DESC=		Include GUI user programs: viewer and editor
-GUI_BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
-GUI_RUN_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
-GUI_CONFIGURE_OFF=	LABLGTK2=no
 
 DOCS_ALL_TARGET=	doc
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e '/VIEWER_DIR. doc/d' ${WRKSRC}/Makefile.in
 
-post-patch-GUI-off:
+post-patch:
 	# Override auto-detection
 	@${REINPLACE_CMD} -Ee 's/(LABLGTK2)=yes/\1=no/' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/META ${STAGEDIR}${PREFIX}/${OCAML_LDLIBS}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/math/ocaml-ocamlgraph/pkg-plist
===================================================================
--- head/math/ocaml-ocamlgraph/pkg-plist	(revision 564014)
+++ head/math/ocaml-ocamlgraph/pkg-plist	(revision 564015)
@@ -1,76 +1,49 @@
-%%GUI%%bin/graph-viewer.byte
-%%GUI%%bin/graph-viewer.opt
-%%GUI%%bin/graph-viewer
-%%GUI%%bin/graph-editor.byte
-%%GUI%%bin/graph-editor.opt
-%%GUI%%bin/graph-editor
 %%OCAMLGRAPHDIR%%/META
 %%OCAMLGRAPHDIR%%/builder.mli
 %%OCAMLGRAPHDIR%%/classic.mli
 %%OCAMLGRAPHDIR%%/clique.mli
 %%OCAMLGRAPHDIR%%/cliquetree.mli
 %%OCAMLGRAPHDIR%%/coloring.mli
 %%OCAMLGRAPHDIR%%/components.mli
 %%OCAMLGRAPHDIR%%/contraction.mli
 %%OCAMLGRAPHDIR%%/delaunay.mli
 %%OCAMLGRAPHDIR%%/dominator.mli
 %%OCAMLGRAPHDIR%%/dot.mli
 %%OCAMLGRAPHDIR%%/dot_ast.mli
 %%OCAMLGRAPHDIR%%/dot_parser.mli
 %%OCAMLGRAPHDIR%%/fixpoint.mli
 %%OCAMLGRAPHDIR%%/flow.mli
 %%OCAMLGRAPHDIR%%/gmap.mli
 %%OCAMLGRAPHDIR%%/gml.mli
 %%OCAMLGRAPHDIR%%/graph.a
 %%OCAMLGRAPHDIR%%/graph.cma
 %%OCAMLGRAPHDIR%%/graph.cmi
 %%OCAMLGRAPHDIR%%/graph.cmo
 %%OCAMLGRAPHDIR%%/graph.cmx
 %%OCAMLGRAPHDIR%%/graph.cmxa
 %%OCAMLGRAPHDIR%%/graph.cmxs
 %%OCAMLGRAPHDIR%%/graph.o
 %%OCAMLGRAPHDIR%%/graphml.mli
 %%OCAMLGRAPHDIR%%/graphviz.mli
 %%OCAMLGRAPHDIR%%/imperative.mli
 %%OCAMLGRAPHDIR%%/kruskal.mli
 %%OCAMLGRAPHDIR%%/leaderlist.mli
 %%OCAMLGRAPHDIR%%/mcs_m.mli
 %%OCAMLGRAPHDIR%%/md.mli
 %%OCAMLGRAPHDIR%%/merge.mli
 %%OCAMLGRAPHDIR%%/mincut.mli
 %%OCAMLGRAPHDIR%%/minsep.mli
 %%OCAMLGRAPHDIR%%/nonnegative.mli
 %%OCAMLGRAPHDIR%%/oper.mli
 %%OCAMLGRAPHDIR%%/pack.mli
 %%OCAMLGRAPHDIR%%/path.mli
 %%OCAMLGRAPHDIR%%/persistent.mli
 %%OCAMLGRAPHDIR%%/prim.mli
 %%OCAMLGRAPHDIR%%/rand.mli
 %%OCAMLGRAPHDIR%%/sig.mli
 %%OCAMLGRAPHDIR%%/sig_pack.mli
 %%OCAMLGRAPHDIR%%/strat.mli
 %%OCAMLGRAPHDIR%%/topological.mli
 %%OCAMLGRAPHDIR%%/traverse.mli
 %%OCAMLGRAPHDIR%%/util.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphContainer.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphModel.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphRandModel.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphSubTree.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphTreeLayout.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphTreeModel.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphView.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dGraphViewItem.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/dgraph.cmi
-%%GUI%%%%OCAMLGRAPHDIR%%/dgraph.cmo
-%%GUI%%%%OCAMLGRAPHDIR%%/dgraph.cmx
-%%GUI%%%%OCAMLGRAPHDIR%%/dgraph.o
-%%GUI%%%%OCAMLGRAPHDIR%%/viewGraph_core.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/viewGraph_select.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/viewGraph_utils.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/viewgraph.cmi
-%%GUI%%%%OCAMLGRAPHDIR%%/viewgraph.cmo
-%%GUI%%%%OCAMLGRAPHDIR%%/viewgraph.cmx
-%%GUI%%%%OCAMLGRAPHDIR%%/viewgraph.o
-%%GUI%%%%OCAMLGRAPHDIR%%/xDot.mli
-%%GUI%%%%OCAMLGRAPHDIR%%/xDotDraw.mli
-@comment @dir %%OCAML_SITELIBDIR%%
+@dir %%OCAML_SITELIBDIR%%