From 5bf9ecd51b6c8a0b7e59a35399cb001f3c7098ac Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 12 Aug 2012 17:40:59 +0000 Subject: Update to 2.03.2, from maintainer Jaap Boender. version 2.03.2, 2012-06-26: =========================== o [Compilation] Compatibility with OCaml 4 version 2.03.1, 2011-03-24: =========================== * [Calendar] Fixed bug in Calendar.prev and Fcalendar.prev: mostly raised exception Date.Out_of_bounds before. * [Printer] `Thurday' was printed instead of `Thursday' version 2.03, 2010-07-05: ========================= o [Date] new function Date.precise_sub o [Calendar] new function Calendar.precise_sub (from Dario Teixeira's suggestion) * [Compilation] detect whether native dynlink works (prevents compilation bug on Mac OS X) version 2.02, 2009-12-11: ========================= o [License] add the usual Ocaml linking exception in the license o [Calendar] Calendar_sig.Period.to_time is deprecated. Replaced by a new function Calendar_sig.Period.safe_to_time o [Date] Date.Period.nb_days is deprecated. Replaced by a new function Date.Period.safe_nb_days o [Compilation] calendarLib.cmxs provided if ocaml >= 3.11 is installed (patch of Mehdi Dogguy) o [Date] new functions Date.make_year and Date.make_year_month o [Date] improve memory representation of Date.Period.t * [Compilation] remove installation of packed *.cmi * [Compilation] bug fixed under Cygwin * [Compilation] META files was incorrect, so "ocamlfind ocamlopt" did not work * [Compilation] file date_sig.mli, time_sig.mli and calendar_sig.mli was not properly linked version 2.01.1, 2009-02-23: =========================== o [Date] add a missing coercion rule for months (e.g. "Date.make 2008 18 1" is now equal to "Date.make 2009 6 1") * [Date] bug fixed in date arithmetic operations due to the missing above feature version 2.01, 2009-01-26: ========================= o [Printer] new formats available for printers and parsers - %C century: as %Y without the two last digits - %F replace %i which is now deprecated - %P am or pm - %R shortcut for %H:%M - %s number of seconds since 1970/1/1 - %z time zone in the form +hhmm (from Warren Harris' suggestion) - %:z time zone in the form +hh:mm (from Warren Harris' suggestion) - %::z time zone in the form +hh:mm:ss (from Warren Harris' suggestion) - %:::z time zone in the form +hh (from Warren Harris' suggestion) o [Printer] new paddings available for printers - 0 (zero): pad fields with zeroes like by default - ^: use uppercase if possible o [Compilation] calendarLib.cma and calendarLib.cmxa are now installed (Janne Hellsten and Guillaume Yziquel's suggestion) * [Tests] test suite now uses Utils.Float.equal if required (patch of Richard Jones) * [Compilation] small bug fixed in make install * [Compilation] support of win64 (patch of David Allsopp) --- time/ocaml-calendar/Makefile | 19 +++++++++++-------- time/ocaml-calendar/PLIST | 22 +++++++--------------- time/ocaml-calendar/PLIST.opt | 3 --- time/ocaml-calendar/distinfo | 10 +++++----- time/ocaml-calendar/patches/patch-Makefile.in | 21 +++++++++++++++++++++ time/ocaml-calendar/patches/patch-aa | 20 -------------------- 6 files changed, 44 insertions(+), 51 deletions(-) delete mode 100644 time/ocaml-calendar/PLIST.opt create mode 100644 time/ocaml-calendar/patches/patch-Makefile.in delete mode 100644 time/ocaml-calendar/patches/patch-aa (limited to 'time') diff --git a/time/ocaml-calendar/Makefile b/time/ocaml-calendar/Makefile index 1667f5e4074..01ca8e0bbcc 100644 --- a/time/ocaml-calendar/Makefile +++ b/time/ocaml-calendar/Makefile @@ -1,15 +1,15 @@ -# $NetBSD: Makefile,v 1.4 2011/12/06 00:19:25 sbd Exp $ +# $NetBSD: Makefile,v 1.5 2012/08/12 17:40:59 wiz Exp $ # -DISTNAME= calendar-2.0.4 +DISTNAME= calendar-2.03.2 PKGNAME= ocaml-${DISTNAME} -PKGREVISION= 1 CATEGORIES= time devel -MASTER_SITES= # http://www.lri.fr/~signoles/prog/calendar/ +MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/915/ MAINTAINER= jaapb@kerguelen.org -HOMEPAGE= http://www.lri.fr/~signoles/prog.en.html/ +HOMEPAGE= http://calendar.forge.ocamlcore.org/ COMMENT= OCaml library managing dates and times +LICENSE= gnu-lgpl-v2.1 PKG_DESTDIR_SUPPORT= user-destdir @@ -19,16 +19,19 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" + +PLIST_VARS= opt .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") -PLIST_SRC+= PLIST.opt +PLIST.opt= yes .endif -PLIST_SRC+= PLIST - 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/bsd.pkg.mk" diff --git a/time/ocaml-calendar/PLIST b/time/ocaml-calendar/PLIST index 4f3c20c2a21..c30347ee416 100644 --- a/time/ocaml-calendar/PLIST +++ b/time/ocaml-calendar/PLIST @@ -1,34 +1,26 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:17:59 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2012/08/12 17:40:59 wiz 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.cmi lib/ocaml/site-lib/calendar/calendar.mli +lib/ocaml/site-lib/calendar/calendarLib.a +${PLIST.opt}lib/ocaml/site-lib/calendar/calendarLib.cma lib/ocaml/site-lib/calendar/calendarLib.cmi lib/ocaml/site-lib/calendar/calendarLib.cmo -lib/ocaml/site-lib/calendar/calendar_builder.cmi +${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 lib/ocaml/site-lib/calendar/calendar_builder.mli -lib/ocaml/site-lib/calendar/calendar_sig.cmi lib/ocaml/site-lib/calendar/calendar_sig.mli -lib/ocaml/site-lib/calendar/date.cmi lib/ocaml/site-lib/calendar/date.mli -lib/ocaml/site-lib/calendar/date_sig.cmi lib/ocaml/site-lib/calendar/date_sig.mli -lib/ocaml/site-lib/calendar/fcalendar.cmi lib/ocaml/site-lib/calendar/fcalendar.mli -lib/ocaml/site-lib/calendar/ftime.cmi lib/ocaml/site-lib/calendar/ftime.mli -lib/ocaml/site-lib/calendar/period.cmi lib/ocaml/site-lib/calendar/period.mli -lib/ocaml/site-lib/calendar/printer.cmi lib/ocaml/site-lib/calendar/printer.mli -lib/ocaml/site-lib/calendar/time.cmi lib/ocaml/site-lib/calendar/time.mli -lib/ocaml/site-lib/calendar/time_Zone.cmi lib/ocaml/site-lib/calendar/time_Zone.mli -lib/ocaml/site-lib/calendar/time_sig.cmi lib/ocaml/site-lib/calendar/time_sig.mli -lib/ocaml/site-lib/calendar/utils.cmi lib/ocaml/site-lib/calendar/utils.mli -lib/ocaml/site-lib/calendar/version.cmi lib/ocaml/site-lib/calendar/version.mli @exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/calendar diff --git a/time/ocaml-calendar/PLIST.opt b/time/ocaml-calendar/PLIST.opt deleted file mode 100644 index 732a661d7d6..00000000000 --- a/time/ocaml-calendar/PLIST.opt +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.opt,v 1.1.1.1 2008/11/01 12:09:44 obache Exp $ -lib/ocaml/site-lib/calendar/calendarLib.cmx -lib/ocaml/site-lib/calendar/calendarLib.o diff --git a/time/ocaml-calendar/distinfo b/time/ocaml-calendar/distinfo index 8ff194690ff..da31614c28a 100644 --- a/time/ocaml-calendar/distinfo +++ b/time/ocaml-calendar/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2010/02/12 00:31:52 joerg Exp $ +$NetBSD: distinfo,v 1.3 2012/08/12 17:40:59 wiz Exp $ -SHA1 (calendar-2.0.4.tar.gz) = 60917d141a79b07b3bf4289ef906e97bd657814a -RMD160 (calendar-2.0.4.tar.gz) = 23c2a5a8d030cdf19d4d98b7b7bdf67d87146b59 -Size (calendar-2.0.4.tar.gz) = 221843 bytes -SHA1 (patch-aa) = 0a0520e4d63ef4315f8519e953d47d61f76bc6a6 +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 diff --git a/time/ocaml-calendar/patches/patch-Makefile.in b/time/ocaml-calendar/patches/patch-Makefile.in new file mode 100644 index 00000000000..81e08d47367 --- /dev/null +++ b/time/ocaml-calendar/patches/patch-Makefile.in @@ -0,0 +1,21 @@ +$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) diff --git a/time/ocaml-calendar/patches/patch-aa b/time/ocaml-calendar/patches/patch-aa deleted file mode 100644 index 0060b6fb8e5..00000000000 --- a/time/ocaml-calendar/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2010/02/12 00:31:52 joerg Exp $ - ---- Makefile.in.orig 2010-02-12 00:29:07.000000000 +0000 -+++ Makefile.in -@@ -190,14 +190,7 @@ headers: - ######### - - install: $(LIBS) $(CLIBS) META -- @if [ "`sed -n -e 's/version = "\([0-9.]*\)"/\1/p' META`" = "$(VERSION)" ]; then \ -- (if test -d $(CAMLLIB)/site-lib/$(NAME); then $(MAKE) uninstall; fi;\ -- $(CAMLFIND) install $(NAME) target/*.cm[iox] $(MLI) $(CMI) $(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[iox] $(MLI) $(CMI) $(CLIBS) META\ - - uninstall: - $(CAMLFIND) remove $(NAME) -- cgit v1.2.3