CVS commit: pkgsrc/textproc/ocaml-csv

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Sat Jul  2 10:11:09 UTC 2016

Modified Files:
        pkgsrc/textproc/ocaml-csv: Makefile PLIST buildlink3.mk distinfo

Log Message:
Updated package to latest version, 1.5; also updated package to work with
ocaml.mk structure and changed upstream to github.

Changes:
version 1.5
* Improve various commands of csvtool avoiding loading the whole CSV file to memory.
* As a consequence, one avoids some Stack_overflow exceptions for long files.

version 1.4.2
* Add the possibility to specify an output format to csvtool.

version 1.4.1
* Fix writing bug when excel_tricks is enabled.

version 1.4
* Optional discarding of spaces
* Special handling of files with a header


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/ocaml-csv/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/ocaml-csv/PLIST \
    pkgsrc/textproc/ocaml-csv/buildlink3.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/ocaml-csv/distinfo

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

Modified files:

Index: pkgsrc/textproc/ocaml-csv/Makefile
diff -u pkgsrc/textproc/ocaml-csv/Makefile:1.9 pkgsrc/textproc/ocaml-csv/Makefile:1.10
--- pkgsrc/textproc/ocaml-csv/Makefile:1.9      Thu May  5 11:45:41 2016
+++ pkgsrc/textproc/ocaml-csv/Makefile  Sat Jul  2 10:11:09 2016
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2016/05/05 11:45:41 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2016/07/02 10:11:09 jaapb Exp $
 
-PKGNAME= ocaml-${DISTNAME}
-DISTNAME=      csv-1.3.0
-PKGREVISION=   6
+VERSION=       1.5
+GITHUB_PROJECT=        ocaml-csv
+DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=    textproc
-MASTER_SITES=  http://forge.ocamlcore.org/frs/download.php/1172/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=Chris00/}
 
 MAINTAINER=    jaapb%NetBSD.org@localhost
 HOMEPAGE=      http://csv.forge.ocamlcore.org/
@@ -16,29 +16,19 @@ USE_LANGUAGES=      c
 
 CONFIGURE_ARGS+=       --destdir "${DESTDIR}" --prefix "${PREFIX}"
 
-SUBST_CLASSES+=        destdir
-SUBST_STAGE.destdir=    post-configure
-SUBST_MESSAGE.destdir=  Changing install location to DESTDIR
-SUBST_FILES.destdir=    setup.ml
-SUBST_SED.destdir=      -e 's,"install" :: findlib_name,"install" :: "-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,'
+OCAML_USE_OASIS=       yes
 
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_VARS=     opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
-PLIST.opt=     yes
-.endif
-
-do-configure:
-       cd ${WRKSRC} && ${CONFIGURE_ENV} ocaml setup.ml -configure ${CONFIGURE_ARGS}
+#SUBST_CLASSES+=       destdir
+#SUBST_STAGE.destdir=    post-configure
+#SUBST_MESSAGE.destdir=  Changing install location to DESTDIR
+#SUBST_FILES.destdir=    setup.ml
+#SUBST_SED.destdir=      -e 's,"install" :: findlib_name,"install" :: "-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,'
 
-do-build:
-       cd ${WRKSRC} && ${MAKE_ENV} ocaml setup.ml -build
+pre-configure:
+       cd ${WRKSRC} && ${MAKE} setup.ml
 
-do-install:
-       cd ${WRKSRC} && ocaml setup.ml -install
+.include "../../mk/bsd.prefs.mk"
 
-.include "../../devel/ocaml-findlib/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/ocaml.mk"
+.include "../../devel/ocaml-oasis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/ocaml-csv/PLIST
diff -u pkgsrc/textproc/ocaml-csv/PLIST:1.1 pkgsrc/textproc/ocaml-csv/PLIST:1.2
--- pkgsrc/textproc/ocaml-csv/PLIST:1.1 Sat Jun 15 20:53:03 2013
+++ pkgsrc/textproc/ocaml-csv/PLIST     Sat Jul  2 10:11:09 2016
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2013/06/15 20:53:03 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/07/02 10:11:09 jaapb Exp $
 bin/csvtool
-lib/ocaml/site-lib/csv/META
-${PLIST.opt}lib/ocaml/site-lib/csv/csv.a
-lib/ocaml/site-lib/csv/csv.cma
-lib/ocaml/site-lib/csv/csv.cmi
-${PLIST.opt}lib/ocaml/site-lib/csv/csv.cmx
-${PLIST.opt}lib/ocaml/site-lib/csv/csv.cmxa
-${PLIST.opt}lib/ocaml/site-lib/csv/csv.cmxs
-lib/ocaml/site-lib/csv/csv.mli
+${OCAML_SITELIB}/csv/META
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.a
+${OCAML_SITELIB}/csv/csv.annot
+${OCAML_SITELIB}/csv/csv.cma
+${OCAML_SITELIB}/csv/csv.cmi
+${OCAML_SITELIB}/csv/csv.cmt
+${OCAML_SITELIB}/csv/csv.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.cmxs
+${OCAML_SITELIB}/csv/csv.mli
Index: pkgsrc/textproc/ocaml-csv/buildlink3.mk
diff -u pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.1 pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.2
--- pkgsrc/textproc/ocaml-csv/buildlink3.mk:1.1 Wed Jul  3 10:53:06 2013
+++ pkgsrc/textproc/ocaml-csv/buildlink3.mk     Sat Jul  2 10:11:09 2016
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/07/03 10:53:06 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2016/07/02 10:11:09 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-csv
 
 .if !defined(OCAML_CSV_BUILDLINK3_MK)
 OCAML_CSV_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-csv+=      ocaml-csv>=1.3.0
+BUILDLINK_API_DEPENDS.ocaml-csv+=      ocaml-csv>=1.5
 BUILDLINK_PKGSRCDIR.ocaml-csv?=        ../../textproc/ocaml-csv
 
 .endif # OCAML_CSV_BUILDLINK3_MK

Index: pkgsrc/textproc/ocaml-csv/distinfo
diff -u pkgsrc/textproc/ocaml-csv/distinfo:1.2 pkgsrc/textproc/ocaml-csv/distinfo:1.3
--- pkgsrc/textproc/ocaml-csv/distinfo:1.2      Wed Nov  4 01:59:41 2015
+++ pkgsrc/textproc/ocaml-csv/distinfo  Sat Jul  2 10:11:09 2016
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:59:41 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/07/02 10:11:09 jaapb Exp $
 
-SHA1 (csv-1.3.0.tar.gz) = 07ae8a6ebb10779ea6242199fe0298a5065536e8
-RMD160 (csv-1.3.0.tar.gz) = 3b31e9cbea573c3da0027531407cdb99588b918b
-SHA512 (csv-1.3.0.tar.gz) = 57fcc356571cd08f30ad4add9e9cebe6a8716f86af9c9387b108250f02b3cffdeda2fabb346dea3c349079653207131f5b462f6a07dd99170b42268f3f17cd8d
-Size (csv-1.3.0.tar.gz) = 72014 bytes
+SHA1 (ocaml-csv-1.5.tar.gz) = 9488efb5a35ca88d79376bfbd9edf5fe7d3c203c
+RMD160 (ocaml-csv-1.5.tar.gz) = bdbd4800948f459d485c16acafe10203e09f30fc
+SHA512 (ocaml-csv-1.5.tar.gz) = c11af5aec1a77465f5f9583a3c7dde3628d881db948ae4f02bdf6ae7ffb0e8ce1bb8fa4bf73ab7c12e916d3bead3664bf99ff348fb1bcb9f336e315f2f001f5c
+Size (ocaml-csv-1.5.tar.gz) = 41183 bytes