ok me, but it needs to go in with the ocaml-camlp4 port as they are
paired. This also needs revision bumps across the board for ocaml
ports, right?
-anil
On 21 Oct 2014, at 17:56, Christopher Zimmermann <chr...@openbsd.org> wrote:
> Hi,
>
> like my last proposal, but also update to 4.02.1. The NO_TEST
> --enable-tests broke some ports, so just leave it away. OK?
>
>
> Christopher
>
>
> On Fri, 10 Oct 2014 18:59:37 +0200 Christopher Zimmermann
> <chr...@openbsd.org> wrote:
>
>> Hi,
>>
>> here are some fixes and a new CONFIGURE_STYLE for lang/ocaml.
>>
>> * add an oasis_setup CONFIGURE_STYLE, see the port-modules doc below.
>>
>> * install ocamlbuild.1
>>
>> OK?
>>
>> Christopher
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/ocaml/Makefile,v
> retrieving revision 1.66
> diff -u -p -r1.66 Makefile
> --- Makefile 4 Sep 2014 15:56:26 -0000 1.66
> +++ Makefile 21 Oct 2014 16:51:36 -0000
> @@ -10,8 +10,7 @@ COMMENT-graphics = OCaml Graphics librar
> # XXX Don't even think of updating ocaml alone.
> # Do check that the ports that depend on it still work, or repair them.
> # Don't forget to bump version in ocaml.port.mk, too!
> -VERSION=4.02.0
> -REVISION=0
> +VERSION=4.02.1
>
> PKGNAME-main = ocaml-${VERSION}
> PKGNAME-graphics = ocaml-graphics-${VERSION}
> @@ -72,6 +71,9 @@ post-install:
> ${PREFIX}/share/doc/ocaml/html
> @${INSTALL_DATA} ${WRKDIR}/htmlman/libref/* \
> ${PREFIX}/share/doc/ocaml/html/libref
> + ${INSTALL_DATA} \
> + ${WRKSRC}/ocamlbuild/man/ocamlbuild.1 \
> + ${PREFIX}/man/man1/
> @${INSTALL_DATA} \
> ${WRKSRC}/{LICENSE,Changes} \
> ${PREFIX}/share/doc/ocaml
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/ocaml/distinfo,v
> retrieving revision 1.19
> diff -u -p -r1.19 distinfo
> --- distinfo 2 Sep 2014 09:24:44 -0000 1.19
> +++ distinfo 21 Oct 2014 16:51:36 -0000
> @@ -1,4 +1,4 @@
> SHA256 (ocaml-4.02-refman-html.tar.gz) =
> Lxt5c6cbc/FAO4AUVseA52Q5C9fX/C5Fwf0RT3o4hgc=
> -SHA256 (ocaml-4.02.0.tar.gz) = 27y9cqKaUSBmd6YG6gnf7IOuJcu/Ut7pAwa8BIEs0DQ=
> +SHA256 (ocaml-4.02.1.tar.gz) = PLx69aOIbIxa+Nq1Vo1iVqGR2J7L1K6hjq9bRwNMYTg=
> SIZE (ocaml-4.02-refman-html.tar.gz) = 612896
> -SIZE (ocaml-4.02.0.tar.gz) = 3048921
> +SIZE (ocaml-4.02.1.tar.gz) = 3063481
> Index: ocaml.port.mk
> ===================================================================
> RCS file: /cvs/ports/lang/ocaml/ocaml.port.mk,v
> retrieving revision 1.29
> diff -u -p -r1.29 ocaml.port.mk
> --- ocaml.port.mk 8 Sep 2014 05:10:10 -0000 1.29
> +++ ocaml.port.mk 21 Oct 2014 16:51:36 -0000
> @@ -57,6 +57,7 @@ INSTALL_TARGET = -install
> TEST_TARGET ?= -test
> _MODOASIS_SETUP = ${WRKDIR}/oasis_setup.byte
>
> +
> ######################################################################
> # CONFIGURE
> .if ${PROPERTIES:Mocaml_native}
> @@ -64,7 +65,12 @@ _MODOASIS_OCAMLC = ocamlc.opt
> .else
> _MODOASIS_OCAMLC = ocamlc
> .endif
> -MODOASIS_configure = \
> +
> +. if ${CONFIGURE_STYLE:L:Moasis_setup}
> +BUILD_DEPENDS += sysutils/oasis
> +MODOASIS_configure += cd ${WRKSRC} && oasis setup &&
> +. endif
> +MODOASIS_configure += \
> ${_MODOASIS_OCAMLC} -o ${_MODOASIS_SETUP} ${WRKSRC}/setup.ml && \
> cd ${WRKSRC} && \
> rm setup.cm[io] && \
> Index: patches/patch-asmrun_signals_osdep_h
> ===================================================================
> RCS file: patches/patch-asmrun_signals_osdep_h
> diff -N patches/patch-asmrun_signals_osdep_h
> --- patches/patch-asmrun_signals_osdep_h 2 Sep 2014 09:24:44 -0000
> 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,50 +0,0 @@
> -$OpenBSD: patch-asmrun_signals_osdep_h,v 1.1 2014/09/02 09:24:44 chrisz Exp $
> -
> -Add stack overflow detection for i386 and amd64.
> -
> ---- asmrun/signals_osdep.h.orig Tue May 13 15:20:48 2014
> -+++ asmrun/signals_osdep.h Sun Aug 31 20:22:33 2014
> -@@ -130,6 +130,22 @@
> - #define CONTEXT_YOUNG_PTR (context->uc_mcontext.gregs[REG_R15])
> - #define CONTEXT_FAULTING_ADDRESS ((char *) info->si_addr)
> -
> -+/****************** AMD64, OpenBSD */
> -+
> -+#elif defined(TARGET_amd64) && defined (SYS_openbsd)
> -+
> -+ #define DECLARE_SIGNAL_HANDLER(name) \
> -+ static void name(int sig, siginfo_t * info, struct sigcontext * context)
> -+
> -+ #define SET_SIGACT(sigact,name) \
> -+ sigact.sa_sigaction = (void (*)(int,siginfo_t *,void *)) (name); \
> -+ sigact.sa_flags = SA_SIGINFO
> -+
> -+ #define CONTEXT_PC (context->sc_rip)
> -+ #define CONTEXT_EXCEPTION_POINTER (context->sc_r14)
> -+ #define CONTEXT_YOUNG_PTR (context->sc_r15)
> -+ #define CONTEXT_FAULTING_ADDRESS ((char *) info->si_addr)
> -+
> - /****************** I386, Linux */
> -
> - #elif defined(TARGET_i386) && defined(SYS_linux_elf)
> -@@ -142,6 +158,20 @@
> - sigact.sa_flags = 0
> -
> - #define CONTEXT_FAULTING_ADDRESS ((char *) context.cr2)
> -+
> -+/****************** I386, BSD_ELF */
> -+
> -+#elif defined(TARGET_i386) && defined(SYS_bsd_elf)
> -+
> -+ #define DECLARE_SIGNAL_HANDLER(name) \
> -+ static void name(int sig, siginfo_t * info, struct sigcontext * context)
> -+
> -+ #define SET_SIGACT(sigact,name) \
> -+ sigact.sa_sigaction = (void (*)(int,siginfo_t *,void *)) (name); \
> -+ sigact.sa_flags = SA_SIGINFO
> -+
> -+ #define CONTEXT_PC (context->sc_eip)
> -+ #define CONTEXT_FAULTING_ADDRESS ((char *) info->si_addr)
> -
> - /****************** I386, BSD */
> -
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/lang/ocaml/patches/patch-configure,v
> retrieving revision 1.18
> diff -u -p -r1.18 patch-configure
> --- patches/patch-configure 2 Sep 2014 09:24:44 -0000 1.18
> +++ patches/patch-configure 21 Oct 2014 16:51:36 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure,v 1.18 2014/09/02 09:24:44 chrisz Exp $
> ---- configure.orig Sun Aug 31 21:04:23 2014
> -+++ configure Sun Aug 31 21:06:35 2014
> -@@ -816,6 +816,8 @@ case "$target" in
> +--- configure.orig Fri Oct 3 21:25:46 2014
> ++++ configure Sat Oct 18 12:19:58 2014
> +@@ -822,6 +822,8 @@ case "$target" in
> if $arch64;then model=ppc64;else
> model=ppc;fi;;
> armv6*-*-linux-gnueabihf) arch=arm; model=armv6; system=linux_eabihf;;
> arm*-*-linux-gnueabihf) arch=arm; system=linux_eabihf;;
> @@ -10,24 +10,14 @@ $OpenBSD: patch-configure,v 1.18 2014/09
> armv7*-*-linux-gnueabi) arch=arm; model=armv7; system=linux_eabi;;
> armv6t2*-*-linux-gnueabi) arch=arm; model=armv6t2; system=linux_eabi;;
> armv6*-*-linux-gnueabi) arch=arm; model=armv6; system=linux_eabi;;
> -@@ -1324,7 +1326,8 @@ fi
> - # Determine if system stack overflows can be detected
> -
> - case "$arch,$system" in
> -- i386,linux_elf|amd64,linux|power,rhapsody|amd64,macosx|i386,macosx)
> -+ i386,linux_elf|amd64,linux|power,rhapsody|amd64,macosx|i386,macosx| \
> -+ amd64,openbsd|i386,bsd_elf)
> - inf "System stack overflow can be detected."
> - echo "#define HAS_STACK_OVERFLOW_DETECTION" >> s.h;;
> - *)
> -@@ -1581,11 +1584,11 @@ echo "X11_LINK=$x11_link" >> Makefile
> +@@ -1602,11 +1604,11 @@ echo "X11_LINK=$x11_link" >> Makefile
>
> # Look for BFD library
>
> --if ./hasgot -i bfd.h && \
> -- ./hasgot -lbfd -ldl -liberty -lz bfd_openr; then
> -+if ./hasgot -I${OPENBSD_LOCALBASE}/include -DPACKAGE=ocaml -i bfd.h && \
> -+ ./hasgot -L${OPENBSD_LOCALBASE}/lib -DPACKAGE=ocaml -lbfd -liberty -lz
> bfd_openr; then
> +-if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
> +- sh ./hasgot -DPACKAGE=ocaml -lbfd -ldl -liberty -lz bfd_openr; then
> ++if sh ./hasgot -I${OPENBSD_LOCALBASE}/include -DPACKAGE=ocaml -i bfd.h && \
> ++ sh ./hasgot -L${OPENBSD_LOCALBASE}/lib -DPACKAGE=ocaml -lbfd -liberty
> -lz bfd_openr; then
> inf "BFD library found."
> echo "#define HAS_LIBBFD" >> s.h
> - echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/lang/ocaml/pkg/PLIST-main,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST-main
> --- pkg/PLIST-main 3 Sep 2014 17:48:19 -0000 1.3
> +++ pkg/PLIST-main 21 Oct 2014 16:51:38 -0000
> @@ -411,6 +411,7 @@ lib/ocaml/weak.cmi
> lib/ocaml/weak.ml
> lib/ocaml/weak.mli
> @man man/man1/ocaml.1
> +@man man/man1/ocamlbuild.1
> @man man/man1/ocamlc.1
> @man man/man1/ocamlc.opt.1
> @man man/man1/ocamlcp.1
> @@ -428,6 +429,32 @@ lib/ocaml/weak.mli
> @man man/man3/Arg.3o
> @man man/man3/Array.3o
> @man man/man3/ArrayLabels.3o
> +@man man/man3/Ast_helper.3o
> +@man man/man3/Ast_helper.Cf.3o
> +@man man/man3/Ast_helper.Ci.3o
> +@man man/man3/Ast_helper.Cl.3o
> +@man man/man3/Ast_helper.Csig.3o
> +@man man/man3/Ast_helper.Cstr.3o
> +@man man/man3/Ast_helper.Ctf.3o
> +@man man/man3/Ast_helper.Cty.3o
> +@man man/man3/Ast_helper.Exp.3o
> +@man man/man3/Ast_helper.Incl.3o
> +@man man/man3/Ast_helper.Mb.3o
> +@man man/man3/Ast_helper.Md.3o
> +@man man/man3/Ast_helper.Mod.3o
> +@man man/man3/Ast_helper.Mtd.3o
> +@man man/man3/Ast_helper.Mty.3o
> +@man man/man3/Ast_helper.Opn.3o
> +@man man/man3/Ast_helper.Pat.3o
> +@man man/man3/Ast_helper.Sig.3o
> +@man man/man3/Ast_helper.Str.3o
> +@man man/man3/Ast_helper.Te.3o
> +@man man/man3/Ast_helper.Typ.3o
> +@man man/man3/Ast_helper.Type.3o
> +@man man/man3/Ast_helper.Val.3o
> +@man man/man3/Ast_helper.Vb.3o
> +@man man/man3/Ast_mapper.3o
> +@man man/man3/Asttypes.3o
> @man man/man3/Bigarray.3o
> @man man/man3/Bigarray.Array1.3o
> @man man/man3/Bigarray.Array2.3o
> @@ -459,9 +486,12 @@ lib/ocaml/weak.mli
> @man man/man3/Int32.3o
> @man man/man3/Int64.3o
> @man man/man3/Lazy.3o
> +@man man/man3/Lexer.3o
> @man man/man3/Lexing.3o
> @man man/man3/List.3o
> @man man/man3/ListLabels.3o
> +@man man/man3/Location.3o
> +@man man/man3/Longident.3o
> @man man/man3/Map.3o
> @man man/man3/Map.Make.3o
> @man man/man3/Map.OrderedType.3o
> @@ -487,9 +517,15 @@ lib/ocaml/weak.mli
> @man man/man3/Num.3o
> @man man/man3/Obj.3o
> @man man/man3/Oo.3o
> +@man man/man3/Parse.3o
> +@man man/man3/Parser.3o
> +@man man/man3/Parsetree.3o
> @man man/man3/Parsing.3o
> @man man/man3/Pervasives.3o
> @man man/man3/Pervasives.LargeFile.3o
> +@man man/man3/Pprintast.3o
> +@man man/man3/Pprintast.printer.3o
> +@man man/man3/Printast.3o
> @man man/man3/Printexc.3o
> @man man/man3/Printexc.Slot.3o
> @man man/man3/Printf.3o
> @@ -513,6 +549,7 @@ lib/ocaml/weak.mli
> @man man/man3/Stream.3o
> @man man/man3/String.3o
> @man man/man3/StringLabels.3o
> +@man man/man3/Syntaxerr.3o
> @man man/man3/Sys.3o
> @man man/man3/Unix.3o
> @man man/man3/Unix.LargeFile.3o
>
>
>
>
> --
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
