remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

classic Classic list List threaded Threaded
28 messages Options
12
Reply | Threaded
Open this post in threaded view
|

remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Christopher Zimmermann-2
Hi,

switching sysutils/opam to a source distribution including all
(partly patched) dependencies, the following OCaml libraries are no
longer used by other ports. Since active OCaml users will use opam
instead of OpenBSD ports I would suggest to remove them from the ports
tree.
The following diff obviously just disables them as a first step.

objections, oks ?

Christopher


Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1828
diff -u -p -r1.1828 Makefile
--- devel/Makefile 22 Feb 2019 21:41:18 -0000 1.1828
+++ devel/Makefile 11 Mar 2019 20:39:33 -0000
@@ -88,7 +88,6 @@
      SUBDIR += cscope
      SUBDIR += csmith
      SUBDIR += ctftools
-     SUBDIR += cudf
      SUBDIR += cunit
      SUBDIR += cutils
      SUBDIR += cvs-fast-export
@@ -475,27 +474,19 @@
      SUBDIR += ninja
      SUBDIR += npth
      SUBDIR += nspr
-     SUBDIR += ocaml-cmdliner
-     SUBDIR += ocaml-cppo
-     SUBDIR += ocaml-dose
-     SUBDIR += ocaml-extlib
      SUBDIR += ocaml-graph
-     SUBDIR += ocaml-jsonm
      SUBDIR += ocaml-menhir
      SUBDIR += ocaml-ocamlbuild
      SUBDIR += ocaml-parmap
      SUBDIR += ocaml-pcre
-     SUBDIR += ocaml-re
      SUBDIR += ocaml-uutf
      SUBDIR += ode
      SUBDIR += ois
-     SUBDIR += omake
      SUBDIR += open-ath9k-htc-firmware
      SUBDIR += openmpi
      SUBDIR += openocd
      SUBDIR += ophis
      SUBDIR += orc
-     SUBDIR += ounit
      SUBDIR += p5-Acme-Damn
      SUBDIR += p5-Algorithm-Annotate
      SUBDIR += p5-Algorithm-C3

--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

attachment0 (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Kenneth R Westerback-2
On Mon, Mar 11, 2019 at 09:55:53PM +0100, Christopher Zimmermann wrote:

> Hi,
>
> switching sysutils/opam to a source distribution including all
> (partly patched) dependencies, the following OCaml libraries are no
> longer used by other ports. Since active OCaml users will use opam
> instead of OpenBSD ports I would suggest to remove them from the ports
> tree.
> The following diff obviously just disables them as a first step.
>
> objections, oks ?
>
> Christopher
>

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?

.... Ken

>
> Index: devel/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/Makefile,v
> retrieving revision 1.1828
> diff -u -p -r1.1828 Makefile
> --- devel/Makefile 22 Feb 2019 21:41:18 -0000 1.1828
> +++ devel/Makefile 11 Mar 2019 20:39:33 -0000
> @@ -88,7 +88,6 @@
>       SUBDIR += cscope
>       SUBDIR += csmith
>       SUBDIR += ctftools
> -     SUBDIR += cudf
>       SUBDIR += cunit
>       SUBDIR += cutils
>       SUBDIR += cvs-fast-export
> @@ -475,27 +474,19 @@
>       SUBDIR += ninja
>       SUBDIR += npth
>       SUBDIR += nspr
> -     SUBDIR += ocaml-cmdliner
> -     SUBDIR += ocaml-cppo
> -     SUBDIR += ocaml-dose
> -     SUBDIR += ocaml-extlib
>       SUBDIR += ocaml-graph
> -     SUBDIR += ocaml-jsonm
>       SUBDIR += ocaml-menhir
>       SUBDIR += ocaml-ocamlbuild
>       SUBDIR += ocaml-parmap
>       SUBDIR += ocaml-pcre
> -     SUBDIR += ocaml-re
>       SUBDIR += ocaml-uutf
>       SUBDIR += ode
>       SUBDIR += ois
> -     SUBDIR += omake
>       SUBDIR += open-ath9k-htc-firmware
>       SUBDIR += openmpi
>       SUBDIR += openocd
>       SUBDIR += ophis
>       SUBDIR += orc
> -     SUBDIR += ounit
>       SUBDIR += p5-Acme-Damn
>       SUBDIR += p5-Algorithm-Annotate
>       SUBDIR += p5-Algorithm-C3
>
> --
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1


Reply | Threaded
Open this post in threaded view
|

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

Christopher Zimmermann-2
On Mon, 11 Mar 2019 17:08:45 -0400
Kenneth R Westerback <[hidden email]> 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
--- Makefile 4 Mar 2019 12:51:16 -0000 1.10
+++ Makefile 11 Mar 2019 21:26:24 -0000
@@ -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
--- distinfo 4 Mar 2019 12:51:16 -0000 1.3
+++ distinfo 11 Mar 2019 21:26:24 -0000
@@ -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/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-m4_ocaml_m4 11 Mar 2019 21:26:24 -0000
@@ -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])
+       AS_TR_SH([OCAML_PKG_$1])=$pkg
+       found=yes
Index: patches/patch-shell_bootstrap-ocaml_sh
===================================================================
RCS file: patches/patch-shell_bootstrap-ocaml_sh
diff -N patches/patch-shell_bootstrap-ocaml_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-shell_bootstrap-ocaml_sh 11 Mar 2019 21:26:24 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+use clang instead of gcc when bootstrapping OCaml,
+not necessary at the moment, because we use the installed compiler
+
+Index: shell/bootstrap-ocaml.sh
+--- shell/bootstrap-ocaml.sh.orig
++++ shell/bootstrap-ocaml.sh
+@@ -130,7 +130,11 @@ if [ -n "$1" -a -n "${COMSPEC}" -a -x "${COMSPEC}" ] ;
+ else
+   PREFIX=`cd .. ; pwd`/ocaml
+   if [ ${GEN_CONFIG_ONLY} -eq 0 ] ; then
+-    ./configure -prefix "${PREFIX}"
++    ./configure -prefix "${PREFIX}" \
++ -aspp '${CC} -c' \
++ -cc ${CC} \
++ -x11include ${X11BASE}/include \
++ -x11lib ${X11BASE}/lib
+     ${MAKE:-make} world opt.opt
+     ${MAKE:-make} install
+   fi
Index: patches/patch-src_ext_Makefile
===================================================================
RCS file: patches/patch-src_ext_Makefile
diff -N patches/patch-src_ext_Makefile
--- patches/patch-src_ext_Makefile 4 Mar 2019 12:51:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-src_ext_Makefile,v 1.1 2019/03/04 12:51:16 chrisz Exp $
-
-Those are installed systemwide. No need to fetch them.
-
-Index: src_ext/Makefile
---- src_ext/Makefile.orig
-+++ src_ext/Makefile
-@@ -30,8 +30,8 @@ URL_PKG_$(1) = $(URL_$(1))
- MD5_PKG_$(1) = $(MD5_$(1))
- endef
-
--SRC_EXTS = cppo extlib re cmdliner ocamlgraph cudf dose3 opam-file-format result seq
--PKG_EXTS = $(SRC_EXTS) dune-local findlib ocamlbuild topkg mccs
-+SRC_EXTS = opam-file-format
-+PKG_EXTS = $(SRC_EXTS) mccs
-
- ifeq ($(MCCS_ENABLED),true)
- SRC_EXTS := $(SRC_EXTS) mccs
-@@ -57,7 +57,7 @@ else
- MD5CHECK = test "`md5sum $(1) | sed -e 's/^[^a-f0-9]*\([a-f0-9]*\).*/\1/'`" = "$(2)" || (rm $(1) && false)
- endif
-
--lib-ext: clone ensure-seq-patched.stamp
-+lib-ext: clone
- @
-
- ifeq ($(CAN_PKG),1)



--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

attachment0 (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

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

Kenneth R Westerback-2
This is ok krw@.

.... Ken

> On Mar 11, 2019, at 5:29 PM, Christopher Zimmermann <[hidden email]> wrote:
>
> On Mon, 11 Mar 2019 17:08:45 -0400
> Kenneth R Westerback <[hidden email]> 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
> --- Makefile    4 Mar 2019 12:51:16 -0000    1.10
> +++ Makefile    11 Mar 2019 21:26:24 -0000
> @@ -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
> --- distinfo    4 Mar 2019 12:51:16 -0000    1.3
> +++ distinfo    11 Mar 2019 21:26:24 -0000
> @@ -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/null    1 Jan 1970 00:00:00 -0000
> +++ patches/patch-m4_ocaml_m4    11 Mar 2019 21:26:24 -0000
> @@ -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])
> +       AS_TR_SH([OCAML_PKG_$1])=$pkg
> +       found=yes
> Index: patches/patch-shell_bootstrap-ocaml_sh
> ===================================================================
> RCS file: patches/patch-shell_bootstrap-ocaml_sh
> diff -N patches/patch-shell_bootstrap-ocaml_sh
> --- /dev/null    1 Jan 1970 00:00:00 -0000
> +++ patches/patch-shell_bootstrap-ocaml_sh    11 Mar 2019 21:26:24 -0000
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +
> +use clang instead of gcc when bootstrapping OCaml,
> +not necessary at the moment, because we use the installed compiler
> +
> +Index: shell/bootstrap-ocaml.sh
> +--- shell/bootstrap-ocaml.sh.orig
> ++++ shell/bootstrap-ocaml.sh
> +@@ -130,7 +130,11 @@ if [ -n "$1" -a -n "${COMSPEC}" -a -x "${COMSPEC}" ] ;
> + else
> +   PREFIX=`cd .. ; pwd`/ocaml
> +   if [ ${GEN_CONFIG_ONLY} -eq 0 ] ; then
> +-    ./configure -prefix "${PREFIX}"
> ++    ./configure -prefix "${PREFIX}" \
> ++        -aspp '${CC} -c' \
> ++        -cc ${CC} \
> ++        -x11include ${X11BASE}/include \
> ++        -x11lib ${X11BASE}/lib
> +     ${MAKE:-make} world opt.opt
> +     ${MAKE:-make} install
> +   fi
> Index: patches/patch-src_ext_Makefile
> ===================================================================
> RCS file: patches/patch-src_ext_Makefile
> diff -N patches/patch-src_ext_Makefile
> --- patches/patch-src_ext_Makefile    4 Mar 2019 12:51:16 -0000    1.1
> +++ /dev/null    1 Jan 1970 00:00:00 -0000
> @@ -1,27 +0,0 @@
> -$OpenBSD: patch-src_ext_Makefile,v 1.1 2019/03/04 12:51:16 chrisz Exp $
> -
> -Those are installed systemwide. No need to fetch them.
> -
> -Index: src_ext/Makefile
> ---- src_ext/Makefile.orig
> -+++ src_ext/Makefile
> -@@ -30,8 +30,8 @@ URL_PKG_$(1) = $(URL_$(1))
> - MD5_PKG_$(1) = $(MD5_$(1))
> - endef
> -
> --SRC_EXTS = cppo extlib re cmdliner ocamlgraph cudf dose3 opam-file-format result seq
> --PKG_EXTS = $(SRC_EXTS) dune-local findlib ocamlbuild topkg mccs
> -+SRC_EXTS = opam-file-format
> -+PKG_EXTS = $(SRC_EXTS) mccs
> -
> - ifeq ($(MCCS_ENABLED),true)
> - SRC_EXTS := $(SRC_EXTS) mccs
> -@@ -57,7 +57,7 @@ else
> - MD5CHECK = test "`md5sum $(1) | sed -e 's/^[^a-f0-9]*\([a-f0-9]*\).*/\1/'`" = "$(2)" || (rm $(1) && false)
> - endif
> -
> --lib-ext: clone ensure-seq-patched.stamp
> -+lib-ext: clone
> -    @
> -
> - ifeq ($(CAN_PKG),1)
>
>
>
> --
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

Reply | Threaded
Open this post in threaded view
|

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

Anil Madhavapeddy-2
And ok avsm@.

> On 11 Mar 2019, at 22:01, [hidden email] wrote:
>
> This is ok krw@.
>
> .... Ken
>
>> On Mar 11, 2019, at 5:29 PM, Christopher Zimmermann <[hidden email]> wrote:
>>
>> On Mon, 11 Mar 2019 17:08:45 -0400
>> Kenneth R Westerback <[hidden email]> 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
>> --- Makefile    4 Mar 2019 12:51:16 -0000    1.10
>> +++ Makefile    11 Mar 2019 21:26:24 -0000
>> @@ -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
>> --- distinfo    4 Mar 2019 12:51:16 -0000    1.3
>> +++ distinfo    11 Mar 2019 21:26:24 -0000
>> @@ -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/null    1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-m4_ocaml_m4    11 Mar 2019 21:26:24 -0000
>> @@ -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])
>> +       AS_TR_SH([OCAML_PKG_$1])=$pkg
>> +       found=yes
>> Index: patches/patch-shell_bootstrap-ocaml_sh
>> ===================================================================
>> RCS file: patches/patch-shell_bootstrap-ocaml_sh
>> diff -N patches/patch-shell_bootstrap-ocaml_sh
>> --- /dev/null    1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-shell_bootstrap-ocaml_sh    11 Mar 2019 21:26:24 -0000
>> @@ -0,0 +1,21 @@
>> +$OpenBSD$
>> +
>> +use clang instead of gcc when bootstrapping OCaml,
>> +not necessary at the moment, because we use the installed compiler
>> +
>> +Index: shell/bootstrap-ocaml.sh
>> +--- shell/bootstrap-ocaml.sh.orig
>> ++++ shell/bootstrap-ocaml.sh
>> +@@ -130,7 +130,11 @@ if [ -n "$1" -a -n "${COMSPEC}" -a -x "${COMSPEC}" ] ;
>> + else
>> +   PREFIX=`cd .. ; pwd`/ocaml
>> +   if [ ${GEN_CONFIG_ONLY} -eq 0 ] ; then
>> +-    ./configure -prefix "${PREFIX}"
>> ++    ./configure -prefix "${PREFIX}" \
>> ++        -aspp '${CC} -c' \
>> ++        -cc ${CC} \
>> ++        -x11include ${X11BASE}/include \
>> ++        -x11lib ${X11BASE}/lib
>> +     ${MAKE:-make} world opt.opt
>> +     ${MAKE:-make} install
>> +   fi
>> Index: patches/patch-src_ext_Makefile
>> ===================================================================
>> RCS file: patches/patch-src_ext_Makefile
>> diff -N patches/patch-src_ext_Makefile
>> --- patches/patch-src_ext_Makefile    4 Mar 2019 12:51:16 -0000    1.1
>> +++ /dev/null    1 Jan 1970 00:00:00 -0000
>> @@ -1,27 +0,0 @@
>> -$OpenBSD: patch-src_ext_Makefile,v 1.1 2019/03/04 12:51:16 chrisz Exp $
>> -
>> -Those are installed systemwide. No need to fetch them.
>> -
>> -Index: src_ext/Makefile
>> ---- src_ext/Makefile.orig
>> -+++ src_ext/Makefile
>> -@@ -30,8 +30,8 @@ URL_PKG_$(1) = $(URL_$(1))
>> - MD5_PKG_$(1) = $(MD5_$(1))
>> - endef
>> -
>> --SRC_EXTS = cppo extlib re cmdliner ocamlgraph cudf dose3 opam-file-format result seq
>> --PKG_EXTS = $(SRC_EXTS) dune-local findlib ocamlbuild topkg mccs
>> -+SRC_EXTS = opam-file-format
>> -+PKG_EXTS = $(SRC_EXTS) mccs
>> -
>> - ifeq ($(MCCS_ENABLED),true)
>> - SRC_EXTS := $(SRC_EXTS) mccs
>> -@@ -57,7 +57,7 @@ else
>> - MD5CHECK = test "`md5sum $(1) | sed -e 's/^[^a-f0-9]*\([a-f0-9]*\).*/\1/'`" = "$(2)" || (rm $(1) && false)
>> - endif
>> -
>> --lib-ext: clone ensure-seq-patched.stamp
>> -+lib-ext: clone
>> -    @
>> -
>> - ifeq ($(CAN_PKG),1)
>>
>>
>>
>> --
>> http://gmerlin.de
>> OpenPGP: http://gmerlin.de/christopher.pub
>> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1
>

Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Marc Espie-2
In reply to this post by Christopher Zimmermann-2
On Mon, Mar 11, 2019 at 09:55:53PM +0100, Christopher Zimmermann wrote:

> Hi,
>
> switching sysutils/opam to a source distribution including all
> (partly patched) dependencies, the following OCaml libraries are no
> longer used by other ports. Since active OCaml users will use opam
> instead of OpenBSD ports I would suggest to remove them from the ports
> tree.
> The following diff obviously just disables them as a first step.
>
> objections, oks ?
>
> Christopher

Not okay.

You also want an entry in quirks explaining about them, and what to do.

Just in case some people you don't know about  use them and wonder where
they went.

Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Kenneth R Westerback-2
In reply to this post by Kenneth R Westerback-2
On Mon, Mar 11, 2019 at 05:08:45PM -0400, Kenneth R Westerback wrote:

> On Mon, Mar 11, 2019 at 09:55:53PM +0100, Christopher Zimmermann wrote:
> > Hi,
> >
> > switching sysutils/opam to a source distribution including all
> > (partly patched) dependencies, the following OCaml libraries are no
> > longer used by other ports. Since active OCaml users will use opam
> > instead of OpenBSD ports I would suggest to remove them from the ports
> > tree.
> > The following diff obviously just disables them as a first step.
> >
> > objections, oks ?
> >
> > Christopher
> >
>
> 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?
>
> .... Ken

Not sure if you're waiting for anything, but just to clarify, this is
ok krw@.

.... Ken

Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Christopher Zimmermann-2
In reply to this post by Marc Espie-2
On Thu, 14 Mar 2019 23:23:10 +0100
Marc Espie <[hidden email]> wrote:

> Not okay.
>
> You also want an entry in quirks explaining about them, and what to
> do.

I added the removed packages to quirks with reason 7. Reason 5 would
also apply. is this ok (espie@ ?)
I'd like to wait for another week and then commit if no one objects.

Christopher



--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

attachment0 (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Kenneth R Westerback-2
On Sun, Mar 17, 2019 at 08:02:38PM +0100, Christopher Zimmermann wrote:

> On Thu, 14 Mar 2019 23:23:10 +0100
> Marc Espie <[hidden email]> wrote:
>
> > Not okay.
> >
> > You also want an entry in quirks explaining about them, and what to
> > do.
>
> I added the removed packages to quirks with reason 7. Reason 5 would
> also apply. is this ok (espie@ ?)
> I'd like to wait for another week and then commit if no one objects.

Works for me.

.... Ken

>
> Christopher
>
>
>
> --
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1


Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Jasper Lievisse Adriaanse-2
In reply to this post by Christopher Zimmermann-2
On Sun, Mar 17, 2019 at 08:02:38PM +0100, Christopher Zimmermann wrote:

> On Thu, 14 Mar 2019 23:23:10 +0100
> Marc Espie <[hidden email]> wrote:
>
> > Not okay.
> >
> > You also want an entry in quirks explaining about them, and what to
> > do.
>
> I added the removed packages to quirks with reason 7. Reason 5 would
> also apply. is this ok (espie@ ?)
> I'd like to wait for another week and then commit if no one objects.
>
> Christopher
>
>
>
> --
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

tick tock, time to remove them :)


--
jasper

Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Klemens Nanni-2
In reply to this post by Christopher Zimmermann-2
On Sun, Mar 17, 2019 at 08:02:38PM +0100, Christopher Zimmermann wrote:
> I added the removed packages to quirks with reason 7. Reason 5 would
> also apply. is this ok (espie@ ?)
7 is fine.

> I'd like to wait for another week and then commit if no one objects.
OK kn

Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Marc Espie-2
In reply to this post by Jasper Lievisse Adriaanse-2
On Sat, Mar 30, 2019 at 03:11:26AM +0100, Jasper Lievisse Adriaanse wrote:

> On Sun, Mar 17, 2019 at 08:02:38PM +0100, Christopher Zimmermann wrote:
> > On Thu, 14 Mar 2019 23:23:10 +0100
> > Marc Espie <[hidden email]> wrote:
> >
> > > Not okay.
> > >
> > > You also want an entry in quirks explaining about them, and what to
> > > do.
> >
> > I added the removed packages to quirks with reason 7. Reason 5 would
> > also apply. is this ok (espie@ ?)
> > I'd like to wait for another week and then commit if no one objects.
> >
> > Christopher
> >
> >
> >
> > --
> > http://gmerlin.de
> > OpenPGP: http://gmerlin.de/christopher.pub
> > CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1
>
> tick tock, time to remove them :)

Yep, I thought this was implicitly okay with the proper quirks added. :)

Reply | Threaded
Open this post in threaded view
|

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

Kenneth R Westerback-2


> On Mar 31, 2019, at 12:29 AM, Marc Espie <[hidden email]> wrote:
>
>> On Sat, Mar 30, 2019 at 03:11:26AM +0100, Jasper Lievisse Adriaanse wrote:
>>> On Sun, Mar 17, 2019 at 08:02:38PM +0100, Christopher Zimmermann wrote:
>>> On Thu, 14 Mar 2019 23:23:10 +0100
>>> Marc Espie <[hidden email]> wrote:
>>>
>>>> Not okay.
>>>>
>>>> You also want an entry in quirks explaining about them, and what to
>>>> do.
>>>
>>> I added the removed packages to quirks with reason 7. Reason 5 would
>>> also apply. is this ok (espie@ ?)
>>> I'd like to wait for another week and then commit if no one objects.
>>>
>>> Christopher
>>>
>>>
>>>
>>> --
>>> http://gmerlin.de
>>> OpenPGP: http://gmerlin.de/christopher.pub
>>> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1
>>
>> tick tock, time to remove them :)
>
> Yep, I thought this was implicitly okay with the proper quirks added. :)

+1

.... Ken

Reply | Threaded
Open this post in threaded view
|

More OCaml ports for /dev/null?

Kenneth R Westerback-2
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.

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

.... Ken
Reply | Threaded
Open this post in threaded view
|

Re: More OCaml ports for /dev/null?

Christopher Zimmermann-2
Hi,

my list of obsolete ocaml ports has been removed from devel/Makefile
and is therefore disabled. How do I delete the ports from cvs?
Simply 'cvs remove' all files in the ports directories?

On Sun, 31 Mar 2019 11:29:02 +0800
Kenneth Westerback <[hidden email]> wrote:
> I have
>
> devel/ocaml-uutf
> lang/ocaml-camlp5
> math/ocaml-num

used by devel/{coccinelle,cil}

> math/ocaml-zarith

math/ocaml-zarith is used by devel/frama-c

> devel/dune
>
> as candidates for removal since they don't appear to be used by any
> end-user program.

zarith is supposed to replace num.
At the moment I would keep devel/dune, because it is so very widely
used.

Can anyone tell me why I can't find the dependants of ocaml-num with
this command:
sqlite3 /usr/local/share/sqlports 'SELECT FULLPKGPATH FROM Depends \
WHERE DEPENDSPATH LIKE "math/ocaml-num"'


Christopher


--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

attachment0 (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: More OCaml ports for /dev/null?

Kenneth R Westerback-2


> On Apr 2, 2019, at 4:04 PM, Christopher Zimmermann <[hidden email]> wrote:
>
> Hi,
>
> my list of obsolete ocaml ports has been removed from devel/Makefile
> and is therefore disabled. How do I delete the ports from cvs?
> Simply 'cvs remove' all files in the ports directories?
>
> On Sun, 31 Mar 2019 11:29:02 +0800
> Kenneth Westerback <[hidden email]> wrote:
>> I have
>>
>> devel/ocaml-uutf
>> lang/ocaml-camlp5
>> math/ocaml-num
>
> used by devel/{coccinelle,cil}
>
>> math/ocaml-zarith
>
> math/ocaml-zarith is used by devel/frama-c
>
>> devel/dune
>>
>> as candidates for removal since they don't appear to be used by any
>> end-user program.
>
> zarith is supposed to replace num.
> At the moment I would keep devel/dune, because it is so very widely
> used.
>
> Can anyone tell me why I can't find the dependants of ocaml-num with
> this command:
> sqlite3 /usr/local/share/sqlports 'SELECT FULLPKGPATH FROM Depends \
> WHERE DEPENDSPATH LIKE "math/ocaml-num"'
>
>
> Christopher
>
>
> --
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

Jasper also pointed out my shoddy dependency checking. :-) I put a newer ocamlports.org on cvs.

I have problem keeping dune. One can even hope the remaining ports are modified upstream to use modern build tools. :-)

.... Ken

Reply | Threaded
Open this post in threaded view
|

Re: More OCaml ports for /dev/null?

Jeremie Courreges-Anglas-2
In reply to this post by Christopher Zimmermann-2
On Tue, Apr 02 2019, Christopher Zimmermann <[hidden email]> wrote:
> Hi,
>
> my list of obsolete ocaml ports has been removed from devel/Makefile
> and is therefore disabled. How do I delete the ports from cvs?
> Simply 'cvs remove' all files in the ports directories?

cvs rm -f <directories>
cvs commit <directories>

> On Sun, 31 Mar 2019 11:29:02 +0800
> Kenneth Westerback <[hidden email]> wrote:
>> I have
>>
>> devel/ocaml-uutf
>> lang/ocaml-camlp5
>> math/ocaml-num
>
> used by devel/{coccinelle,cil}

ocaml-camlp5 and ocaml-num are used indeed, but devel/ocaml-uutf doesn't
seem to be used anywhere, so I don't see a reason to keep it.

>> math/ocaml-zarith
>
> math/ocaml-zarith is used by devel/frama-c
>
>> devel/dune
>>
>> as candidates for removal since they don't appear to be used by any
>> end-user program.
>
> zarith is supposed to replace num.
> At the moment I would keep devel/dune, because it is so very widely
> used.

I would agree with you but:
- no consumer means no easy way to test, and the current make test
  failures don't make me very confident.
- it's already lagging behind upstream, 1.7.2 vs 1.8.2.  Anil had
  an update diff but nobody commented on it.

If dune is only useful to build libraries/programs shipped by opam, then
maybe dune should be shipped by opam too?

> Can anyone tell me why I can't find the dependants of ocaml-num with
> this command:
> sqlite3 /usr/local/share/sqlports 'SELECT FULLPKGPATH FROM Depends \
> WHERE DEPENDSPATH LIKE "math/ocaml-num"'

Works for me (tm), amd64-current.

ritchie ~$ sqlite3 /usr/local/share/sqlports 'SELECT FULLPKGPATH FROM Depends WHERE DEPENDSPATH LIKE "math/ocaml-num"'
devel/cil
devel/coccinelle
math/coq
net/mldonkey

>
> Christopher

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply | Threaded
Open this post in threaded view
|

Re: More OCaml ports for /dev/null?

Anil Madhavapeddy-2
In reply to this post by Kenneth R Westerback-2
On 31 Mar 2019, at 04:29, Kenneth Westerback <[hidden email]> wrote:

>
> My full table is on cvs as ~krw/ocamlports.org <http://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 <https://m.youtube.com/watch?v=oyeKLAYPmQQ>
Unbelievable talk! Such poise and grace!

Anil

Reply | Threaded
Open this post in threaded view
|

Re: More OCaml ports for /dev/null?

Christopher Zimmermann-2
On Tue, 2 Apr 2019 10:41:58 +0100
Anil Madhavapeddy <[hidden email]> wrote:

> 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.

That's an interesting idea, I also thought about, but was wondering
whether to generate the port from OPAM metadata or create a package
from opam builds. This would obviously not integrate with the ports
infrastructure. But would it even need to?

Christopher



--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

attachment0 (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: More OCaml ports for /dev/null?

Stuart Henderson
In reply to this post by Christopher Zimmermann-2
On 2019/04/02 10:04, Christopher Zimmermann wrote:
> Hi,
>
> my list of obsolete ocaml ports has been removed from devel/Makefile

I removed the unhooked ones because there was support and gentle
prods from various people and nobody else had got round to it :)

> and is therefore disabled. How do I delete the ports from cvs?
> Simply 'cvs remove' all files in the ports directories?

e.g.

cd /usr/ports/devel
cvs rm -Rf cudf
cvs commit cudf

> Can anyone tell me why I can't find the dependants of ocaml-num with
> this command:
> sqlite3 /usr/local/share/sqlports 'SELECT FULLPKGPATH FROM Depends \
> WHERE DEPENDSPATH LIKE "math/ocaml-num"'

Works for me

$ sqlite3 /usr/local/share/sqlports 'select fullpkgpath from depends where dependspath like "math/ocaml-num"'
devel/cil
devel/coccinelle
math/coq
net/mldonkey

though as you're just doing an equality search it might as well be
'dependspath="math/ocaml-num"' (or you could do e.g. 'like "%ocaml-num%"').

12