CVS commit: pkgsrc/devel/ocaml-findlib

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/ocaml-findlib
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Wed, 30 Nov 2016 13:46:14 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Nov 30 13:46:14 UTC 2016

Modified Files:
        pkgsrc/devel/ocaml-findlib: Makefile PLIST distinfo
        pkgsrc/devel/ocaml-findlib/patches: patch-Makefile
            patch-src_findlib_Makefile

Log Message:
Updated ocaml-findlib to 1.7.1.

Fix man page installation.

Changes:

1.7.1:
added missing file to tarball

1.7.0:
New command "ocamlfind printppx" that outputs
how the ppx preprocessor would be called (Hendrik Tews).

Support for the raw_spacetime library that comes with
OCaml 4.04 (Gerd Stolpmann with help from Mark Shinwell).

Require that ocamlc and ocamlc.opt are installed to the
same directory for emitting the "opt" setting in the generated
config file - same for ocamlopt.opt, ocamldep.opt, ocamldoc.opt.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/ocaml-findlib/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocaml-findlib/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocaml-findlib/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/ocaml-findlib/patches/patch-Makefile
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile

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

Modified files:

Index: pkgsrc/devel/ocaml-findlib/Makefile
diff -u pkgsrc/devel/ocaml-findlib/Makefile:1.29 pkgsrc/devel/ocaml-findlib/Makefile:1.30
--- pkgsrc/devel/ocaml-findlib/Makefile:1.29    Sat Jun 25 13:55:15 2016
+++ pkgsrc/devel/ocaml-findlib/Makefile Wed Nov 30 13:46:14 2016
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2016/06/25 13:55:15 jaapb Exp $
+# $NetBSD: Makefile,v 1.30 2016/11/30 13:46:14 wiz Exp $
 
-DISTNAME=              findlib-1.6.2
-PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   1
+DISTNAME=              findlib-1.7.1
+PKGNAME=               ocaml-${DISTNAME}
 CATEGORIES=            devel
 MASTER_SITES=          http://download.camlcity.org/download/
 

Index: pkgsrc/devel/ocaml-findlib/PLIST
diff -u pkgsrc/devel/ocaml-findlib/PLIST:1.11 pkgsrc/devel/ocaml-findlib/PLIST:1.12
--- pkgsrc/devel/ocaml-findlib/PLIST:1.11       Sat Jun 25 13:55:15 2016
+++ pkgsrc/devel/ocaml-findlib/PLIST    Wed Nov 30 13:46:14 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/06/25 13:55:15 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.12 2016/11/30 13:46:14 wiz Exp $
 bin/ocamlfind
 ${OCAML_SITELIB}/bigarray/META
 ${OCAML_SITELIB}/bytes/META
@@ -16,7 +16,10 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/findl
 ${OCAML_SITELIB}/findlib/findlib_dynload.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_dynload.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_top.a
 ${OCAML_SITELIB}/findlib/findlib_top.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_top.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/findlib/findlib_top.cmxs
 ${OCAML_SITELIB}/findlib/fl_dynload.cmi
 ${OCAML_SITELIB}/findlib/fl_dynload.mli
 ${OCAML_SITELIB}/findlib/fl_metascanner.cmi
@@ -38,8 +41,8 @@ ${OCAML_SITELIB}/str/META
 ${OCAML_SITELIB}/threads/META
 ${OCAML_SITELIB}/unix/META
 lib/ocaml/topfind
-@comment man/man1/ocamlfind.1
-@comment man/man5/META.5
-@comment man/man5/findlib.conf.5
-@comment man/man5/site-lib.5
+man/man1/ocamlfind.1
+man/man5/META.5
+man/man5/findlib.conf.5
+man/man5/site-lib.5
 share/examples/ocaml-findlib/ocamlfind.conf

Index: pkgsrc/devel/ocaml-findlib/distinfo
diff -u pkgsrc/devel/ocaml-findlib/distinfo:1.14 pkgsrc/devel/ocaml-findlib/distinfo:1.15
--- pkgsrc/devel/ocaml-findlib/distinfo:1.14    Thu May  5 09:42:19 2016
+++ pkgsrc/devel/ocaml-findlib/distinfo Wed Nov 30 13:46:14 2016
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2016/05/05 09:42:19 jaapb Exp $
+$NetBSD: distinfo,v 1.15 2016/11/30 13:46:14 wiz Exp $
 
-SHA1 (findlib-1.6.2.tar.gz) = 25da312f0a0013fe04ebe0577594e8bc9e7f5d64
-RMD160 (findlib-1.6.2.tar.gz) = b6d448a5266254b3bfeceb8ca445e454291007fb
-SHA512 (findlib-1.6.2.tar.gz) = 8c4098e6956530bc88d20a1b91512c68368e8a866398ce4d504afe3f71e81124c01644ba31ff97da6e61e7410328b533fb1d31a513166231047dab1933179fc4
-Size (findlib-1.6.2.tar.gz) = 253764 bytes
-SHA1 (patch-Makefile) = c1688615027f5f0f67a738c15ddd44a31a77ffdf
+SHA1 (findlib-1.7.1.tar.gz) = 5cde7077341a3ff9de7a625383f369b1e1d61fd3
+RMD160 (findlib-1.7.1.tar.gz) = 2d4dca216c58214e102ab35f604607d91a6f6c89
+SHA512 (findlib-1.7.1.tar.gz) = 1c8002dc2ed1804afc78c2aa92ab55d2b6501fbb021a7ca46698b4de0dea8ad6485a64f7bf9ec5f3df888da1a420ab270efb5e26f1e408cc8b78fa3ccb981ba4
+Size (findlib-1.7.1.tar.gz) = 256883 bytes
+SHA1 (patch-Makefile) = 7d427be437e4ec2fb50feba8dee7d2759506267b
 SHA1 (patch-configure) = 023cc1610ab082cf3cdb82efda00df0f4b25d881
-SHA1 (patch-src_findlib_Makefile) = 0fc2570c4d2cb271bbd8a872d8331b3d3edcbc7c
+SHA1 (patch-src_findlib_Makefile) = f523a19a205257b320ebaab956b546659aa46ed4

Index: pkgsrc/devel/ocaml-findlib/patches/patch-Makefile
diff -u pkgsrc/devel/ocaml-findlib/patches/patch-Makefile:1.4 pkgsrc/devel/ocaml-findlib/patches/patch-Makefile:1.5
--- pkgsrc/devel/ocaml-findlib/patches/patch-Makefile:1.4       Thu May  5 09:42:19 2016
+++ pkgsrc/devel/ocaml-findlib/patches/patch-Makefile   Wed Nov 30 13:46:14 2016
@@ -1,7 +1,7 @@
-$NetBSD: patch-Makefile,v 1.4 2016/05/05 09:42:19 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.5 2016/11/30 13:46:14 wiz Exp $
 
 make package support DESTDIR; use BSD_INSTALL_* instead of mkdir and cp
---- Makefile.orig      2016-03-07 13:46:34.000000000 +0000
+--- Makefile.orig      2016-11-18 13:04:45.000000000 +0000
 +++ Makefile
 @@ -17,14 +17,14 @@ opt:
        for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done
@@ -25,12 +25,12 @@ make package support DESTDIR; use BSD_IN
  
  .PHONY: install-doc
  install-doc:
--      mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
+-      mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5"
 -      -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
 -      -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
-+      $(BSD_INSTALL_MAN_DIR( "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5"
-+      -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1"
-+      -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5"
++      $(BSD_INSTALL_MAN_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
++      -$(BSD_INSTALL_MAN) doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1"
++      -$(BSD_INSTALL_MAN) doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5"
  
  .PHONY: uninstall-doc
  uninstall-doc:

Index: pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile
diff -u pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile:1.6 pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile:1.7
--- pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile:1.6   Tue Feb  2 11:41:46 2016
+++ pkgsrc/devel/ocaml-findlib/patches/patch-src_findlib_Makefile       Wed Nov 30 13:46:14 2016
@@ -1,9 +1,9 @@
-$NetBSD: patch-src_findlib_Makefile,v 1.6 2016/02/02 11:41:46 jaapb Exp $
+$NetBSD: patch-src_findlib_Makefile,v 1.7 2016/11/30 13:46:14 wiz Exp $
 
 Install into DESTDIR, use BSD install commands
---- src/findlib/Makefile.orig  2015-12-07 14:35:24.000000000 +0000
+--- src/findlib/Makefile.orig  2016-11-18 13:04:46.000000000 +0000
 +++ src/findlib/Makefile
-@@ -112,23 +112,23 @@ clean:
+@@ -119,23 +119,23 @@ clean:
          ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
  
  install: all
@@ -13,7 +13,7 @@ Install into DESTDIR, use BSD install co
 +      $(BSD_INSTALL_DATA_DIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +      $(BSD_INSTALL_PROGRAM_DIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
 +      test $(INSTALL_TOPFIND) -eq 0 || $(BSD_INSTALL_SCRIPT) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
-       files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli 
fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi 
META` && \
+       files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli 
fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a 
findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
 -      cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
 +      $(BSD_INSTALL_DATA) $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
        f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index