CVS commit: pkgsrc/devel/ocamlgraph

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Mon Oct 23 13:43:31 UTC 2017

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

Log Message:
Updated graph/ocamlgraph to version 1.8.8.

Changes include compatibility with safe-string (needed for ocaml 4.06
compatibility), installation fixes and some bugfixes and enhancements.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ocamlgraph/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocamlgraph/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocamlgraph/buildlink3.mk \
    pkgsrc/devel/ocamlgraph/distinfo
cvs rdiff -u -r1.2 -r1.3 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.22 pkgsrc/devel/ocamlgraph/Makefile:1.23
--- pkgsrc/devel/ocamlgraph/Makefile:1.22       Mon Sep 18 09:53:18 2017
+++ pkgsrc/devel/ocamlgraph/Makefile    Mon Oct 23 13:43:31 2017
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.22 2017/09/18 09:53:18 maya Exp $
+# $NetBSD: Makefile,v 1.23 2017/10/23 13:43:31 jaapb Exp $
 
-DISTNAME=      ocamlgraph-1.8.7
-PKGREVISION=   11
+DISTNAME=      ocamlgraph-1.8.8
 CATEGORIES=    devel
 MASTER_SITES=  http://ocamlgraph.lri.fr/download/
 

Index: pkgsrc/devel/ocamlgraph/PLIST
diff -u pkgsrc/devel/ocamlgraph/PLIST:1.2 pkgsrc/devel/ocamlgraph/PLIST:1.3
--- pkgsrc/devel/ocamlgraph/PLIST:1.2   Fri Jun 17 16:31:30 2016
+++ pkgsrc/devel/ocamlgraph/PLIST       Mon Oct 23 13:43:31 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/06/17 16:31:30 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/10/23 13:43:31 jaapb Exp $
 ${PLIST.lablgtk}bin/graph-editor
 ${PLIST.lablgtk}bin/graph-viewer
 ${PLIST.lablgtk}${OCAML_SITELIB}/ocamlgraph/dgraph.cmi
@@ -12,6 +12,7 @@ ${PLIST.ocaml-opt}${PLIST.lablgtk}${OCAM
 ${PLIST.ocaml-opt}${PLIST.lablgtk}${OCAML_SITELIB}/ocamlgraph/viewgraph.o
 ${OCAML_SITELIB}/ocamlgraph/META
 ${OCAML_SITELIB}/ocamlgraph/builder.mli
+${OCAML_SITELIB}/ocamlgraph/chaoticIteration.mli
 ${OCAML_SITELIB}/ocamlgraph/classic.mli
 ${OCAML_SITELIB}/ocamlgraph/clique.mli
 ${OCAML_SITELIB}/ocamlgraph/cliquetree.mli
@@ -41,6 +42,8 @@ ${OCAML_SITELIB}/ocamlgraph/graph.cmi
 ${OCAML_SITELIB}/ocamlgraph/graph.cmo
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlgraph/graph.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlgraph/graph.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlgraph/graph.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocamlgraph/graph.o
 ${OCAML_SITELIB}/ocamlgraph/graphml.mli
 ${OCAML_SITELIB}/ocamlgraph/graphviz.mli
 ${OCAML_SITELIB}/ocamlgraph/imperative.mli
@@ -67,5 +70,6 @@ ${OCAML_SITELIB}/ocamlgraph/util.mli
 ${OCAML_SITELIB}/ocamlgraph/viewGraph_core.mli
 ${OCAML_SITELIB}/ocamlgraph/viewGraph_select.mli
 ${OCAML_SITELIB}/ocamlgraph/viewGraph_utils.mli
+${OCAML_SITELIB}/ocamlgraph/weakTopological.mli
 ${OCAML_SITELIB}/ocamlgraph/xDot.mli
 ${OCAML_SITELIB}/ocamlgraph/xDotDraw.mli

Index: pkgsrc/devel/ocamlgraph/buildlink3.mk
diff -u pkgsrc/devel/ocamlgraph/buildlink3.mk:1.3 pkgsrc/devel/ocamlgraph/buildlink3.mk:1.4
--- pkgsrc/devel/ocamlgraph/buildlink3.mk:1.3   Tue Jul 11 14:19:20 2017
+++ pkgsrc/devel/ocamlgraph/buildlink3.mk       Mon Oct 23 13:43:31 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 14:19:20 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2017/10/23 13:43:31 jaapb Exp $
 
 BUILDLINK_TREE+=       ocamlgraph
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocamlgraph
 OCAMLGRAPH_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocamlgraph+=     ocamlgraph>=1.8.7
-BUILDLINK_ABI_DEPENDS.ocamlgraph+=     ocamlgraph>=1.8.7nb8
+BUILDLINK_ABI_DEPENDS.ocamlgraph+=     ocamlgraph>=1.8.8
 BUILDLINK_PKGSRCDIR.ocamlgraph?=       ../../devel/ocamlgraph
 .endif # OCAMLGRAPH_BUILDLINK3_MK
 
Index: pkgsrc/devel/ocamlgraph/distinfo
diff -u pkgsrc/devel/ocamlgraph/distinfo:1.3 pkgsrc/devel/ocamlgraph/distinfo:1.4
--- pkgsrc/devel/ocamlgraph/distinfo:1.3        Fri Jun 17 16:31:30 2016
+++ pkgsrc/devel/ocamlgraph/distinfo    Mon Oct 23 13:43:31 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2016/06/17 16:31:30 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2017/10/23 13:43:31 jaapb Exp $
 
-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
+SHA1 (ocamlgraph-1.8.8.tar.gz) = 92ac2387102747ee4aa0124d5d908dd5f8b54160
+RMD160 (ocamlgraph-1.8.8.tar.gz) = ced82b5f45eeb38b5e59bf3edc2a7137b0828cd8
+SHA512 (ocamlgraph-1.8.8.tar.gz) = ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5
+Size (ocamlgraph-1.8.8.tar.gz) = 282729 bytes
+SHA1 (patch-Makefile.in) = 7b58bec3d470c709ac481cc9e4261a5f7a747117

Index: pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in
diff -u pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in:1.2 pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in:1.3
--- pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in:1.2       Fri Jun 17 16:31:30 2016
+++ pkgsrc/devel/ocamlgraph/patches/patch-Makefile.in   Mon Oct 23 13:43:31 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.2 2016/06/17 16:31:30 jaapb Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2017/10/23 13:43:31 jaapb Exp $
 
 Change configure procedure to use pkgsrc settings rather than detection
 Also install in site-lib
---- Makefile.in.orig   2016-04-12 06:47:31.000000000 +0000
+--- Makefile.in.orig   2017-10-17 09:25:15.000000000 +0000
 +++ Makefile.in
 @@ -33,7 +33,7 @@ OCAMLDOC = @OCAMLDOC@
  OCAMLLEX = @OCAMLLEX@
@@ -22,7 +22,7 @@ Also install in site-lib
  all: byte $(OCAMLBEST) viewer dgraph editor
  else
  all: byte $(OCAMLBEST)
-@@ -240,7 +240,7 @@ $(DGRAPH_DIR)/dgraph.opt: $(CMXA) $(DGRA
+@@ -246,7 +246,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.
  
@@ -31,7 +31,7 @@ Also install in site-lib
  graph.cmx: | $(DGRAPH_DIR)/dgraph.byte \
        $(VIEWER_DIR)/viewgraph.byte \
        $(ED_DIR)/editor.byte
-@@ -381,7 +381,7 @@ INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/oca
+@@ -387,7 +387,7 @@ INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/oca
  
  install: install-$(OCAMLBEST) install-byte
        mkdir -p $(BINDIR)
@@ -40,25 +40,25 @@ Also install in site-lib
  ifeq ($(OCAMLBEST),byte)
        cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE)
        cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE)
-@@ -395,7 +395,7 @@ install-byte:
+@@ -401,7 +401,7 @@ install-byte:
        mkdir -p $(INSTALL_LIBDIR)
        cp -f graph.cmo graph.cmi $(CMA) $(INSTALL_LIBDIR)
-       cp -f $(SRCDIR)/*.mli $(INSTALL_LIBDIR)
+       cp -f $(OCAMLGRAPH_SRCDIR)/*.mli $(INSTALL_LIBDIR)
 -ifeq (@LABLGNOMECANVAS@,yes)
 +ifeq (${USE_LABLGTK},yes)
        mkdir -p $(BINDIR)
        cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte
        cp -f $(VIEWER_CMILIB) $(VIEWER_CMOLIB) $(INSTALL_LIBDIR)
-@@ -409,7 +409,7 @@ install-opt: install-byte
+@@ -415,7 +415,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)
+       cp -f $(OCAMLGRAPH_SRCDIR)/*.mli $(INSTALL_LIBDIR)
 -ifeq (@LABLGNOMECANVAS@,yes)
 +ifeq (${USE_LABLGTK},yes)
        mkdir -p $(BINDIR)
        cp -f $(ED_DIR)/editor.opt $(BINDIR)/graph-editor.opt
        cp -f $(VIEWER_CMILIB) $(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) \
-@@ -421,12 +421,12 @@ ifeq (@LABLGNOMECANVAS@,yes)
+@@ -427,14 +427,14 @@ ifeq (@LABLGNOMECANVAS@,yes)
  endif
  
  ifdef DESTDIR
@@ -66,19 +66,21 @@ Also install in site-lib
 +OCAMLFINDDEST := -destdir $(DESTDIR)${PREFIX}/${OCAML_SITELIBDIR}
  endif
  
+ ifeq ($(OCAMLBEST),byte)
+   OCAMLFIND_OPT_FILES=
+ else
+   OCAMLFIND_OPT_FILES=graph$(OBJEXT) graph$(LIBEXT) graph.cmx $(CMXA) $(CMXS)
+-  ifeq (@LABLGNOMECANVAS@,yes)
++  ifeq (${USE_LABLGTK},yes)
+     OCAMLFIND_OPT_FILES+=\
+       $(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) \
+       $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o)
+@@ -443,7 +443,7 @@ endif
+ 
  install-findlib: META
  ifdef OCAMLFIND
 -ifeq (@LABLGNOMECANVAS@,yes)
 +ifeq (${USE_LABLGTK},yes)
        $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
-               $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
-               graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
-@@ -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)
--ifeq (@LABLGNOMECANVAS@,yes)
-+ifeq (${USE_LABLGTK},yes)
- DOC_SRC := $(DOC_SRC) $(DGRAPH_CMI:.cmi=.mli)
- endif
- 
+               $(OCAMLGRAPH_SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
+               graph.cmo graph.cmi \