Re: lang/ocaml and IBT WAS: amd64: IBT bulk build breakage

2023-08-15 Thread Anil Madhavapeddy 
On 11 Aug 2023, at 12:51, Stuart Henderson  wrote:
> 
> yes, for amd64 it's intel Tiger Lake (11th gen) and newer, models of the
> format iX-11XXX, iX-12XXX, iX-13XXX. no AMD CPUs. On ark.intel.com, look
> for "Control-Flow Enforcement Technology" (the intel term which covers
> both shadow stacks and indirect branch tracking).
> 
> for arm64 currently only on Apple M2.

Thanks for all the pointers! Every machine for 100 miles around me seems
to be an AMD these days, so I've ordered myself a Raptor Lake NUC
to be my new OpenBSD desktop. As soon as that arrives I'll take a look
at the native code compiler output (unless someone else beats me to it).

In the meanwhile I think we should go for updating the OCaml ports
to 5.1.0 so that a patch against trunk will be manageable...

The only roadbump is from Daniel Dickman, who wrote:

> Fine with me so long as compcert continues to work on i386. I think the
> only impact is potentially running slower? That’s fine with me.
> 
> That being said I think there were some challenges with newer coq on
> i386. So maybe the end is close for compcert on that platform?

Indeed, I think it's time to move to a 64-bit license after so many years.
I strongly suspect you're the only user of OpenBSD/i386 compcert
these days, so it's worth just asking for an upgrade of the license
to shift to 64-bit.  OCaml 5 will definitely be bytecode-only for 32-bit
architectures for the foreseeable future. This in turn pushes up memory
requirements (due to the extra boxing of values), which makes it more
likely that Compcert/Coq will hit the 4GB process limit.

Anil

Re: lang/ocaml and IBT WAS: amd64: IBT bulk build breakage

2023-08-15 Thread Anil Madhavapeddy 
On 8 Aug 2023, at 20:49, Volker Schlecht  wrote:
> 
> Cc: Maintainer
> 
> On 7/31/23 14:28, Christian Weisgerber wrote:
>> I managed to run a full bulk build on my T14 G3 with IBT.  Kudos
>> to Lenovo for engineering a laptop that can build for days on end
>> without melting down.
>> The following ports fail to build:
>> devel/ocaml-menhir  # OCaml
>> sysutils/opam   # OCaml
>> x11/lablgtk3# OCaml
>> I included an uncommitted USE_NOBTICF fix for sysutils/findlib, but
>> there seems to remain another problem with some OCaml ports.
> 
> With the attached patch, I get a lang/ocaml that builds ocaml-menhir and
> lablgtk3 successfully on my IBT enabled amd64 machine.


I’m just catching up; is a recent amd64 snapshot enough to get an
IBT-enabled system?

I’m testing out OCaml 5.1~rc1, and the testsuite fully passes.  Might
be easier to just upgrade to that instead.  It would mean turning i386
and arm32 into bytecode-only architectures, but that’s got to happen at
some stage.

Anil

Re: [UPDATE] lang/ocaml 4.14.0

2022-09-20 Thread Anil Madhavapeddy 
On 20 Sep 2022, at 19:34, Volker Schlecht  wrote:
> 
> I know we're slowing down for the 7.2 release, but I wanted to put this out 
> there anyway.
> 
> Here's an update for ocaml 4.14.0 ... my initial drama with M4 aside, this 
> seems to work on amd64, and rebuilds

Thanks Volker!  What was the incompatibility with the base m4 in OCaml 4.14.0? 
May be able to fix that upstream as well...

Anil

Re: current status of OCaml

2022-09-05 Thread Anil Madhavapeddy 
On 5 Sep 2022, at 14:18, Daniel Dickman  wrote:
> 
>> the lack of native code i386 in OCaml 5.0
> 
> Hi Anil, I haven’t followed the ocaml lists but what is the reason to drop 
> this out of curiosity?

It's a large burden to maintain i386 these days.
See https://github.com/ocaml/ocaml/pull/10540 
 for
the initial attempt to remove it which has some of the
justifications.  Then, the multicore merge in 5.0 simply
doesn't have support for i386, so it's gone by default
there.  We preferred to put our efforts into (e.g.) the
RISC-V backend first, and PowerPC64 still needs to be
completed.  i386 is pretty low on the list...

Anil

Re: current status of OCaml

2022-09-05 Thread Anil Madhavapeddy 
On 5 Sep 2022, at 11:58, Stuart Henderson  wrote:
> 
> On 2022/09/05 09:44, Anil Madhavapeddy wrote:
>> Daniel will be have to deal with the lack of native code i386 in OCaml 5.0 
>> in all likelihood though
> 
> Honestly, a bytecode-only arch on something that anyone can run in a VM
> makes things simpler as far as ports is concerned.

I suspect that Daniel may have an opinion regarding the performance of 
Compcert/i386 when run in this mode though...

Anil

Re: current status of OCaml

2022-09-05 Thread Anil Madhavapeddy 
On 4 Sep 2022, at 19:15, Daniel Dickman  wrote:
> 
>> On Sep 3, 2022, at 11:34 AM, Volker Schlecht  
>> wrote:
>> 
>> Hi,
>> 
>> just wanted to get a quick idea about the state of affairs with OCaml in 
>> ports: there's been a lot happening in the OCaml world and not so much in 
>> the related ports.
>> Is that due to lack of time and/or interest or any more fundamental 
>> compatibility issues with the later releases?
> 
> Hi Volker, nothing is stopping anyone from proposing an update.
> 
> But compcert on i386 is a very important package for me so I’d like to be 
> sure that any updates don’t break it.
> 
> If you decide to do any work here please be sure that all native and 
> non-native ocaml packages continue to build and run fine.
> 
> In the past I haven’t been able to update ocaml without doing related updates 
> to the many ocaml consumer ports. That being said, it is much easier these 
> days now that the ocaml consumers in the tree were reduced to a minimum (ie. 
> opam is expected to be used for things not in the tree).
> 
> I would be very happy with newer ocaml and coq if we can get them though. 
> (Also compcert is one version behind the latest release — that one should be 
> an easy update I think).

Likewise, an upgrade to 4.14 in ports would be very welcome, and there should 
be no blockers.

OCaml 5.00 will be a bit of a bumpy ride due to the number of 
deprecated-features-that-have-actually-been-removed, but I use it without too 
many bumps on OpenBSD/amd64 these days.  Daniel will be have to deal with the 
lack of native code i386 in OCaml 5.0 in all likelihood though -- either we 
have to package up OCaml 4/5 separately in ports or deal with a bytecode-only 
set of 32-bit architectures.  We're a few months away from having to make that 
decision, though -- let's get the port up to 4.14 first.

cheers,
Anil

Re: update ocaml to 4.12.1

2021-12-18 Thread Anil Madhavapeddy 
On 17 Dec 2021, at 17:48, Daniel Dickman  wrote:
> 
> 
> 
>> On Dec 17, 2021, at 12:21 PM, Jeremie Courreges-Anglas  
>> wrote:
>> 
>> On Sat, Dec 04 2021, Daniel Dickman  wrote:
>>> See below for a diff for ocaml to the 4.12.x series. Only a few changes 
>>> were needed for this update and they're already in the tree:
>>> - mldonkey and unison 2.4.x needed a small diff
>>> - dune needed to be updated to 2.7.0
>>> 
>>> All ocaml ports were built successfully on amd64 (except coccinelle which 
>>> is still broken).
>> 
>> This update doesn't package on sparc64 and riscv64 - and likely all
>> non-native archs.  The diff below fixes this for me, and seems to be
>> correct.  IIUC the compilation of those two files is hooked from ASMCOMP
>> in ./compilerlibs/Makefile.compilerlibs.
>> 
>> ok?
>> 
> 
> Ok daniel@ and thank you for testing this!

This looks right to me. Although if you have RISC-V hardware, you could
also try adding riscv64 to OCAML_NATIVE_ARCHS and
OCAML_NATIVE_DYNLINK_ARCHS in arch-defines.mk and seeing how
that gets along. Most things should just work with native riscv OCaml.

Anil

Re: update ocaml to 4.12.1

2021-12-06 Thread Anil Madhavapeddy 
That sounds great. It's been a while since I've done a ports update, so I'll 
follow your dependent-port-revision-bump once you've committed your 4.12.1 
update.  This one's ok avsm@

Anil

> On 6 Dec 2021, at 14:09, Daniel Dickman  wrote:
> 
> Hi Anil, that sound great! I’m very happy that you’re still able to work on 
> the ocaml world on OpenBSD!
> 
> Let me do the commit to 4.12 for now and leave 4.13 and further to you.
> 
> On dune, getting it from 2.7.0 to latest would also be awesome.
> 
> Thanks!
> 
>> On Dec 6, 2021, at 2:52 AM, Anil Madhavapeddy  wrote:
>> 
>> Thanks Daniel. I've coincidentally unslacked in order to refresh OCaml ports
>> in preparation for supporting OpenBSD for OCaml 5.0 (which has multicore).
>> 
>> A few quick questions:
>> 
>> - why not bump straight to 4.13.1? Is anything incompatible there?
>> - I have local diffs for dune to go 2.9.1, which requires adding some 
>> multipackages
>> for the dune libraries (now separate from the dune binary)
>> - riscv should also be a native arch now in case that's missing.
>> 
>> otherwise looks good to me. I'm happy to remain maintainer, but also can
>> drop it if you would prefer to take it over. Best not to make it totally 
>> unmaintained
>> though...
>> 
>> Anil
>> 
>>> On 5 Dec 2021, at 04:36, Daniel Dickman  wrote:
>>> 
>>> See below for a diff for ocaml to the 4.12.x series. Only a few changes 
>>> were needed for this update and they're already in the tree:
>>> - mldonkey and unison 2.4.x needed a small diff
>>> - dune needed to be updated to 2.7.0
>>> 
>>> All ocaml ports were built successfully on amd64 (except coccinelle which 
>>> is still broken).
>>> 
>>> As usual the ocaml update requires an update to a matching camlp4 which is 
>>> included in the diff below.
>>> 
>>> All consumer ports will also be bumped when this goes in.
>>> 
>>> ok for the update?
>>> 
>>> p.s. Anil, not sure if you want to stay as maintainer of ocaml or not. I'm 
>>> dropping you in the proposed diff. But if you want to stay as maintainer 
>>> please let me know.
>>> 
>>> 
>>> Index: lang/ocaml/Makefile
>>> ===
>>> RCS file: /cvs/ports/lang/ocaml/Makefile,v
>>> retrieving revision 1.89
>>> diff -u -p -u -r1.89 Makefile
>>> --- lang/ocaml/Makefile4 Dec 2021 21:17:10 -1.89
>>> +++ lang/ocaml/Makefile5 Dec 2021 04:29:23 -
>>> @@ -4,8 +4,7 @@ COMMENT =   ML language with complete c
>>> 
>>> # XXX Don't even think of updating ocaml alone.
>>> # Do check that the ports that depend on it still work, or repair them.
>>> -VERSION=4.11.2
>>> -REVISION =0
>>> +VERSION=4.12.1
>>> 
>>> PKGNAME =ocaml-${VERSION:C/\+//}
>>> 
>>> @@ -20,7 +19,6 @@ DISTFILES=${DISTNAME}.tar.gz ${DOCFILES
>>> DISTNAME =ocaml-${VERSION}
>>> 
>>> HOMEPAGE=https://ocaml.org/
>>> -MAINTAINER=Anil Madhavapeddy 
>>> 
>>> # QPL/LGPL
>>> PERMIT_PACKAGE=Yes
>>> Index: lang/ocaml/distinfo
>>> ===
>>> RCS file: /cvs/ports/lang/ocaml/distinfo,v
>>> retrieving revision 1.28
>>> diff -u -p -u -r1.28 distinfo
>>> --- lang/ocaml/distinfo2 Dec 2021 03:59:20 -1.28
>>> +++ lang/ocaml/distinfo5 Dec 2021 04:29:23 -
>>> @@ -1,4 +1,4 @@
>>> -SHA256 (ocaml-4.11-refman-html.tar.gz) = 
>>> 88vAwTLfHhI2oWJpAI32Vk6fuLh0XCLGyWjK0TStUHY=
>>> -SHA256 (ocaml-4.11.2.tar.gz) = T1UdfLDAhdxXJW0ZbKUdMvqqywKYyE0JBSuETecCCSE=
>>> -SIZE (ocaml-4.11-refman-html.tar.gz) = 1762039
>>> -SIZE (ocaml-4.11.2.tar.gz) = 4969981
>>> +SHA256 (ocaml-4.12-refman-html.tar.gz) = 
>>> eLtzsc6LiAUty+m1n97k/amUzCl46ll4gx8if3fagvs=
>>> +SHA256 (ocaml-4.12.1.tar.gz) = bWHsE6fRtS7uc1r6xhZVK1btEt2hmBxNRBBX5S2RD9c=
>>> +SIZE (ocaml-4.12-refman-html.tar.gz) = 1444139
>>> +SIZE (ocaml-4.12.1.tar.gz) = 5181551
>>> Index: lang/ocaml/patches/patch-configure_ac
>>> ===
>>> RCS file: /cvs/ports/lang/ocaml/patches/patch-configure_ac,v
>>> retrieving revision 1.5
>>> diff -u -p -u -r1.5 patch-configure_ac
>>> --- lang/ocaml/patches/patch-configure_ac4 Dec 2021 21:17:10 -
>

Re: update ocaml to 4.12.1

2021-12-06 Thread Anil Madhavapeddy 
Thanks Daniel. I've coincidentally unslacked in order to refresh OCaml ports
in preparation for supporting OpenBSD for OCaml 5.0 (which has multicore).

A few quick questions:

- why not bump straight to 4.13.1? Is anything incompatible there?
- I have local diffs for dune to go 2.9.1, which requires adding some 
multipackages
  for the dune libraries (now separate from the dune binary)
- riscv should also be a native arch now in case that's missing.

otherwise looks good to me. I'm happy to remain maintainer, but also can
drop it if you would prefer to take it over. Best not to make it totally 
unmaintained
though...

Anil

> On 5 Dec 2021, at 04:36, Daniel Dickman  wrote:
> 
> See below for a diff for ocaml to the 4.12.x series. Only a few changes 
> were needed for this update and they're already in the tree:
> - mldonkey and unison 2.4.x needed a small diff
> - dune needed to be updated to 2.7.0
> 
> All ocaml ports were built successfully on amd64 (except coccinelle which 
> is still broken).
> 
> As usual the ocaml update requires an update to a matching camlp4 which is 
> included in the diff below.
> 
> All consumer ports will also be bumped when this goes in.
> 
> ok for the update?
> 
> p.s. Anil, not sure if you want to stay as maintainer of ocaml or not. I'm 
> dropping you in the proposed diff. But if you want to stay as maintainer 
> please let me know.
> 
> 
> Index: lang/ocaml/Makefile
> ===
> RCS file: /cvs/ports/lang/ocaml/Makefile,v
> retrieving revision 1.89
> diff -u -p -u -r1.89 Makefile
> --- lang/ocaml/Makefile   4 Dec 2021 21:17:10 -   1.89
> +++ lang/ocaml/Makefile   5 Dec 2021 04:29:23 -
> @@ -4,8 +4,7 @@ COMMENT =ML language with complete c
> 
> # XXX Don't even think of updating ocaml alone.
> # Do check that the ports that depend on it still work, or repair them.
> -VERSION= 4.11.2
> -REVISION =   0
> +VERSION= 4.12.1
> 
> PKGNAME = ocaml-${VERSION:C/\+//}
> 
> @@ -20,7 +19,6 @@ DISTFILES=  ${DISTNAME}.tar.gz ${DOCFILES
> DISTNAME =ocaml-${VERSION}
> 
> HOMEPAGE= https://ocaml.org/
> -MAINTAINER=  Anil Madhavapeddy 
> 
> # QPL/LGPL
> PERMIT_PACKAGE=   Yes
> Index: lang/ocaml/distinfo
> ===
> RCS file: /cvs/ports/lang/ocaml/distinfo,v
> retrieving revision 1.28
> diff -u -p -u -r1.28 distinfo
> --- lang/ocaml/distinfo   2 Dec 2021 03:59:20 -   1.28
> +++ lang/ocaml/distinfo   5 Dec 2021 04:29:23 -
> @@ -1,4 +1,4 @@
> -SHA256 (ocaml-4.11-refman-html.tar.gz) = 
> 88vAwTLfHhI2oWJpAI32Vk6fuLh0XCLGyWjK0TStUHY=
> -SHA256 (ocaml-4.11.2.tar.gz) = T1UdfLDAhdxXJW0ZbKUdMvqqywKYyE0JBSuETecCCSE=
> -SIZE (ocaml-4.11-refman-html.tar.gz) = 1762039
> -SIZE (ocaml-4.11.2.tar.gz) = 4969981
> +SHA256 (ocaml-4.12-refman-html.tar.gz) = 
> eLtzsc6LiAUty+m1n97k/amUzCl46ll4gx8if3fagvs=
> +SHA256 (ocaml-4.12.1.tar.gz) = bWHsE6fRtS7uc1r6xhZVK1btEt2hmBxNRBBX5S2RD9c=
> +SIZE (ocaml-4.12-refman-html.tar.gz) = 1444139
> +SIZE (ocaml-4.12.1.tar.gz) = 5181551
> Index: lang/ocaml/patches/patch-configure_ac
> ===
> RCS file: /cvs/ports/lang/ocaml/patches/patch-configure_ac,v
> retrieving revision 1.5
> diff -u -p -u -r1.5 patch-configure_ac
> --- lang/ocaml/patches/patch-configure_ac 4 Dec 2021 21:17:10 -   
> 1.5
> +++ lang/ocaml/patches/patch-configure_ac 5 Dec 2021 04:29:23 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-configure_ac,v 1.5 2021/
> Index: configure.ac
> --- configure.ac.orig
> +++ configure.ac
> -@@ -700,6 +700,11 @@ AS_CASE([$CC,$host],
> +@@ -735,6 +735,11 @@ AS_CASE([$CC,$host],
>  )
> 
> 
> @@ -15,13 +15,16 @@ Index: configure.ac
>  ## Program to use to install files
>  AC_PROG_INSTALL
> 
> -@@ -824,8 +829,8 @@ AS_IF([test x"$enable_shared" != "xno"],
> +@@ -867,10 +872,10 @@ AS_IF([test x"$enable_shared" != "xno"],
>  [[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
>  |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
>[sharedlib_cflags="-fPIC"
> --  mksharedlib="$CC -shared"
> -   oc_ldflags="$oc_ldflags -Wl,-E"
> -+  mksharedlib="$CC -shared $oc_ldflags"
> ++  oc_ldflags="$oc_ldflags -Wl,-E"
> +AS_CASE([$CC,$host],
> +[gcc*,powerpc-*-linux*], [mksharedlib="$CC -shared -mbss-plt"],
> +-   [mksharedlib="$CC -shared"])
> +-  oc_ldflags="$oc_ldflags -Wl,-E"
> ++   [mksharedlib="$CC -shared $o

Re: mldonkey: use custom build of OCaml 3.12

2019-06-17 Thread Anil Madhavapeddy 
On 17 Jun 2019, at 20:35, Stuart Henderson  wrote:
> 
> On 2019/06/17 21:20, Christopher Zimmermann wrote:
>> Hi,
>> 
>> Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml.
>> Its build system has the option to build against a private build of
>> OCaml 3.12 and a copy of lablgtk.
>> I adapted the port to use this option and therefore get rid of the
>> dependency on a system wide OCaml installation.
>> Tested to build and start up on amd64.
>> Not tested on bytecode-only archs.
>> 
>> Is this the way to go? OK to commit?
>> Is this port still in use?
>> 
>> Christopher
> 
> My vote would be for rm..

I have changed my mind after thinking about it a bit.  There have been
_so_ many bugfixes in OCaml since 3.12 that it's probably unsafe to
ship a 3.12 runtime with a modern release of OpenBSD.

I'd vote for disabling the port (in the hope of a 4.08.0 future port) rather
than regressing to an OCaml 3.12.1 build with those potential unsafe
bugs baked into a statically linked binary.

Anil

Re: mldonkey: use custom build of OCaml 3.12

2019-06-17 Thread Anil Madhavapeddy 
I think this approach is fine for this particular package, since upstream lags 
in recent times.

The opam package for mldonkey is on ocaml<4.06, but I'm CCing the current 
maintainer Ygrek in case there is a 4.08 port in the offing.

cheers,
Anil

> On 17 Jun 2019, at 20:20, Christopher Zimmermann  wrote:
> 
> Hi,
> 
> Mldonkey in difficult to adapt to the new 4.08.0 release of OCaml.
> Its build system has the option to build against a private build of
> OCaml 3.12 and a copy of lablgtk.
> I adapted the port to use this option and therefore get rid of the
> dependency on a system wide OCaml installation.
> Tested to build and start up on amd64.
> Not tested on bytecode-only archs.
> 
> Is this the way to go? OK to commit?
> Is this port still in use?
> 
> Christopher
> 
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/mldonkey/Makefile,v
> retrieving revision 1.30
> diff -u -p -r1.30 Makefile
> --- Makefile  20 May 2019 22:15:19 -  1.30
> +++ Makefile  17 Jun 2019 19:07:35 -
> @@ -21,13 +21,21 @@ WANTLIB += pthread rsvg-2 ${COMPILER_LIB
> 
> COMPILER =base-clang ports-gcc base-gcc
> 
> -MASTER_SITES =   
> https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/
> +MASTER_SITES0 =  
> https://github.com/ygrek/mldonkey/releases/download/release-${VER:S/./-/g}/
> +MASTER_SITES1 =  http://caml.inria.fr/pub/distrib/ocaml-3.12/
> +MASTER_SITES2 =  
> http://www.math.nagoya-u.ac.jp/~garrigue/soft/olabl/dist/
> 
> +OCAML_SRC =  ocaml-3.12.0.tar.gz
> +LAMLGTK_SRC =lablgtk-2.14.2.tar.gz
> EXTRACT_SUFX =.tar.bz2
> +DISTFILES =  ${DISTNAME}${EXTRACT_SUFX}:0 ${OCAML_SRC}:1 ${LAMLGTK_SRC}:2
> +
> 
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS += --enable-gui=newgui2 \
> - --enable-upnp-natpmp
> + --enable-upnp-natpmp \
> + --enable-force-ocaml \
> + --enable-batch
> CONFIGURE_ENV +=  CPPFLAGS='-I${LOCALBASE}/include -I${X11BASE}/include' \
>   LDFLAGS='${LDFLAGS}' \
>   ac_cv_prog_RPMBUILD="" \
> @@ -44,8 +52,8 @@ MODGNU_CONFIG_GUESS_DIRS =  ${WRKSRC}/con
> WRKCONF = ${WRKSRC}/config
> 
> USE_GMAKE =   Yes
> -MODULES =lang/ocaml
> -BUILD_DEPENDS =  lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num
> +#MODULES =   lang/ocaml
> +#BUILD_DEPENDS = lang/ocaml-camlp4 x11/lablgtk2 math/ocaml-num
> LIB_DEPENDS = archivers/bzip2 \
>   devel/gettext,-runtime \
>   devel/libmagic \
> @@ -53,6 +61,7 @@ LIB_DEPENDS =   archivers/bzip2 \
>   net/miniupnp/libnatpmp \
>   net/miniupnp/miniupnpc>=1.9 \
>   x11/gnome/librsvg \
> + devel/libglade2 \
>   x11/gtk+2
> 
> ALL_TARGET =  depend all
> @@ -67,6 +76,11 @@ FAKE_FLAGS =   OCAML_NATIVE=no
> NO_TEST = Yes
> 
> .include 
> +
> +post-extract:
> + ln -s ${FULLDISTDIR}/${OCAML_SRC} ${WRKSRC}/patches
> + ln -s ${FULLDISTDIR}/${LAMLGTK_SRC} ${WRKSRC}/patches
> +
> pre-patch:
>   @cd ${WRKSRC}; perl -i -pe 's/\r$$//' `find . -type f`
> 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/mldonkey/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  17 Aug 2017 10:06:12 -  1.6
> +++ distinfo  17 Jun 2019 19:07:35 -
> @@ -1,2 +1,6 @@
> +SHA256 (lablgtk-2.14.2.tar.gz) = SYGr7avcRiMD80UQQELIivInzNUP0wqb9I/TU6sC0Lo=
> SHA256 (mldonkey-3.1.6.tar.bz2) = Gza1fAWoPC42PAhb+OgGMIhMbJLs3v/BrV4cOamOBD0=
> +SHA256 (ocaml-3.12.0.tar.gz) = 2WSzheEQwVF8neHGMxR21eejWFzGkra2uJc/Opvn2ks=
> +SIZE (lablgtk-2.14.2.tar.gz) = 779803
> SIZE (mldonkey-3.1.6.tar.bz2) = 2886916
> +SIZE (ocaml-3.12.0.tar.gz) = 3271024
> Index: patches/patch-config_Makefile_in
> ===
> RCS file: /cvs/ports/net/mldonkey/patches/patch-config_Makefile_in,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-config_Makefile_in
> --- patches/patch-config_Makefile_in  4 Mar 2019 12:51:16 -   1.6
> +++ patches/patch-config_Makefile_in  17 Jun 2019 19:07:35 -
> @@ -2,34 +2,6 @@ $OpenBSD: patch-config_Makefile_in,v 1.6
> Index: config/Makefile.in
> --- config/Makefile.in.orig
> +++ config/Makefile.in
> -@@ -13,6 +13,9 @@ changequote([[, ]])
> - 
> - include config/Makefile.config
> - 
> -+OCAMLC:=$(OCAMLC) -unsafe-string
> -+OCAMLOPT:=$(OCAMLOPT) -unsafe-string
> -+
> - ifneq ("$(GLIBC_VERSION)" , "")
> -   GLIBC_VERSION_ARCH = "_glibc-"$(GLIBC_VERSION)
> - endif
> -@@ -93,7 +96,7 @@ SRC_FILETP=src/networks/fileTP
> - SUBDIRS=$(EXTLIB) $(CDK) $(BITSTRING) $(LIB) $(RSS) $(XML) $(NET) tools \
> -$(COMMON) $(DRIVER) $(MP3) src/config/$(OS_FILES)
> - 
> --INCLUDES += $(foreach file, $(SUBDIRS), -I $(file)) -I +camlp4
> -+INCLUDES += $(foreach file, $(SUBDIRS),

Re: More OCaml ports for /dev/null?

2019-04-02 Thread Anil Madhavapeddy 
On 2 Apr 2019, at 18:26, Cyril Roelandt  wrote:
> 
> (I'm the author of upt. Please keep me CCed)
> 
> On 2019-04-02 12:58, Daniel Jakots wrote:
>> You can look at sysutils/upt. It's not something specific for OpenBSD.
>> It works with "frontends" (language-specific packages systems, cpan pip
>> etc) and "backends" (OS-specific packages systems). There's already an
>> OpenBSD backend so you need to only add a ocaml frontend.
> 
> That is a good summary of how upt works. The idea is that every time a
> new frontend is added (for Hackage or NPM, for instance), minimal effort
> is required to add support for it on the OpenBSD side. Support for PyPI
> is just one simple class[1] and one short Jinja2 template[2].
> 
> Instead of writing a new backend for PortGen, you could write a new
> frontend for upt :) It would also help package managers who use other
> operating systems (hey, nobody's perfect!).
> 
> I'm willing to help with this if you're interested in using upt.

This also looks very cool!  How does it deal with mapping system
dependencies that a package needs into the ports Makefile?

opam has something called a 'depexts' field (see
https://github.com/ocaml/opam-depext ) 
which records a mapping of
system OS package name that can be installed by that package 
manager to satisfying C libraries that are needed.  That needs to
be mapped into the OpenBSD Makefile as well.

Anil

Re: More OCaml ports for /dev/null?

2019-04-02 Thread Anil Madhavapeddy 



> On 2 Apr 2019, at 13:12, Ian Darwin  wrote:
> 
>> Adding support to portgen would be ideal ..
> 
> Exactly what I was going to say, but Stuart beat me to it. This would be 
> ideal for OpenBSD;
> hopefully not too non-ideal for upstream.
> 
>> Adding something to directly build a package from outside ports
>> infrastructure is not so good
> 
> Yup. And remember that OpenBSD ports cannot fetch files over the net during 
> bulk
> builds, so portgen is the best option, something else that builds a port in
> the same manner is next (but why reinvent the thing?).
> 
> Installing outside of the ports system would be treated as renegade by the
> project and as a pain in the arse for users. I also have a Mac and have to
> install crap from Apple store, from brew, from at least one other other
> ports system, directly from some vendors, some as .dmg and some as .pkg. 
> Updating is such a frickin' mess I have all but given up trying to keep that
> system up to date! OBSD is the very best because you can just do pkg_add -vu
> and update all third-party software.

portgen is _exactly_ what I was looking for, thanks!  I'll look into supporting
that first in the new dune infrastructure for this.

I'm the first user on my laptop, so I really want `pkg_add -u` to just work
for myself :-)

Anil

Re: More OCaml ports for /dev/null?

2019-04-02 Thread Anil Madhavapeddy 
On 31 Mar 2019, at 04:29, Kenneth Westerback  wrote:
> 
> My full table is on cvs as ~krw/ocamlports.org .
> 
> I have
> 
> devel/ocaml-uutf
> lang/ocaml-camlp5
> math/ocaml-num
> math/ocaml-zarith
> devel/dune
> 
> as candidates for removal since they don't appear to be used by any end-user 
> program.

greetings! 

dune will soon be used by Coq as well (we’re just finalising the build 
integration upstream).  We’re also separating out the dune “binary” from the 
dune “libraries” so the host build tool can be installed independently of any 
particular OCaml version.  This will make it possible to build OCaml itself 
using dune in the future, so it’s useful to keep it installing the binary.

(Christophe: that dune patch I sent you to install the ocaml libraries for 
dune.configurator prompted this train of thought — I now think the current port 
is better and that we should have a separate dune library package)

In general, it would be good to keep the ‘host binaries’ for OCaml tools in 
ports, and to retire the libraries that not used by other ports.

I’m also working on a non-April fools joke, which is sufficient metadata in 
dune to generate reliable openbsd ports. So in a few months, we should be able 
to type in package names and have reasonable Makefiles output for the ports 
(including WANTLIB etc).  Am doing it for Homebrew and a few other operating 
systems as well to see if we can sidestep the port maintainer burden somewhat.  
Unsure yet if it’ll be suitable for usage in OpenBSD, but at a minimum it’ll 
generate sufficient scaffolding for a human ports maintainer to tweak for 
upstreaming.

> 
> For anyone who hasn't stumbled across it, there is an inspirational video on 
> youtube about the OCaml Platform vision. Presented by a grizzled veteran of 
> the OCaml wars who looks tantalizingly familiar.
> 
> https://m.youtube.com/watch?v=oyeKLAYPmQQ 
> 
Unbelievable talk! Such poise and grace!

Anil

Re: ocaml fallout (i386): lang/obc

2019-03-26 Thread Anil Madhavapeddy 
I think this is safe to remove...

> On 26 Mar 2019, at 18:25, Christopher Zimmermann  wrote:
> 
> Hi,
> 
> please excuse me for replying so late.
> This issue is very probably easy to work around.
> But still I'm wondering whether this is used by anyone.
> We still ship version 2.9, which only supports i386.
> According to the homepage version 3.1 will support amd64, too.
> I would suggest to either update to 3.1 or remove it altogether.
> 
> 
> Christopher
> 
> 
> 
> This is what the maintainer wrote me in 2015:
> 
> On Tue, 24 Feb 2015 22:58:11 +0300
> Александр Ширяев (Alexander Shiryaev)  wrote:
> 
>>> Hi,
>>> 
>>> you are listed as maintainer of the obc port. Do you know whether
>>> this is still used by anyone. If yes, I would try and upgrade it.
>>> 
>>> Christopher
>>> 
>> 
>> Hi, Christopher.
>> 
>> I do not know who uses it.
>> 
>> I made a patch.
>> 
>> There is much more interesting, what I use now instead:
>> https://github.com/aixp/BlackBox
>> 
>> Best regards, Alexander.
> 
> 
> 
> 
> On Sun, 10 Mar 2019 14:51:34 +
> Stuart Henderson  wrote:
> 
>> ocamlc -g -c -o error.cmo error.ml
>> File "error.ml", line 223, characters 10-21:
>> Warning 3: deprecated: Stdlib.String.copy
>> File "error.ml", line 224, characters 30-59:
>> Warning 3: deprecated: Stdlib.String.set
>> Use Bytes.set instead.
>> File "error.ml", line 224, characters 30-31:
>> Error: This expression has type string but an expression was expected
>> of type bytes
>> gmake[1]: *** [Makefile:88: error.cmo] Error 2
>> 
>> Full log below:
>> 
> Building on i386-2 under lang/obc  
>>   BDEPENDS =
>> [devel/ocaml-ocamlbuild;x11/lablgtk2;devel/gmake;lang/tcl/8.5;x11/gtksourceview;lang/ocaml]
>> DIST = [lang/obc:obc-2.9.7.tar.gz] FULLPKGNAME = obc-2.9.7
>>   RDEPENDS = [lang/ocaml;x11/lablgtk2;x11/gtksourceview]
>> (Junk lock obtained for i386-2 at 1552196950)
> Running depends in lang/obc at 1552196950  
>>   last junk was in www/dillo
>> /usr/sbin/pkg_add -aI -Drepair gtksourceview-2.10.5p5 lablgtk2-2.18.6
>> ocaml-4.07.1 ocamlbuild-0.12.0 tcl-8.5.19p4 was: /usr/sbin/pkg_add
>> -aI -Drepair gmake-4.2.1p0 gtksourceview-2.10.5p5 lablgtk2-2.18.6
>> ocaml-4.07.1 ocamlbuild-0.12.0 tcl-8.5.19p4 /usr/sbin/pkg_add -aI
>> -Drepair gtksourceview-2.10.5p5 lablgtk2-2.18.6 ocaml-4.07.1
>> ocamlbuild-0.12.0 tcl-8.5.19p4 New and changed
>> readme(s): /usr/local/share/doc/pkg-readmes/tcl-8.5 --- +tcl-8.5.19p4
>> --- You may wish to add /usr/local/lib/tcl/tcl8.5/man
>> to /etc/man.conf
> Running show-prepare-results in lang/obc at 1552196989  
>> ===> lang/obc
>> ===> obc-2.9.7 depends on: lablgtk2->=2.14.2p1 -> lablgtk2-2.18.6
>> ===> obc-2.9.7 depends on: ocaml-=4.07.1 -> ocaml-4.07.1
>> ===> obc-2.9.7 depends on: tcl->=8.5,<8.6 -> tcl-8.5.19p4
>> ===> obc-2.9.7 depends on: ocamlbuild-* -> ocamlbuild-0.12.0
>> ===> obc-2.9.7 depends on: gmake-* -> gmake-4.2.1p0
>> ===> obc-2.9.7 depends on: gtksourceview-* -> gtksourceview-2.10.5p5
>> ===>  Verifying specs:  X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
>> Xinerama Xrandr Xrender atk-1.0 c cairo curses fontconfig freetype
>> gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-x11-2.0
>> gtksourceview-2.0 intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
>> pthread z ===>  found X11.16.1 Xcomposite.4.0 Xcursor.5.0 Xdamage.4.0
>> Xext.13.0 Xfixes.6.0 Xi.12.1 Xinerama.6.0 Xrandr.7.1 Xrender.6.0
>> atk-1.0.21809.2 c.95.0 cairo.13.0 curses.14.0 fontconfig.12.0
>> freetype.29.0 gdk-x11-2.0.2400.0 gdk_pixbuf-2.0.3200.1 gio-2.0.4200.8
>> glib-2.0.4201.1 gobject-2.0.4200.8 gtk-x11-2.0.2400.0
>> gtksourceview-2.0.5.0 intl.6.0 m.10.1 pango-1.0.3800.2
>> pangocairo-1.0.3800.1 pangoft2-1.0.3800.1 pthread.26.1 z.5.0
>> gmake-4.2.1p0 gtksourceview-2.10.5p5 lablgtk2-2.18.6 ocaml-4.07.1
>> ocamlbuild-0.12.0 tcl-8.5.19p4 (Junk lock released for i386-2 at
>> 1552196990) distfiles size=795687
> Running build in lang/obc at 1552196990  
>> ===> lang/obc
>> ===>  Checking files for obc-2.9.7  
>> `/mnt/distfiles/obc-2.9.7.tar.gz' is up to date.
>> ===>  Extracting for obc-2.9.7
>> ===>  Patching for obc-2.9.7
>> ===>   Applying OpenBSD patch patch-Makefile_in  
>> Hmm...  Looks like a unified diff to me...
>> The text leading up to this was:
>> --
>> |$OpenBSD: patch-Makefile_in,v 1.3 2016/08/30 11:02:41 jasper Exp $
>> |--- Makefile.in.origTue Jan 12 19:26:21 2016
>> |+++ Makefile.in Thu Aug 25 11:08:03 2016
>> --
>> Patching file Makefile.in using Plan A...
>> Hunk #1 succeeded at 92.
>> done
>> ===>   Applying OpenBSD patch patch-configure  
>> Hmm...  Looks like a unified diff to me...
>> The text leading up to this was:
>> --
>> |$OpenBSD: patch-configure,v 1.3 2016/08/30 11:02:41 jasper Exp $
>> |--- configure.orig  Tue Jan 12 19:26:22 2016
>> |+++ configure   Thu Aug 25 11:08:03 2016
>> --
>> Patching file configure using Plan A...
>> Hunk #1 succeeded at

Re: sysutils/opam: use -full source tree including all dependencies.

2019-03-11 Thread Anil Madhavapeddy 
And ok avsm@.

> On 11 Mar 2019, at 22:01, kwesterb...@gmail.com wrote:
> 
> This is ok krw@.
> 
>  Ken
> 
>> On Mar 11, 2019, at 5:29 PM, Christopher Zimmermann  
>> wrote:
>> 
>> On Mon, 11 Mar 2019 17:08:45 -0400
>> Kenneth R Westerback  wrote:
>> 
>>> I like this, but I am slightly confused -- did I miss the commit to
>>> switch opam to -full? I would assume we'd want to do that first, no?
>> 
>> oops, I somehow asserted this was already committed. So of course I'd
>> like to commit this first. OKs for change?
>> 
>> Christopher
>> 
>> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/sysutils/opam/Makefile,v
>> retrieving revision 1.10
>> diff -u -p -r1.10 Makefile
>> --- Makefile4 Mar 2019 12:51:16 -1.10
>> +++ Makefile11 Mar 2019 21:26:24 -
>> @@ -4,24 +4,12 @@ COMMENT =OCaml source-based package ma
>> 
>> CATEGORIES =sysutils devel
>> 
>> -# opam version
>> V =2.0.3
>> -# opam file format version
>> -OFFV =2.0.0
>> -MCSS =1.1+9
>> -#GH_ACCOUNT =ocaml
>> -GH_PROJECT =opam
>> -#GH_TAGNAME =${V}
>> -DISTNAME =${GH_PROJECT}-${V}
>> -
>> -DISTFILES +=opam-${V}.tar.gz:0
>> -MASTER_SITES0 =https://github.com/ocaml/opam/archive/${V}/
>> -DISTFILES +=opam-file-format-${OFFV}.tar.gz:1
>> -MASTER_SITES1 =
>> https://github.com/ocaml/opam-file-format/archive/${OFFV}/
>> -DISTFILES +=ocaml-mccs-${MCSS}.tar.gz:2
>> -MASTER_SITES2 =https://github.com/AltGr/ocaml-mccs/archive/${MCSS}/
>> -
>> +REVISION =0
>> PKGNAME =opam-${V}
>> +DISTNAME =opam-full-${V}
>> +
>> +MASTER_SITES =https://github.com/ocaml/opam/releases/download/${V}/
>> 
>> HOMEPAGE =https://opam.ocaml.org/
>> 
>> @@ -34,16 +22,7 @@ WANTLIB =${COMPILER_LIBCXX} c m
>> 
>> #MODULES =lang/ocaml
>> 
>> -BUILD_DEPENDS =lang/ocaml \
>> -devel/dune \
>> -sysutils/findlib \
>> -devel/ocaml-cppo \
>> -devel/cudf,-ocaml>=0.7 \
>> -devel/ocaml-cmdliner>=0.9.8 \
>> -devel/ocaml-dose>=5 \
>> -devel/ocaml-graph \
>> -devel/ocaml-re>=1.5.0 \
>> -net/curl # TODO: remove this dep and patch build system
>> +BUILD_DEPENDS =lang/ocaml
>> 
>> RUN_DEPENDS =archivers/unzip \
>>   archivers/bzip2 \
>> @@ -54,7 +33,11 @@ RUN_DEPENDS =archivers/unzip \
>> 
>> USE_GMAKE =Yes
>> 
>> -CONFIGURE_STYLE =gnu
>> +CONFIGURE_ENV +=CFLAGS="${CFLAGS}" \
>> +LDFLAGS="${LDFLAGS}" \
>> +CC=cc
>> +CONFIGURE_STYLE =gnu autoconf no-autoheader
>> +AUTOCONF_VERSION =2.69
>> 
>> ALL_TARGET =lib-ext all man #doc requires odoc
>> INSTALL_TARGET =install
>> @@ -62,13 +45,8 @@ TEST_TARGET =tests
>> 
>> docdir =${PREFIX}/share/doc/opam
>> 
>> -
>> -pre-patch:
>> -ln -s${FULLDISTDIR}/opam-file-format-${OFFV}.tar.gz \
>> -${WRKSRC}/src_ext/opam-file-format.tar.gz
>> -ln -s${FULLDISTDIR}/ocaml-mccs-${MCSS}.tar.gz \
>> -${WRKSRC}/src_ext/mccs.tar.gz
>> -touch
>> ${WRKSRC}/src_ext/{mccs,opam-file-format}.{download,pkgdownload}
>> +#pre-configure:
>> +#cd ${WRKSRC} && env ${CONFIGURE_ENV} ${GMAKE} compiler
>> 
>> post-install:
>>   mv${PREFIX}/doc/opam-installer \
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/sysutils/opam/distinfo,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 distinfo
>> --- distinfo4 Mar 2019 12:51:16 -1.3
>> +++ distinfo11 Mar 2019 21:26:24 -
>> @@ -1,6 +1,2 @@
>> -SHA256 (ocaml-mccs-1.1+9.tar.gz) = 
>> G3rkvRs0n8JMU2k9cApg39qaO86VTZMaZ703WQwzyD0=
>> -SHA256 (opam-2.0.3.tar.gz) = zMbAl7vPMZDZGW4T1l9pwZuKHdZJ/V1wsbrhsSDuhzk=
>> -SHA256 (opam-file-format-2.0.0.tar.gz) = 
>> FSUt8u24K//CCplXyzdkV0srp0g5K7NObJHGeHIyXDI=
>> -SIZE (ocaml-mccs-1.1+9.tar.gz) = 1008737
>> -SIZE (opam-2.0.3.tar.gz) = 626720
>> -SIZE (opam-file-format-2.0.0.tar.gz) = 31419
>> +SHA256 (opam-full-2.0.3.tar.gz) = 
>> BYnaTaGEWEpURdWThQCVNlNPYLwOJ3ciRbL0nl+o8OI=
>> +SIZE (opam-full-2.0.3.tar.gz) = 7870020
>> Index: patches/patch-m4_ocaml_m4
>> ===
>> RCS file: patches/patch-m4_ocaml_m4
>> diff -N patches/patch-m4_ocaml_m4
>> --- /dev/null1 Jan 1970 00:00:00 -
>> +++ patches/patch-m4_ocaml_m411 Mar 2019 21:26:24 -
>> @@ -0,0 +1,16 @@
>> +$OpenBSD$
>> +
>> +do not detect any installed findlib library.
>> +
>> +Index: m4/ocaml.m4
>> +--- m4/ocaml.m4.orig
>>  m4/ocaml.m4
>> +@@ -209,7 +209,7 @@ AC_DEFUN([AC_CHECK_OCAML_PKG],
>> +   unset pkg
>> +   found=no
>> +   for pkg in $1 $2 ; do
>> +-if $OCAMLFIND query $pkg >/dev/null 2>/dev/null; then
>> ++if false; then
>> +   AC_MSG_RESULT([found])
>> +

Re: UPDATE of lang/ocaml to 4.07 and dependent ports

2019-02-14 Thread Anil Madhavapeddy 
> 
> The ocaml depends column I got from the results of 'opam show
> ". I am not sure how seriously to take the info since several say
> they won't work with 4.07.1 and yet they do. :-).

Which ones? I can fix those upstream.  Looks like just cil and camlp5
are restricted to <4.07 in your list above (the others are <=4.07.1).

> Finally, while I do have frama-c successfully building it does require
> the nasty hack of creating a /bin/bash link to /bin/sh because the
> latest alt-ergo(-lib) package has a configure script that starts with
> "#!/bin/bash -e". I could not figure out a pin incantation that
> allowed me to modify that file and build alt-ergo-lib. Sad.

That configure script is just a passthrough to a single command,
so you could modify the opam script to invoke this directly instead:

ocaml unix.cma configure.ml "$@"

Although having said that, the alt-ergo release now appears to
have some non-standard "OCamlPro Non-Commercial License"
which may make it wiser to pull it from the ports tree entirely.
A glance at the upstream repo shows a melange of possibly
mutually incompatible licenses in there: https://github.com/OCamlPro/alt-ergo.
(Apache+LGPL+no-commercial)

regards,
Anil

Re: UPDATE of lang/ocaml to 4.07 and dependent ports

2019-02-13 Thread Anil Madhavapeddy 



> On 13 Feb 2019, at 09:07, Jeremie Courreges-Anglas  wrote:
> 
> On Sat, Jul 21 2018, Christopher Zimmermann  > wrote:
>> On 2018-06-21 Christopher Zimmermann  wrote:
>>> Hi,
>>> 
>>> the last few days I prepared an update of ocaml to 4.06 and opam to
>>> 2.00rc2 and along with it updates or REVISION bumps of the dependent
>>> ports.
>> 
>> Here comes a reworked diff to upgrade to OCaml 4.07. (attached gzipped)
>> Thanks for the testing and fixes you supplied so far.
>> I believe I included all of them so far.
>> I will need some help in moving sysutils/dune to devel/, because I
>> imported it into the wrong category.
>> Also building dune on sparc64 was broken. I suspect the stack size
>> needs to be increased with ulimit -s 8192. Can someone with access to
>> sparc64 please test this as I don't have access to any sparc64 machine?
> 
> So, back to this:
> - sysutils/dune has been moved to devel/dune, updated to the latest
>  version, which also fixes the stack exhaustion seen on amd64 by krw
>  and me.
> - devel/dune is still broken on sparc64 because the "custom bytecode
>  executable" produced by dune are stripped by the install target.
>  My first idea was just to force dune to produce standard bytecode
>  executables.  That would be more convenient for the ports tree, but
>  ignoring the choices made upstream.  We could also just ensure that
>  all the ports using dune don't using strip(1).

OCaml bytecode executables prefer -custom mode since that also
supports loading in shared library stubs automatically. If the executable
were built without -custom, it needs setting ld path variables and
matching the right version of ocamlrun.

A reasonable default is to strip native code binaries and not do so for
any bytecode executables built by the OCaml ports (not just the ones
built with dune).

Anil

Re: p5-Net-FTPServer update to 1.125, fix with perl 5.28

2019-02-09 Thread Anil Madhavapeddy 



> On 9 Feb 2019, at 17:00, Stuart Henderson  wrote:
> 
> The in-tree version of p5-Net-FTPServer fails at build time with
> the pending Perl update.
> 
> Diff below:
> 
> - updates to 1.125 which fixes the build issue
> - removes the old patches which are no longer needed
> - adds new patch to fix a faulty regex
> - adds new patch to raise the default memory limit (fixes some
> tests and probably some runtime issues)
> - port tweak: more exact license, use the MODCPAN_EXAMPLES ports
> infrastructure
> 
> One test still fails out-of-memory due to the limits but
> most things work and going higher than 32MB per concurrent user
> seems a bit much.
> 
> Any OKs?  Anil, do you still want to be listed as maintainer?

Not used this for >15 years, so removing me as maintainer would be
appreciated :-)

thanks,
Anil

Re: Nuke some Ocaml ports

2017-03-01 Thread Anil Madhavapeddy 
On 27 Feb 2017, at 20:58, Daniel Dickman  wrote:
> 
> 
> 
>> On Feb 27, 2017, at 3:23 PM, Christopher Zimmermann  
>> wrote:
>> 
>>> On 2017-02-27 Kenneth R Westerback  wrote:
>>> 
>>> Anyway, I'm happy to do the dirty work of nuking any or all of these
>>> ports and then continuing the process of weeding out ports that
>>> might be more useful to get people sourcing from opam.
>>> 
>>> And thus hopefully making it simpler to keep us on the ocaml bleeding
>>> edge.
>>> 
>>> Thoughts?
>>> 
>>>  Ken
>>> 
>>> The numbers //
>>> 
>>> Anil:
>>> ./databases/ocaml-postgresql 3.2.1/4.0.1/4.0.1 (master & homepage dead?)
>>> ./databases/ocaml-sqlite3 2.0.9/4.1.2/4.1.2 (master & homepage dead?)
>>> ./devel/ocaml-calendar 2.03.2/2.0.4/2.03.2
>>> ./graphics/ocaml-camlimages 4.2.1/4.2.1/4.2.3
>>> ./security/ocaml-cryptokit 1.10/1.11/1.11
>>> ./textproc/ocaml-rss 2.0/2.2.1/2.2.2
>>> ./textproc/ocaml-xml-light 2.2/2.4/2.4
>>> ./textproc/ocaml-xmlm 1.2.0/1.2.0/1.2.0
>>> 
>>> Chrisz
>>> ./devel/ocaml-batteries 2.5.0/2.5.3/2.5.3
>>> ./devel/ocaml-net 4.0.2/4.1.2/4.1.2
>> 
>> OK chrisz@
>> 
>>> Edd:
>>> ./devel/ocaml-mlgmp 0.13/20120224/20120224
>>> 
>>> None:
>>> ./devel/ocaml-bitstring 2.0.4/2.0.4/2.1.0 (google code!?)
>>> ./devel/ocaml-curses 1.0.3/1.0.3/1.0.3
>>> ./textproc/ocaml-csv 1.4.1/1.6/1.6
>> 
>> OK chrisz@
>> 
>> 
>> I would like to add more to this list:
>> 
>> devel/utop
> 
> please no.
> 
>> devel/ocaml-lambda-term
>> devel/ocaml-zed
>> devel/ocaml-lwt
>> devel/ocaml-menhir
> 
> please no. it's required for compcert.

I'm ok with deleting the intermediate ports, but we should indeed keep anything 
that is required for Compcert in the ports tree.  It's very useful to have a 
binary package of it.

As for utop, I'd be happy just installing that through OPAM.  You typically 
also need to install libraries with utop to make it useful, and that's 
difficult to do with a system OCaml and a port-installed OPAM (it can use the 
system compiler fine, but libraries must be managed all through opam or not at 
all).

Anil

Re: Update ocaml-cmdliner to 0.9.8

2016-07-05 Thread Anil Madhavapeddy 
ok avsm, but doesn't this require bumping the REVISIONs of everything that 
depends on cmdliner as well?

Anil

> On 5 Jul 2016, at 14:29, Kenneth R Westerback  wrote:
> 
> Trivial (?) update to latest ocaml-cmdliner, an opam dependency.
> 
> This brings cmdliner up to the version that opam itself installs, if you
> use opam to install cmdliner.
> 
> ok?
> 
>  Ken
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/ocaml-cmdliner/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile  23 Jun 2016 19:23:53 -  1.3
> +++ Makefile  3 Jul 2016 12:22:02 -
> @@ -3,13 +3,12 @@
> COMMENT = declarative definition of command line interfaces
> CATEGORIES =  devel
> 
> -V =  0.9.7
> +V =  0.9.8
> NAME =cmdliner
> DISTNAME =${NAME}-${V}
> EXTRACT_SUFX =.tbz
> PKGNAME = ocaml-${DISTNAME}
> MASTER_SITES =http://erratique.ch/software/${NAME}/releases/
> -REVISION =   0
> 
> HOMEPAGE =http://erratique.ch/software/${NAME}
> 
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/ocaml-cmdliner/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  30 Aug 2015 15:57:25 -  1.2
> +++ distinfo  2 Jul 2016 19:08:24 -
> @@ -1,2 +1,2 @@
> -SHA256 (cmdliner-0.9.7.tbz) = nBmJPP+108NGnuDM6F4+7roX0wmzO5rOMaugb2jwv3o=
> -SIZE (cmdliner-0.9.7.tbz) = 50343
> +SHA256 (cmdliner-0.9.8.tbz) = ffqv3YjsnZar+N7UwOpxEZSBlEACIKVuS7RKHt+kvUE=
> +SIZE (cmdliner-0.9.8.tbz) = 53249
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/ocaml-cmdliner/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 25 Oct 2014 16:50:30 -  1.1.1.1
> +++ pkg/PLIST 2 Jul 2016 19:08:42 -
> @@ -19,6 +19,7 @@ share/doc/ocaml-cmdliner/api/index_attri
> share/doc/ocaml-cmdliner/api/index_class_types.html
> share/doc/ocaml-cmdliner/api/index_classes.html
> share/doc/ocaml-cmdliner/api/index_exceptions.html
> +share/doc/ocaml-cmdliner/api/index_extensions.html
> share/doc/ocaml-cmdliner/api/index_methods.html
> share/doc/ocaml-cmdliner/api/index_module_types.html
> share/doc/ocaml-cmdliner/api/index_modules.html
>

CVS: cvs.openbsd.org: ports

2015-08-31 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/31 06:14:12

Modified files:
sysutils/opam  : Makefile distinfo 

Log message:
opam: add missing patch hunks in upgrade to 1.2.2

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:38:32

Modified files:
lang/ocaml : Makefile distinfo 
lang/ocaml/pkg : PFRAG.native-main PLIST-main 

Log message:
update to ocaml-4.02.3

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:50:24

Modified files:
databases/ocaml-sqlite3: Makefile distinfo 
databases/ocaml-sqlite3/pkg: PLIST 

Log message:
update to ocaml-sqlite3-2.0.9

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:02:11

Modified files:
devel/ocaml-net: Makefile distinfo 
devel/ocaml-net/pkg: PFRAG.native PLIST 

Log message:
update to ocaml-net-4.0.2

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:58:32

Modified files:
devel/ocaml-graph: Makefile 
devel/ocaml-graph/pkg: PLIST 

Log message:
bump REVISION on ocaml-graph due to ocaml 4.02.3 update

also mark a few installed files as @bin

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:20:29

Modified files:
devel/cudf : Makefile 

Log message:
bump cudf REVISION due to OCaml 4.02.3 update

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:26:32

Modified files:
devel/utop : Makefile 

Log message:
bump utop REVISION due to OCaml 4.02.3 update

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:24:35

Modified files:
devel/ounit: Makefile 

Log message:
bump ounit REVISION due to OCaml 4.02.3 bump

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:30:45

Modified files:
sysutils/opam/pkg: DESCR-main PFRAG.native-lib PLIST-lib 
   PLIST-main 
Added files:
sysutils/opam/files: aspcud 

Log message:
update to opam-1.2.2

Because the Aspcud constraint solver is not ported to OpenBSD yet, this
package is configured to use the IRILL online solver by default.  To
disable this and use the internal solver, set the OPAMNOASPCUD env
variable to 1.  You will need to do this if you want to use OPAM
when offline.

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:29:26

ports/sysutils/opam/files

Update of /cvs/ports/sysutils/opam/files
In directory cvs.openbsd.org:/tmp/cvs-serv23365/files

Log Message:
Directory /cvs/ports/sysutils/opam/files added to the repository

Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade

2015-08-30 Thread Anil Madhavapeddy 
On 25 Aug 2015, at 18:15, Jérémie Courrèges-Anglas j...@wxcvbn.org wrote:
 
 
 ok jca@
 

Thanks! All committed now.

 
 - regarding bison, it's complicated

I'm just trying to figure out if it's worth the hassle of removing the
minor bison feature used in the aspcud porting chain, or wait for a
bison update to land in ports (which presumably depends on a corresponding
m4 update in base).  I'm not volunteering to help with the latter, much
as I'd like to :-)

 
 - this is a pretty big diff, I didn't review everything, only the bits
  I care about.  (I don't use opam, for example.)  For next updates, can
  we expect OCaml to be updated alone, along with updates required
  because of incompatibilities with the new ocaml port?

Well, OCaml will always need a large number of REVISION bumps due to
the lack of binary compatibility.  However, this was a particularly
large one since I swept the tree for version updates as well.  I'll
try to commit those in a more timely way for the future...

 
  That being said, the parts I reviewed looked pretty good, and the
  extensive testing on other archs make me confident that this can go
  in.  This includes an ok to import devel/ocaml-ppx-tools (which could
  use NO_TEST=Yes, btw).

NO_TEST also added before import.  Thanks again for looking over the patch!

-a

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:33:02

Modified files:
textproc/ocaml-xmlm: Makefile distinfo 
textproc/ocaml-xmlm/pkg: PFRAG.native PFRAG.no-native PLIST 

Log message:
update to ocaml-xmlm-1.2.0

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:31:26

Modified files:
textproc/ocaml-csv: Makefile distinfo 
textproc/ocaml-csv/pkg: PLIST 

Log message:
update to ocaml-csv-1.4.1

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:32:25

Modified files:
textproc/ocaml-xml-light: Makefile 

Log message:
bump ocaml-xml-light REVISION due to OCaml 4.02.3 upgrade

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:31:57

Modified files:
textproc/ocaml-rss: Makefile 

Log message:
bump ocaml-rss REVISION due to OCaml 4.02.3 upgrade

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:57:25

Modified files:
devel/ocaml-cmdliner: Makefile distinfo 

Log message:
update to ocaml-cmdliner-0.9.7

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:04:25

Modified files:
devel/ocaml-uutf: Makefile distinfo 

Log message:
update to ocaml-uutf-0.9.4

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:02:58

Modified files:
devel/ocaml-pcre: Makefile distinfo 
devel/ocaml-pcre/pkg: PFRAG.native PLIST 

Log message:
update to ocaml-pcre-7.0.5

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:49:08

Modified files:
databases/ocaml-postgresql: Makefile distinfo 
databases/ocaml-postgresql/pkg: PFRAG.native PLIST 

Log message:
update to ocaml-postgresql-3.2.1

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:47:06

Log message:
ocaml-ppx-tools-0.99.2 port

Status:

Vendor Tag: avsm
Release Tags:   avsm_2015-Aug-30

N ports/devel/ocaml-ppx-tools/Makefile
N ports/devel/ocaml-ppx-tools/distinfo
N ports/devel/ocaml-ppx-tools/patches/patch-Makefile
N ports/devel/ocaml-ppx-tools/pkg/DESCR
N ports/devel/ocaml-ppx-tools/pkg/PFRAG.dynlink-native
N ports/devel/ocaml-ppx-tools/pkg/PFRAG.native
N ports/devel/ocaml-ppx-tools/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:59:21

Modified files:
devel/ocaml-lambda-term: Makefile distinfo 
devel/ocaml-lambda-term/pkg: PFRAG.native PLIST 

Log message:
update to lambda-term-1.9

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:03:42

Modified files:
devel/ocaml-re : Makefile distinfo 
devel/ocaml-re/pkg: PFRAG.native PLIST 

Log message:
update to ocaml-re-1.4.1

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:23:41

Modified files:
devel/ocaml-react: Makefile 

Log message:
bump ocaml-react REVISION due to OCaml 4.02.3 update

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:24:09

Modified files:
devel/omake: Makefile 

Log message:
bump omake REVISION due to OCaml 4.02.3 bump

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:06:35

Modified files:
graphics/ocaml-camlimages: Makefile distinfo 
graphics/ocaml-camlimages/pkg: PFRAG.native PFRAG.shared PLIST 
Removed files:
graphics/ocaml-camlimages/patches: patch-OMakefile 
   patch-src_gifread_c 
   patch-src_gifwrite_c 
   patch-src_pngread_c 
   patch-src_pngwrite_c 
   patch-src_tiffread_c 
   patch-src_tiffwrite_c 

Log message:
update to ocaml-camlimages-4.2.1

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:07:09

Modified files:
security/ocaml-cryptokit: Makefile distinfo 
security/ocaml-cryptokit/pkg: PLIST 

Log message:
update to cryptokit-1.10

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:27:32

Modified files:
security/ocaml-ssl: Makefile 

Log message:
bump ocaml-ssl REVISION due to OCaml 4.02.3 upgrade

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:52:33

Modified files:
devel/ocaml-batteries: Makefile distinfo 
devel/ocaml-batteries/pkg: PFRAG.native PLIST 
Removed files:
devel/ocaml-batteries/patches: patch-Makefile 
   patch-build_prefilter_ml 
   patch-src_batPrintf_mliv 
   patch-src_batPrintf_mlv 

Log message:
update to ocaml-batteries-2.3.1

Removes OCaml 4.02.0+ patches which are now upstreamed

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:05:12

Modified files:
devel/ocaml-zed: Makefile distinfo 
devel/ocaml-zed/pkg: PLIST 

Log message:
update to ocaml-zed-1.4

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:18:48

Modified files:
devel/coccinelle: Makefile 
devel/ocaml-bitstring: Makefile 
devel/ocaml-calendar: Makefile 
devel/ocaml-camomile: Makefile 
devel/ocaml-curses: Makefile 
devel/ocaml-extlib: Makefile 

Log message:
bump REVISION for OCaml 4.02.3 update

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:41:01

Modified files:
lang/ocaml-camlp4: Makefile distinfo 

Log message:
update to ocaml-camlp4-4.02+6

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:43:47

Modified files:
sysutils/findlib: Makefile distinfo 
sysutils/findlib/pkg: PLIST 
Removed files:
sysutils/findlib/patches: patch-src_findlib_Makefile 

Log message:
update to findlib-1.5.5

This introduces a strong dependency on ocaml-camlp4 in order to get the
safe_camlp4 script. This could be split into a subpackage in the future,
to get a base findlib package that does not depend on camlp4

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:01:16

Modified files:
devel/ocaml-lwt: Makefile distinfo 
devel/ocaml-lwt/pkg: PFRAG.dynlink-native PFRAG.native PLIST 
Removed files:
devel/ocaml-lwt/patches: patch-setup_ml 

Log message:
update to ocaml-lwt-2.4.8

This is not the latest upstream version, but the last one that is most
compatible due to an API change. Be careful about upgrading to lwt-2.5.0
without checking that no in-tree ports break due to new buffer APIs.

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 09:56:12

Modified files:
devel/ocaml-dose: Makefile distinfo 
devel/ocaml-dose/patches: patch-Makefile patch-algo_depsolver_ml 
  patch-applications_distcheck_ml 
  patch-common_util_ml 
devel/ocaml-dose/pkg: PFRAG.dynlink-native PFRAG.native PLIST 
Added files:
devel/ocaml-dose/patches: patch-algo_defaultgraphs_ml 
  patch-algo_depsolver_int_ml 
  patch-algo_diagnostic_ml 
  patch-algo_dominators_ml 
  patch-algo_flatten_ml 
  patch-algo_statistics_ml 
  patch-algo_strongconflicts_int_ml 
  patch-algo_strongconflicts_ml 
  patch-algo_strongdeps_int_ml 
  patch-algo_strongdeps_ml 
  patch-applications_ceve_ml 
  patch-applications_challenged_ml 
  patch-applications_deb-buildcheck_ml 
  patch-applications_deb-coinstall_ml 
  patch-applications_dominators-graph_ml 
  patch-applications_outdated_ml 
  patch-applications_smallworld_ml 
  patch-applications_strong-deps_ml 
  patch-common_cudfAdd_ml 
  patch-common_cudfSolver_ml 
  patch-common_edosSolver_ml 
  patch-common_input_ml 
  patch-common_input_mli 
  patch-common_url_ml 
  patch-common_util_mli 
  patch-cv_cvcudf_ml patch-deb_apt_ml 
  patch-deb_architecture_ml 
  patch-deb_debcudf_ml 
  patch-deb_debutil_ml patch-deb_edsp_ml 
  patch-deb_format822_ml 
  patch-deb_packages_ml 
  patch-deb_sources_ml 
  patch-doseparse_stdDebug_ml 
  patch-doseparse_stdLoaders_ml 
  patch-doseparse_stdOptions_ml 
  patch-doseparse_stdUtils_ml 
  patch-eclipse_packages_ml 
  patch-eclipse_version_ml 
  patch-opencsw_packages_ml 
  patch-opencsw_version_ml 
  patch-rpm_hdlists_ml 
  patch-rpm_packages_ml 
  patch-rpm_rpmcudf_ml 
Removed files:
devel/ocaml-dose/patches: patch-algo_depsolver_mli 
  patch-myocamlbuild_ml 

Log message:
update to ocaml-dose-3.3

Includes local patches for OPAM compatibility, as with the previous version

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:23:06

Modified files:
devel/ocaml-jsonm: Makefile 

Log message:
bump REVISION on ocaml-jsonm due to OCaml 4.02.3 update

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:22:15

Modified files:
devel/frama-c  : Makefile distinfo 
devel/frama-c/pkg: PFRAG.native PLIST 
Removed files:
devel/frama-c/patches: patch-configure 

Log message:
update to framac-1.11 (the Sodium release upstream)

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:34:41

Modified files:
math/coq   : Makefile 

Log message:
bump coq REVISION due to OCaml 4.02.3 update

ok jca@, tested by krw@ daniel@ jsg@

CVS: cvs.openbsd.org: ports

2015-08-30 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/08/30 10:35:15

Modified files:
x11/lablgtk2   : Makefile 

Log message:
bump lablgtk2 REVISION due to OCaml 4.02.3 upgrade

ok jca@, tested by krw@ daniel@ jsg@

Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade

2015-08-17 Thread Anil Madhavapeddy 
On 16 Aug 2015, at 09:18, Jonathan Gray j...@jsg.id.au wrote:
 
 On Sun, 
 
 I built coccinelle on armv7 with the -2 version of the patch without
 problem.  It appears this is not native as
 infrastructure/mk/arch-defines.mk has:
 OCAML_NATIVE_ARCHS = i386 sparc amd64
 OCAML_NATIVE_DYNLINK_ARCHS = i386 amd64
 ?
 
 I'm not really in a position to do a bulk build but if there is some
 sort of ocaml regression test or the like you'd like run let me know.

Thanks!  After your and krw's tests, the final -4 patchset here should
build all the ports on everything:

http://recoil.org/~avsm/openbsd-patches/ocaml-4.02.3-4.patch.txt

OCaml does support ARM native code, but our port currently doesn't
use it until the configure glue is in.  I'll have a followup patch
to enable this, but got sidetracked with compiling up a custom u-Boot
for my Cubieboard2 since the current snapshots don't seem to boot
successfully on it.  For now, the portable bytecode is sufficient
(but there aren't any interesting ARM-specific regress tests until
native code support lands).

Would a ports person be able to give me an ok to commit the patchset?

-a

Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade

2015-08-17 Thread Anil Madhavapeddy 
On 17 Aug 2015, at 12:37, Kenneth Westerback kwesterb...@gmail.com wrote:
 
 Firing up -4 on my i386 test box while you wait for the ports@ ok. :-)
 
 What was the issue with ocaml-camlimage?

It was missing an explicit dependency on lablgtk, and so it got skipped
from the configure script when rebuilt on a clean package-free bulk build.
I also synced WANTLIB and added a LIB_DEPENDS on libexif while there as
well.  It now builds cleanly on sparc64/amd64 in my tests.

-a

Re: [opam-devel] openbsd ocaml 4.02.3 + opam 1.2.2 upgrade

2015-08-16 Thread Anil Madhavapeddy 
On 14 Aug 2015, at 15:40, Anil Madhavapeddy a...@recoil.org wrote:
 
 On 3 Aug 2015, at 18:58, Anil Madhavapeddy a...@recoil.org wrote:
 
 This rather large ports diff does an update of the OCaml ports to 4.02.3:
 http://www.recoil.org/~avsm/openbsd-patches/ocaml-4.02.3.patch.txt
 
 It bumps the REVISION of most of the untouched OCaml ports since binary 
 compat is not preserved across OCaml revisions.
 
 Any tests on non-x86 would be appreciated, especially ARM with native code.
 
 Here's a followup OCaml 4.02.3 patch that is now suitable for wider testing.
 I've run it on amd64 and sparc64 and am doing a complete bulk rebuild that 
 isn't
 complete yet.
 
 Full patch: 
 http://www.recoil.org/~avsm/openbsd-patches/ocaml-4.02.3-2.patch.txt
 

And here's a third patchset with some fixes thanks to a bulk build by krw
http://recoil.org/~avsm/openbsd-patches/ocaml-4.02.3-3.patch.txt

There's only one known failure now in ocaml-camlimages, and the rest all
builds on sparc64 as well.

-a

Re: openbsd ocaml 4.02.3 + opam 1.2.2 upgrade

2015-08-14 Thread Anil Madhavapeddy 
On 3 Aug 2015, at 18:58, Anil Madhavapeddy a...@recoil.org wrote:
 
 This rather large ports diff does an update of the OCaml ports to 4.02.3:
 http://www.recoil.org/~avsm/openbsd-patches/ocaml-4.02.3.patch.txt
 
 It bumps the REVISION of most of the untouched OCaml ports since binary 
 compat is not preserved across OCaml revisions.
 
 Any tests on non-x86 would be appreciated, especially ARM with native code.

Here's a followup OCaml 4.02.3 patch that is now suitable for wider testing.
I've run it on amd64 and sparc64 and am doing a complete bulk rebuild that isn't
complete yet.

Full patch: http://www.recoil.org/~avsm/openbsd-patches/ocaml-4.02.3-2.patch.txt

Diffstat is fairly large as I took the opportunity to do version upgrade on 
most of the small library ports.  The biggest upgrade is to OPAM 1.2.2, and
using the online solver by default rather than the now-broken internal solver.
Unfortunately, porting Aspcud requires Bison 2.25 or higher in our ports tree;
is anyone working on that for OpenBSD?

This mail should be CCed to all the MAINTAINER folk listed in the various
ports.  Testing on ARM would be appreciated in particular, and i386.

$ diffstat ocaml-4.02.3-2.patch.txt 
 b/databases/ocaml-postgresql/Makefile |4 
 b/databases/ocaml-postgresql/distinfo |4 
 b/databases/ocaml-postgresql/pkg/PFRAG.native |1 
 b/databases/ocaml-postgresql/pkg/PLIST|5 
 b/databases/ocaml-sqlite3/Makefile|5 
 b/databases/ocaml-sqlite3/distinfo|4 
 b/databases/ocaml-sqlite3/pkg/PLIST   |4 
 b/devel/coccinelle/Makefile   |2 
 b/devel/cudf/Makefile |1 
 b/devel/frama-c/Makefile  |5 
 b/devel/frama-c/distinfo  |4 
 b/devel/frama-c/pkg/PFRAG.native  |   53 
 b/devel/frama-c/pkg/PLIST |  118 -
 b/devel/ocaml-batteries/Makefile  |3 
 b/devel/ocaml-batteries/distinfo  |4 
 b/devel/ocaml-batteries/pkg/PFRAG.native  |1 
 b/devel/ocaml-batteries/pkg/PLIST |   49 
 b/devel/ocaml-bitstring/Makefile  |2 
 b/devel/ocaml-calendar/Makefile   |2 
 b/devel/ocaml-camomile/Makefile   |1 
 b/devel/ocaml-cmdliner/Makefile   |2 
 b/devel/ocaml-cmdliner/distinfo   |4 
 b/devel/ocaml-curses/Makefile |2 
 b/devel/ocaml-dose/Makefile   |4 
 b/devel/ocaml-dose/distinfo   |4 
 b/devel/ocaml-dose/patches/patch-Makefile |   33 
 b/devel/ocaml-dose/patches/patch-algo_defaultgraphs_ml|   12 
 b/devel/ocaml-dose/patches/patch-algo_depsolver_int_ml|   12 
 b/devel/ocaml-dose/patches/patch-algo_depsolver_ml|   69 
 b/devel/ocaml-dose/patches/patch-algo_diagnostic_ml   |   12 
 b/devel/ocaml-dose/patches/patch-algo_dominators_ml   |   12 
 b/devel/ocaml-dose/patches/patch-algo_flatten_ml  |   12 
 b/devel/ocaml-dose/patches/patch-algo_statistics_ml   |   12 
 b/devel/ocaml-dose/patches/patch-algo_strongconflicts_int_ml  |   12 
 b/devel/ocaml-dose/patches/patch-algo_strongconflicts_ml  |   12 
 b/devel/ocaml-dose/patches/patch-algo_strongdeps_int_ml   |   12 
 b/devel/ocaml-dose/patches/patch-algo_strongdeps_ml   |   12 
 b/devel/ocaml-dose/patches/patch-applications_ceve_ml |   72 
 b/devel/ocaml-dose/patches/patch-applications_challenged_ml   |   48 
 b/devel/ocaml-dose/patches/patch-applications_deb-buildcheck_ml   |   19 
 b/devel/ocaml-dose/patches/patch-applications_deb-coinstall_ml|   19 
 b/devel/ocaml-dose/patches/patch-applications_distcheck_ml|   80 
 b/devel/ocaml-dose/patches/patch-applications_dominators-graph_ml |   12 
 b/devel/ocaml-dose/patches/patch-applications_outdated_ml |   19 
 b/devel/ocaml-dose/patches/patch-applications_smallworld_ml   |   12 
 b/devel/ocaml-dose/patches/patch-applications_strong-deps_ml  |   12 
 b/devel/ocaml-dose/patches/patch-common_cudfAdd_ml|   12 
 b/devel/ocaml-dose/patches/patch-common_cudfSolver_ml |   12 
 b/devel/ocaml-dose/patches/patch-common_edosSolver_ml |   12 
 b/devel/ocaml-dose/patches/patch-common_input_ml  |   53 
 b/devel/ocaml-dose/patches/patch

Re: openbsd ocaml 4.02.3 + opam 1.2.2 upgrade

2015-08-04 Thread Anil Madhavapeddy 
On 3 Aug 2015, at 18:58, Anil Madhavapeddy a...@recoil.org wrote:
 
 This rather large ports diff does an update of the OCaml ports to 4.02.3:
 http://www.recoil.org/~avsm/openbsd-patches/ocaml-4.02.3.patch.txt
 
 It bumps the REVISION of most of the untouched OCaml ports since binary 
 compat is not preserved across OCaml revisions.
 
 Any tests on non-x86 would be appreciated, especially ARM with native code.
 

This is for post 5.8, so please don't worry about this until then...

-anil

openbsd ocaml 4.02.3 + opam 1.2.2 upgrade

2015-08-03 Thread Anil Madhavapeddy 
This rather large ports diff does an update of the OCaml ports to 4.02.3:
http://www.recoil.org/~avsm/openbsd-patches/ocaml-4.02.3.patch.txt

It bumps the REVISION of most of the untouched OCaml ports since binary compat 
is not preserved across OCaml revisions.

Any tests on non-x86 would be appreciated, especially ARM with native code.

thanks!
Anil

Re: UPDATE several OCaml ports: hevea, wyrd, utop...

2015-03-28 Thread Anil Madhavapeddy 
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?
- 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.

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.

-anil

 On 28 Mar 2015, at 16:24, Christopher Zimmermann chr...@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 
 4FEEfindlib.diffhevea.diffocaml-batteries.diffocaml-bitstring.diffocaml-calendar.diffocaml-camlp4.diffocaml-cmdliner.diffocaml-cryptokit.diffocaml-csv.diffocaml-dose.diffocaml-graph.diffocaml-lambda-term.diffocaml-lwt.diffocaml-net.diffocaml-pcre.diffocaml-postgresql.diffocaml-re.diffocaml-rss.diffocaml-sqlite3.diffocaml-ssl.diffocaml-text.diffocaml-uutf.diffocaml-xmlm.diffocaml-zed.diffutop.diffwyrd.diff

CVS: cvs.openbsd.org: ports

2015-01-07 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2015/01/07 04:00:23

Modified files:
sysutils/opam  : Makefile 

Log message:
Correct homepage for sysutils/opam, bump REVISION

CVS: cvs.openbsd.org: ports

2014-11-09 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2014/11/09 02:22:11

Modified files:
sysutils/opam  : Makefile 

Log message:
add missing RUN_DEPENDS to opam port needed for sensible operation

Also update HOMEPAGE to https version.

Re: CVS: cvs.openbsd.org: ports

2014-11-09 Thread Anil Madhavapeddy 
This was ok chrisz@ (the maintainer)

 On 9 Nov 2014, at 09:22, Anil Madhavapeddy a...@cvs.openbsd.org wrote:
 
 CVSROOT:  /cvs
 Module name:  ports
 Changes by:   a...@cvs.openbsd.org2014/11/09 02:22:11
 
 Modified files:
   sysutils/opam  : Makefile 
 
 Log message:
 add missing RUN_DEPENDS to opam port needed for sensible operation
 
 Also update HOMEPAGE to https version.

CVS: cvs.openbsd.org: ports

2014-10-11 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2014/10/11 07:27:51

Modified files:
textproc/openjade: Makefile 

Log message:
drop MAINTAINER on openjade; bump REVISION

Re: [FIX] lang/ocaml

2014-10-11 Thread Anil Madhavapeddy 
On 10 Oct 2014, at 09:59, 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.
 
 * Set CONFIGURE_ARGS += --enable-tests depending on NO_TEST in oasis 
  CONFIGURE_STYLE.
 
 * install ocamlbuild.1
 
 * two patches already committed upstream for the next release, but I'd 
  like to have them now.
 
 OK?
 

ok avsm@, except for the minor typo below

 ##
 # BUILD
 Index: patches/patch-ocamlbuild_ocaml_specific_ml
 ===
 RCS file: patches/patch-ocamlbuild_ocaml_specific_ml
 diff -N patches/patch-ocamlbuild_ocaml_specific_ml
 --- /dev/null 1 Jan 1970 00:00:00 -
 +++ patches/patch-ocamlbuild_ocaml_specific_ml10 Oct 2014 16:45:40 
 -
 @@ -0,0 +1,15 @@
 +$OpenBSD$
 +
 +PR#6544: the bin_annot flag is only effective when compiling. It should be
 +enabled when packing, too.

That should be PR#6599

-anil

Re: [NEW] OCaml oasis and Janestreet Core and Async

2014-10-11 Thread Anil Madhavapeddy 
On 10 Oct 2014, at 11:48, Kenneth Westerback kwesterb...@gmail.com wrote:

 On 10 October 2014 14:46, Kenneth Westerback kwesterb...@gmail.com wrote:
 On 10 October 2014 13:03, Christopher Zimmermann christop...@gmerlin.de 
 wrote:
 Hi,
 
 attached you find many new OCaml ports. Mainly the following two and
 their dependencies:
 
 * Oasis (an OCaml project build and metadata tool) used by many of our
  OCaml ports.
 
 * Janestreet Core standard library overlay and Janestreet Async
 
 Oasis depends on devel/janestreet/ocaml-type_conv while most of
 janestreet stuff uses oasis. If this is too much, I could leave the rest
 of janestreet for now and only import ocaml-type_conv.
 
 Since I'm currently waiting for the release of OPAM 1.2
 (https://github.com/jasperla/openbsd-wip/tree/master/sysutils/opam),
 which can be used to install all those libraries and binaries, I'm
 wondering whether it still makes any sense to maintain those ports in
 our ports tree. The same applies to other ports already in our tree
 like devel/{utop,ocaml-lambda-term,ocaml-lwt} ...). Opinions? OKs?
 
 
 Christopher
 
 Personally I would prefer to use opam over ports. The only reason I
 can see for maintaining ports is if they are needed to build other
 ocaml ports (mldonkey?) in the tree. That's my 0.05C (Canada has
 eliminated the penny).
 
  Ken
 
 I guess we would also need a port when upstream needs patches to
 compile on OpenBSD. Hopefully a rare situation going forward.

I'm happy to merge OpenBSD-specific fixes into OPAM -- it's possible to
add OS-specific selectors in the patches field to not affect other OSes.

However, it is very convenient to be able to depend on a binary
installation of OCaml libraries for end-user applications, particularly
given the strict versioning requirements.  The OpenBSD port is also
higher quality when it comes to architecture portability, since it
separates out bytecode vs native code vs native dynlinking architectures.

There is enough metadata available in an OPAM package to generate a
snapshot of OpenBSD ports from a given package set.  I'm not suggesting
we automatically import the results into OpenBSD, but it would really
help keep the ports tree in sync with the latest versions of libraries.
The metadata needed for this is roughly:

- build instructions -- present in OPAM, but they do not separate out
  fake installation and native code at the moment.  This could be added
  to OPAM fairly easily.

- external dependencies -- OPAM has a 'depexts' field where OS packages
  can be specified.  This is a free-form field, so it could be a precise
  pkgspec for the OpenBSD entry.

- categories and homepages -- these can be lifted straight out of the 
  OPAM spec, and tags can be used to map OpenBSD-specific information.

More broadly though, does any other language-specific packaging system
do this at the moment, or all ports maintained manually? 

-anil

Re: [UPDATE] lang/ocaml 4.02

2014-09-03 Thread Anil Madhavapeddy 
On 3 Sep 2014, at 06:53, Kenneth Westerback kwesterb...@gmail.com wrote:
 
 Got OCaml and OCaml-camlp4 built and installed. Some confusion about
 'pkg_add -u' not working for OCaml or opam so I deleted the packages
 and re-installed. Also installed OCaml-graphics since it was there so
 I assumed it was necessary even if I hadn't asked for it specifically.
 
 Did 'opam install list of stuff'. *Only* two did not work --
 ocp-indent and async_graphics. Both complain that conduit is not
 available:
 
 $ opam install async_graphics
 
 The dependency ssl of package conduit.0.5.1 is not available for your
 compiler or your OS.
 'opam install async_graphics' failed.
 $ cd -
 /usr/ports/packages/amd64/all
 $ opam install ocp-indent
 
 The dependency ssl of package conduit.0.5.1 is not available for your
 compiler or your OS.
 'opam install ocp-indent' failed.

Can you try opam install ssl, and if that fails, 
opam install async_graphics --debug?

I suspect this may be due to the internal package solver in 1.1.1,
but I'll have a port of OPAM 1.2.0 to put into the tree quite
shortly (with an improved solver). We could really use a port of 
aspcud (an external solver that is picked up and used if present),
but it's a pain to port due to requiring a newer bison than we
have.

-anil

Re: [UPDATE] lang/ocaml 4.02

2014-09-03 Thread Anil Madhavapeddy 
On 3 Sep 2014, at 09:32, Christopher Zimmermann chr...@openbsd.org wrote:

 On Wed, 3 Sep 2014 09:14:00 +0200 Anil Madhavapeddy a...@recoil.org
 wrote:
 
 On 3 Sep 2014, at 06:53, Kenneth Westerback kwesterb...@gmail.com wrote:
 
 Got OCaml and OCaml-camlp4 built and installed. Some confusion about
 'pkg_add -u' not working for OCaml or opam so I deleted the packages
 and re-installed. Also installed OCaml-graphics since it was there so
 I assumed it was necessary even if I hadn't asked for it specifically.
 
 Did 'opam install list of stuff'. *Only* two did not work --
 ocp-indent and async_graphics. Both complain that conduit is not
 available:
 
 $ opam install async_graphics
 
 The dependency ssl of package conduit.0.5.1 is not available for your
 compiler or your OS.
 'opam install async_graphics' failed.
 $ cd -
 /usr/ports/packages/amd64/all
 $ opam install ocp-indent
 
 The dependency ssl of package conduit.0.5.1 is not available for your
 compiler or your OS.
 'opam install ocp-indent' failed.
 
 Can you try opam install ssl, and if that fails, 
 opam install async_graphics --debug?
 
 I suspect this may be due to the internal package solver in 1.1.1,
 but I'll have a port of OPAM 1.2.0 to put into the tree quite
 shortly (with an improved solver). We could really use a port of 
 aspcud (an external solver that is picked up and used if present),
 but it's a pain to port due to requiring a newer bison than we
 have.
 
 Hi,
 
 well, I guess we did double work. I have an opam 1.2.0 port ready at
 wip...
 

Happy to use yours -- I'm busy fixing the actual opam tool itself,
so the port shouldn't need any local patches...

If you get a chance to look at aspcud and friends, that would be
very useful indeed, but you'll run into the bison issue with gringo.

-a

Re: [UPDATE] devel/ounit 2.0.0

2014-09-03 Thread Anil Madhavapeddy 
On 3 Sep 2014, at 09:33, Christopher Zimmermann christop...@gmerlin.de wrote:

 +share/examples/Makefile
 +share/examples/example.ml
 +share/examples/test_list.ml
 +share/examples/test_list2.ml
 +share/examples/test_stack.ml
 +share/examples/test_suite.ml

The examples need to be installed to a subdirectory, otherwise ok avsm@

-anil

Re: [UPDATE] lang/ocaml 4.02

2014-09-03 Thread Anil Madhavapeddy 
On 3 Sep 2014, at 13:44, Kenneth Westerback kwesterb...@gmail.com wrote:
 
 opam install ssl followed by opam install async_graphics worked.
 And looking at 'opam list' on my other, as-yet-un-upgraded, box I see
 that ssl was present there.

Great -- this will be fixed by the external solver being ported.  The
ssl is an optional dependency, which is a bit complex to solve for
due to a combinatorial explosion.  OPAM 1.2 should do a better job of
this with its builtin solver I hope.

 
 However, opam install ocp-indent failed. Albeit for apparently
 different reasons since it did not complain about conduit this time:

This one's due to the ocp-indent build system :-/  A bug report on
https://github.com/ocaml/opam-repository/issues would be appreciated,
and I'll look at it shortly if noone else does (travelling at ICFP atm).

-anil

Re: [NEW] lang/ocaml-camlp4

2014-09-02 Thread Anil Madhavapeddy 
This shouldn't need findlib in the build depends any more since it's installed 
directly.

-anil

 On 2 Sep 2014, at 06:50, Christopher Zimmermann chr...@openbsd.org wrote:
 
 On Mon, 1 Sep 2014 23:34:18 -0400 Kenneth Westerback
 kwesterb...@gmail.com wrote:
 
 On 1 September 2014 07:12, Christopher Zimmermann chr...@openbsd.org 
 wrote:
 Hi,
 
 OCaml 4.02 will no longer ship with camlp4. Therefore we need a
 separate port. OK?
 
 Since git, in what I ascribe to it's infinite annoying stupidity, does
 not actually provide the information necessary to determine where you
 intend this patch to be applied I'm kinda stymied. Especially when
 sqlports bombed out again after jca@'s fix. This time complaining that
 ocaml-camlp4 does not exit. :-(
 
 
 Well it wasn't git's, but my own stupidity. Here's a proper patch. This
 time with lang/Makefile addition, too. OK?
 
 Christopher
 
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/lang/Makefile,v
 retrieving revision 1.163
 diff -u -p -r1.163 Makefile
 --- Makefile15 Aug 2014 12:24:46 -1.163
 +++ Makefile2 Sep 2014 04:48:00 -
 @@ -66,6 +66,7 @@
  SUBDIR += nqp
  SUBDIR += obc
  SUBDIR += ocaml
 + SUBDIR += ocaml-camlp4
  SUBDIR += ocamlduce
  SUBDIR += onyx
  SUBDIR += oo2c
 Index: ocaml-camlp4/Makefile
 ===
 RCS file: ocaml-camlp4/Makefile
 diff -N ocaml-camlp4/Makefile
 --- /dev/null1 Jan 1970 00:00:00 -
 +++ ocaml-camlp4/Makefile2 Sep 2014 04:48:00 -
 @@ -0,0 +1,48 @@
 +# $OpenBSD: $
 +
 +COMMENT =OCaml Preprocessor and Pretty-Printer
 +CATEGORIES =lang
 +
 +V =4.02.0
 +GH_ACCOUNT =ocaml
 +GH_PROJECT =camlp4
 +GH_TAGNAME =${V}
 +GH_COMMIT =0bb620fad7005850beadbf3aafeeb17d28c8fecd
 +DISTNAME =${GH_PROJECT}-${GH_TAGNAME}
 +PKGNAME =ocaml-${DISTNAME}
 +
 +HOMEPAGE =https://github.com/ocaml/camlp4/
 +
 +MAINTAINER =Christopher Zimmermann chr...@openbsd.org
 +
 +# LGPL =2.1
 +PERMIT_PACKAGE_CDROM =Yes
 +
 +MODULES =lang/ocaml
 +
 +WANTLIB +=c m
 +BUILD_DEPENDS +=sysutils/findlib
 +
 +USE_GMAKE =Yes
 +
 +CONFIGURE_STYLE =simple
 +
 +MAKE_ENV =DESTDIR=${WRKINST}
 +
 +ALL_TARGET =byte
 +
 +.include bsd.port.arch.mk
 +.if ${PROPERTIES:Mocaml_native}
 +ALL_TARGET +=native
 +.endif
 +
 +INSTALL_TARGET =install install-META
 +
 +
 +pre-install:
 +echo LIBDIR=${PREFIX}/lib/ocaml ${WRKSRC}/config.sh
 +echo BINDIR=${PREFIX}/bin ${WRKSRC}/config.sh
 +echo PKGDIR=${PREFIX}/lib/ocaml/camlp4 ${WRKSRC}/config.sh
 +
 +
 +.include bsd.port.mk
 Index: ocaml-camlp4/distinfo
 ===
 RCS file: ocaml-camlp4/distinfo
 diff -N ocaml-camlp4/distinfo
 --- /dev/null1 Jan 1970 00:00:00 -
 +++ ocaml-camlp4/distinfo2 Sep 2014 04:48:00 -
 @@ -0,0 +1,2 @@
 +SHA256 (camlp4-4.02.0.tar.gz) = 6MuTgKfxtKhiadSr4hr8zws9lsbyB7hVwnFfOVgIu94=
 +SIZE (camlp4-4.02.0.tar.gz) = 697243
 Index: ocaml-camlp4/pkg/DESCR
 ===
 RCS file: ocaml-camlp4/pkg/DESCR
 diff -N ocaml-camlp4/pkg/DESCR
 --- /dev/null1 Jan 1970 00:00:00 -
 +++ ocaml-camlp4/pkg/DESCR2 Sep 2014 04:48:00 -
 @@ -0,0 +1,7 @@
 +Camlp4 is a software system for writing extensible parsers
 +for programming languages. It provides a set of OCaml
 +libraries that are used to define grammars as well as
 +loadable syntax extensions of such grammars. Camlp4 stands
 +for Caml Preprocessor and Pretty-Printer and one of its most
 +important applications is the definition of domain-specific
 +extensions of the syntax of OCaml.
 Index: ocaml-camlp4/pkg/PFRAG.native
 ===
 RCS file: ocaml-camlp4/pkg/PFRAG.native
 diff -N ocaml-camlp4/pkg/PFRAG.native
 --- /dev/null1 Jan 1970 00:00:00 -
 +++ ocaml-camlp4/pkg/PFRAG.native2 Sep 2014 04:48:00 -
 @@ -0,0 +1,75 @@
 +@comment $OpenBSD$
 +@bin bin/camlp4o.opt
 +@bin bin/camlp4of.opt
 +@bin bin/camlp4oof.opt
 +@bin bin/camlp4orf.opt
 +@bin bin/camlp4r.opt
 +@bin bin/camlp4rf.opt
 +lib/ocaml/camlp4/Camlp4Bin.cmx
 +lib/ocaml/camlp4/Camlp4Bin.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx

Re: [NEW] lang/ocaml-camlp4

2014-09-01 Thread Anil Madhavapeddy 
This needs to wait until we tag a non RC version of camlp4.

Jeremie: since we decided against installing camlp4 via findlib, can
the 4.02.0+rc1-no-findlib tag be turned into 4.02.0 release?  I
don't think there are any source changes involved, so the below should
work once the tag is created.

-anil

On 1 Sep 2014, at 13:12, Christopher Zimmermann chr...@openbsd.org wrote:

 Hi,
 
 OCaml 4.02 will no longer ship with camlp4. Therefore we need a
 separate port. OK?
 
 Christopher
 
 
 diff -Nru /tmp/lang/Makefile ocaml-camlp4/Makefile
 --- /tmp/lang/MakefileThu Jan  1 01:00:00 1970
 +++ ocaml-camlp4/Makefile Mon Sep  1 13:06:35 2014
 @@ -0,0 +1,49 @@
 +# $OpenBSD: $
 +
 +COMMENT =OCaml Preprocessor and Pretty-Printer
 +CATEGORIES = lang
 +
 +V =  4.02.0rc1
 +GH_ACCOUNT = ocaml
 +GH_PROJECT = camlp4
 +GH_TAGNAME = 4.02.0+rc1-no-findlib
 +GH_COMMIT =  0bb620fad7005850beadbf3aafeeb17d28c8fecd
 +DISTNAME =   ${GH_PROJECT}-${GH_TAGNAME}
 +PKGNAME =ocaml-${GH_PROJECT}-${V}
 +WRKSRC = ${WRKDIR}/${DISTNAME:S/+/-/g}
 +
 +HOMEPAGE =   https://github.com/ocaml/camlp4/
 +
 +MAINTAINER = Christopher Zimmermann chr...@openbsd.org
 +
 +# LGPL =2.1
 +PERMIT_PACKAGE_CDROM =   Yes
 +
 +MODULES =lang/ocaml
 +
 +WANTLIB +=   c m
 +BUILD_DEPENDS += sysutils/findlib
 +
 +USE_GMAKE =  Yes
 +
 +CONFIGURE_STYLE =simple
 +
 +MAKE_ENV =   DESTDIR=${WRKINST}
 +
 +ALL_TARGET = byte
 +
 +.include bsd.port.arch.mk
 +.if ${PROPERTIES:Mocaml_native}
 +ALL_TARGET +=native
 +.endif
 +
 +INSTALL_TARGET = install install-META
 +
 +
 +pre-install:
 + echo LIBDIR=${PREFIX}/lib/ocaml ${WRKSRC}/config.sh
 + echo BINDIR=${PREFIX}/bin ${WRKSRC}/config.sh
 + echo PKGDIR=${PREFIX}/lib/ocaml/camlp4 ${WRKSRC}/config.sh
 +
 +
 +.include bsd.port.mk
 diff -Nru /tmp/lang/distinfo ocaml-camlp4/distinfo
 --- /tmp/lang/distinfoThu Jan  1 01:00:00 1970
 +++ ocaml-camlp4/distinfo Mon Sep  1 12:42:51 2014
 @@ -0,0 +1,2 @@
 +SHA256 (camlp4-4.02.0+rc1-no-findlib.tar.gz) = 
 cFJOilixBLCjpk7gEP4kCMt7LU2nWBOwYFPnK1IXSdY=
 +SIZE (camlp4-4.02.0+rc1-no-findlib.tar.gz) = 697365
 diff -Nru /tmp/lang/pkg/DESCR ocaml-camlp4/pkg/DESCR
 --- /tmp/lang/pkg/DESCR   Thu Jan  1 01:00:00 1970
 +++ ocaml-camlp4/pkg/DESCRMon Aug 18 16:09:38 2014
 @@ -0,0 +1,7 @@
 +Camlp4 is a software system for writing extensible parsers
 +for programming languages. It provides a set of OCaml
 +libraries that are used to define grammars as well as
 +loadable syntax extensions of such grammars. Camlp4 stands
 +for Caml Preprocessor and Pretty-Printer and one of its most
 +important applications is the definition of domain-specific
 +extensions of the syntax of OCaml.
 diff -Nru /tmp/lang/pkg/PFRAG.native ocaml-camlp4/pkg/PFRAG.native
 --- /tmp/lang/pkg/PFRAG.nativeThu Jan  1 01:00:00 1970
 +++ ocaml-camlp4/pkg/PFRAG.native Mon Aug 18 16:12:29 2014
 @@ -0,0 +1,75 @@
 +@comment $OpenBSD$
 +@bin bin/camlp4o.opt
 +@bin bin/camlp4of.opt
 +@bin bin/camlp4oof.opt
 +@bin bin/camlp4orf.opt
 +@bin bin/camlp4r.opt
 +@bin bin/camlp4rf.opt
 +lib/ocaml/camlp4/Camlp4Bin.cmx
 +lib/ocaml/camlp4/Camlp4Bin.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4AstLifter.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4ExceptionTracer.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4FoldGenerator.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4LocationStripper.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4MapGenerator.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4MetaGenerator.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4Profiler.o
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.cmx
 +lib/ocaml/camlp4/Camlp4Filters/Camlp4TrashRemover.o
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.cmx
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4AstLoader.o
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.cmx
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4DebugParser.o
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.cmx
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4GrammarParser.o
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.cmx
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4ListComprehension.o
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.cmx
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4MacroParser.o
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.cmx
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlOriginalQuotationExpander.o
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.cmx
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParser.o
 +lib/ocaml/camlp4/Camlp4Parsers/Camlp4OCamlParserParser.cmx

Re: [UPDATE] lang/ocaml 4.02

2014-09-01 Thread Anil Madhavapeddy 
/ocaml
 
 -BUILD_DEPENDS += sysutils/findlib
 +BUILD_DEPENDS += sysutils/findlib lang/ocaml-camlp4
 
 CONFIGURE_STYLE = oasis
 
 Index: devel/utop/Makefile
 ===
 RCS file: /cvs/ports/devel/utop/Makefile,v
 retrieving revision 1.4
 diff -u -p -r1.4 Makefile
 --- devel/utop/Makefile   27 Aug 2014 08:05:17 -  1.4
 +++ devel/utop/Makefile   1 Sep 2014 11:18:09 -
 @@ -21,7 +21,7 @@ CONFIGURE_ARGS +=   --enable-tests
 
 MODULES = lang/ocaml
 RUN_DEPENDS = devel/ocaml-lambda-term
 -BUILD_DEPENDS =  ${RUN_DEPENDS} sysutils/findlib 
 lang/ocaml,-camlp4
 +BUILD_DEPENDS =  ${RUN_DEPENDS} sysutils/findlib 
 lang/ocaml-camlp4
 
 # silence a warning
 post-extract:
 Index: lang/ocaml/Makefile
 ===
 RCS file: /cvs/ports/lang/ocaml/Makefile,v
 retrieving revision 1.64
 diff -u -p -r1.64 Makefile
 --- lang/ocaml/Makefile   21 Aug 2014 20:54:04 -  1.64
 +++ lang/ocaml/Makefile   1 Sep 2014 11:20:21 -
 @@ -2,23 +2,18 @@
 
 NOT_FOR_ARCHS=hppa
 
 -MULTI_PACKAGES = -camlp4 -graphics -labltk -main
 +MULTI_PACKAGES = -graphics -main
 
 COMMENT-main =   ML language with complete class-based objective 
 system
 COMMENT-graphics = OCaml Graphics library providing basic drawing primitives
 -COMMENT-camlp4 =   OCaml Preprocessor and Pretty-Printer
 -COMMENT-labltk =   OCaml TK bindings
 
 # 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.01.0
 -REVISION = 0
 +VERSION=4.02.0
 
 PKGNAME-main =ocaml-${VERSION}
 PKGNAME-graphics =ocaml-graphics-${VERSION}
 -PKGNAME-camlp4 = ocaml-camlp4-${VERSION}
 -PKGNAME-labltk = ocaml-labltk-${VERSION}
 
 # OCaml has no binary compatibility between releases.
 PKGSPEC-main =ocaml-=${VERSION}
 @@ -37,65 +32,45 @@ MAINTAINER=   Anil Madhavapeddy avsm@open
 # QPL/LGPL
 PERMIT_PACKAGE_CDROM= Yes
 
 -MODULES+= lang/tcl x11/tk
 -
 -CONFIGURE_STYLE= simple
 -CONFIGURE_ARGS+=-tkdefs '-I${MODTCL_INCDIR} -I${MODTK_INCDIR}'
 -CONFIGURE_ARGS+=-tklibs -L${LOCALBASE}/lib
 +CONFIGURE_STYLE= simple dest
 CONFIGURE_ARGS+=-prefix ${PREFIX} 
 CONFIGURE_ARGS+=-cc '${CC} ${CFLAGS}'
 CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib
 CONFIGURE_ENV+=OPENBSD_LOCALBASE=${LOCALBASE}
 
 -# ocaml's configure script is too smart for its own good
 -FAKE_FLAGS=  PREFIX=${WRKINST}${PREFIX}
 -
 USE_GMAKE=Yes
 
 -BUILD_DEPENDS += ${MODTK_BUILD_DEPENDS} \
 - devel/gdb
 -RUN_DEPENDS-camlp4 +=lang/ocaml
 +BUILD_DEPENDS += devel/gdb
 RUN_DEPENDS-graphics +=   lang/ocaml
 -RUN_DEPENDS-labltk +=lang/ocaml ${MODTK_RUN_DEPENDS}
 -LIB_DEPENDS-labltk +=${MODTK_LIB_DEPENDS}
 -WANTLIB-main =   c curses m pthread
 -WANTLIB-camlp4 = c m
 +WANTLIB-main =   c curses iberty m pthread z
 WANTLIB-graphics =X11
 -WANTLIB-labltk = X11 ${MODTK_WANTLIB}
 
 .include bsd.port.arch.mk
 
 .if ${PROPERTIES:Mocaml_native}
 ALL_TARGET=   world bootstrap opt opt.opt
 PKG_ARGS +=   -Dnative=1
 +TEST_DEPENDS +=  ${BUILD_PKGPATH}
 +
 .if ${PROPERTIES:Mocaml_native_dynlink}
 PKG_ARGS +=   -Ddynlink=1
 .else
 PKG_ARGS +=   -Ddynlink=0
 .endif
 +
 .else
 ALL_TARGET=   world bootstrap
 PKG_ARGS +=   -Dnative=0
 +NO_TEST   =  yes
 .endif
 
 -# XXX regress tests only work on archs with native-code compiler
 -TEST_DEPENDS+=   ${BUILD_PKGPATH}
 -
 -post-extract:
 - @cp ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
 
 post-install:
 -.if ${PROPERTIES:Mocaml_native}
 - @ln -sf ${LOCALBASE}/bin/ocamlbuild.native ${PREFIX}/bin/ocamlbuild
 -.else
 - @ln -sf ${LOCALBASE}/bin/ocamlbuild.byte ${PREFIX}/bin/ocamlbuild
 -.endif
   @${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml/html/libref
   @${INSTALL_DATA} ${WRKDIR}/htmlman/*.{html,gif} \
   ${PREFIX}/share/doc/ocaml/html
   @${INSTALL_DATA} ${WRKDIR}/htmlman/libref/* \
   ${PREFIX}/share/doc/ocaml/html/libref
 - @strip ${PREFIX}/bin/ocamlrun ${PREFIX}/bin/ocamlyacc
   @${INSTALL_DATA} \
   ${WRKSRC}/{LICENSE,Changes} \
   ${PREFIX}/share/doc/ocaml
 Index: lang/ocaml/distinfo
 ===
 RCS file: /cvs/ports/lang/ocaml/distinfo,v
 retrieving revision 1.18
 diff -u -p -r1.18 distinfo
 --- lang/ocaml/distinfo   25 Nov 2013 14:40:15 -  1.18
 +++ lang/ocaml/distinfo   1 Sep 2014 11:20:21 -
 @@ -1,4 +1,4 @@
 -SHA256 (ocaml-4.01-refman-html.tar.gz) = 
 AQGcj4opqKf0IuCQcEtmat4qAH1X6pQSKF+I9xZlYAE=
 -SHA256 (ocaml-4.01.0.tar.gz) = 6hdR3v9FT1xzjRDYoK0TWv7ghS05HPlXZrcmwPr3z9s=
 -SIZE (ocaml-4.01-refman-html.tar.gz) = 571422
 -SIZE (ocaml

Re: [UPDATE] lang/ocaml 4.02

2014-09-01 Thread Anil Madhavapeddy 
On 1 Sep 2014, at 14:35, Christopher Zimmermann chr...@openbsd.org wrote:

 On Mon, 1 Sep 2014 14:21:56 +0200 Anil Madhavapeddy a...@recoil.org
 wrote:
 
 This is a huge update, thanks Christopher! Do you also want to take
 joint MAINTAINER on OCaml?  Main reason this should go in is that 
 4.02 fixed all the sprintf/strcpy uses, so there are no more linker
 warnings on every ocamlopt compilation.
 
 Bulk of the update is ok me; a few questions:
 
 - got a separate port for labltk now that it's pulled out?
 
 No. The only user I found is findlib's make_wizard, but I have no idea
 what it does.

no idea -- can add the tk interface as a port later on if any users show up.

 
 - is there an upstream Mantis bug for the stack overflow detection? if so, 
 putting it in the port patch comment would make it easier to keep track of 
 what we need to upstream.
 
 I mailed it to c...@inria.fr. I can file a Mantis bug, too.

A Mantis bug is definitely the way to make sure it gets fixed.

 According to packages-specs(7), the package / ports system works well
 with rc versions. They are always below normal versions. So if a fast
 camlp4 release is not possible, we can use the rc, too.

Final camlp4 version released from that tag now; 
https://github.com/ocaml/camlp4/archive/4.02.0.tar.gz

-anil

Re: UPDATE: devel/ocaml-batteries

2014-08-27 Thread Anil Madhavapeddy 
Ok avsm, except consider bumping the version number with a suffix to indicate 
it's not vanilla 2.2.0 due to the backported patches (which are significant).

 On 25 Aug 2014, at 20:22, Christopher Zimmermann chr...@openbsd.org wrote:
 
 Hi,
 
 this is a straightforward update for batteries included.
 Patches from upstream for OCaml 4.02 are already included.
 OK?
 
 
 Christopher
 
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/devel/ocaml-batteries/Makefile,v
 retrieving revision 1.10
 diff -u -p -r1.10 Makefile
 --- Makefile22 Aug 2014 22:21:53 -1.10
 +++ Makefile25 Aug 2014 19:19:25 -
 @@ -3,11 +3,11 @@
 COMMENT =OCaml Batteries Included - OCaml foundation library
 CATEGORIES =devel
 
 -V =2.1.0
 +V =2.2.0
 GH_ACCOUNT =ocaml-batteries-team
 GH_PROJECT =batteries-included
 GH_TAGNAME =v$V
 -GH_COMMIT =7613438a4e8425fc51b16f21faaccdebc7ea76ce
 +GH_COMMIT =9370680ef30e225e50c76fc05654a897d79ee79d
 DISTNAME =${GH_PROJECT}-$V
 PKGNAME =ocaml-batteries-$V
 REVISION =0
 Index: distinfo
 ===
 RCS file: /cvs/ports/devel/ocaml-batteries/distinfo,v
 retrieving revision 1.4
 diff -u -p -r1.4 distinfo
 --- distinfo25 Nov 2013 14:35:26 -1.4
 +++ distinfo25 Aug 2014 19:19:25 -
 @@ -1,2 +1,2 @@
 -SHA256 (batteries-included-2.1.0.tar.gz) = 
 NJFZygo+j2OJl9E9U3sgvXYo+ke7RafUHbyys+0aRq8=
 -SIZE (batteries-included-2.1.0.tar.gz) = 695835
 +SHA256 (batteries-included-2.2.0.tar.gz) = 
 C3nbTrWgjk350scqV8pu5CytUeX978GtFPhgtEMCz5I=
 +SIZE (batteries-included-2.2.0.tar.gz) = 711646
 Index: patches/patch-Makefile
 ===
 RCS file: patches/patch-Makefile
 diff -N patches/patch-Makefile
 --- /dev/null1 Jan 1970 00:00:00 -
 +++ patches/patch-Makefile25 Aug 2014 19:19:25 -
 @@ -0,0 +1,16 @@
 +$OpenBSD$
 +
 +from upstream: fix compilation with ocaml 4.02
 +
 +--- Makefile.origFri Jan 17 20:28:42 2014
  MakefileWed Aug 20 11:50:45 2014
 +@@ -67,7 +67,8 @@ endif
 + 
 + PREPROCESSED_FILES = src/batMarshal.mli src/batUnix.mli 
 src/batPervasives.mli \
 + src/batInnerPervasives.ml src/batHashtbl.ml \
 +- src/batPrintexc.mli src/batSys.mli src/batBigarray.mli
 ++ src/batPrintexc.mli src/batPrintf.ml src/batPrintf.mli \
 ++ src/batSys.mli src/batBigarray.mli
 + 
 + .PHONY: all clean doc install uninstall reinstall test qtest qtest-clean 
 camfail camfailunk coverage man
 + 
 Index: patches/patch-build_prefilter_ml
 ===
 RCS file: patches/patch-build_prefilter_ml
 diff -N patches/patch-build_prefilter_ml
 --- /dev/null1 Jan 1970 00:00:00 -
 +++ patches/patch-build_prefilter_ml25 Aug 2014 19:19:25 -
 @@ -0,0 +1,39 @@
 +$OpenBSD$
 +
 +from upstream: support comparison operator for prefilter on version
 +needed for backwards compatibility with ocaml  4.2
 +
 +--- build/prefilter.ml.origFri Jan 17 20:28:42 2014
  build/prefilter.mlWed Aug 20 11:50:45 2014
 +@@ -3,23 +3,21 @@ let (major, minor) =
 + %d.%d. (fun j n - (j, n))
 + 
 + let filter_cookie_re =
 +-  Str.regexp ^##V\\([^#]+\\)##
 ++  Str.regexp ^##V\\([]?=?\\)\\([^#]+\\)##
 + let version_re =
 +   Str.regexp \\([0-9]+\\)\\(\\.\\([0-9]+\\)\\)?
 + 
 +-let maybe f x = try Some (f x) with _ - None
 +-
 + let process_line line =
 +   if Str.string_match filter_cookie_re line 0 then begin
 +-let ver_string = Str.matched_group 1 line in
 ++let cmp = match Str.matched_group 1 line with
 ++|  - () |  - () | = - (=)
 ++| = - (=) | = - (=) | _ - (=)
 ++in
 ++let ver_string = Str.matched_group 2 line in
 + assert (Str.string_match version_re ver_string 0) ;
 + let ver_maj = int_of_string (Str.matched_group 1 ver_string) in
 +-let pass = match maybe (Str.matched_group 3) ver_string with
 +-| None - ver_maj = major
 +-| Some ver_min -
 +-  let ver_min = int_of_string ver_min in
 +-  ver_maj = major  ver_min = minor
 +-in
 ++let ver_min = try int_of_string (Str.matched_group 3 ver_string) with _ 
 - 0 in
 ++let pass = cmp (major*100+minor) (ver_maj*100+ver_min) in
 + if pass then Str.replace_first filter_cookie_re  line
 + else 
 +   end else line
 Index: patches/patch-src_batPrintf_mliv
 ===
 RCS file: patches/patch-src_batPrintf_mliv
 diff -N patches/patch-src_batPrintf_mliv
 --- /dev/null1 Jan 1970 00:00:00 -
 +++ patches/patch-src_batPrintf_mliv25 Aug 2014 19:19:25 -
 @@ -0,0 +1,406 @@
 +$OpenBSD$
 +
 +from upstream: fix compilation with ocaml 4.02
 +
 +--- src/batPrintf.mliv.origWed Aug 20 11:50:45 2014
  src/batPrintf.mlivWed Aug 20 11:50:45 2014
 +@@ -0,0 +1,399 @@
 ++(*
 ++ *

Re: UPDATE: devel/ocaml-camomile to 0.8.5

2014-08-27 Thread Anil Madhavapeddy 
Is cppo difficult to port? Minimising diffs here is preferable as cppo has some 
features that cpp doesn't (and can be easy to miss).

 On 25 Aug 2014, at 16:32, Christopher Zimmermann chr...@openbsd.org wrote:
 
 Hi,
 
 here comes an update to Camomile 0.8.5.
 The Camomile build system relies on the cppo OCaml preprocessor, which 
 is not available on OpenBSD. Therefore I use cpp as substitute. To 
 allow this, the indentation of preprocessor directives needs to be 
 removed. This port should be ready for OCaml 4.02. OK?
 
 
 Christopher
 
 
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/devel/ocaml-camomile/Makefile,v
 retrieving revision 1.5
 diff -u -p -r1.5 Makefile
 --- Makefile22 Aug 2014 22:21:53 -1.5
 +++ Makefile25 Aug 2014 15:25:52 -
 @@ -4,31 +4,42 @@ COMMENT =unicode library for objective 
 
 CATEGORIES =devel
 
 -V =0.8.3
 -REVISION =2
 -DISTNAME =camomile-${V}
 -PKGNAME =ocaml-camomile-${V}
 -EXTRACT_SUFX =.tar.bz2
 +V =0.8.5
 +GH_ACCOUNT =yoriyuki
 +GH_PROJECT =Camomile
 +GH_TAGNAME =rel-${V}
 +GH_COMMIT =07415d3049eaad11914523468904ee117db149e3
 +DISTNAME =${GH_PROJECT}-${V}
 +WRKSRC =${WRKDIST}/Camomile
 +PKGNAME =ocaml-${DISTNAME}
 
 -MASTER_SITES =${MASTER_SITE_SOURCEFORGE:=camomile/}
 +HOMEPAGE =https://github.com/yoriyuki/Camomile
 
 -HOMEPAGE =http://camomile.sourceforge.net/
 -
 -MAINTAINER =Christopher Zimmermann madro...@gmerlin.de
 +MAINTAINER =Christopher Zimmermann chr...@openbsd.org
 
 # LGPL = 2
 PERMIT_PACKAGE_CDROM =Yes
 
 MODULES =lang/ocaml
 
 -BUILD_DEPENDS =sysutils/findlib
 +BUILD_DEPENDS =sysutils/findlib lang/ocaml,-camlp4
 
 -CONFIGURE_STYLE = gnu dest
 +CONFIGURE_STYLE =gnu dest autoconf no-autoheader
 +AUTOCONF_VERSION =2.69
 
 NO_TEST =Yes
 USE_GMAKE =Yes
 
 +# don't want to port cppo - use cpp as cppo substitute
 +CONFIGURE_ENV =CPPO=cpp -P
 +
 ALL_TARGET =all dochtml
 +
 +post-extract:
 +touch ${WRKSRC}/.depend
 +# for cpp remove indentation before preprocessor directives.
 +echo '1;$$s/^ *#/#/\nwq' |ed -s ${WRKSRC}/camomileLibrary.mlp
 +echo '1;$$s/^ *#/#/\nwq' |ed -s ${WRKSRC}/camomileLibrary.mlip
 
 pre-fake:
${INSTALL_DATA_DIR} ${PREFIX}/lib/ocaml
 Index: distinfo
 ===
 RCS file: /cvs/ports/devel/ocaml-camomile/distinfo,v
 retrieving revision 1.2
 diff -u -p -r1.2 distinfo
 --- distinfo18 Aug 2012 22:13:17 -1.2
 +++ distinfo25 Aug 2014 15:25:52 -
 @@ -1,2 +1,2 @@
 -SHA256 (camomile-0.8.3.tar.bz2) = 
 lMjWXUF8kDAfazsh5LAOFRxDSj4tQGw9WzNjhZA08ns=
 -SIZE (camomile-0.8.3.tar.bz2) = 2646968
 +SHA256 (Camomile-0.8.5.tar.gz) = C5UB/Em+B2tpwPmMln+VpcoTACCLGBAjBsaT5FAGVI0=
 +SIZE (Camomile-0.8.5.tar.gz) = 7302354
 Index: patches/patch-Makefile_in
 ===
 RCS file: patches/patch-Makefile_in
 diff -N patches/patch-Makefile_in
 --- patches/patch-Makefile_in13 Jul 2012 08:38:10 -1.1.1.1
 +++ /dev/null1 Jan 1970 00:00:00 -
 @@ -1,16 +0,0 @@
 -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/07/13 08:38:10 edd Exp $
 -
 -Upstream bug:
 -http://sourceforge.net/tracker/?func=detailaid=3318291group_id=40603atid=428416
 -
  Makefile.in.origMon Jul  9 19:29:06 2012
 -+++ Makefile.inMon Jul  9 19:29:09 2012
 -@@ -70,7 +70,7 @@ OFLAGS =  $(OOPTIONS) $(INCLUDES)
 - # Generic targets
 - #
 - 
 --all : byte $(OCAMLBEST) opt unidata unimaps charmap_data locale_data
 -+all : byte $(OCAMLBEST) unidata unimaps charmap_data locale_data
 - 
 - # Build the library
 - ###
 Index: pkg/PLIST
 ===
 RCS file: /cvs/ports/devel/ocaml-camomile/pkg/PLIST,v
 retrieving revision 1.2
 diff -u -p -r1.2 PLIST
 --- pkg/PLIST18 Aug 2012 22:13:17 -1.2
 +++ pkg/PLIST25 Aug 2014 15:25:53 -
 @@ -998,6 +998,7 @@ share/doc/camomile/html/CamomileLibrary.
 share/doc/camomile/html/CamomileLibrary.CharEncoding.html
 share/doc/camomile/html/CamomileLibrary.ConfigInt.Type.html
 share/doc/camomile/html/CamomileLibrary.ConfigInt.html
 +share/doc/camomile/html/CamomileLibrary.DefaultConfig.html
 share/doc/camomile/html/CamomileLibrary.Locale.html
 share/doc/camomile/html/CamomileLibrary.Make.html
 share/doc/camomile/html/CamomileLibrary.OOChannel.channel_of_stream-c.html
 @@ -1178,6 +1179,7 @@ share/doc/camomile/html/type_CamomileLib
 share/doc/camomile/html/type_CamomileLibrary.CharEncoding.html
 share/doc/camomile/html/type_CamomileLibrary.ConfigInt.Type.html
 share/doc/camomile/html/type_CamomileLibrary.ConfigInt.html
 +share/doc/camomile/html/type_CamomileLibrary.DefaultConfig.html
 share/doc/camomile/html/type_CamomileLibrary.Locale.html
 share/doc/camomile/html/type_CamomileLibrary.Make.html

Re: add OCaml camlp4 as build depends where needed

2014-08-27 Thread Anil Madhavapeddy 
On 27 Aug 2014, at 12:24, Christopher Zimmermann chr...@openbsd.org wrote:

 On Wed, 27 Aug 2014 11:08:40 +0200 Christopher Zimmermann
 chr...@openbsd.org wrote:
 
 Hi,
 
 those are the packages build_depending on camlp4 I found so far.
 This shouldn't need a REVISION bump since those ports already depend on
 lang/ocaml,-camlp4 via MODULES=lang/ocaml.
 
 oh, just ignore this one. It can wait until after OCaml 4.02. Then it
 will need to depend on lang/ocaml-camlp4 instead of lang/ocaml,-camlp4.

Also, a number of those packages don't directly depend on camlp4 -- it's
their dependent libraries (e.g. type_conv) that use it.  In that case,
I dont think camlp4 should show up as a build dependency here.

-anil

Re: UPDATE: sysutils/findlib

2014-08-25 Thread Anil Madhavapeddy 
ok @avsm (this is needed for the 4.02 update as well, to support ppx)

-anil

On 25 Aug 2014, at 14:38, Christopher Zimmermann chr...@openbsd.org wrote:

 Hi,
 
 I'd like to update findlib to the latest upstream release. Tested by
 bulk building all OCaml ports on amd64 with dynlink-native, without
 dynlink and bytecode only. OK?
 
 Christopher
 
 
 diff -x CVS -Nru sysutils/findlib/Makefile 
 /usr/ports/mystuff/sysutils/findlib/Makefile
 --- sysutils/findlib/Makefile Thu Aug 21 22:54:04 2014
 +++ /usr/ports/mystuff/sysutils/findlib/Makefile  Mon Aug 25 14:28:55 2014
 @@ -1,9 +1,8 @@
 -# $OpenBSD: Makefile,v 1.27 2014/08/21 20:54:04 chrisz Exp $
 +# $OpenBSD: Makefile,v 1.26 2013/03/11 11:41:30 espie Exp $
 
 COMMENT=  OCaml package manager
 CATEGORIES=   sysutils
 -DISTNAME=findlib-1.3.3
 -REVISION=2
 +DISTNAME=findlib-1.5.2
 MASTER_SITES= http://download.camlcity.org/download/
 
 MAINTAINER=   Anil Madhavapeddy a...@openbsd.org
 @@ -12,11 +11,11 @@
 # MIT/X11
 PERMIT_PACKAGE_CDROM= Yes
 
 -WANTLIB =c m
 -MODULES+=lang/ocaml x11/tk
 -BUILD_DEPENDS +=lang/ocaml,-labltk
 -NO_TEST= Yes
 +MODULES+=x11/tk
 
 +RUN_DEPENDS +=   lang/ocaml
 +BUILD_DEPENDS += lang/ocaml lang/ocaml,-labltk lang/ocaml,-camlp4
 +
 CONFIGURE_STYLE=simple
 CONFIGURE_ARGS=   -with-toolbox \
   -no-custom \
 @@ -25,12 +24,23 @@
 
 USE_GMAKE=Yes
 FAKE_FLAGS=   prefix=${DESTDIR}
 +NO_TEST= Yes
 
 -ALL_TARGET=  all
 .include bsd.port.arch.mk
 .if ${PROPERTIES:Mocaml_native}
 -ALL_TARGET +=opt
 +PKG_ARGS+=-Dnative=1
 +ALL_TARGET +=all opt
 +.else
 +PKG_ARGS+=-Dnative=0
 +ALL_TARGET = all
 .endif
 +
 +.if ${PROPERTIES:Mocaml_native_dynlink}
 +PKG_ARGS+=-Ddynlink=1
 +.else
 +PKG_ARGS+=-Ddynlink=0
 +.endif
 +
 
 post-install:
   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/findlib
 diff -x CVS -Nru sysutils/findlib/distinfo 
 /usr/ports/mystuff/sysutils/findlib/distinfo
 --- sysutils/findlib/distinfo Sun Aug 19 00:24:50 2012
 +++ /usr/ports/mystuff/sysutils/findlib/distinfo  Fri Aug 22 12:50:01 2014
 @@ -1,2 +1,2 @@
 -SHA256 (findlib-1.3.3.tar.gz) = mB9cZxGKK+AV76efOvPLAGM3a5MSO11pXny1xYax1Fw=
 -SIZE (findlib-1.3.3.tar.gz) = 231414
 +SHA256 (findlib-1.5.2.tar.gz) = cL4xFXF5K2zZI7z00qWBosw4Zc8Xvp/Ya8W0vR6HIv0=
 +SIZE (findlib-1.5.2.tar.gz) = 235561
 diff -x CVS -Nru sysutils/findlib/patches/patch-Makefile 
 /usr/ports/mystuff/sysutils/findlib/patches/patch-Makefile
 --- sysutils/findlib/patches/patch-Makefile   Thu Jan  3 15:30:57 2013
 +++ /usr/ports/mystuff/sysutils/findlib/patches/patch-MakefileThu Jan 
  1 01:00:00 1970
 @@ -1,14 +0,0 @@
 -$OpenBSD: patch-Makefile,v 1.3 2013/01/03 14:30:57 chrisz Exp $
  Makefile.origMon Dec 31 12:38:03 2012
 -+++ Makefile Mon Dec 31 12:38:58 2012
 -@@ -63,6 +63,10 @@ findlib.conf: findlib.conf.in 
 - if ocamldep.opt /dev/null 21; then \
 - echo 'ocamldep=ocamldep.opt' findlib.conf; \
 - fi
 -+if ocamldoc.opt /dev/null 21; then \
 -+echo '#Please consider that ocamldoc plugins depend on 
 dynlink' findlib.conf; \
 -+echo '#ocamldoc=ocamldoc.opt' findlib.conf; \
 -+fi
 - 
 - .PHONY: install-doc
 - install-doc:
 diff -x CVS -Nru sysutils/findlib/patches/patch-configure 
 /usr/ports/mystuff/sysutils/findlib/patches/patch-configure
 --- sysutils/findlib/patches/patch-configure  Thu Jan  3 15:30:57 2013
 +++ /usr/ports/mystuff/sysutils/findlib/patches/patch-configure   Thu Jan 
  1 01:00:00 1970
 @@ -1,50 +0,0 @@
 -$OpenBSD: patch-configure,v 1.3 2013/01/03 14:30:57 chrisz Exp $
  configure.orig   Mon Jul  9 11:29:16 2012
 -+++ configureMon Dec 31 13:43:10 2012
 -@@ -116,6 +116,7 @@ ocaml_sitelib=
 - ocamlfind_config=
 - with_toolbox=0
 - with_topfind=1
 -+custom=-custom
 - system=
 - 
 - while [ $# != 0 ]; do
 -@@ -132,6 +133,9 @@ while [ $# != 0 ]; do
 - -config) ocamlfind_config=$2
 -  shift 2
 -  ;;
 -+-no-custom) custom=
 -+ shift
 -+ ;;
 - -cygpath) system=mingw
 -  shift
 -  ;;
 -@@ -153,6 +157,7 @@ while [ $# != 0 ]; do
 -   echo   -mandir path where manual pages are 
 installed 12
 -   echo   -sitelib pathset the location of the 
 site-specific packages 12
 -   echo   -config path set the location of the 
 configuration file 12
 -+  echo   -no-custom   don't link in custom runtime 
 mode 12
 -   echo   -system systypeoverride system type (esp. mingw 
 and win32) 12
 -   echo   -with-toolboxalso build the toolbox 12
 -   echo   -no-topfind  don't install topfind script 
 into stdlib directory 12
 -@@ -536,6 +541,7 @@ echo OCAMLFIND_CONF=${ocamlfind_config} Makefile.c
 - echo OCAML_AUTOLINK=${ocaml_autolink} Makefile.config
 - echo OCAML_REMOVE_DIRECTORY=${have_remdir} Makefile.config

Re: [UPDATE] ocaml-4.01.0

2013-11-15 Thread Anil Madhavapeddy 
On 15 Nov 2013, at 06:42, David Coppa dco...@openbsd.org wrote:
 
 netcamlbox and netmulticore are not being built anymore because we
 lack POSIX named semaphores (sem_open(), sem_close(), etc).
 
 Is it right to put netsys_c_outofheap.o into PFRAG.native instead
 of PLIST?

Hrm, I believe that's a C binding, and so will probably be built in
the bytecode version too.

 
 Index: ocaml-lwt/distinfo
 ===
 RCS file: /cvs/ports/devel/ocaml-lwt/distinfo,v
 retrieving revision 1.3
 diff -u -p -u -p -r1.3 distinfo
 --- ocaml-lwt/distinfo4 Dec 2012 06:57:39 -   1.3
 +++ ocaml-lwt/distinfo15 Nov 2013 13:33:51 -
 @@ -1,2 +1,2 @@
 -SHA256 (lwt-2.4.2.tar.gz) = EDM2yIQPxfYxP3Z0BbqatA/s5JE57Jpl72s8AnQbl2M=
 -SIZE (lwt-2.4.2.tar.gz) = 502942
 +SHA256 (lwt-2.4.3.tar.gz) = 7+4jk3dQKQ1t7pbu1sC72xmBfVvm7vy6YaxQMfrBAQc=
 +SIZE (lwt-2.4.3.tar.gz) = 504000

The latest version of Lwt is actually 2.4.4 -- they've switched over
to GitHub recently but haven't updated the download site.  It does
include the 4.01 patch, so worth updating directly to that rather than
maintaining the patch in our ports tree.

https://github.com/ocsigen/lwt/releases/tag/2.4.4

-anil

Re: new: opam-1.0.0

2013-04-14 Thread Anil Madhavapeddy 
On 17 Mar 2013, at 22:34, James Turner ja...@calminferno.net wrote:

 On Fri, Mar 15, 2013 at 09:49:57PM -0400, James Turner wrote:
 Attached is a new port for opam an OCaml source-based package manager.
 Tested on amd64 and loongson. On amd64 the binaries produced are native
 code while on loongson they are OCaml bytecode; so WANTLIB and PLIST
 vary slightly for these type of platforms. However having the extra
 WANTLIBs (c  m) and the @bin markers doesn't seem to be a problem on
 the bytecode using platforms. Is this alright or should special checks
 be put in place?
 
 I would appreciate if OCaml people give this a go. I did limited testing
 using opam init and opam installing some packages.
 
 oks?
 
 Information for inst:opam-1.0.0
 
 Comment: OCaml source-based package manager
 
 Description: OPAM is a source-based package manager for OCaml. It
 supports multiple simultaneous compiler installations, flexible package
 constraints, and a Git-friendly development workflow.
 
 Maintainer: The OpenBSD ports mailing-list ports@openbsd.org
 
 WWW: http://opam.ocamlpro.com/
 
 
 jca@ noticed some issues with opam's build system, ocp-build, when
 building this port with SYSTRACE=Yes. The build system would download a
 few libraries at build time and basically statically compile them into
 the opam binary. jca@ discovered another distfile we can use that
 already contains these files. I've updated the port and it's attached
 here.
 
 The other option would be to import the additional libraries as separate
 ports and rely on an alternate build target to build opam which would
 utilize the system libraries.
 
 Preferences, thoughts?

ocp-build is a bit less packaging friendly than ocamlbuild.  There's a
'make with-ocamlbuild' target that will use that in preference to ocp-build
(however, ocp-build is far nicer for day-to-day development and will
eventually be packaging friendly too).

There's an opam-1.0.0-full.tar.gz which contains all the dependencies.
Since the final output is just a binary and has no LIB_DEPENDS on the
OCaml libraries, it may be simpler to package that instead.  It's already
been broken up though, so this is no big deal for the moment.

However, I did notice that the make with-ocamlbuild target seems to be
missing a cudf3 dependency on 1.0.0, so created an issue to look at it
later:
https://github.com/OCamlPro/opam/issues/591

-anil

CVS: cvs.openbsd.org: ports

2012-11-01 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/11/01 01:57:26

Modified files:
lang/ocaml : Makefile 
lang/ocaml/patches: patch-configure 

Log message:
unbreak ocaml on macppc by fixing the configure script

Re: [update] lablgtk2-2.16.0

2012-10-08 Thread Anil Madhavapeddy 
On 19 Sep 2012, at 01:52, David Coppa dco...@openbsd.org wrote:

 -SHA1 (lablgtk-2.14.2.tar.gz) = /RhEGMy8VCgldIymP7p1E40upWE=
 -SHA256 (lablgtk-2.14.2.tar.gz) = SYGr7avcRiMD80UQQELIivInzNUP0wqb9I/TU6sC0Lo=
 -SIZE (lablgtk-2.14.2.tar.gz) = 779803
 +SHA256 (lablgtk-2.16.0.tar.gz) = oOqXUuslfa3PwpFECP/zOdTDQ1eALwLGMyndQbd33i8=
 +SIZE (lablgtk-2.16.0.tar.gz) = 787217
 Index: patches/patch-META
 ===
 RCS file: patches/patch-META
 diff -N patches/patch-META
 --- patches/patch-META22 May 2012 13:56:33 -  1.3
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -1,23 +0,0 @@
 -$OpenBSD: patch-META,v 1.3 2012/05/22 13:56:33 dcoppa Exp $
  META.origFri Feb 13 03:39:14 2009
 -+++ META Tue May 22 15:50:54 2012
 -@@ -1,8 +1,13 @@
 - requires=
 --version=2.12.0
 --archive(byte)=lablgtk.cma
 --archive(byte,init)=lablgtk.cma gtkInit.cmo
 --archive(native)=lablgtk.cmxa
 --archive(native,init)=lablgtk.cmxa gtkInit.cmx
 --linkopts=
 -+version=2.14.0

I'm happy except for this... is this an upstream bug in the META file?
Shouldn't it be 2.16.0 ?

-anil


 - directory=+lablgtk2
 -+requires(lablGL)=lablGL
 -+archive(byte)=lablgtk.cma  lablgnomecanvas.cma  gtkInit.cmo

Re: [update] lablgtk2-2.16.0

2012-10-08 Thread Anil Madhavapeddy 
On 8 Oct 2012, at 08:08, David Coppa dco...@gmail.com wrote:
 This is the old META file.
 
 patches/patch-META is gone:
 
 --- patches/patch-META  22 May 2012 13:56:33 -  1.3
 +++ /dev/null   1 Jan 1970 00:00:00 -
 

oops, diffsofdiffs...sorry!

-anil

CVS: cvs.openbsd.org: ports

2012-09-05 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/09/05 15:36:31

Modified files:
lang/ocaml : ocaml.port.mk 

Log message:
CONFIGURE_STYLE=oasis should BUILD_DEPENDS on sysutils/findlib, as OASIS
hardcodes its use, and naddy@ found several broken builds as a result.

ok from czimmermann too.

CVS: cvs.openbsd.org: ports

2012-09-05 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/09/05 15:39:09

Modified files:
devel/ocaml-lwt: Makefile distinfo 
devel/ocaml-lwt/patches: patch-setup_ml 
Removed files:
devel/ocaml-lwt/patches: patch-discover_ml 
 patch-src_unix_lwt_unix_ml 
 patch-src_unix_lwt_unix_unix_c 

Log message:
update to lwt-2.4.1
- patches now upstream, so remove local versions
- add missing GMAKE dependency (I am fixing this requirement in OASIS directly 
too)

CVS: cvs.openbsd.org: ports

2012-09-05 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/09/05 15:37:26

Modified files:
devel/ocaml-lambda-term: Makefile 

Log message:
remove the manual dependency on findlib, since the CONFIGURE_STYLE=oasis 
includes it now

CVS: cvs.openbsd.org: ports

2012-09-05 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/09/05 15:40:21

Modified files:
security/ocaml-cryptokit: Makefile 

Log message:
bump ocaml-cryptokit REVISION, as it now depends on findlib explicitly
due to the change in ocaml.port.mk.

build breakage noticed by naddy@

CVS: cvs.openbsd.org: ports

2012-08-26 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/08/26 14:12:13

Modified files:
devel/ocaml-calendar: Makefile 

Log message:
ocaml-calendar: add a missing BUILD_DEPENDS on sysutils/findlib and bump 
REVISION
noticed by naddy@

CVS: cvs.openbsd.org: ports

2012-08-26 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/08/26 14:17:42

Modified files:
devel/cil  : Makefile 

Log message:
cil: add a missing BUILD_DEPENDS on findlib, bump REVISION
noticed by naddy@

CVS: cvs.openbsd.org: ports

2012-08-23 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/08/23 10:40:38

Modified files:
productivity/wyrd: Makefile distinfo 
Added files:
productivity/wyrd/patches: patch-Makefile_in patch-configure 

Log message:
Update to wyrd-1.4.5
- remove USE_GROFF
- support ocaml-4.00.0
ok maintainer okan@
From: Christopher Zimmermann madro...@gmerlin.de

CVS: cvs.openbsd.org: ports

2012-08-22 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/08/22 14:10:38

Removed files:
devel/cil/patches: patch-Makefile_in 

Log message:
unbreak devel/cil build by removing a straggling patch from the previous 
changeset
noticed by sthen@

CVS: cvs.openbsd.org: ports

2012-08-21 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/08/21 18:41:38

Modified files:
security/ocaml-cryptokit: Makefile 
security/ocaml-cryptokit/pkg: PLIST 

Log message:
mark a secondary pkgpath for ocaml-cryptokit to reflect the renaming from
security/cryptokit. bump REVISION.

CVS: cvs.openbsd.org: ports

2012-08-20 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/08/20 18:24:22

Modified files:
lang/ocaml : ocaml.port.mk 

Log message:
specify the correct man page location for CONFIGURE_STYLE=oasis ports

CVS: cvs.openbsd.org: ports

2012-08-20 Thread Anil Madhavapeddy 
CVSROOT:/cvs
Module name:ports
Changes by: a...@cvs.openbsd.org2012/08/20 18:26:46

Modified files:
devel/ocaml-lambda-term: Makefile 
devel/ocaml-lambda-term/pkg: PLIST 

Log message:
update ocaml-lambda-term to install man pages in the right location.
this requires the last ocaml.port.mk change to CONFIGURE_STYLE=oasis.
bump REVISION.

from: Christopher Zimmermann madro...@gmerlin.de

  1   2   >