CVS commit: pkgsrc/textproc/ocaml-csv

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Tue Jul 11 12:35:54 UTC 2017

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

Log Message:
Updated package to latest version, 1.7. There does not seem to be a
changelog.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/ocaml-csv/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/ocaml-csv/PLIST
cvs rdiff -u -r1.3 -r1.4 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.11 pkgsrc/textproc/ocaml-csv/Makefile:1.12
--- pkgsrc/textproc/ocaml-csv/Makefile:1.11     Fri Dec 30 11:17:02 2016
+++ pkgsrc/textproc/ocaml-csv/Makefile  Tue Jul 11 12:35:54 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2016/12/30 11:17:02 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2017/07/11 12:35:54 jaapb Exp $
 
-VERSION=       1.5
+VERSION=       1.7
 GITHUB_PROJECT=        ocaml-csv
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
-PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Chris00/}
 
@@ -15,21 +14,21 @@ LICENSE=    gnu-lgpl-v2.1
 HAS_CONFIGURE= yes
 USE_LANGUAGES= c
 
-CONFIGURE_ARGS+=       --destdir "${DESTDIR}" --prefix "${PREFIX}"
+CONFIGURE_ARGS+=       --destdir "${DESTDIR}" --prefix "${PREFIX}" --bindir "${DESTDIR}${PREFIX}/bin"
 
 OCAML_USE_OASIS=       yes
+INSTALLATION_DIRS+=    bin
 
-#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,'
+.include "../../mk/ocaml.mk"
 
-pre-configure:
-       cd ${WRKSRC} && ${MAKE} setup.ml
+post-wrapper:
+       ${RUN} cd ${WRKSRC} && ${MAKE} setup.ml
 
-.include "../../mk/bsd.prefs.mk"
+post-install:
+.if ${OCAML_USE_OPT_COMPILER} == yes
+       ${INSTALL_PROGRAM} ${WRKSRC}/_build/examples/csvtool.native ${DESTDIR}${PREFIX}/bin/csvtool
+.else
+       ${INSTALL_SCRIPT} ${WRKSRC}/_build/examples/csvtool.byte ${DESTDIR}${PREFIX}/bin/csvtool
+.endif
 
-.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.2 pkgsrc/textproc/ocaml-csv/PLIST:1.3
--- pkgsrc/textproc/ocaml-csv/PLIST:1.2 Sat Jul  2 10:11:09 2016
+++ pkgsrc/textproc/ocaml-csv/PLIST     Tue Jul 11 12:35:54 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/07/02 10:11:09 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/07/11 12:35:54 jaapb Exp $
 bin/csvtool
 ${OCAML_SITELIB}/csv/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv.a
@@ -10,4 +10,6 @@ ${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
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv_row.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/csv/csv_utils.cmx
 ${OCAML_SITELIB}/csv/csv.mli

Index: pkgsrc/textproc/ocaml-csv/distinfo
diff -u pkgsrc/textproc/ocaml-csv/distinfo:1.3 pkgsrc/textproc/ocaml-csv/distinfo:1.4
--- pkgsrc/textproc/ocaml-csv/distinfo:1.3      Sat Jul  2 10:11:09 2016
+++ pkgsrc/textproc/ocaml-csv/distinfo  Tue Jul 11 12:35:54 2017
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2016/07/02 10:11:09 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2017/07/11 12:35:54 jaapb Exp $
 
-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
+SHA1 (ocaml-csv-1.7.tar.gz) = dcde33b0c95cf9db59bdbf9453832c5ea6bd09d7
+RMD160 (ocaml-csv-1.7.tar.gz) = ecdd7fe3f32b7b0ca277a663b8453b16bebc24e7
+SHA512 (ocaml-csv-1.7.tar.gz) = cbe3d316e6f99318b3958bbfba3308225e709afb481a333d314adb66c20683171c23ac0565fc8d8e936b9dad13b9330b5208340b9fc671b4ccddf3a7d8b82b3e
+Size (ocaml-csv-1.7.tar.gz) = 45160 bytes