CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2023/12/27 08:29:35

Modified files:
comms/conserver: Makefile 
comms/conserver/patches: patch-conserver_cutil_c 
Added files:
comms/conserver/patches: patch-conserver_cutil_h 
 patch-conserver_readcfg_c 

Log message:
Support hw.ucomnames a la cu(1). e.g. 'device = usb2.0.1.0'.

Requested by deraadt@

Testing & ok jca@ sthen@

Re: [update] emacs-28.1

[Kenneth R Westerback]

On Wed, Apr 13, 2022 at 02:23:04PM +0200, Jeremie Courreges-Anglas wrote:
> 
> Here's an update to the latest emacs version, very lightly tested so
> far on amd64, test build running on sparc64.
> 
> Test reports welcome.

So far so good on my amd64 E595.

The only comment doom makes is

  ! Emacs was not built with native compilation support
Users will see a substantial performance gain by building Emacs with native
compilation support, availible in emacs 28+.You must install a prebuilt
Emacs binary with this included, or compile Emacs with the
--with-native-compilation option.

Dunno if avoiding native compilation is deliberate on your part or not. :-)

 Ken

> 
> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.104
> diff -u -p -r1.104 Makefile
> --- Makefile  10 Mar 2022 00:04:06 -  1.104
> +++ Makefile  13 Apr 2022 05:48:09 -
> @@ -1,8 +1,7 @@
>  COMMENT= GNU editor: extensible, customizable, self-documenting
>  
> -VERSION= 27.2
> +VERSION= 28.1
>  DISTNAME=emacs-${VERSION}
> -REVISION=4
>  
>  CATEGORIES=  editors
>  
> @@ -70,7 +69,7 @@ RUN_DEPENDS+=   devel/desktop-file-utils 
>  . if ${FLAVOR} == "athena"
>  CONFIGURE_ARGS+= --with-x-toolkit=athena
>  LIB_DEPENDS+=x11/Xaw3d
> -WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xft Xinerama Xmu
> +WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xinerama Xmu
>  WANTLIB += Xpm Xrandr Xrender Xt cairo dbus-1 fontconfig freetype
>  WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 harfbuzz
>  WANTLIB += intl jpeg lcms2 m17n-core m17n-flt otf png rsvg-2 tiff
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/editors/emacs/distinfo,v
> retrieving revision 1.15
> diff -u -p -r1.15 distinfo
> --- distinfo  4 Apr 2021 23:43:25 -   1.15
> +++ distinfo  12 Apr 2022 20:57:37 -
> @@ -1,2 +1,2 @@
> -SHA256 (emacs-27.2.tar.xz) = tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=
> -SIZE (emacs-27.2.tar.xz) = 44624480
> +SHA256 (emacs-28.1.tar.xz) = KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=
> +SIZE (emacs-28.1.tar.xz) = 47699512
> Index: patches/patch-Makefile_in
> ===
> RCS file: /home/cvs/ports/editors/emacs/patches/patch-Makefile_in,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-Makefile_in
> --- patches/patch-Makefile_in 10 Mar 2022 00:04:06 -  1.7
> +++ patches/patch-Makefile_in 12 Apr 2022 20:58:41 -
> @@ -3,7 +3,7 @@
>  Index: Makefile.in
>  --- Makefile.in.orig
>  +++ Makefile.in
> -@@ -671,7 +671,7 @@ install-info: info
> +@@ -693,7 +693,7 @@ install-info: info
> for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
>  (cd "$${thisdir}"; \
>   ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); 
> \
> @@ -12,7 +12,7 @@ Index: Makefile.in
>   rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
>   ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
> done; \
> -@@ -695,7 +695,7 @@ install-man:
> +@@ -717,7 +717,7 @@ install-man:
> dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
> (cd "$${thisdir}"; \
>  ${INSTALL_DATA} ${mansrcdir}/$${page} 
> "$(DESTDIR)${man1dir}/$${dest}"); \
> Index: patches/patch-configure
> ===
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure   10 Mar 2022 00:04:06 -  1.22
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,37 +0,0 @@
> -Don't disable SIGIO, it looks like an old workaround and it's suspected
> -to be harmful.
> -  https://marc.info/?l=openbsd-ports=150996114220295=2
> -  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=29170
> -Introduced in:
> -  https://marc.info/?l=openbsd-ports=130019184729434=2
> -
> -Use posix_openpt(3).
> -https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42059
> -
> -Index: configure
>  configure.orig
> -+++ configure
> -@@ -19578,7 +19578,7 @@ esac
> - emacs_broken_SIGIO=no
> - 
> - case $opsys in
> --hpux* | nacl | openbsd | sol2* | unixware )
> -+hpux* | nacl | sol2* | unixware )
> - emacs_broken_SIGIO=yes
> - ;;
> - 
> -@@ -19668,12 +19668,12 @@ case $opsys in
> - 
> - ;;
> - 
> --  gnu | openbsd | qnxnto )
> -+  gnu | qnxnto )
> - $as_echo "#define FIRST_PTY_LETTER 'p'" >>confdefs.h
> - 
> - ;;
> - 
> --  gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd | darwin | nacl )
> -+  openbsd | gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd | 
> darwin | nacl )
> - if test "x$ac_cv_func_grantpt" = xyes; then
> - 
> - $as_echo "#define UNIX98_PTYS 1" >>confdefs.h
> Index: patches/patch-lisp_files_el
> 

Re: sysutils/bat

[Kenneth R Westerback]

On Tue, Jul 27, 2021 at 10:15:23AM -0600, Theo de Raadt wrote:
> Ingo Schwarze  wrote:
> 
> > Theo de Raadt wrote on Tue, Jul 27, 2021 at 09:12:58AM -0600:
> > > Ian Darwin  wrote:
> > >> On Tue, Jul 27, 2021 at 04:47:46PM +0200, Ingo Schwarze wrote:
> > 
> >  Changes by:st...@cvs.openbsd.org   2021/07/27 05:55:36
> >  
> >  Modified files:
> > sysutils/bat   : Makefile 
> >  
> >  Log message:
> >  set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
> >  dependencies (sys-info) has a 32 vs 64 bit issue when checking
> >  the number of CPUs online
> > 
> > >>> Wait, a cat with 147 dependencies?  Looks like it's a rabbit after all!
> > >>> At least there can be no doubt that it inhabits a rabbit hole, doesn't 
> > >>> it?
> > >>> 
> > >>> Besides, isn't a program that stops working once your machine has
> > >>> more than four billion CPUs utterly useless in the 31st century?
> > >>> 
> > >>> If it didn't constantly trip up otherwise busy porters, this port
> > >>> would be a really good laugh.
> > >>> 
> > >>> *Looking at the calendar*
> > >>> No, it's unlikely to be the Easter bunny.
> > >>> We are not that close to Apil 1.
> > 
> > >> And to think that Rob Pike once wrote a paper "cat -v considered harmful"
> > >> since it added unnecessary functionality to cat, whose only job is
> > >> to catenate files...
> > 
> > > bat is my favorite rust program
> > > 
> > > please continue maintaining it in ports,
> > > i don't want the standup comedy to end
> > 
> > I didn't mean to summon tedu@ regarding the port,
> > quite to the contary, i might even contribute to it!
> > 
> > https://github.com/sharkdp/bat/pull/1756
> 
> I won't use bat until it has an emacs mode.
> 

I thought the classic indication of maturity was when it sprouted a full LISP 
interpreter.

 Ken

Re: [update] emacs-27.2

[Kenneth R Westerback]

On Sun, Apr 04, 2021 at 02:02:52AM +0200, Jeremie Courreges-Anglas wrote:
> On Sat, Apr 03 2021, Kenneth Westerback  wrote:
> > Got a emacs-27.2-gtk3 package I can download?
> 
> Try those (all flavors are available):
> 
>   https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-27.2/
> 

emacs-27.2-gtk3 (amd64) installed and seems to work fine.

Doom Emacs, magit, evil all seem happy.

 Ken

Re: NEW: fd v8.1.1

[Kenneth R Westerback]

On Mon, Sep 14, 2020 at 01:23:14PM +1000, Stephen Gregoratto wrote:
> Pinging for visibility. Any feedback?
> -- 
> Stephen Gregoratto
> 

As Doom Emacs prefers/recommends it, I would be nice to have a port!

 Ken

Re: emacs-27.1

[Kenneth R Westerback]

On Fri, Aug 14, 2020 at 02:14:07PM +0200, Jeremie Courreges-Anglas wrote:
> 
> emacs-27.1 was released earlier than I expected, thanks Ken for the
> heads-up.
> 
> This is good news.  As mentioned in
> https://marc.info/?l=openbsd-ports=159380829911290=2 emacs now uses
> a "portable dumper" that doesn't involve games with ELF layout and sbrk
> at build time.  No more ld -Z or -nopie flags hampering ASLR, no more
> workarounds in libc, etc.
> 
> A few changes regarding deps:
> - libgmp is now a direct dep used for bignums, it was already there
>   because of gnutls
> - libjansson is now linked in for LSP (Language Server Protocol) support
>   (requested by Timo Myyra).  Yes, this introduce an indirect build dep
>   on cmake which kinda sucks for non-clang archs.  If that's a problem,
>   well, it was already the case because emacs->gnutls->cmocka->cmake->argh.
> - harfbuzz is used for test layout
> - bye bye ImageMagick
> 
> If you notice changes with highlighting, particularly with vc-diff, well
> you're not alone.  I find that some foreground and background color
> changes (maybe not intended) make the resulting frames very hard to
> read.  But maybe just in the no_x11/tty case?
> 
> Anyway, test reports welcome.  Even if the new dumping mechanism is
> called "portable" I'm not sure it has been tested on the wide range of
> architectures we provide.  amd64 and sparc64 seem to behave, what about
> yours?
> 
> Finally, oks?
>

Been working for me for a few weeks on amd64, so ok krw@ fwiw.

 Ken

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.95
> diff -u -p -r1.95 Makefile
> --- Makefile  3 Jul 2020 17:05:14 -   1.95
> +++ Makefile  14 Aug 2020 07:36:48 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT= GNU editor: extensible, customizable, self-documenting
>  
> -VERSION= 26.3
> -REVISION=2
> +VERSION= 27.1
>  DISTNAME=emacs-${VERSION}
>  
>  CATEGORIES=  editors
> @@ -13,9 +12,9 @@ HOMEPAGE=   https://www.gnu.org/software/
>  MAINTAINER=  Jeremie Courreges-Anglas 
>  
>  # GPLv3+
> -PERMIT_PACKAGE=  Yes
> +PERMIT_PACKAGE=  Yes
>  
> -WANTLIB= c m curses pthread gnutls xml2 z
> +WANTLIB =c curses jansson gmp gnutls m pthread xml2 z
>  
>  MASTER_SITES=${MASTER_SITE_GNU:=emacs/}
>  EXTRACT_SUFX=.tar.xz
> @@ -33,18 +32,8 @@ CONFIGURE_ARGS=--build="${GCCARCH}" \
>   --without-sound
>  
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib -nopie ${LDFLAGS}" \
> + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
>   ac_cv_header_execinfo_h=no
> -CFLAGS+= -fno-pie
> -
> -.include 
> -.if ${PROPERTIES:Mlld}
> -# ld -Z not supported
> -.elif ${MACHINE_ARCH} == "sparc64"
> -# No need for ld -Z
> -.else
> -CONFIGURE_ENV+=  EMACS_LD_SWITCH_SYSTEM="-Z"
> -.endif
>  
>  MAKE_ENV=INSTALL_EMACS="${INSTALL_SCRIPT}" \
>   LOGNAME="${SHAREOWN}"
> @@ -52,24 +41,27 @@ MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRI
>  SUBST_VARS=  GCCARCH VERSION
>  
>  USE_GMAKE=   Yes
> -LIB_DEPENDS= security/gnutls \
> +LIB_DEPENDS= devel/jansson \
> + devel/gmp \
> + security/gnutls \
>   textproc/libxml
>  
>  .if ${FLAVOR} == "no_x11"
>  CONFIGURE_ARGS+= --without-x \
>   --without-dbus \
>   --without-gsettings \
> + --without-harfbuzz \
>   --without-jpeg \
>   --without-lcms2 \
>   --without-libotf \
>   --without-m17n-flt
>  .else
> -LIB_DEPENDS+=devel/libotf \
> +LIB_DEPENDS+=devel/harfbuzz \
> + devel/libotf \
>   graphics/jpeg \
>   graphics/png \
>   graphics/tiff \
>   graphics/giflib \
> - graphics/ImageMagick \
>   graphics/lcms2 \
>   misc/m17n/lib \
>   x11/dbus \
> @@ -80,30 +72,29 @@ RUN_DEPENDS+= devel/desktop-file-utils 
>  . if ${FLAVOR} == "athena"
>  CONFIGURE_ARGS+= --with-x-toolkit=athena
>  LIB_DEPENDS+=x11/Xaw3d
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> -WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
> -WANTLIB += Xt cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0
> -WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 m17n-core
> -WANTLIB += m17n-flt otf png rsvg-2 tiff xcb
> +WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xft Xinerama 

Re: [pretest] emacs-27.0.91

[Kenneth R Westerback]

On Sat, Jul 04, 2020 at 03:15:05PM +0200, Jeremie Courreges-Anglas wrote:
> On Sat, Jul 04 2020, Timo Myyr??  wrote:
> 
> [...]
> 
> > Is there any particular reason why json is disabled in configure?
> 
> Nope, I just forgot to mention that I had disabled it for no particular
> reason.  Let's blame it on Miod's gentiane.
> 
> > It provides massive speed up for emacs-lsp mode so at least I'd like to see 
> > it
> > included.
> 
> Oh, I had not looked at lsp-mode.  Fine with me if people find fast json
> support useful.
> 
> And since Ken asked for it, here are some fresh (unsigned) amd64 packages:
> 
>   https://russell.wxcvbn.org/pub/OpenBSD/snapshots/emacs-pretest/

Took a bit to remember how to configure PKG_PATH so pkg_add -u would
work with local emacs package and remote supporting packages. But
success!

Now running the package and already noticed a BIG
improvement. 'emacsclient -a "" -c' now seems to actually work when I
try to reply to emails like this from neomutt. Previously I had to
manually ensure emacs --daemon was already running.

It did claim that package 'cl' is deprecated. Now I have to go look
that up. :-)

> 
> And since someone else asked, *this is a preview only*, I'm not going
> to commit an update to a pretest release unless you folks significantly
> bribe me. ;)

Following request for information does not in any way
represent the OpenBSD Foundation or imply access to that organization's
vast resources!

Define "significant". :-)

 Ken

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.95
> diff -u -p -r1.95 Makefile
> --- Makefile  3 Jul 2020 17:05:14 -   1.95
> +++ Makefile  4 Jul 2020 12:59:22 -
> @@ -2,8 +2,7 @@
>  
>  COMMENT= GNU editor: extensible, customizable, self-documenting
>  
> -VERSION= 26.3
> -REVISION=2
> +VERSION= 27.0.91
>  DISTNAME=emacs-${VERSION}
>  
>  CATEGORIES=  editors
> @@ -13,11 +12,11 @@ HOMEPAGE= https://www.gnu.org/software/
>  MAINTAINER=  Jeremie Courreges-Anglas 
>  
>  # GPLv3+
> -PERMIT_PACKAGE=  Yes
> +PERMIT_PACKAGE=  Yes
>  
> -WANTLIB= c m curses pthread gnutls xml2 z
> +WANTLIB =c curses jansson gmp gnutls m pthread xml2 z
>  
> -MASTER_SITES=${MASTER_SITE_GNU:=emacs/}
> +MASTER_SITES=https://alpha.gnu.org/gnu/emacs/pretest/
>  EXTRACT_SUFX=.tar.xz
>  
>  DEBUG_PACKAGES = ${BUILD_PACKAGES}
> @@ -33,18 +32,8 @@ CONFIGURE_ARGS=--build="${GCCARCH}" \
>   --without-sound
>  
>  CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/include" \
> - LDFLAGS="-L${LOCALBASE}/lib -nopie ${LDFLAGS}" \
> + LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
>   ac_cv_header_execinfo_h=no
> -CFLAGS+= -fno-pie
> -
> -.include 
> -.if ${PROPERTIES:Mlld}
> -# ld -Z not supported
> -.elif ${MACHINE_ARCH} == "sparc64"
> -# No need for ld -Z
> -.else
> -CONFIGURE_ENV+=  EMACS_LD_SWITCH_SYSTEM="-Z"
> -.endif
>  
>  MAKE_ENV=INSTALL_EMACS="${INSTALL_SCRIPT}" \
>   LOGNAME="${SHAREOWN}"
> @@ -52,24 +41,27 @@ MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRI
>  SUBST_VARS=  GCCARCH VERSION
>  
>  USE_GMAKE=   Yes
> -LIB_DEPENDS= security/gnutls \
> +LIB_DEPENDS= devel/jansson \
> + devel/gmp \
> + security/gnutls \
>   textproc/libxml
>  
>  .if ${FLAVOR} == "no_x11"
>  CONFIGURE_ARGS+= --without-x \
>   --without-dbus \
>   --without-gsettings \
> + --without-harfbuzz \
>   --without-jpeg \
>   --without-lcms2 \
>   --without-libotf \
>   --without-m17n-flt
>  .else
> -LIB_DEPENDS+=devel/libotf \
> +LIB_DEPENDS+=devel/harfbuzz \
> + devel/libotf \
>   graphics/jpeg \
>   graphics/png \
>   graphics/tiff \
>   graphics/giflib \
> - graphics/ImageMagick \
>   graphics/lcms2 \
>   misc/m17n/lib \
>   x11/dbus \
> @@ -80,30 +72,29 @@ RUN_DEPENDS+= devel/desktop-file-utils 
>  . if ${FLAVOR} == "athena"
>  CONFIGURE_ARGS+= --with-x-toolkit=athena
>  LIB_DEPENDS+=x11/Xaw3d
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> -WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
> -WANTLIB += Xt cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0
> -WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 m17n-core
> -WANTLIB += m17n-flt 

Re: update x11/lablgtk3

[Kenneth R Westerback]

On Tue, Apr 28, 2020 at 12:26:40AM +0200, Christopher Zimmermann wrote:
> 
> Update lablgtk3. This will be nice to have when updating OCaml to 4.10.
> OK?

Baring objections relative to the ports slowdown for release, ok krw@.

 Ken

> 
> Christopher
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/lablgtk3/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile  26 Sep 2019 09:46:10 -  1.4
> +++ Makefile  27 Apr 2020 22:24:24 -
> @@ -5,8 +5,7 @@ CATEGORIES =  x11 devel
>  GH_ACCOUNT = garrigue
>  GH_PROJECT = lablgtk
> -GH_TAGNAME = 3.0.beta6
> -REVISION =   1
> +GH_TAGNAME = 3.1.0
>  PKGNAME =lablgtk3-${GH_TAGNAME}
>  # LGPL
> @@ -14,13 +13,11 @@ PERMIT_PACKAGE = Yes
>  WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
>  WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3 
> gtksourceview-3.0
> -WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread z
> +WANTLIB += harfbuzz intl m pango-1.0 pangocairo-1.0 pthread z
>  LIB_DEPENDS =x11/gtk+3 \
>   devel/gettext,-runtime \
> - x11/gtksourceview3 \
> - x11/gnome/librsvg \
> - x11/gnome/libgnomecanvas
> + x11/gtksourceview3
>  RUN_DEPENDS =graphics/ocaml-cairo
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/lablgtk3/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo  4 Aug 2019 19:13:19 -   1.1.1.1
> +++ distinfo  27 Apr 2020 22:24:24 -
> @@ -1,2 +1,2 @@
> -SHA256 (lablgtk-3.0.beta6.tar.gz) = 
> uikDKAPkKqmzjAaZqw2ixQGUAyaH0hJBsuG0QbLvlnU=
> -SIZE (lablgtk-3.0.beta6.tar.gz) = 1099271
> +SHA256 (lablgtk-3.1.0.tar.gz) = +aZiihTg3O3aX6v5Scvy3++xrywnF0hTtjr/hNF9XbA=
> +SIZE (lablgtk-3.1.0.tar.gz) = 1031045
> Index: patches/patch-src_Makefile
> ===
> RCS file: patches/patch-src_Makefile
> diff -N patches/patch-src_Makefile
> --- patches/patch-src_Makefile4 Aug 2019 19:13:19 -   1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,29 +0,0 @@
> -$OpenBSD: patch-src_Makefile,v 1.1.1.1 2019/08/04 19:13:19 chrisz Exp $
> -
> -Index: src/Makefile
>  src/Makefile.orig
> -+++ src/Makefile
> -@@ -48,12 +48,12 @@ endif
> - GTKCFLAGS += -I`ocamlfind query cairo2`
> - - ifdef DEBUG
> --CFLAGS = -g $(GTKCFLAGS)
> -+CFLAGS += -g $(GTKCFLAGS)
> - CUSTOM = -custom
> - #MLLINK += -cclib -lcamlrund
> - MLBYTEFLAGS = -g -dtypes
> - else
> --CFLAGS = -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
> -+CFLAGS += -DG_DISABLE_ASSERT -DG_DISABLE_CAST_CHECKS $(GTKCFLAGS)
> - ifneq ($(TOOLCHAIN),msvc)
> - CFLAGS += -O
> - endif
> -@@ -131,7 +131,7 @@ GTKSPELLCOBJS = ml_gtkspell$(XO)
> - endif
> - - ifdef USE_GTKSOURCEVIEW3
> --ml_gtksourceview3.o: CFLAGS=$(GTKSOURCEVIEW3CFLAGS)
> -+ml_gtksourceview3.o: CFLAGS+=$(GTKSOURCEVIEW3CFLAGS)
> - MLLIBS += lablgtksourceview3.cma
> - CLIBS += liblablgtksourceview3$(XA)
> - GTKSOURCEVIEW3MLOBJS = gtkSourceView3.cmo gSourceView3.cmo
> Index: pkg/PFRAG.native
> ===
> RCS file: /cvs/ports/x11/lablgtk3/pkg/PFRAG.native,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PFRAG.native
> --- pkg/PFRAG.native  4 Aug 2019 19:13:19 -   1.1.1.1
> +++ pkg/PFRAG.native  27 Apr 2020 22:24:24 -
> @@ -7,6 +7,7 @@ lib/ocaml/lablgtk3-sourceview3/lablgtk3_
>  lib/ocaml/lablgtk3-sourceview3/lablgtk3_sourceview3.cmxa
>  lib/ocaml/lablgtk3-sourceview3/ogtkSourceView3Props.cmx
>  lib/ocaml/lablgtk3-sourceview3/sourceView3Enums.cmx
> +lib/ocaml/lablgtk3/cairo_pango.cmx
>  lib/ocaml/lablgtk3/gAction.cmx
>  lib/ocaml/lablgtk3/gAssistant.cmx
>  lib/ocaml/lablgtk3/gBin.cmx
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/lablgtk3/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 4 Aug 2019 19:13:19 -   1.1.1.1
> +++ pkg/PLIST 27 Apr 2020 22:24:24 -
> @@ -7,14 +7,14 @@ doc/lablgtk3/
>  doc/lablgtk3-sourceview3/
>  doc/lablgtk3-sourceview3/CHANGELOG.API
>  doc/lablgtk3-sourceview3/CHANGES.md
> +doc/lablgtk3-sourceview3/LICENSE
>  doc/lablgtk3-sourceview3/README.dune.md
>  doc/lablgtk3-sourceview3/README.md
> -doc/lablgtk3-sourceview3/README.win32
>  doc/lablgtk3/CHANGELOG.API
>  doc/lablgtk3/CHANGES.md
> +doc/lablgtk3/LICENSE
>  doc/lablgtk3/README.dune.md
>  doc/lablgtk3/README.md
> -doc/lablgtk3/README.win32
>  lib/ocaml/lablgtk3/
>  lib/ocaml/lablgtk3-sourceview3/
>  lib/ocaml/lablgtk3-sourceview3/META
> @@ -34,7 +34,7 @@ lib/ocaml/lablgtk3-sourceview3/gtkSource
>  lib/ocaml/lablgtk3-sourceview3/gtkSourceView3_types.cmti
>  lib/ocaml/lablgtk3-sourceview3/gtkSourceView3_types.mli
>  lib/ocaml/lablgtk3-sourceview3/lablgtk3_sourceview3.cma
> 

Re: update sysutils/opam 2.0.7

[Kenneth R Westerback]

On Mon, Apr 27, 2020 at 11:49:31AM +0100, Anil Madhavapeddy wrote:
> looks good; ok avsm
> 

Opam 2.0.7 seems to work fine on my amd64 laptop. Not installed from
the port, rather upgraded in place. But still.

I did not see anything in the Changelog that struck me as critical, so
I'm not sure how the ports powers that be would feel since they
announced the pre-release slowdown. If they are ok then I'm ok. :-)

 Ken

> > On 27 Apr 2020, at 10:26, Christopher Zimmermann  wrote:
> > 
> > Hi,
> > 
> > this is a pretty straightforward update. OK?
> > 
> > Christopher
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/opam/Makefile,v
> > retrieving revision 1.18
> > diff -u -p -r1.18 Makefile
> > --- Makefile28 Mar 2020 17:56:44 -  1.18
> > +++ Makefile27 Apr 2020 09:24:05 -
> > @@ -4,8 +4,7 @@ COMMENT =   OCaml source-based package ma
> >  CATEGORIES =   sysutils devel
> > -V =2.0.5
> > -REVISION = 1
> > +V =2.0.7
> > PKGNAME =   opam-${V}
> > DISTNAME =  opam-full-${V}
> > @@ -39,16 +38,13 @@ CONFIGURE_ENV +=CFLAGS="${CFLAGS}" \
> > LDFLAGS="${LDFLAGS}"
> > CONFIGURE_STYLE =   gnu
> > -ALL_TARGET =   lib-ext all man #doc requires odoc
> > +ALL_TARGET =   lib-ext all
> > INSTALL_TARGET =install
> > TEST_TARGET =   tests
> >  docdir =   ${PREFIX}/share/doc/opam
> >  post-install:
> > -   mv  ${PREFIX}/doc/opam-installer \
> > -   ${PREFIX}/share/doc/
> > -   rm -R   ${PREFIX}/lib/opam-installer
> > ${INSTALL_DATA_DIR} ${docdir}
> > ${INSTALL_DATA} \
> > ${WRKSRC}/{CHANGES,README.md} \
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/sysutils/opam/distinfo,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 distinfo
> > --- distinfo16 Jul 2019 18:02:07 -  1.6
> > +++ distinfo27 Apr 2020 09:24:05 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (opam-full-2.0.5.tar.gz) = 
> > d2x+ZNbiTC7x79Hmpx024AdkXvrpTq+GDAXBkp7/x28=
> > -SIZE (opam-full-2.0.5.tar.gz) = 7922459
> > +SHA256 (opam-full-2.0.7.tar.gz) = 
> > nA2sEJTtYkFY//EwAM36jtvJZ5jTK5+rQLC1Mw+UkKI=
> > +SIZE (opam-full-2.0.7.tar.gz) = 7929123
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/sysutils/opam/pkg/PLIST,v
> > retrieving revision 1.1
> > diff -u -p -r1.1 PLIST
> > --- pkg/PLIST   4 Mar 2019 12:51:16 -   1.1
> > +++ pkg/PLIST   27 Apr 2020 09:24:05 -
> > @@ -2,12 +2,16 @@
> > @pkgpath sysutils/opam,-main
> > @bin bin/opam
> > @bin bin/opam-installer
> > -doc/
> > +@man man/man1/opam-admin-add-constraint.1
> > +@man man/man1/opam-admin-add-hashes.1
> > @man man/man1/opam-admin-cache.1
> > +@man man/man1/opam-admin-check.1
> > @man man/man1/opam-admin-filter.1
> > +@man man/man1/opam-admin-help.1
> > @man man/man1/opam-admin-index.1
> > @man man/man1/opam-admin-lint.1
> > @man man/man1/opam-admin-list.1
> > +@man man/man1/opam-admin-make.1
> > @man man/man1/opam-admin-upgrade.1
> > @man man/man1/opam-admin.1
> > @man man/man1/opam-clean.1
> > @@ -37,10 +41,6 @@ doc/
> > @man man/man1/opam-var.1
> > @man man/man1/opam.1
> > share/doc/opam/
> > -share/doc/opam-installer/
> > -share/doc/opam-installer/CHANGES
> > -share/doc/opam-installer/LICENSE
> > -share/doc/opam-installer/README.md
> > share/doc/opam/CHANGES
> > share/doc/opam/README.md
> > share/doc/opam/depexts-plugins
> > 
> > 
> > -- 
> > http://gmerlin.de
> > OpenPGP: http://gmerlin.de/christopher.pub
> > CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1
> > 
> 

Re: remove devel/ocaml-configurator

[Kenneth R Westerback]

On Fri, Apr 17, 2020 at 08:53:22PM +0200, Christopher Zimmermann wrote:
> Hi,
> 
> I initially ported this only because I did not realize that this project had
> been integrated into devel/dune. This has no use anymore and can be removed.
> OK?

Makes sense to me. ok krw@ fwiw.

 Ken

> 
> Christopher
> 
> 
> 
> Index: devel/Makefile
> ===
> RCS file: /cvs/ports/devel/Makefile,v
> retrieving revision 1.1963
> diff -u -p -r1.1963 Makefile
> --- devel/Makefile15 Apr 2020 17:13:04 -  1.1963
> +++ devel/Makefile17 Apr 2020 18:39:10 -
> @@ -490,7 +490,6 @@
>   SUBDIR += nspr
>   SUBDIR += nuget
>   SUBDIR += ocaml-biniou
> - SUBDIR += ocaml-configurator
>   SUBDIR += ocaml-cppo
>   SUBDIR += ocaml-easy-format
>   SUBDIR += ocaml-graph
> Index: devel/ocaml-configurator/Makefile
> ===
> RCS file: devel/ocaml-configurator/Makefile
> diff -N devel/ocaml-configurator/Makefile
> --- devel/ocaml-configurator/Makefile 17 Aug 2019 13:29:42 -  1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,27 +0,0 @@
> -# $OpenBSD: Makefile,v 1.2 2019/08/17 13:29:42 chrisz Exp $
> -
> -COMMENT =library for feature testing
> -CATEGORIES = devel
> -
> -GH_ACCOUNT = janestreet
> -GH_PROJECT = configurator
> -GH_TAGNAME = v0.11.0
> -PKGNAME =ocaml-${DISTNAME}
> -
> -# MIT
> -PERMIT_PACKAGE = Yes
> -
> -WANTLIB =c m
> -
> -MODULES =lang/ocaml
> -
> -BUILD_DEPENDS = devel/dune
> -
> -ALL_TARGET =
> -
> -post-install:
> - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${GH_PROJECT}
> - mv ${PREFIX}/doc/* ${PREFIX}/share/doc/ocaml-${GH_PROJECT}/
> - rmdir ${PREFIX}/doc
> -
> -.include 
> Index: devel/ocaml-configurator/distinfo
> ===
> RCS file: devel/ocaml-configurator/distinfo
> diff -N devel/ocaml-configurator/distinfo
> --- devel/ocaml-configurator/distinfo 4 Aug 2019 18:54:39 -   1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,2 +0,0 @@
> -SHA256 (configurator-0.11.0.tar.gz) = 
> TjZLgw+HvFLmppHHkzNOO2NDTDPa3cxAwKqpMmq+cHY=
> -SIZE (configurator-0.11.0.tar.gz) = 10567
> Index: devel/ocaml-configurator/patches/patch-src_configurator_ml
> ===
> RCS file: devel/ocaml-configurator/patches/patch-src_configurator_ml
> diff -N devel/ocaml-configurator/patches/patch-src_configurator_ml
> --- devel/ocaml-configurator/patches/patch-src_configurator_ml9 Aug 
> 2019 12:08:16 -   1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,416 +0,0 @@
> -$OpenBSD: patch-src_configurator_ml,v 1.3 2019/08/09 12:08:16 chrisz Exp $
> -
> -don't depend on janestreet base.
> -
> -Index: src/configurator.ml
>  src/configurator.ml.orig
> -+++ src/configurator.ml
> -@@ -1,13 +1,8 @@
> --open Base
> --open Stdio
> -+module Fn = Filename
> -+open StdLabels
> - --module Sys= Caml.Sys
> --module Fn = Caml.Filename
> --module Arg= Caml.Arg
> --module Buffer = Caml.Buffer
> --module Pervasives = Caml.Pervasives
> -+module StringMap = Map.Make(String)
> - --let ( ^^ ) = Caml.( ^^ )
> - let ( ^/ ) = Fn.concat
> - let sprintf = Printf.sprintf
> - -@@ -18,6 +13,13 @@ let die fmt =
> - raise (Fatal_error s);
> -   ) fmt
> - -+let split_lines s =
> -+  String.split_on_char ~sep:'\n' s |> List.map ~f:begin fun s ->
> -+if s.[String.length s - 1] = '\r'
> -+then String.sub s ~pos:0 ~len:(String.length s - 1)
> -+else s
> -+  end
> -+
> - type t =
> -   { name  : string
> -   ; dest_dir  : string
> -@@ -28,7 +30,7 @@ type t =
> -   ; c_compiler: string
> -   ; stdlib_dir: string
> -   ; ccomp_type: string
> --  ; ocamlc_config : string Map.M(String).t
> -+  ; ocamlc_config : string StringMap.t
> -   ; ocamlc_config_cmd : string
> -   }
> - -@@ -47,7 +49,7 @@ module Temp = struct
> -   let prng = lazy(Random.State.make_self_init ())
> - -   let gen_name ~temp_dir ~prefix ~suffix =
> --let rnd = Int.bit_and (Random.State.bits (Lazy.force prng)) 0xFF in
> -+let rnd = (land) (Random.State.bits (Lazy.force prng)) 0xFF in
> - temp_dir ^/ (Printf.sprintf "%s%06x%s" prefix rnd suffix)
> - -   let create ~prefix ~suffix ~mk =
> -@@ -63,7 +65,7 @@ module Temp = struct
> - -   let create_temp_dir ~prefix ~suffix =
> - let dir = create ~prefix ~suffix ~mk:(fun name -> Unix.mkdir name 
> 0o700) in
> --Caml.at_exit (fun () -> rm_rf dir);
> -+at_exit (fun () -> rm_rf dir);
> - dir
> - end
> - -@@ -76,8 +78,8 @@ module Find_in_path = struct
> - -   let get_path () =
> - match Sys.getenv "PATH" with
> --| exception (Not_found_s _ | Caml.Not_found) -> []
> --| s -> String.split s ~on:path_sep
> -+| exception Not_found -> []
> -+| s -> String.split_on_char s 

Re: update math/coq

[Kenneth R Westerback]

On Fri, Aug 30, 2019 at 10:01:59AM +0200, Christopher Zimmermann wrote:
> Hi,
> 
> I'd like to update math/coq to 8.10+beta2. Which is needed to support
> OCaml 4.08. The only user of coq is lang/compcert and was already
> updated to support Coq 8.10 and OCaml 4.08.
> When this update and the devel/frama-c update are committed the OCaml
> 4.08 update can go in. Tested on amd64 with and without nativecode. OKs?
> 
> Christopher
> 

Not a coq user, so I can't say if this impacts any use case. But
certainly no objections. Especially since this moves the port even
ahead of what is available in opam!

And I would love to see 4.08 make 6.6.

 Ken

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/coq/Makefile,v
> retrieving revision 1.40
> diff -u -p -r1.40 Makefile
> --- Makefile  12 Jul 2019 20:47:40 -  1.40
> +++ Makefile  30 Aug 2019 07:57:23 -
> @@ -2,12 +2,12 @@
>  
>  COMMENT= proof assistant based on a typed lambda calculus
>  
> -V=   8.8.0
> +V=   8.10+beta2
>  GH_ACCOUNT = coq
>  GH_PROJECT = coq
>  GH_TAGNAME = V${V}
> -DISTNAME =   ${GH_PROJECT}-${V}
> -WRKDIST =${WRKDIR}/${GH_PROJECT}-${V}
> +DISTNAME =   ${GH_PROJECT}-${V:S/+//}
> +WRKDIST =${WRKDIR}/${GH_PROJECT}-${V:S/+/-/}
>  
>  CATEGORIES=  math
>  HOMEPAGE=https://coq.inria.fr/
> @@ -17,27 +17,23 @@ MAINTAINER=   Yozo Toda   # LGPL 2.1
>  PERMIT_PACKAGE=  Yes
>  
> -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype fribidi
> -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += gtksourceview-2.0 gtk-x11-2.0 intl m pango-1.0 pangocairo-1.0
> -WANTLIB += pangoft2-1.0 pthread z 
> +WANTLIB += atk-1.0 c cairo cairo-gobject fontconfig freetype gdk-3
> +WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3 
> gtksourceview-3.0
> +WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread z
>  
>  MODULES= lang/ocaml
>  
> -BUILD_DEPENDS=   x11/lablgtk2 \
> - lang/ocaml-camlp5 \
> +BUILD_DEPENDS=   x11/lablgtk3 \
>   math/ocaml-num \
>   sysutils/findlib
> -RUN_DEPENDS= x11/lablgtk2
> +RUN_DEPENDS= x11/lablgtk3
>  
>  DESTDIRNAME= COQINSTALLPREFIX
>  
>  USE_GMAKE=   Yes
>  
>  CONFIGURE_STYLE= simple
> -CONFIGURE_ARGS=  -emacslib ${PREFIX}/share/emacs/site-lisp \
> - -prefix ${PREFIX} \
> +CONFIGURE_ARGS=  -prefix ${PREFIX} \
>   -libdir ${PREFIX}/lib/ocaml/coq \
>   -mandir ${PREFIX}/man \
>   -configdir ${SYSCONFDIR}/xdg/coq
> @@ -65,7 +61,7 @@ post-install:
>   ${INSTALL_DATA_DIR} \
>   ${PREFIX}/share/doc/coq/
>   ${INSTALL_DATA} \
> - ${WRKDIST}/{LICENSE,CREDITS,CHANGES,CONTRIBUTING.md,README.md} \
> + ${WRKDIST}/{LICENSE,CREDITS,CONTRIBUTING.md,README.md} \
>   ${PREFIX}/share/doc/coq/
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/coq/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo  4 Mar 2019 12:51:15 -   1.14
> +++ distinfo  30 Aug 2019 07:57:23 -
> @@ -1,2 +1,2 @@
> -SHA256 (coq-8.8.0.tar.gz) = yvfB055o4OQe2Svh1XyImD+xLtufqVZnpa0tarqYJj0=
> -SIZE (coq-8.8.0.tar.gz) = 5927663
> +SHA256 (coq-8.10beta2.tar.gz) = LIK7Tew3o/+lfuDWQm8OfezMbLM0AA2+Z7DNUV2FUBY=
> +SIZE (coq-8.10beta2.tar.gz) = 6211659
> Index: patches/patch-Makefile_ide
> ===
> RCS file: /cvs/ports/math/coq/patches/patch-Makefile_ide,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-Makefile_ide
> --- patches/patch-Makefile_ide4 Mar 2019 12:51:15 -   1.1
> +++ patches/patch-Makefile_ide30 Aug 2019 07:57:23 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_ide,v 1.1 2019/
>  Index: Makefile.ide
>  --- Makefile.ide.orig
>  +++ Makefile.ide
> -@@ -149,7 +149,7 @@ endif
> +@@ -190,7 +190,7 @@ endif
>   ifeq ($(HASCOQIDE),no)
>   install-coqide-byte: install-ide-toploop-byte
>   else
> Index: patches/patch-Makefile_install
> ===
> RCS file: patches/patch-Makefile_install
> diff -N patches/patch-Makefile_install
> --- patches/patch-Makefile_install4 Mar 2019 12:51:15 -   1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-Makefile_install,v 1.1 2019/03/04 12:51:15 chrisz Exp $
> -
> -Index: Makefile.install
>  Makefile.install.orig
> -+++ Makefile.install
> -@@ -110,11 +110,11 @@ install-devfiles:
> - $(MKDIR) $(FULLCOQLIB)
> - $(INSTALLSH)  $(FULLCOQLIB) $(GRAMMARCMA)
> - $(INSTALLSH)  $(FULLCOQLIB) $(INSTALLCMI)   # Regular CMI files
> -+

Re: mldonkey: use custom build of OCaml 3.12

[Kenneth R Westerback]

On Mon, Jun 17, 2019 at 09:20:09PM +0200, 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

I have never used mldonkey, but I have no objection to this approach.

 Ken

> 
> 
> 
> 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), -I $(file)) -I +camlp4 -I +num
> - 
> - CFLAGS:=$(CFLAGS) $(CONFIG_INCLUDES) $(GTKCFLAGS) $(GD_CFLAGS)
> - 
> -@@ -124,7 +127,7 @@ 

Re: [update] emacs-26.2

[Kenneth R Westerback]

[On Fri, Apr 19, 2019 at 09:31:04PM +0200, Jeremie Courreges-Anglas wrote:
> 
> Here's a diff to update to the latest emacs release.
> 
> Announcement mail:
>   https://lists.gnu.org/archive/html/info-gnu/2019-04/msg3.html
> 
> Tested since a few days with the no_x11 FLAVOR on amd64 and sparc64.
> Test reports on other architectures or with a graphical FLAVOR would be
> welcome.
> 
> The diff also switches to .tar.xz tarballs since that saves a bit of
> space:
> $ du -h /usr/ports/distfiles/emacs-26.2*
> 62.2M   /usr/ports/distfiles/emacs-26.2.tar.gz
> 42.4M   /usr/ports/distfiles/emacs-26.2.tar.xz
>

After some struggles with some (other) port (mu? isync?) deciding it
wanted jdk and thus delaying everything by a day or so, and then
a bit of hand to hand combat with the verdammt installurl file
that keeps trying to suck the wrong packages from the wrong place no
matter how many time I remove, empty or modify it, ... where was I?

Oh, right -- 26.2 gtk+3 flavour seems to work fine for me on amd64.

 Ken


> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.84
> diff -u -p -r1.84 Makefile
> --- Makefile  27 Mar 2019 13:36:00 -  1.84
> +++ Makefile  19 Apr 2019 18:54:47 -
> @@ -2,9 +2,8 @@
>  
>  COMMENT= GNU editor: extensible, customizable, self-documenting
>  
> -VERSION= 26.1
> +VERSION= 26.2
>  DISTNAME=emacs-${VERSION}
> -REVISION=5
>  
>  CATEGORIES=  editors
>  
> @@ -18,6 +17,7 @@ PERMIT_PACKAGE_CDROM=   Yes
>  WANTLIB= c m curses pthread gnutls xml2 z
>  
>  MASTER_SITES=${MASTER_SITE_GNU:=emacs/}
> +EXTRACT_SUFX=.tar.xz
>  
>  USE_GMAKE=   Yes
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/editors/emacs/distinfo,v
> retrieving revision 1.11
> diff -u -p -r1.11 distinfo
> --- distinfo  8 Jun 2018 22:19:20 -   1.11
> +++ distinfo  19 Apr 2019 18:54:47 -
> @@ -1,2 +1,2 @@
> -SHA256 (emacs-26.1.tar.gz) = dgOC1ejNxdDQeej3VLzhE2++FHO+JLuIVmmw44/FaqM=
> -SIZE (emacs-26.1.tar.gz) = 65007481
> +SHA256 (emacs-26.2.tar.xz) = FRzmnb5bgJ1Ekv+uSksVOyd4RZ3m3rJvNWkeEoGpxY4=
> +SIZE (emacs-26.2.tar.xz) = 44406808
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/editors/emacs/patches/patch-Makefile_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-Makefile_in
> --- patches/patch-Makefile_in 8 Jun 2018 22:19:20 -   1.4
> +++ patches/patch-Makefile_in 19 Apr 2019 18:54:47 -
> @@ -5,7 +5,7 @@ $OpenBSD: patch-Makefile_in,v 1.4 2018/0
>  Index: Makefile.in
>  --- Makefile.in.orig
>  +++ Makefile.in
> -@@ -658,7 +658,7 @@ install-info: info
> +@@ -663,7 +663,7 @@ install-info: info
> for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
>  (cd "$${thisdir}"; \
>   ${INSTALL_DATA} ${srcdir}/info/$$f "$(DESTDIR)${infodir}/$$f"); 
> \
> @@ -14,7 +14,7 @@ Index: Makefile.in
>   rm -f "$(DESTDIR)${infodir}/$$f.gz"; \
>   ${GZIP_PROG} -9n "$(DESTDIR)${infodir}/$$f"; \
> done; \
> -@@ -682,7 +682,7 @@ install-man:
> +@@ -687,7 +687,7 @@ install-man:
> dest=`echo "$${page}" | sed -e 's/\.1$$//' -e '$(TRANSFORM)'`.1; \
> (cd "$${thisdir}"; \
>  ${INSTALL_DATA} ${mansrcdir}/$${page} 
> "$(DESTDIR)${man1dir}/$${dest}"); \
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/editors/emacs/patches/patch-configure,v
> retrieving revision 1.15
> diff -u -p -r1.15 patch-configure
> --- patches/patch-configure   27 Nov 2018 13:53:29 -  1.15
> +++ patches/patch-configure   19 Apr 2019 18:54:47 -
> @@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.15 2018/11
>  Index: configure
>  --- configure.orig
>  +++ configure
> -@@ -9226,9 +9226,7 @@ case "$opsys" in
> +@@ -9258,9 +9258,7 @@ case "$opsys" in
>  ;;
>   
> openbsd)
> Index: patches/patch-lisp_files_el
> ===
> RCS file: /cvs/ports/editors/emacs/patches/patch-lisp_files_el,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-lisp_files_el
> --- patches/patch-lisp_files_el   8 Jun 2018 22:19:20 -   1.3
> +++ patches/patch-lisp_files_el   19 Apr 2019 18:54:47 -
> @@ -5,7 +5,7 @@ $OpenBSD: patch-lisp_files_el,v 1.3 2018
>  Index: lisp/files.el
>  --- lisp/files.el.orig
>  +++ lisp/files.el
> -@@ -2660,6 +2660,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
> +@@ -2674,6 +2674,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
>("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
>("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
>("\\.\\(dif\\|pat\\)\\'" 

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

[Kenneth R Westerback]

On Sun, Mar 17, 2019 at 08:02:38PM +0100, Christopher Zimmermann wrote:
> On Thu, 14 Mar 2019 23:23:10 +0100
> Marc Espie  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

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

[Kenneth R Westerback]

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

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

[Kenneth R Westerback]

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/Makefile22 Feb 2019 21:41:18 -  1.1828
> +++ devel/Makefile11 Mar 2019 20:39:33 -
> @@ -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

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

[Kenneth R Westerback]

On Thu, Feb 14, 2019 at 09:55:45AM -0800, Anil Madhavapeddy wrote:
> > 
> > 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).

I see mldonkey as < 4.06.0 and unison 2.48 as < 4.03.0. "opam show
unison" doesn't show 2.51 so I'm not sure about the status of that
version vs opam.

> 
> > 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 "$@"

I will give that a whirl! Thanks.

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

The only reason for alt-ergo is newer versions of frama-c. I see there
is a 'free' 2.0.0 version of alt-ergo but I haven't looked to see what
that really is or if it would suffice.

Since our frama-c is so old (1.11 vs 1,18?) I don't know if there is anyone 
using
it. I am not aware of any regular requests to get it updated anyway.

 Ken

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

[Kenneth R Westerback]

On Wed, Feb 13, 2019 at 09:41:25AM -0800, Anil Madhavapeddy wrote:
> 
> 
> > 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

Here's a comparison chart of whet I've got successfully compiled/installed via 
opam 2.0.3
and what is in our ports tree. (.org file available on request)

|++-+---+--|
| Port   |   Port Version | OPAM Name   |  OPAM Version 
| OPAM depends ocaml   |
|++-+---+--|
| devel/cil  |  1.5.1 | cil | 1.7.3 
| < 4.06.0 |
| devel/coccinelle   |  1.0.4 | coccinelle  | 1.0.2 (current 1.0.7) 
| none (?) |
| devel/cudf |0.9 | cudf|   0.9 
| none |
| devel/dune |  1.6.3 | dune| 1.7.1 
| >= 4.02  |
| devel/frama-c  |   1.11 | frama-c |  18.0 
| >= 4.02.3|
| devel/ocaml-cmdliner   |  0.9.8 | cmdliner| 1.0.3 
| >= 4.03.0|
| devel/ocaml-cppo   |  1.3.2 | cppo| 1.6.5 
| none |
| devel/ocaml-dose   |3.3 | dose| 3.4.2 
| none |
| devel/ocaml-extlib |  1.7.0 | extlib  | 1.7.5 
| none |
| devel/ocaml-graph  |  1.8.8 | ocamlgraph  | 1.8.8 
| none |
| devel/ocaml-jsonm  |  0.9.1 | jsonm   | 1.0.1 
| >= 4.01.0|
| devel/ocaml-menhir |   20180905 | menhir  |  20181113 
| >= 4.02  |
| devel/ocaml-ocamlbuild |  0.9.2 | ocamlbuild  |0.12.0 
| >= 4.03 & < 4.08.0   |
| devel/ocaml-parmap |1.0-rc7 | parmap  |  1.0-rc10 
| none |
| devel/ocaml-pcre   |  7.2.3 | pcre| 7.4.0 
| >= 4.04  |
| devel/ocaml-re |  1.4.1 | re  | 1.8.0 
| >= 4.02.3|
| devel/ocaml-uutf   |  0.9.4 | uutf| 1.0.2 
| >= 4.01.0|
| devel/omake|0.9.8.5 | omake   |0.10.3 
| >= 4.03.0|
| devel/ounit|  2.0.0 | ounit   | 2.0.8 
| >= 3.11.0|
| graphics/pdfsandwich   |  0.1.7 |   |   <0.1.7> 
|  |
| lang/compcert  |3.4 |   | <3.4> 
|  |
| lang/obc   |  2.9.7 |   | <3.1> 
|  |
| lang/ocaml | 4.03.0 | |4.07.1 
|  |
| lang/ocaml-camlp4  | 4.03+1 | camlp4  |   4.07+system 
| >= 4.07 < 

Re: i3 getting killed by pledge

[Kenneth R Westerback]

On Thu, Jan 03, 2019 at 05:19:52PM +0100, Matthieu Herrb wrote:
> Hi,
> 
> I'm running i3 on one of my amd64 machines. Recently, it started to crash
> with "
> 
> i3[12345]: pledge "dns", syscall 97
> 
> in /var/log/messages
> 
> There's something wrong here. I don't see recent changes in the pledge
> patches for i3 in ports, so I guess it must be some system related
> changes (or something in my environment, but I don't see what).
> -- 
> Matthieu Herrb
> 

I'm using i3 and I haven't experienced this (yet).

I build my own snaps and ports (no local changes to i3!) so I guess
there is room for differences and I haven't updated i3 since Dec 19.

I've uploaded my config to cvs as ~krw/config if you want to compare.

 Ken

Re: that old INDEX file

[Kenneth R Westerback]

On Sat, Nov 10, 2018 at 08:00:02PM +0100, Marc Espie wrote:
> Now might be the time to retire it, specifically
> because it's almost always outdated.

Removing it is probably the only I'll be motivated to
learn the sql way. :-) No objections from me.

 Ken

> 
> The idea is that sqlports can generate something
> very close, not quite identical because of some
> insanity, but I have some sqlite3 script that does
> the trick.
> 
> So, probably store the result in the portslist
> subpackage, so that you don't need any sqlite parts
> to use it, and have the actual generating script
> (along with some other scripts) in sqlports (or
> sqlports-compact) proper.
> 
> Right now I have some shell that creates
> almost the same thing..
> 
> e.g.,
> 
> #! /bin/sh
> {
> echo 'select fullpkgname,fullpkgpath,'
> echo '(case prefix when "/usr/local" THEN "" else prefix end),'
> echo 'comment,descr,maintainer,categories,'
> echo 'lib_depends,build_depends,run_depends,'
> echo '(case 1 when fullpkgpath in (select fullpkgpath from onlyforarch) then 
> only_for_archs else (case 1 when fullpkgpath in (select fullpkgpath from 
> notforarch) then "!"||not_for_archs else "any" end) end),'
> echo '(case lower(PERMIT_PACKAGE_CDROM) when "yes" then "y" else "n" end),'
> echo '(case lower(PERMIT_PACKAGE_FTP) when "yes" then "y" else "n" end),'
> echo '(case lower(PERMIT_DISTFILES_FTP) when "yes" then "y" else "n" end)'
> echo ' from ports where fullpkgpath in (select distinct canonical from paths) 
> order by fullpkgpath'; } \
> |sqlite3 /usr/local/share/sqlports
> 
> main differences:
> - full set of pkgpaths from the ports tree, not just what's in subdir
> - depends are not sorted and not stripped of :patch/:configure
> 
> apart from that it's pretty close...
> 
> 
> (this is a proof of concept, it probably ought to be based on sqlports-compact
> but it's not that difficult to adjust)
> 

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

[Kenneth R Westerback]

On Sat, Jul 21, 2018 at 10:40:11AM +0200, Christopher Zimmermann wrote:
> On 2018-06-21 Christopher Zimmermann  wrote:
> > Hi,
> >=20
> > 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.
>=20
> 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?
>=20
>=20
> Christopher
>=20
>=20
>=20
>=20
>=20
>=20
> --=20
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

Further information ...

Recreated clean /usr/ports and did patch -E -p0 just to make sure.

As dpb had built all the dependencies I just went into
/usr/ports/sysutils/dune and did 'make clean; make'. This failed
somewhat more verbosely and in the way it was doing before
g2k18. i.e. the trap messages. Which I have put into the output in
context, immediately following the "./boot.exe" line.

I see in this case the expected ocaml-4.07.0 dependency, so I'm not
sure what happened during the first run using dpb. Possible I got a
old log file. Which would be weird in itself.

Perhaps the [trap] messages are the root cause of the "not a bytecode
executable" messages?

Let me know of any experiments or further information that would be
helpful!

=2E... Ken

=3D=3D=3D> dune-1.0+beta20 depends on: findlib-* -> findlib-1.8.0
=3D=3D=3D> dune-1.0+beta20 depends on: ocaml-=3D4.07.0 -> ocaml-4.07.0
=3D=3D=3D> dune-1.0+beta20 depends on: gmake-* -> gmake-4.2.1
=3D=3D=3D>  Verifying specs:  c m pthread
=3D=3D=3D>  found c.92.4 m.10.1 pthread.25.1
=3D=3D=3D>  Checking files for dune-1.0+beta20
`/usr/ports/distfiles/dune-1.0+beta20.tar.gz' is up to date.
>> (SHA256) dune-1.0+beta20.tar.gz: OK
=3D=3D=3D>  Extracting for dune-1.0+beta20
=3D=3D=3D>  Patching for dune-1.0+beta20
=3D=3D=3D>  Compiler link: clang -> /usr/bin/clang
=3D=3D=3D>  Compiler link: clang++ -> /usr/bin/clang++
=3D=3D=3D>  Compiler link: cc -> /usr/bin/cc
=3D=3D=3D>  Compiler link: c++ -> /usr/bin/c++
=3D=3D=3D>  Configuring for dune-1.0+beta20
=3D=3D=3D>  Building for dune-1.0+beta20
ocaml bootstrap.ml
'/usr/local/bin/ocamllex.opt' -q src/meta_lexer.mll
'/usr/local/bin/ocamldep.opt' -modules src/action.ml src/action_intf.ml src=
/arg_spec.ml src/artifacts.ml src/bin.ml src/binary_kind.ml src/build.ml sr=
c/build_interpret.ml src/build_system.ml src/clflags.ml src/cm_kind.ml src/=
colors.ml src/config.ml src/context.ml src/dep_path.ml src/env.ml src/error=
s.ml src/exe.ml src/file_tree.ml src/findlib.ml src/gen_meta.ml src/gen_rul=
es.ml src/glob_lexer.boot.ml src/import.ml src/inline_tests.ml src/install.=
ml src/install_rules.ml src/installed_dune_file.ml src/interned.ml src/jbui=
ld.ml src/jbuild_load.ml vendor/boot/jbuilder_opam_file_format.ml vendor/bo=
ot/jbuilder_re.ml src/js_of_ocaml_rules.ml src/lib.ml src/loc.ml src/log.ml=
 src/main.ml src/menhir.ml src/merlin.ml src/meta.ml src/meta_lexer.ml src/=
ml_kind.ml src/mode.ml src/module.ml src/module_compilation.ml src/modules_=
partitioner.ml src/ocaml_flags.ml src/ocamldep.ml src/odoc.boot.ml src/opam=
_file.ml src/ordered_set_lang.ml src/package.ml src/path.ml src/per_item.ml=
 src/preprocessing.ml src/print_diff.ml src/process.ml src/report_error.ml =
src/scheduler.ml src/scope.ml src/setup.boot.ml src/sexp.ml src/string_with=
_vars.ml src/sub_system.ml src/sub_system_intf.ml src/sub_system_name.ml sr=
c/super_context.ml src/syntax.ml src/top_closure.ml src/utils.ml src/utop.m=
l src/variant.ml src/vfile_kind.ml src/watermarks.ml src/workspace.ml > boo=
t-depends.txt
'/usr/local/bin/ocamldep.opt' -modules src/stdune/caml/caml.ml src/stdune/c=
aml/result.ml src/stdune/caml/result_compat.ml > boot-depends.txt
'/usr/local/bin/ocamldep.opt' -modules src/fiber/fiber.ml > boot-depends.txt
'/usr/local/bin/ocamldep.opt' -modules src/ocaml-config/ocaml_config.ml > b=
oot-depends.txt
'/usr/local/bin/ocamldep.opt' -modules src/stdune/stdune.ml src/stdune/ansi=
_color.ml src/stdune/array.ml src/stdune/char.ml src/stdune/common.ml src/s=
tdune/comparable.ml src/stdune/either.ml src/stdune/exn.ml src/stdune/filen=
ame.ml src/stdune/hashtbl.ml src/stdune/import.ml src/stdune/int.ml src/std=
une/io.ml src/stdune/list.ml src/stdune/map.ml src/stdune/map_intf.ml src/s=
tdune/option.ml src/stdune/or_exn.ml src/stdune/ordering.ml src/stdune/pp.m=
l src/stdune/result.ml src/stdune/set.ml src/stdune/set_intf.ml src/stdune/=
staged.ml src/stdune/string.ml > boot-depends.txt
'/usr/local/bin/ocamldep.opt' -modules src/usexp/usexp.ml src/usexp/parser_=

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

[Kenneth R Westerback]

On Sat, Jul 21, 2018 at 10:40:11AM +0200, 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?
> 
> 
> Christopher

systutils/dune is still failing during build on my amd64 setup.

Short and sweet build log:


>>> Building on localhost under sysutils/dune
 BDEPENDS = [lang/ocaml;devel/gmake;sysutils/findlib]
 DIST = [sysutils/dune:dune-1.0+beta20.tar.gz]
 FULLPKGNAME = dune-1.0+beta20
 RDEPENDS = [lang/ocaml]
(Junk lock obtained for localhost at 1532789825)
>>> Running depends in sysutils/dune at 1532789825
/usr/sbin/pkg_add -aI -Drepair findlib-1.8.0 gmake-4.2.1 ocaml-4.07.0
was: /usr/sbin/pkg_add -aI -Drepair findlib-1.8.0 gmake-4.2.1 ocaml-4.07.0
/usr/sbin/pkg_add -aI -Drepair findlib-1.8.0 gmake-4.2.1 ocaml-4.07.0
>>> Running show-prepare-results in sysutils/dune at 1532789826
===> sysutils/dune
===>  Verifying specs:  c m pthread
===>  found c.92.4 m.10.1 pthread.25.1
findlib-1.8.0
gmake-4.2.1
ocaml-4.06.1
(Junk lock released for localhost at 1532789827)
distfiles size=395586
>>> Running patch in sysutils/dune at 1532789827
===> sysutils/dune
>>> Running configure in sysutils/dune at 1532789827
===> sysutils/dune
>>> Running build in sysutils/dune at 1532789827
===> sysutils/dune
===>  Building for dune-1.0+beta20
./boot.exe
Fatal error: the file './boot.exe' is not a bytecode executable file
gmake: *** [Makefile:10: release] Error 2
*** Error 2 in sysutils/dune (/usr/ports/infrastructure/mk/bsd.port.mk:2687 
'/wrkobjdir/dune-1.0+beta20/.build_done')
*** Error 1 in sysutils/dune (/usr/ports/infrastructure/mk/bsd.port.mk:2366 
'build')
===> Exiting sysutils/dune with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147 'build')
Error: job failed with 256 on localhost at 1532789827


build.exe does exist in the WRKOBJ directory, and as far as OoenBSD is
concerned it is marked 'x' for the user (_pbuild), group and
others. So I assume this is an ocaml complaint.

Now, I note that the dependency listed as present is 4.06.1, which is
not what I was expecting from a diff labelled ocaml 4.7. :-)

I had a clean ports tree when I applied the diff and found no .rej
files. My finger memory always types "patch -p0 < ~/" so if
there are other options needed to create or remove files/directories
there may be a problem. Which I will now go and double check.

Currently I am just attempting to build sysutils/dune so the whole
process only takes an hour or two from scratch. Much better than a few
days. So experiments are certainly possible.

 Ken

Re: NEW OCaml sysutils/dune math/ocaml-{num,zarith}

[Kenneth R Westerback]

On Mon, Jul 02, 2018 at 10:01:54PM +0200, 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.
> > 
> > two ports have been added since num has been removed from the OCaml
> > distribution.
> > math/ocaml-num
> > math/Zarith
> 
> Thanks a lot for the reviews so far. I fixed few issues and
> renamed math/Zarith to math/ocaml-zarith. Before committing the update
> of OCaml and dependent ports I need to import the new ports
> 
> sysutils/dune
> math/ocaml-{num,zarith}
> 
> which are attached as single tarball. They will be enabled in the
> category Makefiles with the OCaml upgrade diff. OK to import this?
> 
> 
> Christopher
> 
> 
> -- 
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2  0DEF 87E2 92A7 13E5 DEE1

I have no objections.

 Ken

Re: dbus autolaunch (was Re: [UPDATE] net/gpodder -> 3.10.3)

[Kenneth R Westerback]

On Mon, Jul 02, 2018 at 01:19:55PM +0200, Antoine Jacoutot wrote:
> On Mon, Jul 02, 2018 at 09:06:50AM +0100, Stuart Henderson wrote:
> > On 2018/06/28 08:47, Sebastien Marie wrote:
> > > 
> > > I think last patch on firefox workarounded efficiently fork+exec
> > > problem (setting DBUS_SESSION_BUS_ADDRESS if not present). so no wrapper
> > > script should be needed.
> > > 
> > > So reenabling autolaunch on dbus port is possible and should not impact
> > > firefox.
> > > 
> > > On the other side, it only hides the underline problem of dbus session.
> > > If I correctly understood have dbus-launch works, When a program starts
> > > it at program level (opposite to Xsession level), the session is only
> > > "local" to the program: only this particular program will speak with
> > > this dbus daemon. And it could result on starting a dbus session per
> > > program that could need it. I have already seen several dbus deamon
> > > running because starting several firefox -no-remote.
> > 
> > Even if we're going to make changes in Xsession I think we should
> > reenable autolaunch in dbus for now as there is too much hard-to-debug
> > breakage.
> 
> OK, I'll re-enable it for the time being then.
> 
> -- 
> Antoine
> 

I suspect this is also behind 'emacsclient -a "" -c' not doing what I
expected recently. i.e. starting up an emacs daemon if one is not
already running.

 Ken

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

[Kenneth R Westerback]

My current ports build cycle takes several days, so adding in ocaml is
unlikely to speed things up. So I will toss opam into my mix when the
current build finishes and see if it builds all its dependencies and
works on amd64. But it will likely be a while before I report
back. :-)

 Ken

On Thu, Jun 21, 2018 at 11:17:50AM +0200, 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.
> I tested dpb builds on amd64 with and without native code support
> enabled. I could not test on other archs.
> The ports affected are:
> 
> devel/cil
> devel/coccinelle
> devel/cudf
> devel/frama-c
> devel/ocaml-cmdliner
> devel/ocaml-cppo
> devel/ocaml-dose
> devel/ocaml-extlib
> devel/ocaml-graph
> devel/ocaml-jsonm
> devel/ocaml-menhir
> devel/ocaml-ocamlbuild
> devel/ocaml-parmap
> devel/ocaml-pcre
> devel/ocaml-re
> devel/ocaml-uutf
> devel/omake
> devel/ounit
> graphics/pdfsandwich
> lang/obc
> lang/ocaml
> lang/ocaml-camlp4
> lang/ocaml-camlp5
> math/coq
> net/mldonkey
> net/unison/2.4x
> net/unison/2.5x
> sysutils/findlib
> sysutils/opam
> textproc/bibtex2html
> textproc/hevea
> x11/lablgtk2
> 
> two ports have been added since num has been removed from the OCaml
> distribution.
> math/ocaml-num
> math/Zarith
> 
> 
> I'd like to collect some OKs from developers familiar with OCaml ports.
> If someone owning a powerpc or sparc machine feels like it he could try
> to enable OCaml native-code
> in /usr/ports/infrastructure/mk/arch-defines.mk for his arch and test
> whether it is working again.
> 
> The diff is attached as ocaml.diff.gz.
> 
> 
> Christopher
> 
> 
> -- 
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> 2779 7F73 44FD 0736 B67A  C410 69EC 7922 34B4 2566

Re: [update] emacs-26.1

[Kenneth R Westerback]

On Wed, May 30, 2018 at 07:04:46PM +0200, Jeremie Courreges-Anglas wrote:
> On Wed, May 30 2018, kwesterb...@gmail.com wrote:
> >> On May 30, 2018, at 7:55 AM, Jeremie Courreges-Anglas  
> >> wrote:
> >> 
> >>> On Tue, May 29 2018, Jeremie Courreges-Anglas  wrote:
> >>> So emacs-26.1 has been released yesterday:
> >>> 
> >>>  https://lists.gnu.org/archive/html/emacs-devel/2018-05/msg00765.html
> >>> 
> >>> I doubt that this update addresses the bug encountered by Gr??goire,
> >>> Piotr and Manuel, but I don't think it will make it worse.
> >>> 
> >>>  https://debbugs.gnu.org/cgi/bugreport.cgi?bug=29170
> >>> 
> >>> I have only built and tested this on amd64 so far, I'll handle armv7
> >>> and sparc64 later.  People running different archs and/or one of the
> >>> graphical flavors, your test reports are welcome!
> >> 
> >> I could have mentioned that I intend to commit this soon.  oks welcome too.
> >> 
> >> -- 
> >> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> >> 
> >
> > Unfortunately my ports building setup has gotten into state where it's
> > taking > 3days to get to emacs. :-(.
> 
> Looks like you're not the only one who sees an increase in build time.
> Anyway, you don't need to rebuild everything from scratch, and emacs
> itself is relatively quick to build.
> 
> > But assuming this diff doesn't do
> > anything more than the rc1 diff I've been running for a while (gtk3,
> > amd64) then ok krw@
> 
> Not too many changes in the code but lots of lines moved, still:
> 
>   ritchie /tmp$ wc -l emacs-26.1-rc1-to-emacs-26.1-tarball.diff
>   12435 emacs-26.1-rc1-to-emacs-26.1-tarball.diff
> 
> ~jca/tmp/emacs-26.1-rc1-to-emacs-26.1-tarball.diff.gz if you want to
> take a look.
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

More fun than I anticipated getting enough ports compiled that emacs
could compile. Including forgetting to use your latest diff at least
once. :-)

Once I got that far compiling the gtk+3 version went without incident
and the resulting port works at least as well as the RC1
version. i.e. nothing breaks in usage case.

so ok krw@ fwiw.

 Ken

Re: [rc] emacs-26.1-rc1

[Kenneth R Westerback]

On Mon, Apr 23, 2018 at 11:47:45PM +0200, Jeremie Courreges-Anglas wrote:
> 
> Ken reminded me that the first 26.1 RC has been published, so here's
> a fresh diff; I only tested the no_x11 FLAVOR on amd64 so far.

Running gtk3 version now. So far no issues.

 Ken

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/emacs/Makefile,v
> retrieving revision 1.73
> diff -u -p -r1.73 Makefile
> --- Makefile  2 Apr 2018 14:06:09 -   1.73
> +++ Makefile  23 Apr 2018 21:41:40 -
> @@ -2,9 +2,9 @@
>  
>  COMMENT= GNU editor: extensible, customizable, self-documenting
>  
> -VERSION= 25.3
> -REVISION=0
> -DISTNAME=emacs-${VERSION}
> +VERSION= 26.1
> +DISTNAME=emacs-${VERSION}-rc1
> +WRKDIST= ${WRKDIR}/emacs-${VERSION}
>  
>  CATEGORIES=  editors
>  
> @@ -15,9 +15,10 @@ MAINTAINER=Jeremie Courreges-Anglas   # GPLv3+
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -WANTLIB= c m ncurses pthread gnutls xml2 z
> +WANTLIB= c curses gnutls m pthread xml2 z
>  
> -MASTER_SITES=${MASTER_SITE_GNU:=emacs/}
> +MASTER_SITES=https://alpha.gnu.org/gnu/emacs/pretest/
> +EXTRACT_SUFX=.tar.xz
>  
>  USE_GMAKE=   Yes
>  
> @@ -47,46 +48,47 @@ LIB_DEPENDS=  security/gnutls \
>  .if ${FLAVOR} == "no_x11"
>  CONFIGURE_ARGS+= --without-x \
>   --without-dbus \
> - --without-gconf \
>   --without-gsettings \
> - --without-jpeg
> + --without-jpeg \
> + --without-lcms2
>  .else
>  LIB_DEPENDS+=x11/dbus \
>   x11/gnome/librsvg \
> - devel/gconf2 \
>   graphics/jpeg \
>   graphics/png \
>   graphics/tiff \
>   graphics/giflib \
> - graphics/ImageMagick
> + graphics/ImageMagick \
> + graphics/lcms2
>  RUN_DEPENDS+=devel/desktop-file-utils \
>   devel/xdg-utils \
>   x11/gtk+3,-guic
>  . if ${FLAVOR} == "athena"
>  CONFIGURE_ARGS+= --with-x-toolkit=athena
>  LIB_DEPENDS+=x11/Xaw3d
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xaw3d
> -WANTLIB += Xext Xft Xinerama Xmu Xpm Xrandr Xrender Xt cairo dbus-1
> -WANTLIB += fontconfig freetype gconf-2 gdk_pixbuf-2.0 gif gio-2.0
> -WANTLIB += glib-2.0 gobject-2.0 intl jpeg png rsvg-2 tiff X11-xcb Xfixes xcb
> +WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> +WANTLIB += Xaw3d Xext Xfixes Xft Xinerama Xmu Xpm Xrandr Xrender
> +WANTLIB += Xt cairo dbus-1 fontconfig freetype gdk_pixbuf-2.0
> +WANTLIB += gif gio-2.0 glib-2.0 gobject-2.0 intl jpeg lcms2 png
> +WANTLIB += rsvg-2 tiff xcb
>  . elif ${FLAVOR} == "gtk2"
>  CONFIGURE_ARGS+= --with-x-toolkit=gtk2
>  LIB_DEPENDS+=x11/gtk+2
> -WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 Xcomposite
> -WANTLIB += Xcursor Xdamage Xext Xfixes Xft Xi Xinerama Xpm Xrandr
> -WANTLIB += Xrender atk-1.0 cairo dbus-1 fontconfig freetype gconf-2
> -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += gtk-x11-2.0 intl jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0
> -WANTLIB += png rsvg-2 tiff X11-xcb xcb
> +WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> +WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xft Xi Xinerama
> +WANTLIB += Xpm Xrandr Xrender atk-1.0 cairo dbus-1 fontconfig
> +WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gif gio-2.0 glib-2.0
> +WANTLIB += gobject-2.0 gtk-x11-2.0 intl jpeg lcms2 pango-1.0 pangocairo-1.0
> +WANTLIB += pangoft2-1.0 png rsvg-2 tiff xcb
>  . elif ${FLAVOR} == "gtk3"
>  CONFIGURE_ARGS+= --with-x-toolkit=gtk3
>  LIB_DEPENDS+=x11/gtk+3
>  WANTLIB += ICE MagickCore-6.Q16 MagickWand-6.Q16 SM X11 X11-xcb
> -WANTLIB += Xfixes Xft Xinerama Xpm Xrandr Xrender atk-1.0 cairo
> -WANTLIB += cairo-gobject dbus-1 fontconfig freetype gconf-2 gdk-3
> +WANTLIB += Xext Xfixes Xft Xinerama Xpm Xrandr Xrender atk-1.0
> +WANTLIB += cairo cairo-gobject dbus-1 fontconfig freetype gdk-3
>  WANTLIB += gdk_pixbuf-2.0 gif gio-2.0 glib-2.0 gobject-2.0 gtk-3
> -WANTLIB += intl jpeg pango-1.0 pangocairo-1.0 png rsvg-2 tiff
> -WANTLIB += xcb
> +WANTLIB += intl jpeg lcms2 pango-1.0 pangocairo-1.0 png rsvg-2
> +WANTLIB += tiff xcb
>  . else
>  ERRORS+= "Fatal: Conflicting flavor: ${FLAVOR}"
>  . endif
> @@ -94,7 +96,6 @@ ERRORS+="Fatal: Conflicting flavor: ${
>  
>  post-install:
>   chmod -t ${PREFIX}/bin/emacs-${VERSION}
> - chmod -s ${PREFIX}/libexec/emacs/${VERSION}/${GCCARCH}/update-game-score
>  .if ${FLAVOR:Mno_x11}
>   rm -Rf 

Re: NEW: lang/ocaml-camlp5

[Kenneth R Westerback]

On Sun, Jan 28, 2018 at 07:12:01PM -0500, Brian Callahan wrote:
> Hi ports --
> 
> Attached is a new port, lang/ocaml-camlp5. Camlp5 is an OCaml Preprocessor
> and Pretty-Printer.
> A quick perusal of the archives indicates that this piece of software has
> been proposed numerous times, as far back as 2010, yet has never been
> imported. The archives are scarce on reasons why it wasn't ever imported,
> but it seems like it has something to do with math/coq. Looking at Coq, the
> latest version says that Camlp4 no longer works, only Camlp5. And Camlp5
> doesn't conflict with Camlp4, so let's say we're future-proofing for
> whenever someone comes along who wants to update math/coq.
> 
> ---
> pkg/DESCR:
> Camlp5 is a preprocessor and pretty-printer for OCaml programs. It also
> provides parsing and printing tools.
> 
> As a preprocessor, it allows one to:
> * extend the syntax of OCaml,
> * redefine the whole syntax of the language.
> 
> As a pretty printer, it allows one to:
> * display OCaml programs in an elegant way,
> * convert from one syntax to another,
> * check the results of syntax extensions.
> 
> Camlp5 also provides some parsing and pretty printing tools:
> * extensible grammars
> * extensible printers
> * stream parsers and lexers
> * pretty print module
> 
> It works as a shell command and can also be used in the OCaml toplevel.
> ---
> 
> Run tested on amd64 and build tested on armv7. But as this is the first time
> I'm working with OCaml, more experienced eyes appreciated.
> 
> OK?
> 
> ~Brian
> 

I am not the definitive Ocaml guy, but I have touched it in the
past. Most recently in removing a large number of ocaml programming
ports in favour of letting people compile current software from opam,

I sense camlp5 falls into this category, so I would be mildly against
adding this port. I keep hoping opam 2.0 gets released soon and we can
consider using its new functionality to build most if not all ocaml
ports rather than manually maintain each individual program that uses
ocaml.

I thought his might be a topic of discussion at p2k18 in Nantes. :-)

 Ken

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/06/09 06:03:35

Modified files:
lang/rust  : Makefile 

Log message:
Bump LIBESTDC_VERSION to 17.1.

ok espie@

Re: Remove benchmarks/bytebench?

[Kenneth R Westerback]

On Sun, Apr 30, 2017 at 09:34:58PM +0200, Christian Weisgerber wrote:
> benchmarks/bytebenchBYTE magazine benchmark suite
> 
> The timestamps in the distfile are from February 1992.
> (BYTE magazine folded in 1998.)
> 
> I was going to add some fixes to make this compile with clang, but
> there's no point.  This long forgotten cruft can just be removed,
> ok?
> 
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de
> 

I see no point in keeping it. ok krw@ fwiw

 Ken

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 17:31:32

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Oops. Missing comma.

Pointed out by Nigel Taylor. Thanks!

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 14:54:16

Removed files:
devel/ocaml-camomile: Makefile distinfo 
devel/ocaml-camomile/patches: patch-Camomile_Makefile_in 
devel/ocaml-camomile/pkg: DESCR PFRAG.native PLIST 

Log message:
Remove port which was used only by ocaml-zed which was only used
by ocaml-lwt which was only used by ocaml-lambda-term which was
used only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 14:52:10

Modified files:
devel  : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Unhook and note the demise of ocaml-camomile. Last of the utop
dependencies.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 11:32:12

Removed files:
textproc/ocaml-text/pkg: PFRAG.native 

Log message:
Remove port which was used only by ocaml-lwt which was only used
by ocaml-lambda-term which was used only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 11:29:19

Removed files:
devel/ocaml-zed: Makefile distinfo 
devel/ocaml-zed/pkg: DESCR PFRAG.dynlink-native PFRAG.native 
 PLIST 

Log message:
Remove port which was used only by ocaml-lambda-term which was used
only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:26:32

Removed files:
devel/utop : Makefile distinfo 
devel/utop/pkg : DESCR PFRAG.dynlink-native PFRAG.native PLIST 

Log message:
Remove port which is used only only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:25:02

Removed files:
devel/ocaml-lambda-term: Makefile distinfo 
devel/ocaml-lambda-term/pkg: DESCR PFRAG.dynlink-native 
 PFRAG.native PLIST 

Log message:
Remove port which is used only only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:22:48

Removed files:
devel/ocaml-lwt: Makefile distinfo 
devel/ocaml-lwt/pkg: DESCR PFRAG.dynlink-native PFRAG.native 
 PLIST 

Log message:
Remove port which is used only by ocaml-lambda-term, which is used
only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:19:38

Removed files:
devel/ocaml-react: Makefile distinfo 
devel/ocaml-react/pkg: DESCR PFRAG.dynlink-native PFRAG.native 
   PLIST 

Log message:
Remove port used only by lwt, which is used only by ocaml-lambda-term,
which is used only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:17:51

Removed files:
textproc/ocaml-text: Makefile distinfo 
textproc/ocaml-text/patches: patch-setup_ml 
 patch-src_ml_text_bigarray_c 
 patch-src_ml_text_c 
textproc/ocaml-text/pkg: DESCR PFRAG.dynlink-native PLIST 

Log message:
Remove port used only by lwt, which is used only by ocaml-lambda-term,
which is used only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:15:25

Removed files:
security/ocaml-ssl: Makefile distinfo 
security/ocaml-ssl/pkg: DESCR PFRAG.native PLIST 

Log message:
Remove port used only by lwt, which is used only by ocaml-lambda-term,
which is used only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:13:48

Removed files:
devel/ocaml-ppx-tools: Makefile distinfo 
devel/ocaml-ppx-tools/patches: patch-Makefile 
devel/ocaml-ppx-tools/pkg: DESCR PFRAG.dynlink-native 
   PFRAG.native PLIST 

Log message:
Remove port used only by lwt, which is used only by ocaml-lambda-term,
which is used only by utop.

ok chrisz@ avsm@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:08:17

Modified files:
devel/quirks/files: Quirks.pm 

Log message:
Record upcoming removal of utop and dependency tree.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/12 09:02:07

Modified files:
devel  : Makefile 
security   : Makefile 
textproc   : Makefile 

Log message:
Unhook utop, the ports that exist only to support utop, and
dependencies that exist only to support *them*.

If you are writing programs in Ocaml, you build these things from
opam to keep current.

ok chrisz@ avsm@

Remove utop port -- let opam handle it

[Kenneth R Westerback]

utop is the enhanced command line for ocaml. It is used to develop
ocaml programs and maintaining a port is both effortful and likely to be
little used once people encounter opam, where it is actively maintained
with all of its dependencies and the many nifty libraries ocaml
programmers might want to use while hacking ocaml.

So remove our separate port and use the efforts of the opam maintainers
instead.

When I look at ocaml ports that *only* appear as dependencies of utop I
find

devel/utop  1.19.1/1.19.3/1.19.3
devel/ocaml-lambda-term 1.9/1.10.1/1.10.1
devel/ocaml-lwt 2.5.2/2.7.0/2.7.0
devel/ocaml-react   1.2.0/1.2.0/1.2.0
textproc/ocaml-text 0.6/0.8.0/0.8.0
security/ocaml-ssl  0.5.2/0.5.3/0.5.3
devel/ocaml-ppx-tools   4.03.0/4.03.0/4.03.0
devel/ocaml-zed 1.4/1.4/1.4

i.e. only ocaml-lambda-term. In its dependency list lwt and zed appear
only there and no where else in the ports tree. And drilling down one
more, react, text, ssl and ppx-tools appear only in the dependency
list of lwt.

The numbers represent our port version/the latest upstream/version in
opam.

So I propose to delete the 8 ports. As also suggested by chrisz@ and
avsm@.

Thoughts? OK?

 Ken

Re: Nuke some Ocaml ports

[Kenneth R Westerback]

On 02/28, Edd Barrett wrote:
> On Mon, Feb 27, 2017 at 10:31:21PM +0100, Christopher Zimmermann wrote:
> > On 2017-02-27 Daniel Dickman  wrote:
> > > > 
> > > > devel/utop  
> > > 
> > > please no.
> > 
> > I acknowlegde this is a very useful tool for the OCaml developer, but
> > it also has heavy dependencies.
> > Since most OCaml users on OpenBSD use opam, maintaining this stuff is a
> > burden.
> 
> I also would like to keep utop if possible. Can you install utop from
> opam? If so you can probably nuke the port. FWIW, I have never used
> opam, but then, I only dabbled in OCaml.

utop is indeed installable from opam. I always use it thusly.

I classify it as a programmer's tool, not an end-usr tool and thus I
would indeed like to remove the port (and the resulting dangling
dependencies as pointed out by Chris).

 Ken

> 
> > As an alternative, when utop is unavailable, I use `rlwrap ocaml` to get
> > nice command line editing.
> 
> I recall that I didn't get on with this solution for some reason.
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk
> 

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 10:02:29

Removed files:
databases/ocaml-sqlite3: Makefile distinfo 
databases/ocaml-sqlite3/patches: patch-lib_sqlite3_stubs_c 
databases/ocaml-sqlite3/pkg: DESCR PFRAG.dynlink-native 
 PFRAG.native PLIST 

Log message:
Remove obsolete library versions with dead hompages/master sites.
Current ones available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 10:00:34

Removed files:
databases/ocaml-postgresql: Makefile distinfo 
databases/ocaml-postgresql/files: README 
databases/ocaml-postgresql/pkg: DESCR PFRAG.dynlink-native 
PFRAG.native PLIST 

Log message:
Remove obsolete library versions with dead hompages/master sites.
Current ones available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:56:28

Modified files:
databases  : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Remove obsolete library versions with dead hompages/master sites.
Current ones available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:43:13

Removed files:
textproc/ocaml-csv: Makefile distinfo 
textproc/ocaml-csv/pkg: DESCR PFRAG.dynlink-native PFRAG.native 
PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:41:32

Removed files:
textproc/ocaml-xmlm: Makefile distinfo 
textproc/ocaml-xmlm/pkg: DESCR PFRAG.dynlink-native PFRAG.native 
 PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:39:09

Removed files:
textproc/ocaml-xml-light: Makefile distinfo 
textproc/ocaml-xml-light/patches: patch-Makefile 
textproc/ocaml-xml-light/pkg: DESCR PFRAG.native PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:37:19

Removed files:
textproc/ocaml-rss: Makefile distinfo 
textproc/ocaml-rss/patches: patch-Makefile 
textproc/ocaml-rss/pkg: DESCR PFRAG.native PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:34:29

Removed files:
security/ocaml-cryptokit: Makefile distinfo 
security/ocaml-cryptokit/pkg: DESCR PFRAG.dynlink-native 
  PFRAG.native PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:32:26

Removed files:
graphics/ocaml-camlimages: Makefile distinfo 
graphics/ocaml-camlimages/pkg: DESCR PFRAG.native PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:28:44

Removed files:
devel/ocaml-curses: Makefile distinfo 
devel/ocaml-curses/pkg: DESCR PFRAG.native PLIST 
devel/ocaml-curses/patches: patch-curses_ml 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:26:49

Removed files:
devel/ocaml-bitstring: Makefile distinfo 
devel/ocaml-bitstring/patches: patch-Makefile_in 
devel/ocaml-bitstring/pkg: DESCR PFRAG.native PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:25:22

Removed files:
devel/ocaml-net: Makefile distinfo 
devel/ocaml-net/patches: patch-src_equeue_uq_engines_compat_ml 
 patch-src_netsys_netlog_ml 
devel/ocaml-net/pkg: DESCR PFRAG.native PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:22:57

Removed files:
devel/ocaml-batteries: Makefile distinfo 
devel/ocaml-batteries/pkg: DESCR PFRAG.dynlink-native 
   PFRAG.native PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 09:20:41

Removed files:
devel/ocaml-calendar: Makefile distinfo 
devel/ocaml-calendar/patches: patch-Makefile_in 
devel/ocaml-calendar/pkg: DESCR PFRAG.dynlink-native 
  PFRAG.native PLIST 

Log message:
Remove unused, older library versions. Current ones
available via normal Ocaml ecosystem (a.k.a. opam).

ok chrisz@ avsm@ (maintainers)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2017/03/04 07:01:08

Modified files:
devel  : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Unhook ocaml-mlgmp from build prepatory to removing. Archaic version,
unused by anything.

ok edd@

Nuke some Ocaml ports

[Kenneth R Westerback]

Following up some private discussions about ports vs opam I did
some grep'ing, google'ing, github'ing, and opam'ing and came up
with the list below.

I think this are prime candidates for being removed from the ports
tree. 14 out of the 56 ocaml related ports I could find.

ALL but ocaml-curses and ocmal-calendar are behind the upstream to
one extent or the other.  The migration to github seems to be in
flood and at least two current upstreams appear to have been recently
obsoleted.

All are available at their current level from opam 1.2 and thus the
upcoming opam 2.0. None seem to be used by other ports and so seem
to be there to support actual ocaml programming efforts rather than
being end-user ports written in ocaml for people to use as-is.

My impression of the Ocaml space is that 'real programmers' get
their libraries from opam these days. (>1500 opam packages and
counting!) I am but a ocaml dilettante but that's certainly what I
do. I have strong suspicions that Anil would prefer the ones he is
currently down as maintainer for to disappear into the Borg.

My main motivation is to ease the burden off keeping ocaml current
during my episodic spasms of enthusiasm for it. :-) We are soon to
be two releases behind! I think the chances of keeping current are
shrinking as it is after their move to an aggressive six month
release cycle. Where did they get that idea from?

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

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

Re: www/firefox can't connect to google.com

[Kenneth R Westerback]

On 01/06, Landry Breuil wrote:
> On Fri, Jan 06, 2017 at 05:07:54PM +0100, Landry Breuil wrote:
> > On Fri, Jan 06, 2017 at 04:55:40PM +0100, Landry Breuil wrote:
> > > On Fri, Jan 06, 2017 at 10:43:08AM -0500, Daniel Jakots wrote:
> > > > On Fri, 6 Jan 2017 11:08:56 +0100, Landry Breuil 
> > > > wrote:
> > > > 
> > > > > On Fri, Jan 06, 2017 at 10:59:40AM +0100, Sol?ne Rapenne wrote:
> > > > > > Le 2017-01-06 10:47, Sol?ne Rapenne a ?crit?:  
> > > > > > > Le 2017-01-06 10:38, Landry Breuil a ?crit?:  
> > > > > > > > On Fri, Jan 06, 2017 at 10:33:04AM +0100, Sol?ne Rapenne
> > > > > > > > wrote:  
> > > > > > > > > Hello,
> > > > > > > > > 
> > > > > > > > > I upgraded my amd64 -current this morning (OpenBSD 6.0-current
> > > > > > > > > (GENERIC.MP)
> > > > > > > > > #110: Thu Jan  5 20:32:18 MST 2017)
> > > > > > > > > 
> > > > > > > > > With the latest firefox version (firefox-50.1.0) I can't
> > > > > > > > > connect to www.google.com, I get the following message
> > > > > > > > > 
> > > > > > > > > Your connection is not secure
> > > > > > > > > The website tried to negotiate an inadequate level of
> > > > > > > > > security. google.com uses security technology that is
> > > > > > > > > outdated and vulnerable to
> > > > > > > > > attack. An attacker could easily reveal information which you
> > > > > > > > > thought to be
> > > > > > > > > safe. The website administrator will need to fix the server
> > > > > > > > > first before you
> > > > > > > > > can visit the site.
> > > > > > > > > Error code: NS_ERROR_NET_INADEQUATE_SECURITY
> > > > > > > > > 
> > > > > > > > > 
> > > > > > > > > I tried a few others SSL websites and they all works.  
> > > > > > > > 
> > > > > > > > Iirc that's due to the fact that some certs were removed from
> > > > > > > > cert.pem and those were in the cert chain for google. Should be
> > > > > > > > fixed or a fix is
> > > > > > > > in the works.
> > > > > > > > 
> > > > > > > > That's the perfect occasion to start using another search
> > > > > > > > engine which respects users' privacy :)
> > > > > > > > 
> > > > > > > > Landry  
> > > > > > > 
> > > > > > > For what it worth, the problem occurs with firefox-esr too, but it
> > > > > > > doesn't
> > > > > > > show an error, it just fails silently and keep the current page
> > > > > > > viewed.  
> > > > > > 
> > > > > > thanks to johany@ on IRC, setting network.http.spdy.enabled.http2
> > > > > > to false in
> > > > > > about:config works as a workaround  
> > > > > 
> > > > > Ah. Then maybe it's a fuckup with TLS1.3 in nss 3.28. Maybe 3.28.1
> > > > > will fix this. Or not.
> > > > 
> > > > FYI, still broken with 3.28.1.
> > > 
> > > Aaah, crap, now that rings a bell. Cf
> > > https://bugzilla.mozilla.org/show_bug.cgi?id=1323209 and
> > > https://bugzilla.mozilla.org/show_bug.cgi?id=1290037. Fuck. Fuckety Fuck.
> > > 
> > > So http/2 is broken with nss > 3.28... hm. I'm not sure waiting for 51 /
> > > next esr release is the right solution, since that's planned for the 24.
> > > Guess reverting the nss update is the solution. Sigh.
> > 
> > Two options (well, three)
> > - try rebuilding nss 3.28.1 without NSS_ENABLE_TLS_1_3=1, see if that
> >   helps (i think it's unrelated but who knows..)
> > - apply https://bug1290037.bmoattachments.org/attachment.cgi?id=8778661
> >   to firefox, rebuild - should fixit
> 
> Here are the full diffs for esr and mainline. I'll commit them when
> someone confirms me this fixes the issue (cant test tonight)
> 
> Landry
> 

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/firefox-esr/Makefile,v
> retrieving revision 1.44
> diff -u -r1.44 Makefile
> --- Makefile  14 Dec 2016 13:44:19 -  1.44
> +++ Makefile  6 Jan 2017 19:29:34 -
> @@ -8,6 +8,7 @@
>  MOZILLA_CODENAME =   browser
>  BROKEN-sparc64 = xpcshell SIGBUS during fake
>  EXTRACT_SUFX =   .tar.xz
> +REVISION =   0
>  
>  PKGNAME =${MOZILLA_PROJECT}-esr-${MOZILLA_VERSION:S/esr//}
>  SO_VERSION = 3.0
> Index: patches/patch-netwerk_protocol_http_Http2Session_cpp
> ===
> RCS file: patches/patch-netwerk_protocol_http_Http2Session_cpp
> diff -N patches/patch-netwerk_protocol_http_Http2Session_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-netwerk_protocol_http_Http2Session_cpp  6 Jan 2017 
> 19:29:34 -
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Bug 1290037: Fix HTTP/2 with nss 3.28.
> +https://hg.mozilla.org/mozilla-central/rev/361ac226da2a
> +
> +--- netwerk/protocol/http/Http2Session.cpp.orig  Mon Jul 25 14:12:07 2016
>  netwerk/protocol/http/Http2Session.cpp   Fri Jan  6 19:46:48 2017
> +@@ -3521,8 +3521,8 @@ Http2Session::ConfirmTLSProfile()
> + LOG3(("Http2Session::ConfirmTLSProfile %p FAILED due to DH %d < 2048\n",
> +   this, keybits));
> + RETURN_SESSION_ERROR(this, INADEQUATE_SECURITY);
> +-  } else if 

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/11/01 16:11:23

Modified files:
devel/ocaml-dose: Makefile 

Log message:
Oops. Missed one REVISION bump.

Update ocaml-pcre to 7.2.3. Bump revision of ports depending on ocaml-pcre.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/11/01 16:02:59

Modified files:
devel/coccinelle: Makefile 
devel/ocaml-net: Makefile 
devel/ocaml-pcre: Makefile distinfo 
textproc/ocaml-text: Makefile 
Added files:
devel/ocaml-pcre/patches: patch-_oasis patch-myocamlbuild_ml 
  patch-setup_ml 

Log message:
Update ocaml-pcre to 7.2.3. Bump revision of ports depending on ocaml-pcre.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/11/01 15:55:04

ports/devel/ocaml-pcre/patches

Update of /cvs/ports/devel/ocaml-pcre/patches
In directory cvs.openbsd.org:/tmp/cvs-serv89499/patches

Log Message:
Directory /cvs/ports/devel/ocaml-pcre/patches added to the repository

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/09/27 10:09:26

Added files:
devel/ocaml-extlib/patches: patch-Makefile 

Log message:
Oops. Missed patch file in previous update to 1.7.0.

textlive_base amd64+dpb web2c == "No rule to make target 'all'

[Kenneth R Westerback]

Trying to compile coccinelle on my amd64 dpb builder with -current
sources as of last night fails in the dependency textlive_base. The
last messages are

gmake[1]: Entering directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk'
Making all in .
gmake[2]: Entering directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk'
gmake[2]: Leaving directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk'
Making all in web2c
gmake[2]: Entering directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c'
gmake  all-recursive
gmake[3]: Entering directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c'
Making all in doc
gmake[4]: Entering directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c/doc'
gmake[4]: Nothing to be done for 'all'.
gmake[4]: Leaving directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c/doc'
Making all in lib
gmake[4]: Entering directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c/lib'
gmake[4]: Nothing to be done for 'all'.
gmake[4]: Leaving directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c/lib'
Making all in man
gmake[4]: Entering directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c/man'
gmake[4]: Nothing to be done for 'all'.
gmake[4]: Leaving directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c/man'
Making all in web2c
gmake[4]: Entering directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c/web2c'
gmake[4]: *** No rule to make target 'all'.  Stop.
gmake[4]: Leaving directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c/web2c'
gmake[3]: *** [Makefile:13894: all-recursive] Error 1
gmake[3]: Leaving directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c'
gmake[2]: *** [Makefile:3660: all] Error 2
gmake[2]: Leaving directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk/web2c'
gmake[1]: *** [Makefile:479: all-recursive] Error 1
gmake[1]: Leaving directory
'/wrkobjdir/texlive_base-2015/texlive-20150521-source/Work/texk'
gmake: *** [Makefile:567: all-recursive] Error 1
*** Error 2 in print/texlive/base
(/usr/ports/infrastructure/mk/bsd.port.mk:2679
'/wrkobjdir/texlive_base-2015/.build_done')
*** Error 1 in print/texlive/base
(/usr/ports/infrastructure/mk/bsd.port.mk:2397 'build')
===> Exiting print/texlive/base with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:147
'build')
Error: job failed 256

Full log available on request.

Cluebats?

 Ken

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/07/06 11:49:32

Modified files:
sysutils/findlib: Makefile 
sysutils/findlib/pkg: PFRAG.dynlink-native PLIST 

Log message:
Tweak PLIST/PFRAG so build/package works on non-dynlink-native archs again.

Remember to crank REVISION this time.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/07/06 10:11:52

Modified files:
devel/ocaml-cmdliner: Makefile 

Log message:
Add comment to remind future generations that new versions mean build
dependents such as opam need a REVISION bump.

Requested by sthen@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/07/05 10:24:46

Modified files:
devel/ocaml-cmdliner: Makefile distinfo 
devel/ocaml-cmdliner/pkg: PLIST 
sysutils/opam  : Makefile 

Log message:
Update to latest (0.9.8), the same that opam installs.

Bump opam REVISION.

ok anil@ chrisz@

Update ocaml-cmdliner to 0.9.8

[Kenneth R Westerback]

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
--- Makefile23 Jun 2016 19:23:53 -  1.3
+++ Makefile3 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
--- distinfo30 Aug 2015 15:57:25 -  1.2
+++ distinfo2 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

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/07/04 13:01:55

Modified files:
sysutils/findlib: Makefile distinfo 
sysutils/findlib/pkg: PLIST PFRAG.dynlink-native 
Added files:
sysutils/findlib/patches: patch-Makefile 

Log message:
Update to latest (1.6.2).

Don't try to create the man3 directory or remove the .3 man pages that
are not generated because (according to the Makefile comment) ocamldoc is
hopeless at at generating them.

Placate portcheck by using ${PREFIX} instead of a hardcoded directory.

Maintainer timeout.

PLIST tweaks and ok chrisz@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/26 08:36:58

Modified files:
devel/coccinelle: Makefile 

Log message:
Change to PLIST means bumping REVISION.

Found by naddy@ during bulk build. Seconded by espie@.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/26 07:31:10

Modified files:
devel/utop : Makefile 

Log message:
Add missing/lost BUILD_DEPENDS on ocamlbuild.

Found by naddy@ during bulk build.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/25 07:42:37

Modified files:
productivity/wyrd: Makefile 

Log message:
Fix breakage in checking of ocaml_native and setting OCAMLOPT in
CONFIGURE_ENV. Makes configure work again.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/24 09:59:13

Modified files:
devel/coccinelle: Makefile 
devel/coccinelle/pkg: PLIST 
devel/ocaml-batteries: Makefile distinfo 
devel/ocaml-batteries/pkg: PFRAG.native PLIST 
devel/ocaml-lwt: Makefile distinfo 
devel/ocaml-parmap: Makefile 
devel/ocaml-parmap/pkg: PFRAG.native 
devel/ocaml-ppx-tools: Makefile distinfo 
devel/ocaml-ppx-tools/patches: patch-Makefile 
devel/utop : Makefile distinfo 
devel/utop/pkg : PFRAG.dynlink-native PFRAG.native PLIST 
lang/ocaml : Makefile distinfo 
lang/ocaml/patches: patch-configure 
lang/ocaml/pkg : PFRAG.native-main PLIST-graphics PLIST-main 
lang/ocaml-camlp4: Makefile distinfo 
productivity/wyrd: Makefile 
Added files:
devel/ocaml-mlgmp/patches: patch-config_h 
devel/ocaml-net/patches: patch-src_equeue_uq_engines_compat_ml 
 patch-src_netsys_netlog_ml 
devel/ocaml-parmap/patches: patch-Makefile_in 
patch-parmap_mldylib 
patch-parmap_mllib 
math/coq/patches: patch-coqmktmp_ml 
net/mldonkey/patches: patch-src_networks_donkey_donkeyGlobals_ml 
  patch-src_utils_cdk_gdstubs_c 
  patch-src_utils_cdk_zip_ml 
  patch-src_utils_lib_options_ml4 
net/unison/patches: patch-system_system_generic_ml 
productivity/wyrd/patches: patch-Makefile_in 
textproc/ocaml-text/patches: patch-src_ml_text_bigarray_c 
 patch-src_ml_text_c 

Log message:
Upgrade Ocaml to 4.3.0 and tweak ports the minimal amount to keep
them all compiling.

Tweaks include updating

ocaml-batteries 2.3.1 -> 2.5.0
ocaml-lwt 2.4.8 -> 2.5.2
ocaml-ppx-tools 0.99.2 -> 4.03.0
ocaml-camlp4 4.02+6 -> 4.03+1
utop 1.15 -> 1.19.2

and fixes to coccinelle and wyrd to let them build on bytecode archs.

Other necessary tweaks from the various homes of the projects.

Everything still builds on amd64 (native and bytecode) and sparc64 (bytecode).

ok anil@ sthen@ so final 4.3.0 tweaks can be done in-tree.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/23 13:30:18

Modified files:
devel  : Makefile 

Log message:
Add SUBDIR lines for ocaml-ocamlbuild and ocaml-cppo.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/23 13:23:54

Modified files:
databases/ocaml-postgresql: Makefile 
databases/ocaml-sqlite3: Makefile 
devel/cudf : Makefile 
devel/ocaml-batteries: Makefile 
devel/ocaml-cmdliner: Makefile 
devel/ocaml-dose: Makefile 
devel/ocaml-jsonm: Makefile 
devel/ocaml-lambda-term: Makefile 
devel/ocaml-lwt: Makefile 
devel/ocaml-menhir: Makefile 
devel/ocaml-parmap: Makefile 
devel/ocaml-pcre: Makefile 
devel/ocaml-re : Makefile 
devel/ocaml-react: Makefile 
devel/ocaml-uutf: Makefile 
devel/ocaml-zed: Makefile 
devel/ounit: Makefile 
devel/utop : Makefile 
lang/obc   : Makefile 
lang/ocaml : Makefile 
lang/ocaml/pkg : PFRAG.native-main PLIST-main 
lang/ocaml-camlp4: Makefile 
security/ocaml-cryptokit: Makefile 
sysutils/findlib: Makefile 
sysutils/findlib/pkg: PLIST 
sysutils/opam  : Makefile 
textproc/hevea : Makefile 
textproc/ocaml-csv: Makefile 
textproc/ocaml-text: Makefile 
textproc/ocaml-xmlm: Makefile 

Log message:
Stop building Ocaml's internal ocamlbuild and use the ocaml-ocamlbuild port
where needed.

The next step towards Ocaml 4.3.0.

Bulk build by sthen@ identified several laggards which are included here.

ok anil@ sthen@ so final 4.3.0 polishing can be done in-tree.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/23 07:54:26

Added files:
devel/ocaml-ocamlbuild: Makefile distinfo 
devel/ocaml-ocamlbuild/pkg: DESCR PLIST PFRAG.native 
devel/ocaml-ocamlbuild/patches: patch-configure_make 
devel/ocaml-cppo: Makefile distinfo 
devel/ocaml-cppo/pkg: DESCR PLIST PFRAG.dynlink-native 
  PFRAG.native 

Log message:
Add ocamlbuild and cppo ports in preparation for Ocaml 4.3.0.

Ocaml 4.3.0 does not supply an internal ocamlbuild, and cppo is
needed by the utop update related to 4.3.0.

Not hooked into build yet.

ok anil@ sthen@ so final 4.3.0 polishing can be done in-tree.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/23 07:47:06

ports/devel/ocaml-cppo/pkg

Update of /cvs/ports/devel/ocaml-cppo/pkg
In directory cvs.openbsd.org:/tmp/cvs-serv51866/pkg

Log Message:
Directory /cvs/ports/devel/ocaml-cppo/pkg added to the repository

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/23 07:46:33

ports/devel/ocaml-ocamlbuild/pkg

Update of /cvs/ports/devel/ocaml-ocamlbuild/pkg
In directory cvs.openbsd.org:/tmp/cvs-serv12953/pkg

Log Message:
Directory /cvs/ports/devel/ocaml-ocamlbuild/pkg added to the repository

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/23 07:46:08

ports/devel/ocaml-ocamlbuild/patches

Update of /cvs/ports/devel/ocaml-ocamlbuild/patches
In directory cvs.openbsd.org:/tmp/cvs-serv66286/patches

Log Message:
Directory /cvs/ports/devel/ocaml-ocamlbuild/patches added to the repository

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/23 07:45:19

ports/devel/ocaml-cppo

Update of /cvs/ports/devel/ocaml-cppo
In directory cvs.openbsd.org:/tmp/cvs-serv79961/ocaml-cppo

Log Message:
Directory /cvs/ports/devel/ocaml-cppo added to the repository

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/23 07:44:57

ports/devel/ocaml-ocamlbuild

Update of /cvs/ports/devel/ocaml-ocamlbuild
In directory cvs.openbsd.org:/tmp/cvs-serv63385/ocaml-ocamlbuild

Log Message:
Directory /cvs/ports/devel/ocaml-ocamlbuild added to the repository

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/01 12:31:34

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Note that ocamlduce has shuffled off this mortal coil.

cluebat & ok aja@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/01 10:14:32

Removed files:
lang/ocamlduce : Makefile distinfo 
lang/ocamlduce/patches: patch-Makefile 
lang/ocamlduce/pkg: DESCR PFRAG.native PLIST 

Log message:
The world has moved on and ocamduce never made the jump to Ocaml 4.

It's dead Jim.

ok anil@ (maintainer)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/06/01 09:47:58

Modified files:
lang   : Makefile 

Log message:
Unhook ocamlduce from build.

Marked broken for years, and no chance this will change.

Will be nuked shortly.

ok anil@ (maintainer)

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/05/30 19:18:35

Modified files:
devel/frama-c  : Makefile 

Log message:
Add explicit dependencies on devel/ocaml-graph and math/graphviz. This
should eliminate the TOCTOU race between config and build stages
that can result in neither the internal or the port versions being
available.

Found while preparing for Ocaml 4.3.0.

ok sthen@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2016/05/14 05:29:09

Modified files:
infrastructure/man/man1: proot.1 

Log message:
No .Pp before .Sh.

ok espie@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2013/12/28 13:44:21

Added files:
sysutils/collectd/patches: patch-src_tcpconns_c 

Log message:
Replace circleq inpt_queue with tailq, as inpt_queue is now a TAILQ.
Spotted in bulk build by sthen@.

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2013/12/27 16:08:02

Modified files:
net/net-snmp/patches: 
  
patch-agent_mibgroup_tcp-mib_data_access_tcpConn_openbsd_c 
  
patch-agent_mibgroup_udp-mib_data_access_udp_endpoint_openbsd_c 

Log message:
Apply tedu@'s Christmas Miracle cure for TAILQ_PREV vs kvm_read()
while traversing inpt_queue. Fix botch in previous commit by
initializing next and prev once each, rather than prev twice and next
not at all. Eliminate 'skip:' and use 'continue' instead, since code
after 'skip:' was pointless. Nuke now unused variable 'head'.

Re: collectd breakage, circleq removal

[Kenneth R Westerback]

On Fri, Dec 27, 2013 at 04:16:11PM +, Stuart Henderson wrote:
 collectd failed in my bulk (circleq removal) - anyone have time to take a 
 look?
 
 tcpconns.c: In function 'conn_read':
 tcpconns.c:678: error: 'struct inpthead' has no member named 'cqh_first'
 tcpconns.c:686: error: 'struct anonymous' has no member named 'cqe_next'
 
 http://rhaalovely.net/build-failures/i386/20131219/sysutils/collectd,-pgsql.log
 

This patch file (if saved as patch-src_tcpconns_c) seems to let it
compile. Since it wasn't checking the integrity of inpt_queue I did
not add the tedu@ Christmas Miracle part. I can if desired.

Now, whether it works ...

 Ken

$OpenBSD$
--- src/tcpconns.c.orig Fri Dec 27 11:33:41 2013
+++ src/tcpconns.c  Fri Dec 27 11:37:20 2013
@@ -659,7 +659,6 @@ static int conn_init (void)
 static int conn_read (void)
 {
   struct inpcbtable table;
-  struct inpcb *head;
   struct inpcb *next;
   struct inpcb inpcb;
   struct tcpcb tcpcb;
@@ -672,18 +671,16 @@ static int conn_read (void)
   if (status != 0)
 return (-1);
 
-  /* Get the `head' pcb */
-  head = (struct inpcb *) (inpcbtable_ptr-inpt_queue);
   /* Get the first pcb */
-  next = (struct inpcb *)CIRCLEQ_FIRST (table.inpt_queue);
+  next = (struct inpcb *)TAILQ_FIRST (table.inpt_queue);
 
-  while (next != head)
+  while (next)
   {
 /* Read the pcb pointed to by `next' into `inpcb' */
 kread ((u_long) next, inpcb, sizeof (inpcb));
 
 /* Advance `next' */
-next = (struct inpcb *)CIRCLEQ_NEXT (inpcb, inp_queue);
+next = (struct inpcb *)TAILQ_NEXT (inpcb, inp_queue);
 
 /* Ignore sockets, that are not connected. */
 #ifdef __NetBSD__
@@ -700,7 +697,7 @@ static int conn_read (void)
 
 kread ((u_long) inpcb.inp_ppcb, tcpcb, sizeof (tcpcb));
 conn_handle_ports (ntohs(inpcb.inp_lport), ntohs(inpcb.inp_fport), 
tcpcb.t_state);
-  } /* while (next != head) */
+  } /* while (next) */
 
   conn_submit_all ();
 

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2013/12/19 19:11:33

Added files:
sysutils/gkrellm/gkrellm/patches: 
  patch-src_sysdeps_bsd-net-open_c 

Log message:
Adapt to change of inpt_queue to TAILQ from CIRCLEQ.

ok zhuk@ sthen@

CVS: cvs.openbsd.org: ports

[Kenneth R Westerback]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2013/12/19 19:20:00

Added files:
net/net-snmp/patches: patch-agent_mibgroup_mibII_ipv6_c 
  patch-agent_mibgroup_mibII_tcpTable_c 
  patch-agent_mibgroup_mibII_udpTable_c 
  
patch-agent_mibgroup_tcp-mib_data_access_tcpConn_openbsd_c 
  
patch-agent_mibgroup_udp-mib_data_access_udp_endpoint_openbsd_c 

Log message:
Adapt to change of inpt_queue to TAILQ from CIRCLEQ.

ok sthen@

Re: [UPDATE] sbcl-1.1.12

[Kenneth R Westerback]

On Sat, Oct 12, 2013 at 07:59:35PM +0200, J??r??mie Courr??ges-Anglas wrote:
 Josh Elsasser j...@elsasser.org writes:
 
  On Fri, Oct 11, 2013 at 08:00:41PM +0200, J??r??mie Courr??ges-Anglas wrote:
  Kenneth R Westerback kwesterb...@rogers.com writes:
  
   On Thu, Oct 10, 2013 at 04:16:31PM -0700, Josh Elsasser wrote:
   On Thu, Oct 10, 2013 at 09:29:40AM +0200, J?r?mie Courr?ges-Anglas 
   wrote:

So instead of struggling with clisp, let's just update sbcl first.
Regress tests results and diff below.  I'm postponing clisp for now.

More tests on amd64 / ok?
   
   There should be a build-time (and probably runtime) dependency on gmp,
   or else the gmp contrib should be disabled. I'm not sure if it's right
   to enforce a runtime dependency when few users will use sb-gmp, but it
   would also be annoying to start splitting off contribs into separate
   packages.
  
  gmp is opened using load-shared-object (dlopen), the build system
  doesn't search for it (but we should keep in mind that one day it
  might use sb-grovel to detect the size and signedness of gmp objects).
  Given this, plus the fact that it is a relatively new and probably
  seldom used module, I don't think adding gmp to bdeps/rdeps would add
  much value.
  
  What I should have done, though, is to put gmp in TEST_DEPENDS.
  
  Josh, do you agree with this?
 
  Will the port build correctly without gmp installed? I would assume
  that the sb-gmp contrib would fail to build, and then the port bail
  out when files from the plist are missing. I'm fine with leaving it
  out of the runtime deps, but think that it should be declared as a
  build dep if it's really needed then.
 
 I've just tested yesterday evening, with the gmp headers and libs
 made unreachable (it's a bit hard to pkg_delete gmp since it's widely
 used).  sb-gmp is still built and installed.
 
 As krw@ pointed out privately, my last diff had some unwanted .fasl in
 the PLIST (the ones generated at the ''make test'' step).  I should have
 checked twice, sorry.
 
 Here's a more correct diff.  Please give it a shot...

Working find on amd64 now! ok (again) krw@

 Ken

Re: [UPDATE] sbcl-1.1.12

[Kenneth R Westerback]

On Fri, Oct 11, 2013 at 08:00:41PM +0200, J??r??mie Courr??ges-Anglas wrote:
 Kenneth R Westerback kwesterb...@rogers.com writes:
 
  On Thu, Oct 10, 2013 at 04:16:31PM -0700, Josh Elsasser wrote:
  On Thu, Oct 10, 2013 at 09:29:40AM +0200, J?r?mie Courr?ges-Anglas wrote:
   
   So instead of struggling with clisp, let's just update sbcl first.
   Regress tests results and diff below.  I'm postponing clisp for now.
   
   More tests on amd64 / ok?
  
  There should be a build-time (and probably runtime) dependency on gmp,
  or else the gmp contrib should be disabled. I'm not sure if it's right
  to enforce a runtime dependency when few users will use sb-gmp, but it
  would also be annoying to start splitting off contribs into separate
  packages.
 
 gmp is opened using load-shared-object (dlopen), the build system
 doesn't search for it (but we should keep in mind that one day it
 might use sb-grovel to detect the size and signedness of gmp objects).
 Given this, plus the fact that it is a relatively new and probably
 seldom used module, I don't think adding gmp to bdeps/rdeps would add
 much value.
 
 What I should have done, though, is to put gmp in TEST_DEPENDS.
 
 Josh, do you agree with this?
 
  I don't use gmp
 
 Are you sure? :)

OK, I should have said I'd don't consciously use gmp. :-).

 Ken

 
  (or even know what it is) so I don't have a strong
  preference one way or the other on disabling it. I agree starting
  to split off contribs is a longer term idea even if deemed desirable.
 
  So I would go for whatever is minimal change to make 1.1.12 work.
  And leave anything else for future work in-tree.
 
   Ken
 
 -- 
 jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90  8961 6191 8FBF 06A1 1494

Re: [UPDATE] sbcl-1.1.12 (Was: Re: unbreak lang/sbcl on i386)

[Kenneth R Westerback]

On Thu, Oct 10, 2013 at 09:29:40AM +0200, J??r??mie Courr??ges-Anglas wrote:
 
 So instead of struggling with clisp, let's just update sbcl first.
 Regress tests results and diff below.  I'm postponing clisp for now.
 
 More tests on amd64 / ok?

ok krw@

 Ken

 
 1.1.8 i386:
 ===
 Finished running tests.
 Status:
  Expected failure:   character.pure.lisp / (CASE-INSENSITIVE-CHAR-COMPARISONS 
 EXHAUSTIVE)
  Expected failure:   compiler.pure.lisp / 
 FOLD-INDEX-ADDRESSING-POSITIVE-OFFSET
  Expected failure:   interface.pure.lisp / (SLEEP NON-CONSING)
  Expected failure:   dynamic-extent.impure.lisp / (NO-CONSING 
 SPECIALIZED-DX-VECTORS)
  Failure:gc.impure.lisp / BUG-936304
  Expected failure:   packages.impure.lisp / USE-PACKAGE-CONFLICT-SET
  Expected failure:   packages.impure.lisp / IMPORT-SINGLE-CONFLICT
  Expected failure:   walk.impure.lisp / (WALK-LET* HAIRY-SPECIALS)
  Expected failure:   walk.impure.lisp / (WALK-LET* HAIRY-SPECIALS)
  (48 tests skipped for this combination of platform and features)
 test failed, expected 104 return code, got 1
 
 1.1.12 i386:
 
 Finished running tests.
 Status:
  Expected failure:   dynamic-extent.impure.lisp / (NO-CONSING 
 SPECIALIZED-DX-VECTORS)
  Expected failure:   packages.impure.lisp / USE-PACKAGE-CONFLICT-SET
  Expected failure:   packages.impure.lisp / IMPORT-SINGLE-CONFLICT
  Expected failure:   walk.impure.lisp / (WALK-LET* HAIRY-SPECIALS)
  Expected failure:   walk.impure.lisp / (WALK-LET* HAIRY-SPECIALS)
  (50 tests skipped for this combination of platform and features)
 ok
 //apparent success (reached end of run-tests.sh normally)
 
 1.1.8 macppc:
 =
 Finished running tests.
 Status:
  Expected failure:   character.pure.lisp / (CASE-INSENSITIVE-CHAR-COMPARISONS 
 EXHAUSTIVE)
  Unexpected success: compiler.pure.lisp / 
 FOLD-INDEX-ADDRESSING-POSITIVE-OFFSET
  Expected failure:   float.pure.lisp / (ADDITION-OVERFLOW BUG-372)
  Expected failure:   float.pure.lisp / (ADDITION-OVERFLOW BUG-372 TAKE-2)
  Expected failure:   interface.pure.lisp / (SLEEP NON-CONSING)
  Unexpected success: debug.impure.lisp / (TRACE ENCAPSULATE NIL)
  Unexpected success: debug.impure.lisp / (TRACE-RECURSIVE ENCAPSULATE NIL)
  Unexpected success: dynamic-extent.impure.lisp / 
 HANDLER-CASE-BOGUS-COMPILER-NOTE
  Unexpected success: dynamic-extent.impure.lisp / DX-COMPILER-NOTES
  Unexpected success: dynamic-extent.impure.lisp / HANDLER-CASE-EATING-STACK
  Expected failure:   dynamic-extent.impure.lisp / RECHECK-NESTED-DX-BUG
  Expected failure:   packages.impure.lisp / USE-PACKAGE-CONFLICT-SET
  Expected failure:   packages.impure.lisp / IMPORT-SINGLE-CONFLICT
  Skipped (broken):   timer.impure.lisp / (TIMER PARALLEL-UNSCHEDULE)
  Expected failure:   walk.impure.lisp / (WALK-LET* HAIRY-SPECIALS)
  Expected failure:   walk.impure.lisp / (WALK-LET* HAIRY-SPECIALS)
  (52 tests skipped for this combination of platform and features)
 ok
 //apparent success (reached end of run-tests.sh normally)
 
 1.1.12 macppc:
 ==
 Finished running tests.
 Status:
  Expected failure:   compiler.pure.lisp / COPY-MORE-ARG
  Expected failure:   float.pure.lisp / (ADDITION-OVERFLOW BUG-372)
  Expected failure:   float.pure.lisp / (ADDITION-OVERFLOW BUG-372 TAKE-2)
  Unexpected success: debug.impure.lisp / (TRACE ENCAPSULATE NIL)
  Unexpected success: debug.impure.lisp / (TRACE-RECURSIVE ENCAPSULATE NIL)
  Unexpected success: dynamic-extent.impure.lisp / 
 HANDLER-CASE-BOGUS-COMPILER-NOTE
  Unexpected success: dynamic-extent.impure.lisp / DX-COMPILER-NOTES
  Unexpected success: dynamic-extent.impure.lisp / HANDLER-CASE-EATING-STACK
  Expected failure:   dynamic-extent.impure.lisp / RECHECK-NESTED-DX-BUG
  Expected failure:   packages.impure.lisp / USE-PACKAGE-CONFLICT-SET
  Expected failure:   packages.impure.lisp / IMPORT-SINGLE-CONFLICT
  Skipped (broken):   timer.impure.lisp / (TIMER PARALLEL-UNSCHEDULE)
  Expected failure:   walk.impure.lisp / (WALK-LET* HAIRY-SPECIALS)
  Expected failure:   walk.impure.lisp / (WALK-LET* HAIRY-SPECIALS)
  (54 tests skipped for this combination of platform and features)
 ok
 //apparent success (reached end of run-tests.sh normally)
 
 
 
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/lang/sbcl/Makefile,v
 retrieving revision 1.20
 diff -u -p -r1.20 Makefile
 --- Makefile  15 Sep 2013 16:34:00 -  1.20
 +++ Makefile  9 Oct 2013 07:03:38 -
 @@ -5,8 +5,7 @@ ONLY_FOR_ARCHS =  amd64 i386 powerpc
  
  COMMENT= compiler and runtime system for ANSI Common Lisp
  
 -V =  1.1.8
 -REVISION=0
 +V =  1.1.12
  DISTNAME=sbcl-${V}-source
  PKGNAME= sbcl-${V}
  WRKDIST= ${WRKDIR}/sbcl-${V}
 Index: distinfo
 ===
 RCS file: /cvs/ports/lang/sbcl/distinfo,v
 retrieving revision 1.9
 diff -u -p 

Re: [UPDATE] sbcl-1.1.12 (Was: Re: unbreak lang/sbcl on i386)

[Kenneth R Westerback]

On Thu, Oct 10, 2013 at 04:16:31PM -0700, Josh Elsasser wrote:
 On Thu, Oct 10, 2013 at 09:29:40AM +0200, J?r?mie Courr?ges-Anglas wrote:
  
  So instead of struggling with clisp, let's just update sbcl first.
  Regress tests results and diff below.  I'm postponing clisp for now.
  
  More tests on amd64 / ok?
 
 There should be a build-time (and probably runtime) dependency on gmp,
 or else the gmp contrib should be disabled. I'm not sure if it's right
 to enforce a runtime dependency when few users will use sb-gmp, but it
 would also be annoying to start splitting off contribs into separate
 packages.
 

I don't use gmp (or even know what it is) so I don't have a strong
preference one way or the other on disabling it. I agree starting
to split off contribs is a longer term idea even if deemed desirable.

So I would go for whatever is minimal change to make 1.1.12 work.
And leave anything else for future work in-tree.

 Ken

Re: unbreak lang/sbcl on i386

[Kenneth R Westerback]

On Mon, Sep 16, 2013 at 06:06:06PM +0200, J??r??mie Courr??ges-Anglas wrote:
 
 Huh, I thought I had sent this mail... *shrug*
 
 - updating clisp to 2.49
   - texlive make build and make fake work fine; pkg/PLIST changed but
 that doesn't seem to be due to the clisp update
 - updating sbcl to 1.1.11 (using clisp-2.49 as a host)
   - note: sbcl/INSTALL lists supported clisp versions: (only some
 versions: 2.44.1 is OK, 2.47 is not)...
   - patch committed yesterday doesn't apply and isn't needed anymore
   - but a new struct timeval problem has been introduced in
 contrib/sb-posix/constants.lisp :)
   - two other errors in contrib/, maybe (?) linked to the one above, to
 the clisp update, or... just plain regressions
 
 dpb running on powerpc now, sbcl's make test on i386 not yet finished.
 That stuff takes a long time to build...
 
 WIP diff at the end of the mail.

Compiled w/o problems on amd64 and macppc so far. Will see if I can
get an i386 machine building a port while I wait for the rest of my
macppc ports to build. I'm looking at you firefox!

Then run some regress ...

 Ken