[pkgsrc/trunk]: pkgsrc/time/ocaml-calendar Updated to latest version, 2.04. C...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/63ada0c670ac
branches:  trunk
changeset: 650942:63ada0c670ac
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Wed Apr 29 09:37:40 2015 +0000

description:
Updated to latest version, 2.04. Changes include:
* [Makefile] Fix minor issues with ocamlfind and 'make install' (from
  Christopher Zimmermann).
o [Printer] In function from_fstring of sub-module Ftime, Fcalendar, and
  Precise_Fcalendar, the number of seconds corresponding to %S may be a floating
  point number (from Christophe Troestler' suggestion).

Added buildlink file, and updated package to use ocaml.mk framework.

diffstat:

 time/ocaml-calendar/Makefile                  |  24 +++++-------------------
 time/ocaml-calendar/PLIST                     |  12 ++++++------
 time/ocaml-calendar/buildlink3.mk             |  14 ++++++++++++++
 time/ocaml-calendar/distinfo                  |   9 ++++-----
 time/ocaml-calendar/patches/patch-Makefile.in |  21 ---------------------
 5 files changed, 29 insertions(+), 51 deletions(-)

diffs (127 lines):

diff -r 580fd7c5f585 -r 63ada0c670ac time/ocaml-calendar/Makefile
--- a/time/ocaml-calendar/Makefile      Wed Apr 29 07:59:53 2015 +0000
+++ b/time/ocaml-calendar/Makefile      Wed Apr 29 09:37:40 2015 +0000
@@ -1,36 +1,22 @@
-# $NetBSD: Makefile,v 1.10 2015/01/20 14:24:37 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/29 09:37:40 jaapb Exp $
 #
 
-DISTNAME=      calendar-2.03.2
-PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   4
+DISTNAME=      calendar-2.04
 CATEGORIES=    time devel
-MASTER_SITES=  http://forge.ocamlcore.org/frs/download.php/915/
+MASTER_SITES=  http://forge.ocamlcore.org/frs/download.php/1481/
 
 MAINTAINER=    jaapb%kerguelen.org@localhost
 HOMEPAGE=      http://calendar.forge.ocamlcore.org/
 COMMENT=       OCaml library managing dates and times
 LICENSE=       gnu-lgpl-v2.1
 
-DEPENDS+=      ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake
+OCAML_USE_FINDLIB=     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
-
 TEST_TARGET=   tests
 
-INSTALLATION_DIRS+=    lib/ocaml/site-lib
-
-pre-install:
-       ${MKDIR} ${DESTDIR}${PREFIX}/lib/ocaml/site-lib
-
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 580fd7c5f585 -r 63ada0c670ac time/ocaml-calendar/PLIST
--- a/time/ocaml-calendar/PLIST Wed Apr 29 07:59:53 2015 +0000
+++ b/time/ocaml-calendar/PLIST Wed Apr 29 09:37:40 2015 +0000
@@ -1,15 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2012/08/12 17:40:59 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/29 09:37:40 jaapb Exp $
 @unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/calendar
 lib/ocaml/site-lib/calendar/META
 lib/ocaml/site-lib/calendar/calendar.mli
 lib/ocaml/site-lib/calendar/calendarLib.a
-${PLIST.opt}lib/ocaml/site-lib/calendar/calendarLib.cma
+${PLIST.ocaml-opt}lib/ocaml/site-lib/calendar/calendarLib.cma
 lib/ocaml/site-lib/calendar/calendarLib.cmi
 lib/ocaml/site-lib/calendar/calendarLib.cmo
-${PLIST.opt}lib/ocaml/site-lib/calendar/calendarLib.cmx
-${PLIST.opt}lib/ocaml/site-lib/calendar/calendarLib.cmxa
-${PLIST.opt}lib/ocaml/site-lib/calendar/calendarLib.cmxs
-${PLIST.opt}lib/ocaml/site-lib/calendar/calendarLib.o
+${PLIST.ocaml-opt}lib/ocaml/site-lib/calendar/calendarLib.cmx
+${PLIST.ocaml-opt}lib/ocaml/site-lib/calendar/calendarLib.cmxa
+${PLIST.ocaml-opt}lib/ocaml/site-lib/calendar/calendarLib.cmxs
+${PLIST.ocaml-opt}lib/ocaml/site-lib/calendar/calendarLib.o
 lib/ocaml/site-lib/calendar/calendar_builder.mli
 lib/ocaml/site-lib/calendar/calendar_sig.mli
 lib/ocaml/site-lib/calendar/date.mli
diff -r 580fd7c5f585 -r 63ada0c670ac time/ocaml-calendar/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/time/ocaml-calendar/buildlink3.mk Wed Apr 29 09:37:40 2015 +0000
@@ -0,0 +1,14 @@
+# $NetBSD: buildlink3.mk,v 1.1 2015/04/29 09:37:40 jaapb Exp $
+
+BUILDLINK_TREE+=       ocaml-calendar
+
+.if !defined(OCAML_CALENDAR_BUILDLINK3_MK)
+OCAML_CALENDAR_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ocaml-calendar+= ocaml-calendar>=2.03.2nb4
+BUILDLINK_PKGSRCDIR.ocaml-calendar?=   ../../time/ocaml-calendar
+
+#.include "../../lang/ocaml/buildlink3.mk"
+.endif # OCAML_CALENDAR_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -ocaml-calendar
diff -r 580fd7c5f585 -r 63ada0c670ac time/ocaml-calendar/distinfo
--- a/time/ocaml-calendar/distinfo      Wed Apr 29 07:59:53 2015 +0000
+++ b/time/ocaml-calendar/distinfo      Wed Apr 29 09:37:40 2015 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/08/12 17:40:59 wiz Exp $
+$NetBSD: distinfo,v 1.4 2015/04/29 09:37:40 jaapb Exp $
 
-SHA1 (calendar-2.03.2.tar.gz) = 64336839fdc24e4bd99e08e01419b183b598831b
-RMD160 (calendar-2.03.2.tar.gz) = b065bb9dcd7a756fd7f77c5fca36b7e2c7e20902
-Size (calendar-2.03.2.tar.gz) = 270225 bytes
-SHA1 (patch-Makefile.in) = 886482162f242a25daf1be9483e9ca932aae7c01
+SHA1 (calendar-2.04.tar.gz) = 20193984bd685170d546102dd57eb1fce34058d9
+RMD160 (calendar-2.04.tar.gz) = ac002410334f008300c74d7ec3ef4a4cff909e6f
+Size (calendar-2.04.tar.gz) = 271522 bytes
diff -r 580fd7c5f585 -r 63ada0c670ac time/ocaml-calendar/patches/patch-Makefile.in
--- a/time/ocaml-calendar/patches/patch-Makefile.in     Wed Apr 29 07:59:53 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2012/08/12 17:41:00 wiz Exp $
-
-remove version detection (doesn't work in NetBSD environment) and add destdir
---- Makefile.in.orig   2010-07-05 07:54:32.000000000 +0000
-+++ Makefile.in
-@@ -198,14 +198,7 @@ headers:
- #########
- 
- install: $(LIBS) $(CLIBS) META
--      @if [ "`sed -n -e 's/version = "\([0-9.+dev]*\)"/\1/p' META`" = "$(VERSION)" ]; then \
--        (if test -d `ocamlfind install -help | grep destdir | sed -e "s/.*default: \(.*\))/\1/"`/$(NAME); then $(MAKE) uninstall; fi;\
--        $(CAMLFIND) install $(NAME) target/*.cm[ioxa] target/*.cmx[as] $(MLI)  $(CLIBS) META); \
--      else \
--        (echo; echo "Not the good version. Please, do :"; \
--         echo "  make clean && make"; \
--         echo "next reinstall"; echo) \
--      fi
-+      $(CAMLFIND) install -destdir ${DESTDIR}${CAMLLIB}/site-lib -ldconf /dev/null $(NAME) target/*.cm[ioxa] target/*.cmx[as] $(MLI)  $(CLIBS) META
- 
- uninstall:
-       $(CAMLFIND) remove $(NAME)