CVS commit: pkgsrc/devel/ocamlgraph

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Fri Jun 17 16:31:30 UTC 2016

Modified Files:
        pkgsrc/devel/ocamlgraph: Makefile PLIST distinfo
        pkgsrc/devel/ocamlgraph/patches: patch-Makefile.in

Log Message:
Updated package to latest version, 1.8.7. Changes include:

version 1.8.7, April 12, 2016
-----------------------------
 o fixed examples/demo.ml so that it also compiles with an installed OCamlGraph
 o [Components] fixed stack overflow with [scc] (patch by Albin Coquereau)
 o [Dominator] fixed stack overflow (patch by Albin Coquereau)
 o new functor [Path.Johnson] to compute all pairs of shortest paths
   using Johnson's algorithm (contributed by M�rio Pereira)
 o fixed configuration on Windows (patch by Martin R. Neuh�u�er)
 o new functor [Components.Undirected] to compute connected components
 o Graphviz: fixed printing of attribute BgcolorWithTransparency
 * Prim, Nonnegative: function weight now has the more general type "edge -> t"
   (to be consistent with Path)
 o new module type Sig.WEIGHT (used in Path, Prim, and Nonnegative)
 o Fixpoint: do not catch Not_found raised by a user-provided function.
 o Adding folds to BFS.

version 1.8.6, January 23, 2015
-------------------------------
 * Dominator: new functor [Make_graph] with may use graph building operations,
   while the old functor [Make] now only requires a read-only graph.
   Function [compute_all] and [compute_dom_graph] are now only defined in the
   new [Make_graph] functor.
 o Graphviz: support for additional polygonal-shapes
 o New module Clique (contributed by Giselle Reis)
 o Avoid ocamldoc error with OCaml 4.02
 * Path: function weight now has the more general type "edge -> t"
   (contributed by Steffen Smolka)
   update your code by turning "weight l" into "weight (G.E.label e)"
 o installation: "make install-findlib" now uses DESTDIR when defined
 o Traverse: documentation is clarified: providing iterators over the roots of
   the graph is enough.
 o Imperative concreate (di)graph: fix bug of functions add_edge* of imperative
   concrete (di)graphs which appears when the added edge [e] was already in the
   graph [g] and one of the vertices of [e] is equal to another vertex of [g]
   (when using the user-defined equality [G.V.equal]), but not physically equal
   to it. This bug only occurs with OCaml version >= 4.0.
 o functions in modules Components, Dominator, Flow, Topological and Traverse
   now create smaller auxiliary hash tables
 o Graphviz: add the attribute `HtmlLabel to specify html strings.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocamlgraph/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocamlgraph/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocamlgraph/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocamlgraph/Makefile
diff -u pkgsrc/devel/ocamlgraph/Makefile:1.11 pkgsrc/devel/ocamlgraph/Makefile:1.12
--- pkgsrc/devel/ocamlgraph/Makefile:1.11       Thu May  5 11:45:39 2016
+++ pkgsrc/devel/ocamlgraph/Makefile    Fri Jun 17 16:31:30 2016
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2016/05/05 11:45:39 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/17 16:31:30 jaapb Exp $
 
-DISTNAME=      ocamlgraph-1.8.5
-PKGREVISION=   9
+DISTNAME=      ocamlgraph-1.8.7
 CATEGORIES=    devel
 MASTER_SITES=  http://ocamlgraph.lri.fr/download/
 

Index: pkgsrc/devel/ocamlgraph/PLIST
diff -u pkgsrc/devel/ocamlgraph/PLIST:1.1 pkgsrc/devel/ocamlgraph/PLIST:1.2
--- pkgsrc/devel/ocamlgraph/PLIST:1.1   Sun Oct 26 13:43:48 2014
+++ pkgsrc/devel/ocamlgraph/PLIST       Fri Jun 17 16:31:30 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/10/26 13:43:48 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/06/17 16:31:30 jaapb Exp $
 ${PLIST.lablgtk}bin/graph-editor
 ${PLIST.lablgtk}bin/graph-viewer
 ${PLIST.lablgtk}${OCAML_SITELIB}/ocamlgraph/dgraph.cmi
@@ -13,6 +13,7 @@ ${PLIST.ocaml-opt}${PLIST.lablgtk}${OCAM
 ${OCAML_SITELIB}/ocamlgraph/META
 ${OCAML_SITELIB}/ocamlgraph/builder.mli
 ${OCAML_SITELIB}/ocamlgraph/classic.mli
+${OCAML_SITELIB}/ocamlgraph/clique.mli
 ${OCAML_SITELIB}/ocamlgraph/cliquetree.mli
 ${OCAML_SITELIB}/ocamlgraph/coloring.mli
 ${OCAML_SITELIB}/ocamlgraph/components.mli
@@ -48,6 +49,7 @@ ${OCAML_SITELIB}/ocamlgraph/leaderlist.m
 ${OCAML_SITELIB}/ocamlgraph/mcs_m.mli
 ${OCAML_SITELIB}/ocamlgraph/md.mli
 ${OCAML_SITELIB}/ocamlgraph/merge.mli
+${OCAML_SITELIB}/ocamlgraph/mincut.mli
 ${OCAML_SITELIB}/ocamlgraph/minsep.mli
 ${OCAML_SITELIB}/ocamlgraph/nonnegative.mli
 ${OCAML_SITELIB}/ocamlgraph/oper.mli

Index: pkgsrc/devel/ocamlgraph/distinfo
diff -u pkgsrc/devel/ocamlgraph/distinfo:1.2 pkgsrc/devel/ocamlgraph/distinfo:1.3
--- pkgsrc/devel/ocamlgraph/distinfo:1.2        Tue Nov  3 03:27:53 2015
+++ pkgsrc/devel/ocamlgraph/distinfo    Fri Jun 17 16:31:30 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 03:27:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/06/17 16:31:30 jaapb Exp $
 
-SHA1 (ocamlgraph-1.8.5.tar.gz) = e53a92d50685ab38f2b856eb64d93aa36dc7bcdf
-RMD160 (ocamlgraph-1.8.5.tar.gz) = c3b67023bae65f9c8a2d32722d0e90a6a947d4fa
-SHA512 (ocamlgraph-1.8.5.tar.gz) = e3bf7f43f7b5167cbd23ea44a510d1a569d35771882ab7ae83bacc73822c5f4c944f62c95e0efa813b765e1e385a6b3ebff342cbf1c5589c73d022b8591a52dc
-Size (ocamlgraph-1.8.5.tar.gz) = 269438 bytes
-SHA1 (patch-Makefile.in) = ce8d401563d37fea0780787dbd81a7e03455c01f
+SHA1 (ocamlgraph-1.8.7.tar.gz) = d6a8d92ead78b48655db13e7fd13e2fc7d305121
+RMD160 (ocamlgraph-1.8.7.tar.gz) = 63be5297b1bc62d13c411cc0eafee9cada21a980
+SHA512 (ocamlgraph-1.8.7.tar.gz) = 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e
+Size (ocamlgraph-1.8.7.tar.gz) = 272625 bytes
+SHA1 (patch-Makefile.in) = f0376c5aab2db6ec873a81d0e071d0634f86b2cc

Index: pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in
diff -u pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in:1.1 pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in:1.2
--- pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in:1.1       Sun Oct 26 13:43:48 2014
+++ pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in   Fri Jun 17 16:31:30 2016
@@ -1,7 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/10/26 13:43:48 jaapb Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2016/06/17 16:31:30 jaapb Exp $
 
 Change configure procedure to use pkgsrc settings rather than detection
---- Makefile.in.orig   2014-04-04 12:45:43.000000000 +0000
+Also install in site-lib
+--- Makefile.in.orig   2016-04-12 06:47:31.000000000 +0000
 +++ Makefile.in
 @@ -33,7 +33,7 @@ OCAMLDOC = @OCAMLDOC@
  OCAMLLEX = @OCAMLLEX@
@@ -22,15 +23,15 @@ Change configure procedure to use pkgsrc
  else
  all: byte $(OCAMLBEST)
 @@ -240,7 +240,7 @@ $(DGRAPH_DIR)/dgraph.opt: $(CMXA) $(DGRA
- # while graph.cmi may be required at the same time by some .cmo of the 
- # bytecodes, leading to tentative access to a corrupted graph.cmi. 
+ # while graph.cmi may be required at the same time by some .cmo of the
+ # bytecodes, leading to tentative access to a corrupted graph.cmi.
  
 -ifeq (@LABLGNOMECANVAS@,yes)
 +ifeq (${USE_LABLGTK},yes)
  graph.cmx: | $(DGRAPH_DIR)/dgraph.byte \
        $(VIEWER_DIR)/viewgraph.byte \
        $(ED_DIR)/editor.byte
-@@ -378,7 +378,7 @@ INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/oca
+@@ -381,7 +381,7 @@ INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/oca
  
  install: install-$(OCAMLBEST) install-byte
        mkdir -p $(BINDIR)
@@ -39,7 +40,7 @@ Change configure procedure to use pkgsrc
  ifeq ($(OCAMLBEST),byte)
        cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE)
        cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE)
-@@ -392,7 +392,7 @@ install-byte:
+@@ -395,7 +395,7 @@ install-byte:
        mkdir -p $(INSTALL_LIBDIR)
        cp -f graph.cmo graph.cmi $(CMA) $(INSTALL_LIBDIR)
        cp -f $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
@@ -48,7 +49,7 @@ Change configure procedure to use pkgsrc
        mkdir -p $(BINDIR)
        cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte
        cp -f $(VIEWER_CMILIB) $(VIEWER_CMOLIB) $(INSTALL_LIBDIR)
-@@ -406,7 +406,7 @@ install-opt: install-byte
+@@ -409,7 +409,7 @@ install-opt: install-byte
        cp -f graph$(OBJEXT) graph$(LIBEXT) graph.cmi graph.cmx \
                $(CMXA) $(CMXS) $(INSTALL_LIBDIR)
        cp -f $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
@@ -57,16 +58,22 @@ Change configure procedure to use pkgsrc
        mkdir -p $(BINDIR)
        cp -f $(ED_DIR)/editor.opt $(BINDIR)/graph-editor.opt
        cp -f $(VIEWER_CMILIB) $(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) \
-@@ -419,7 +419,7 @@ endif
+@@ -421,12 +421,12 @@ ifeq (@LABLGNOMECANVAS@,yes)
+ endif
+ 
+ ifdef DESTDIR
+-OCAMLFINDDEST := -destdir $(DESTDIR)
++OCAMLFINDDEST := -destdir $(DESTDIR)${PREFIX}/${OCAML_SITELIBDIR}
+ endif
  
  install-findlib: META
  ifdef OCAMLFIND
 -ifeq (@LABLGNOMECANVAS@,yes)
 +ifeq (${USE_LABLGTK},yes)
-       $(OCAMLFIND) install ocamlgraph META \
+       $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
                $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
                graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
-@@ -448,7 +448,7 @@ NODOC      = blocks dot_parser dot_lexer vers
+@@ -455,7 +455,7 @@ NODOC      = blocks dot_parser dot_lexer vers
  NODOC := $(patsubst %, $(SRCDIR)/%.cmo, $(NODOC))
  DOC_CMO       = $(filter-out $(NODOC) $(LIB), $(CMO))
  DOC_SRC       = $(CMI:.cmi=.mli) $(DOC_CMO:.cmo=.mli) $(DOC_CMO:.cmo=.ml)