[prev in list] [next in list] [prev in thread] [next in thread]
List: openbsd-ports
Subject: Re: UPDATE several OCaml ports: hevea, wyrd, utop...
From: Christopher Zimmermann <chrisz () openbsd ! org>
Date: 2015-03-29 7:14:16
Message-ID: 20150329091416.41dfdc84 () mortimer ! gmerlin ! de
[Download RAW message or body]
[Attachment #2 (multipart/mixed)]
On Sat, 28 Mar 2015 16:42:57 +0000 Anil Madhavapeddy <anil@recoil.org>
wrote:
> I've eyeballed all these (but not done a build) and they look ok to
> me with these comments
>
> - findlib: need a @bin on safe_camlp4?
As far as I know @bin is a now-op right now. So I just go with what
update-plist puts there and won't force it to be either way.
> - dose3: the version here should precisely match whatever the OPAM
> port needs. OPAM 1.2.1 is now out as well, so if that's added then
> this dose version should be ok too.
> - calendar: no need to install .annot files.
done (updated diff is attached.
> In general, we should start installing .cmt/.cmti files for ports,
> but this requires the build systems to catch up (most OASIS users
> have). These are the typed AST files that can be used by modern
> editor and documentation tools.
Don't tell me ;)
So which ones can you give an OK? dose, new ocaml-calendar, findlib ?
The rest ?
Thanks,
Christopher
>
> -anil
>
> > On 28 Mar 2015, at 16:24, Christopher Zimmermann
> > <chrisz@openbsd.org> wrote:
> >
> > Hi,
> >
> > I have these updates in my ports tree for quite some time now. All
> > tested on amd64. Except for few recently updated ones tested with
> > bytecode-only builds, too.
> > Can you please at least look at the ones you maintain.
> > OKs for the other ones are very welcome, too.
> >
> > ocaml-csv has a large diff because I needed to regenarate the build
> > system using oasis which is not yet in ports.
> >
> >
> > Chritsopher
> >
> >
> > --
> > http://gmerlin.de
> > OpenPGP: http://gmerlin.de/christopher.pub
> > F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E
> > 4FEE<findlib.diff><hevea.diff><ocaml-batteries.diff><ocaml-bitstring.diff><ocaml-c \
> > alendar.diff><ocaml-camlp4.diff><ocaml-cmdliner.diff><ocaml-cryptokit.diff><ocaml- \
> > csv.diff><ocaml-dose.diff><ocaml-graph.diff><ocaml-lambda-term.diff><ocaml-lwt.dif \
> > f><ocaml-net.diff><ocaml-pcre.diff><ocaml-postgresql.diff><ocaml-re.diff><ocaml-rs \
> > s.diff><ocaml-sqlite3.diff><ocaml-ssl.diff><ocaml-text.diff><ocaml-uutf.diff><ocaml-xmlm.diff><ocaml-zed.diff><utop.diff><wyrd.diff>
> >
>
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
[Attachment #5 (text/x-patch)]
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/ocaml-calendar/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 21 Oct 2014 19:18:46 -0000 1.14
+++ Makefile 29 Mar 2015 07:13:24 -0000
@@ -3,12 +3,11 @@
COMMENT= Objective Caml bindings for calendar functions
CATEGORIES= devel
-V= 2.03.2
+V= 2.04
DISTNAME= calendar-${V}
PKGNAME= ocaml-calendar-${V}
-REVISION= 5
# You need to update MASTER_SITES too, when changing the version number.
-MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/915/
+MASTER_SITES= https://forge.ocamlcore.org/frs/download.php/1481/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
HOMEPAGE= http://calendar.forge.ocamlcore.org/
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/ocaml-calendar/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Aug 2012 22:06:49 -0000 1.4
+++ distinfo 29 Mar 2015 07:13:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (calendar-2.03.2.tar.gz) = DjgfqqO7pSLLrHBaf4cubs+hUiBnH0aI0eMRYxaH+xI=
-SIZE (calendar-2.03.2.tar.gz) = 270225
+SHA256 (calendar-2.04.tar.gz) = vqb6oDN6HFSw88K5tFyeuQ4rJ0dAbm8LhB4f0g/U2fc=
+SIZE (calendar-2.04.tar.gz) = 271522
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/ocaml-calendar/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 18 Aug 2012 22:06:49 -0000 1.2
+++ patches/patch-Makefile_in 29 Mar 2015 07:13:24 -0000
@@ -1,12 +1,56 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2012/08/18 22:06:49 avsm Exp $
---- Makefile.in.orig Fri Aug 10 03:46:25 2012
-+++ Makefile.in Fri Aug 10 03:46:58 2012
-@@ -209,7 +209,7 @@ headers:
+$OpenBSD$
+
+Build and install .annot and .cmt files.
+
+--- Makefile.in.orig Wed Oct 29 11:03:20 2014
++++ Makefile.in Sun Mar 29 08:43:32 2015
+@@ -77,6 +77,7 @@ MLI = $(filter %.mli, $(SRC))
+ CMO = $(ML:.ml=.cmo)
+ CMX = $(CMO:.cmo=.cmx)
+ CMI = $(MLI:.mli=.cmi)
++ANNOT = $(ML:.ml=.annot) $(ML:.ml=.cmt)
+ CMI_ONLY= src/period.cmi src/date_sig.cmi src/time_sig.cmi src/calendar_sig.cmi
+
+ GENERATED= src/version.ml
+@@ -86,7 +87,7 @@ GENERATED= src/version.ml
+
+ CAMLIBS = $(addprefix -I , $(DIRS))
+
+-CAMLFLAGS= $(CAMLIBS)
++CAMLFLAGS= -annot -bin-annot $(CAMLIBS)
+ BYTEFLAGS= $(CAMLFLAGS)
+ LINK_OPTFLAGS = $(CAMLFLAGS) -noassert
+ OPTFLAGS = $(LINK_OPTFLAGS) -for-pack CalendarLib
+@@ -133,20 +134,15 @@ META: Makefile
+ %.gz: %
+ gzip -f --best $<
+
+-.SUFFIXES: .ml .mli .cmo .cmi .cmx $(OBJ_EXT)
+-
+-.mli.cmi:
++%.cmi %.cmti: %.mli
+ $(CAMLC) $(BYTEFLAGS) -c $<
+
+-.ml.cmo:
++%.cmo %.cmt %.annot: %.ml
+ $(CAMLC) $(BYTEFLAGS) -c $<
+
+-.ml$(OBJ_EXT):
++%.cmx %.cmt %.annot %$(OBJ_EXT): %.ml
+ $(CAMLOPT) $(OPTFLAGS) -c $<
+
+-.ml.cmx:
+- $(CAMLOPT) $(OPTFLAGS) -c $<
+-
+ # Tests
+ #######
+
+@@ -210,7 +206,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); \
-+ $(CAMLFIND) install $(NAME) target/*.cm* $(MLI) $(CLIBS) META); \
+- $(CAMLFIND) install $(NAME) target/*.cm* $(MLI) $(CLIBS) META); \
++ $(CAMLFIND) install $(NAME) target/*.cm* $(MLI) $(ANNOT) $(CLIBS) META); \
else \
(echo; echo "Not the good version. Please, do :"; \
echo " make clean && make"; \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/ocaml-calendar/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 21 Oct 2014 19:18:46 -0000 1.3
+++ pkg/PLIST 29 Mar 2015 07:13:24 -0000
@@ -2,22 +2,43 @@
%%native%%
lib/ocaml/calendar/
lib/ocaml/calendar/META
+lib/ocaml/calendar/calendar.annot
+lib/ocaml/calendar/calendar.cmt
lib/ocaml/calendar/calendar.mli
lib/ocaml/calendar/calendarLib.cma
lib/ocaml/calendar/calendarLib.cmi
lib/ocaml/calendar/calendarLib.cmo
+lib/ocaml/calendar/calendarLib.cmt
+lib/ocaml/calendar/calendar_builder.annot
+lib/ocaml/calendar/calendar_builder.cmt
lib/ocaml/calendar/calendar_builder.mli
lib/ocaml/calendar/calendar_sig.mli
+lib/ocaml/calendar/date.annot
+lib/ocaml/calendar/date.cmt
lib/ocaml/calendar/date.mli
lib/ocaml/calendar/date_sig.mli
+lib/ocaml/calendar/fcalendar.annot
+lib/ocaml/calendar/fcalendar.cmt
lib/ocaml/calendar/fcalendar.mli
+lib/ocaml/calendar/ftime.annot
+lib/ocaml/calendar/ftime.cmt
lib/ocaml/calendar/ftime.mli
lib/ocaml/calendar/period.mli
+lib/ocaml/calendar/printer.annot
+lib/ocaml/calendar/printer.cmt
lib/ocaml/calendar/printer.mli
+lib/ocaml/calendar/time.annot
+lib/ocaml/calendar/time.cmt
lib/ocaml/calendar/time.mli
+lib/ocaml/calendar/time_Zone.annot
+lib/ocaml/calendar/time_Zone.cmt
lib/ocaml/calendar/time_Zone.mli
lib/ocaml/calendar/time_sig.mli
+lib/ocaml/calendar/utils.annot
+lib/ocaml/calendar/utils.cmt
lib/ocaml/calendar/utils.mli
+lib/ocaml/calendar/version.annot
+lib/ocaml/calendar/version.cmt
lib/ocaml/calendar/version.mli
share/doc/ocaml-calendar/
share/doc/ocaml-calendar/CHANGES
[Attachment #6 (application/pgp-signature)]
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic