From 8f34a2e80681e17370f5b88f9c6aceadd16bab2c Mon Sep 17 00:00:00 2001 From: chrisz Date: Tue, 9 Jun 2020 17:34:13 +0000 Subject: [PATCH] Update lang/ocaml to 4.10.0 tested on sparc64, update to lang/camlp4 and ok by jca@ ok daniel@ thanks. --- devel/cil/Makefile | 4 +- devel/coccinelle/Makefile | 4 +- devel/dune/Makefile | 4 +- devel/frama-c/Makefile | 4 +- devel/ocaml-biniou/Makefile | 3 +- devel/ocaml-cppo/Makefile | 4 +- devel/ocaml-easy-format/Makefile | 4 +- devel/ocaml-graph/Makefile | 4 +- devel/ocaml-menhir/Makefile | 4 +- devel/ocaml-ocamlbuild/Makefile | 4 +- devel/ocaml-ocamlbuild/pkg/PLIST | 5 +- devel/ocaml-parmap/Makefile | 4 +- devel/ocaml-pcre/Makefile | 4 +- devel/ocaml-yojson/Makefile | 4 +- graphics/ocaml-cairo/Makefile | 4 +- graphics/ocaml-graphics/Makefile | 3 +- graphics/pdfsandwich/Makefile | 4 +- lang/haxe/Makefile | 4 +- lang/ocaml-camlp4/Makefile | 5 +- lang/ocaml-camlp4/distinfo | 4 +- lang/ocaml-camlp4/patches/patch-configure | 15 ---- lang/ocaml-camlp5/Makefile | 3 +- lang/ocaml/Makefile | 5 +- lang/ocaml/distinfo | 8 +- lang/ocaml/patches/patch-configure_ac | 63 +-------------- lang/ocaml/pkg/PFRAG.native | 33 ++++++-- lang/ocaml/pkg/PLIST | 99 ++++++++++++++--------- math/ocaml-num/Makefile | 4 +- math/ocaml-zarith/Makefile | 4 +- net/mldonkey/Makefile | 4 +- net/unison/2.4x/Makefile | 4 +- net/unison/2.5x/Makefile | 4 +- sysutils/findlib/Makefile | 4 +- textproc/bibtex2html/Makefile | 4 +- textproc/hevea/Makefile | 4 +- x11/kde-applications/kalzium/Makefile | 3 +- 36 files changed, 160 insertions(+), 181 deletions(-) diff --git a/devel/cil/Makefile b/devel/cil/Makefile index 058353267f8..33417c73d91 100644 --- a/devel/cil/Makefile +++ b/devel/cil/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2019/09/26 09:46:09 chrisz Exp $ +# $OpenBSD: Makefile,v 1.40 2020/06/09 17:34:13 chrisz Exp $ # build system needs per-arch tweaks and is very unfriendly to # bytecode-only builds. powerpc nativecode is currently broken. @@ -7,7 +7,7 @@ ONLY_FOR_ARCHS = ${OCAML_NATIVE_ARCHS} COMMENT= framework for analysis and transformation of C CATEGORIES = devel lang -REVISION = 1 +REVISION = 2 DISTNAME = cil-1.7.3 EXTRACT_SUFX = .tar.gz MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=cil/} diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile index d328172c59f..72a8571fbb1 100644 --- a/devel/coccinelle/Makefile +++ b/devel/coccinelle/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2019/09/26 09:46:09 chrisz Exp $ +# $OpenBSD: Makefile,v 1.41 2020/06/09 17:34:13 chrisz Exp $ BROKEN-sparc64 = "/usr/bin/ld: skipping incompatible pyml-current/libpyml_stubs.a when searching for -lpyml_stubs" \ "/usr/bin/ld: cannot find -lpyml_stubs" @@ -8,7 +8,7 @@ COMMENT = program matching and transformation engine # if updating, check for any additional use of diff/grep which # may need to be switched to gdiff/ggrep DISTNAME = coccinelle-1.0.6 -REVISION = 1 +REVISION = 2 EXTRACT_SUFX = .tgz CATEGORIES = devel diff --git a/devel/dune/Makefile b/devel/dune/Makefile index f3e665e3669..25f1d406058 100644 --- a/devel/dune/Makefile +++ b/devel/dune/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2019/09/26 09:46:09 chrisz Exp $ +# $OpenBSD: Makefile,v 1.10 2020/06/09 17:34:13 chrisz Exp $ COMMENT = OCaml build system @@ -7,7 +7,7 @@ CATEGORIES = devel GH_ACCOUNT = ocaml GH_PROJECT = dune GH_TAGNAME = 1.11.3 -REVISION = 0 +REVISION = 1 HOMEPAGE = https://github.com/ocaml/dune diff --git a/devel/frama-c/Makefile b/devel/frama-c/Makefile index 32d1d4049a8..35768abc011 100644 --- a/devel/frama-c/Makefile +++ b/devel/frama-c/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2019/11/13 17:41:22 sthen Exp $ +# $OpenBSD: Makefile,v 1.25 2020/06/09 17:34:13 chrisz Exp $ BROKEN-i386 = ld: error: undefined symbol: ml_as_z_mul, etc @@ -10,7 +10,7 @@ CATEGORIES = devel GH_ACCOUNT = Frama-C GH_PROJECT = Frama-C-snapshot GH_TAGNAME = 19.0 -REVISION = 2 +REVISION = 3 DISTNAME = frama-c-${GH_TAGNAME}-Potassium PKGNAME = frama-c-${GH_TAGNAME} diff --git a/devel/ocaml-biniou/Makefile b/devel/ocaml-biniou/Makefile index 5e81aeaa1ab..dce4dd1fae6 100644 --- a/devel/ocaml-biniou/Makefile +++ b/devel/ocaml-biniou/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2020/02/18 22:59:50 daniel Exp $ +# $OpenBSD: Makefile,v 1.7 2020/06/09 17:34:13 chrisz Exp $ COMMENT = binary data format designed for speed, safety, usability CATEGORIES = devel @@ -6,6 +6,7 @@ CATEGORIES = devel GH_ACCOUNT = ocaml-community GH_PROJECT = biniou GH_TAGNAME = 1.2.1 +REVISION = 0 PKGNAME = ocaml-${DISTNAME} # 3-clause BSD diff --git a/devel/ocaml-cppo/Makefile b/devel/ocaml-cppo/Makefile index 89849241267..8faabf2ab86 100644 --- a/devel/ocaml-cppo/Makefile +++ b/devel/ocaml-cppo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.8 2020/06/09 17:34:13 chrisz Exp $ COMMENT = OCaml preprocessor CATEGORIES = devel @@ -6,7 +6,7 @@ CATEGORIES = devel GH_ACCOUNT = ocaml-community GH_PROJECT = cppo GH_TAGNAME = v1.6.6 -REVISION = 1 +REVISION = 2 PKGNAME = ocaml-${DISTNAME} # 3-clause BSD diff --git a/devel/ocaml-easy-format/Makefile b/devel/ocaml-easy-format/Makefile index 769af612f2d..168eb5dc93e 100644 --- a/devel/ocaml-easy-format/Makefile +++ b/devel/ocaml-easy-format/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.5 2020/06/09 17:34:13 chrisz Exp $ COMMENT = interface to the OCaml stdlib Format module CATEGORIES = devel @@ -6,7 +6,7 @@ CATEGORIES = devel GH_ACCOUNT = mjambon GH_PROJECT = easy-format GH_TAGNAME = v1.3.1 -REVISION = 1 +REVISION = 2 PKGNAME = ocaml-${DISTNAME} # 3-clause BSD diff --git a/devel/ocaml-graph/Makefile b/devel/ocaml-graph/Makefile index f98a5d70952..a3df6502e2f 100644 --- a/devel/ocaml-graph/Makefile +++ b/devel/ocaml-graph/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.11 2020/06/09 17:34:13 chrisz Exp $ COMMENT = OCaml graph library CATEGORIES = devel V = 1.8.8 -REVISION = 1 +REVISION = 2 DISTNAME = ocamlgraph-${V} PKGNAME = ocaml-graph-${V} MASTER_SITES = http://ocamlgraph.lri.fr/download/ diff --git a/devel/ocaml-menhir/Makefile b/devel/ocaml-menhir/Makefile index 6b222cb7cd0..1b412485fba 100644 --- a/devel/ocaml-menhir/Makefile +++ b/devel/ocaml-menhir/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.20 2020/03/10 03:31:45 daniel Exp $ +# $OpenBSD: Makefile,v 1.21 2020/06/09 17:34:13 chrisz Exp $ COMMENT = OCaml parser generator for LR(1) grammars V = 20190924 DISTNAME = menhir-${V} PKGNAME = ocaml-${DISTNAME} -REVISION = 0 +REVISION = 1 MASTER_SITES = https://gitlab.inria.fr/fpottier/menhir/-/archive/${V}/ diff --git a/devel/ocaml-ocamlbuild/Makefile b/devel/ocaml-ocamlbuild/Makefile index 8af62c58ad1..47eac91334d 100644 --- a/devel/ocaml-ocamlbuild/Makefile +++ b/devel/ocaml-ocamlbuild/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2020/02/14 11:11:33 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2020/06/09 17:34:13 chrisz Exp $ COMMENT = ocamlbuild CATEGORIES = devel @@ -6,7 +6,7 @@ CATEGORIES = devel GH_ACCOUNT = ocaml GH_PROJECT = ocamlbuild GH_TAGNAME = 0.14.0 -REVISION = 1 +REVISION = 2 # LGPLv2.1+ PERMIT_PACKAGE = Yes diff --git a/devel/ocaml-ocamlbuild/pkg/PLIST b/devel/ocaml-ocamlbuild/pkg/PLIST index 3349092cdb6..98ef0e4bdd3 100644 --- a/devel/ocaml-ocamlbuild/pkg/PLIST +++ b/devel/ocaml-ocamlbuild/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2019/03/04 12:51:13 chrisz Exp $ +@comment $OpenBSD: PLIST,v 1.3 2020/06/09 17:34:13 chrisz Exp $ %%native%% @bin bin/ocamlbuild bin/ocamlbuild.byte @@ -6,9 +6,12 @@ lib/ocaml/ocamlbuild/ lib/ocaml/ocamlbuild/META lib/ocaml/ocamlbuild/ocamlbuild.cmo lib/ocaml/ocamlbuild/ocamlbuild_executor.cmi +lib/ocaml/ocamlbuild/ocamlbuild_executor.cmo lib/ocaml/ocamlbuild/ocamlbuild_pack.cmi lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmi +lib/ocaml/ocamlbuild/ocamlbuild_plugin.cmo lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmi +lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.cmo lib/ocaml/ocamlbuild/ocamlbuildlib.cma lib/ocaml/ocamlbuild/signatures.cmi lib/ocaml/ocamlbuild/signatures.cmti diff --git a/devel/ocaml-parmap/Makefile b/devel/ocaml-parmap/Makefile index 543538a96fc..a8cef3476ff 100644 --- a/devel/ocaml-parmap/Makefile +++ b/devel/ocaml-parmap/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.12 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.13 2020/06/09 17:34:13 chrisz Exp $ COMMENT = OCaml parallel map primitive for multicores CATEGORIES = devel V = 1.0-rc10 -REVISION = 1 +REVISION = 2 NAME = ocaml-parmap DISTNAME = ocaml-parmap-$V DISTFILES = ${DISTNAME}{$V}.tar.gz diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile index 4a6a25e22b4..5f069c7be3b 100644 --- a/devel/ocaml-pcre/Makefile +++ b/devel/ocaml-pcre/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.17 2020/06/09 17:34:14 chrisz Exp $ COMMENT = OCaml Perl-compatible regexp library CATEGORIES = devel textproc @@ -9,7 +9,7 @@ DISTNAME = pcre-ocaml-$V PKGNAME = ${NAME}-$V MASTER_SITES = https://github.com/mmottl/pcre-ocaml/releases/download/v${V}/ HOMEPAGE = https://github.com/mmottl/pcre-ocaml -REVISION = 2 +REVISION = 3 # GPLv2+ PERMIT_PACKAGE = Yes diff --git a/devel/ocaml-yojson/Makefile b/devel/ocaml-yojson/Makefile index 103b229e938..4d3c038c2fd 100644 --- a/devel/ocaml-yojson/Makefile +++ b/devel/ocaml-yojson/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.6 2020/06/09 17:34:14 chrisz Exp $ COMMENT = optimized parsing and printing library for the JSON format CATEGORIES = devel @@ -6,7 +6,7 @@ CATEGORIES = devel GH_ACCOUNT = ocaml-community GH_PROJECT = yojson GH_TAGNAME = 1.7.0 -REVISION = 2 +REVISION = 3 PKGNAME = ocaml-${DISTNAME} # 3-clause BSD diff --git a/graphics/ocaml-cairo/Makefile b/graphics/ocaml-cairo/Makefile index 8ffb5c704a9..2fd955a744e 100644 --- a/graphics/ocaml-cairo/Makefile +++ b/graphics/ocaml-cairo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.6 2020/06/09 17:34:14 chrisz Exp $ COMMENT = binding to cairo, a 2D vector graphics library CATEGORIES = graphics @@ -6,7 +6,7 @@ CATEGORIES = graphics GH_ACCOUNT = Chris00 GH_PROJECT = ocaml-cairo GH_TAGNAME = 0.6.1 -REVISION = 1 +REVISION = 2 # LGPL 3.0 PERMIT_PACKAGE = Yes diff --git a/graphics/ocaml-graphics/Makefile b/graphics/ocaml-graphics/Makefile index 944c795b195..41db0ada580 100644 --- a/graphics/ocaml-graphics/Makefile +++ b/graphics/ocaml-graphics/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2019/09/26 09:33:14 chrisz Exp $ +# $OpenBSD: Makefile,v 1.2 2020/06/09 17:34:14 chrisz Exp $ COMMENT = graphics library providing basic drawing primitives CATEGORIES = graphics V = 5.0.0 +REVISION = 0 DISTNAME = graphics-$V PKGNAME = ocaml-graphics-$V diff --git a/graphics/pdfsandwich/Makefile b/graphics/pdfsandwich/Makefile index b7217e02646..9003ac6fef0 100644 --- a/graphics/pdfsandwich/Makefile +++ b/graphics/pdfsandwich/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.8 2020/06/09 17:34:14 chrisz Exp $ # configure looks for ocamlopt ONLY_FOR_ARCHS = ${OCAML_NATIVE_ARCHS} COMMENT = generator for sandwich OCR pdf files DISTNAME = pdfsandwich-0.1.7 -REVISION = 1 +REVISION = 2 CATEGORIES = graphics diff --git a/lang/haxe/Makefile b/lang/haxe/Makefile index 6ca52ac4cf7..2952d4e322b 100644 --- a/lang/haxe/Makefile +++ b/lang/haxe/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2020/02/29 03:00:03 thfr Exp $ +# $OpenBSD: Makefile,v 1.5 2020/06/09 17:34:14 chrisz Exp $ BROKEN = calls to curl(1) and autodetection of CPUs break bulk builds @@ -6,7 +6,7 @@ COMMENT = toolkit for the Haxe programming language V = 4.0.5 DISTNAME = haxe-${V} -REVISION = 0 +REVISION = 1 GH_ACCOUNT = HaxeFoundation GH_PROJECT = haxe diff --git a/lang/ocaml-camlp4/Makefile b/lang/ocaml-camlp4/Makefile index a9469ac9672..2390010f600 100644 --- a/lang/ocaml-camlp4/Makefile +++ b/lang/ocaml-camlp4/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.15 2020/06/03 00:39:53 jca Exp $ +# $OpenBSD: Makefile,v 1.16 2020/06/09 17:34:15 chrisz Exp $ COMMENT = OCaml Preprocessor and Pretty-Printer CATEGORIES = lang -EPOCH = 0 -V = 4.08+1 +V = 4.10+1 GH_ACCOUNT = ocaml GH_PROJECT = camlp4 GH_TAGNAME = ${V} diff --git a/lang/ocaml-camlp4/distinfo b/lang/ocaml-camlp4/distinfo index 4ee7acaa120..485f5b99696 100644 --- a/lang/ocaml-camlp4/distinfo +++ b/lang/ocaml-camlp4/distinfo @@ -1,2 +1,2 @@ -SHA256 (camlp4-4.08+1.tar.gz) = ZVzTvcr7+ENYd/YPS0fdLraf7vWv2IgSke8BuhK9nYg= -SIZE (camlp4-4.08+1.tar.gz) = 649830 +SHA256 (camlp4-4.10+1.tar.gz) = nZsYgQ6DTuEeYnNqaAMTz5DBVR4iwITKK3DGgzju8p4= +SIZE (camlp4-4.10+1.tar.gz) = 650092 diff --git a/lang/ocaml-camlp4/patches/patch-configure b/lang/ocaml-camlp4/patches/patch-configure index 6407eef2544..e69de29bb2d 100644 --- a/lang/ocaml-camlp4/patches/patch-configure +++ b/lang/ocaml-camlp4/patches/patch-configure @@ -1,15 +0,0 @@ -$OpenBSD: patch-configure,v 1.5 2020/06/01 14:20:48 jca Exp $ -camlp4 4.08 seems to work with OCaml 4.09 just fine. - -Index: configure ---- configure.orig -+++ configure -@@ -39,7 +39,7 @@ if [ $major -lt 4 -o \( $major -eq 4 -a $minor -lt 2 \ - echo "The standalone Camlp4 requires OCaml >= 4.02." - echo "For previous versions of OCaml use the Camlp4 distributed with OCaml." - exit 2 --elif [ $major -ne 4 -o $minor -ne 8 ]; then -+elif [ $major -ne 4 -o $minor -ne 9 -a $minor -ne 8 ]; then - echo "This version of Camlp4 is for OCaml 4.07 but you are using OCaml $ocaml_version." - if [ -d .git ] ; then - if [ $PINNED -eq 1 ] ; then diff --git a/lang/ocaml-camlp5/Makefile b/lang/ocaml-camlp5/Makefile index 504c87740bc..4f805e77181 100644 --- a/lang/ocaml-camlp5/Makefile +++ b/lang/ocaml-camlp5/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2020/02/18 22:45:52 daniel Exp $ +# $OpenBSD: Makefile,v 1.9 2020/06/09 17:34:14 chrisz Exp $ V = 7.11 +REVISION = 0 COMMENT = OCaml Preprocessor and Pretty-Printer DISTFILES = camlp5-rel${V}{rel${V:S/.//}}${EXTRACT_SUFX} PKGNAME = ocaml-camlp5-${V} diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 794a69af0fc..b3e85e7267d 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.85 2019/09/26 09:46:11 chrisz Exp $ +# $OpenBSD: Makefile,v 1.86 2020/06/09 17:34:14 chrisz Exp $ COMMENT = ML language with complete class-based objective system # XXX Don't even think of updating ocaml alone. # Do check that the ports that depend on it still work, or repair them. -VERSION= 4.09.0 +VERSION= 4.10.0 PKGNAME = ocaml-${VERSION:C/\+//} @@ -30,6 +30,7 @@ CONFIGURE_STYLE = gnu autoconf no-autoheader CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ CPPFLAGS="${CFLAGS} ${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS += --disable-force-safe-string CFLAGS += -I${LOCALBASE}/include LDFLAGS += -L${LOCALBASE}/lib diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index df0493cecbe..400027fb64a 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -SHA256 (ocaml-4.09-refman-html.tar.gz) = nq+DKl0IrVLLIK+47NOKW+/uTlmKKSbnTkjsbjnjvQk= -SHA256 (ocaml-4.09.0.tar.gz) = K3KPig6Q2hTyL9wEZg8qszgZzbsSv/DOrj/bsBM896Y= -SIZE (ocaml-4.09-refman-html.tar.gz) = 1682948 -SIZE (ocaml-4.09.0.tar.gz) = 4829882 +SHA256 (ocaml-4.10-refman-html.tar.gz) = /r+sdsa1SDErm5CodiPVv/fiAAhigelOKfdMQeGOn+0= +SHA256 (ocaml-4.10.0.tar.gz) = WNQx3eZvV1Dr6bFdWhxIcvgNKD3sI0SGibDRpJi35Mc= +SIZE (ocaml-4.10-refman-html.tar.gz) = 1737359 +SIZE (ocaml-4.10.0.tar.gz) = 4922813 diff --git a/lang/ocaml/patches/patch-configure_ac b/lang/ocaml/patches/patch-configure_ac index 7cfeaece17d..2012aa78018 100644 --- a/lang/ocaml/patches/patch-configure_ac +++ b/lang/ocaml/patches/patch-configure_ac @@ -1,9 +1,9 @@ -$OpenBSD: patch-configure_ac,v 1.2 2019/09/26 09:46:11 chrisz Exp $ +$OpenBSD: patch-configure_ac,v 1.3 2020/06/09 17:34:14 chrisz Exp $ Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -640,6 +640,11 @@ AS_CASE([$CC,$host], +@@ -681,6 +681,11 @@ AS_CASE([$CC,$host], ) @@ -15,7 +15,7 @@ Index: configure.ac ## Program to use to install files AC_PROG_INSTALL -@@ -756,8 +761,8 @@ AS_IF([test x"$enable_shared" != "xno"], +@@ -797,8 +802,8 @@ AS_IF([test x"$enable_shared" != "xno"], [[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\ |*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]], [sharedlib_cflags="-fPIC" @@ -25,60 +25,3 @@ Index: configure.ac rpath="-Wl,-rpath," mksharedlibrpath="-Wl,-rpath," natdynlinkopts="-Wl,-E" -@@ -1438,27 +1443,39 @@ AS_IF([test x"$enable_systhreads" = "xno"], - ## libbfd - - AC_CHECK_HEADER([bfd.h], -- [libbfd_ling="" -- AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd"]) -- AS_IF([test -z "$libbfd_link"], -- [AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd -ldl"], [], [-ldl])]) -- AS_IF([test -z "$libbfd_link"], -- [AC_CHECK_LIB([bfd], [bfd_openr], -- [libbfd_link="-lbfd -ldl -liberty"], [], [-ldl -liberty])]) -- AS_IF([test -z "$libbfd_link"], -- [AC_CHECK_LIB([bfd], [bfd_openr], -- [libbfd_link="-lbfd -ldl -liberty -lz"], [], [-ldl -liberty -lz])]) -- AS_IF([test -z "$libbfd_link"], -- [AC_CHECK_LIB([bfd], [bfd_openr], -+ [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ], -+ [unset ac_cv_lib_bfd_bfd_openr -+ AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd"])])] -+ [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ], -+ [unset ac_cv_lib_bfd_bfd_openr -+ AC_CHECK_LIB([bfd], [bfd_openr], [libbfd_link="-lbfd -ldl"], [], [-ldl])])] -+ [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ], -+ [unset ac_cv_lib_bfd_bfd_openr -+ AC_CHECK_LIB([bfd], [bfd_openr], -+ [libbfd_link="-lbfd -liberty -lz"], [], [-liberty -lz])])] -+ [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ], -+ [unset ac_cv_lib_bfd_bfd_openr -+ AC_CHECK_LIB([bfd], [bfd_openr], -+ [libbfd_link="-lbfd -ldl -liberty"], [], [-ldl -liberty])])] -+ [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ], -+ [unset ac_cv_lib_bfd_bfd_openr -+ AC_CHECK_LIB([bfd], [bfd_openr], -+ [libbfd_link="-lbfd -ldl -liberty -lz"], [], [-ldl -liberty -lz])])] -+ [AS_IF([test x"${ac_cv_lib_bfd_bfd_openr}" != "xyes" ], -+ [unset ac_cv_lib_bfd_bfd_openr -+ AC_CHECK_LIB([bfd], [bfd_openr], - [libbfd_link="-lbfd -ldl -liberty -lz -lintl"], [], -- [-ldl -liberty -lz -lintl])]) -- AS_IF([test -n "$libbfd_link"], -- [AC_DEFINE([HAS_LIBBFD])], -+ [-ldl -liberty -lz -lintl])])] -+ [AS_IF( -+ [test x"${ac_cv_lib_bfd_bfd_openr}" = "xyes" ], -+ [libbfd_link="${oc_ldflags} ${libbfd_link}" -+ AC_DEFINE([HAS_LIBBFD])], - [AC_MSG_NOTICE(m4_normalize([ - BFD library not found, 'objinfo' will be unable to display - info on .cmxs files. -- ]))]) -- ]) -+ ]))] -+ )] -+) - - ## Does the assembler support debug prefix map and CFI directives - as_has_debug_prefix_map=false diff --git a/lang/ocaml/pkg/PFRAG.native b/lang/ocaml/pkg/PFRAG.native index 8a11748e568..b506d37047b 100644 --- a/lang/ocaml/pkg/PFRAG.native +++ b/lang/ocaml/pkg/PFRAG.native @@ -1,4 +1,4 @@ -@comment $OpenBSD: PFRAG.native,v 1.17 2019/09/26 09:46:11 chrisz Exp $ +@comment $OpenBSD: PFRAG.native,v 1.18 2020/06/09 17:34:14 chrisz Exp $ %%dynlink%% @bin bin/ocamlc.opt @bin bin/ocamlcp.opt @@ -20,6 +20,18 @@ lib/ocaml/camlinternalFormatBasics.cmx lib/ocaml/camlinternalLazy.cmx lib/ocaml/camlinternalMod.cmx lib/ocaml/camlinternalOO.cmx +lib/ocaml/compiler-libs/closure_middle_end.cmi +lib/ocaml/compiler-libs/closure_middle_end.cmt +lib/ocaml/compiler-libs/closure_middle_end.cmti +lib/ocaml/compiler-libs/closure_middle_end.mli +lib/ocaml/compiler-libs/cmm_helpers.cmi +lib/ocaml/compiler-libs/cmm_helpers.cmt +lib/ocaml/compiler-libs/cmm_helpers.cmti +lib/ocaml/compiler-libs/cmm_helpers.mli +lib/ocaml/compiler-libs/linear.cmi +lib/ocaml/compiler-libs/linear.cmt +lib/ocaml/compiler-libs/linear.cmti +lib/ocaml/compiler-libs/linear.mli lib/ocaml/compiler-libs/CSE.cmi lib/ocaml/compiler-libs/CSE.cmt lib/ocaml/compiler-libs/CSE.cmx @@ -149,6 +161,7 @@ lib/ocaml/compiler-libs/closure_id.cmt lib/ocaml/compiler-libs/closure_id.cmti lib/ocaml/compiler-libs/closure_id.cmx lib/ocaml/compiler-libs/closure_id.mli +lib/ocaml/compiler-libs/closure_middle_end.cmx lib/ocaml/compiler-libs/closure_offsets.cmi lib/ocaml/compiler-libs/closure_offsets.cmt lib/ocaml/compiler-libs/closure_offsets.cmti @@ -165,6 +178,7 @@ lib/ocaml/compiler-libs/cmm.cmt lib/ocaml/compiler-libs/cmm.cmti lib/ocaml/compiler-libs/cmm.cmx lib/ocaml/compiler-libs/cmm.mli +lib/ocaml/compiler-libs/cmm_helpers.cmx lib/ocaml/compiler-libs/cmmgen.cmi lib/ocaml/compiler-libs/cmmgen.cmt lib/ocaml/compiler-libs/cmmgen.cmti @@ -226,6 +240,7 @@ lib/ocaml/compiler-libs/debuginfo.cmx lib/ocaml/compiler-libs/depend.cmx lib/ocaml/compiler-libs/dll.cmx lib/ocaml/compiler-libs/docstrings.cmx +lib/ocaml/compiler-libs/domainstate.cmx lib/ocaml/compiler-libs/effect_analysis.cmi lib/ocaml/compiler-libs/effect_analysis.cmt lib/ocaml/compiler-libs/effect_analysis.cmti @@ -407,6 +422,7 @@ lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmt lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmti lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.cmx lib/ocaml/compiler-libs/lift_let_to_initialize_symbol.mli +lib/ocaml/compiler-libs/linear.cmx lib/ocaml/compiler-libs/linearize.cmi lib/ocaml/compiler-libs/linearize.cmt lib/ocaml/compiler-libs/linearize.cmti @@ -453,6 +469,8 @@ lib/ocaml/compiler-libs/ocamlbytecomp.a lib/ocaml/compiler-libs/ocamlbytecomp.cmxa lib/ocaml/compiler-libs/ocamlcommon.a lib/ocaml/compiler-libs/ocamlcommon.cmxa +lib/ocaml/compiler-libs/ocamlmiddleend.a +lib/ocaml/compiler-libs/ocamlmiddleend.cmxa lib/ocaml/compiler-libs/ocamloptcomp.a lib/ocaml/compiler-libs/ocamloptcomp.cma lib/ocaml/compiler-libs/ocamloptcomp.cmxa @@ -705,6 +723,7 @@ lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmt lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmti lib/ocaml/compiler-libs/traverse_for_exported_symbols.cmx lib/ocaml/compiler-libs/traverse_for_exported_symbols.mli +lib/ocaml/compiler-libs/type_immediacy.cmx lib/ocaml/compiler-libs/typeclass.cmx lib/ocaml/compiler-libs/typecore.cmx lib/ocaml/compiler-libs/typedecl.cmx @@ -776,12 +795,12 @@ lib/ocaml/dynlink_common.cmx lib/ocaml/dynlink_compilerlibs.cmx lib/ocaml/dynlink_platform_intf.cmx lib/ocaml/dynlink_types.cmx -lib/ocaml/libasmrun.a -lib/ocaml/libasmrun_pic.a -lib/ocaml/libasmrun_shared.so -lib/ocaml/libasmrund.a -lib/ocaml/libasmruni.a -lib/ocaml/libthreadsnat.a +@static-lib lib/ocaml/libasmrun.a +@static-lib lib/ocaml/libasmrun_pic.a +@so lib/ocaml/libasmrun_shared.so +@static-lib lib/ocaml/libasmrund.a +@static-lib lib/ocaml/libasmruni.a +@static-lib lib/ocaml/libthreadsnat.a lib/ocaml/ocamldoc/odoc.cmx lib/ocaml/ocamldoc/odoc_analyse.cmx lib/ocaml/ocamldoc/odoc_args.cmx diff --git a/lang/ocaml/pkg/PLIST b/lang/ocaml/pkg/PLIST index e31a7cb10b6..a124af02780 100644 --- a/lang/ocaml/pkg/PLIST +++ b/lang/ocaml/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.26 2019/09/26 09:46:11 chrisz Exp $ +@comment $OpenBSD: PLIST,v 1.27 2020/06/09 17:34:14 chrisz Exp $ @pkgpath lang/ocaml,-main %%native%% bin/ocaml @@ -66,6 +66,9 @@ lib/ocaml/caml/compatibility.h lib/ocaml/caml/config.h lib/ocaml/caml/custom.h lib/ocaml/caml/debugger.h +lib/ocaml/caml/domain.h +lib/ocaml/caml/domain_state.h +lib/ocaml/caml/domain_state.tbl lib/ocaml/caml/dynlink.h lib/ocaml/caml/exec.h lib/ocaml/caml/fail.h @@ -87,6 +90,7 @@ lib/ocaml/caml/m.h lib/ocaml/caml/major_gc.h lib/ocaml/caml/md5.h lib/ocaml/caml/memory.h +lib/ocaml/caml/memprof.h lib/ocaml/caml/minor_gc.h lib/ocaml/caml/misc.h lib/ocaml/caml/mlvalues.h @@ -282,6 +286,10 @@ lib/ocaml/compiler-libs/docstrings.cmi lib/ocaml/compiler-libs/docstrings.cmt lib/ocaml/compiler-libs/docstrings.cmti lib/ocaml/compiler-libs/docstrings.mli +lib/ocaml/compiler-libs/domainstate.cmi +lib/ocaml/compiler-libs/domainstate.cmt +lib/ocaml/compiler-libs/domainstate.cmti +lib/ocaml/compiler-libs/domainstate.mli lib/ocaml/compiler-libs/emitcode.cmi lib/ocaml/compiler-libs/emitcode.cmt lib/ocaml/compiler-libs/emitcode.cmti @@ -387,6 +395,7 @@ lib/ocaml/compiler-libs/numbers.cmti lib/ocaml/compiler-libs/numbers.mli lib/ocaml/compiler-libs/ocamlbytecomp.cma lib/ocaml/compiler-libs/ocamlcommon.cma +lib/ocaml/compiler-libs/ocamlmiddleend.cma lib/ocaml/compiler-libs/ocamltoplevel.cma lib/ocaml/compiler-libs/opcodes.cmi lib/ocaml/compiler-libs/opcodes.cmt @@ -567,6 +576,10 @@ lib/ocaml/compiler-libs/translprim.cmi lib/ocaml/compiler-libs/translprim.cmt lib/ocaml/compiler-libs/translprim.cmti lib/ocaml/compiler-libs/translprim.mli +lib/ocaml/compiler-libs/type_immediacy.cmi +lib/ocaml/compiler-libs/type_immediacy.cmt +lib/ocaml/compiler-libs/type_immediacy.cmti +lib/ocaml/compiler-libs/type_immediacy.mli lib/ocaml/compiler-libs/typeclass.cmi lib/ocaml/compiler-libs/typeclass.cmt lib/ocaml/compiler-libs/typeclass.cmti @@ -660,16 +673,16 @@ lib/ocaml/lazy.mli lib/ocaml/ld.conf lib/ocaml/lexing.ml lib/ocaml/lexing.mli -lib/ocaml/libcamlrun.a -lib/ocaml/libcamlrun_pic.a -lib/ocaml/libcamlrun_shared.so -lib/ocaml/libcamlrund.a -lib/ocaml/libcamlruni.a -lib/ocaml/libcamlstr.a +@static-lib lib/ocaml/libcamlrun.a +@static-lib lib/ocaml/libcamlrun_pic.a +@so lib/ocaml/libcamlrun_shared.so +@static-lib lib/ocaml/libcamlrund.a +@static-lib lib/ocaml/libcamlruni.a +@static-lib lib/ocaml/libcamlstr.a @comment raw_spacetime is not built on all archs @comment lib/ocaml/libraw_spacetime_lib.a -lib/ocaml/libthreads.a -lib/ocaml/libunix.a +@static-lib lib/ocaml/libthreads.a +@static-lib lib/ocaml/libunix.a lib/ocaml/list.ml lib/ocaml/list.mli lib/ocaml/listLabels.ml @@ -963,11 +976,11 @@ lib/ocaml/string.mli lib/ocaml/stringLabels.ml lib/ocaml/stringLabels.mli lib/ocaml/stublibs/ -lib/ocaml/stublibs/dllcamlstr.so +@so lib/ocaml/stublibs/dllcamlstr.so @comment raw_spacetime is not built on all archs @comment lib/ocaml/stublibs/dllraw_spacetime_lib.so -lib/ocaml/stublibs/dllthreads.so -lib/ocaml/stublibs/dllunix.so +@so lib/ocaml/stublibs/dllthreads.so +@so lib/ocaml/stublibs/dllunix.so lib/ocaml/sys.ml lib/ocaml/sys.mli lib/ocaml/threads/ @@ -1127,6 +1140,7 @@ lib/ocaml/weak.mli @man man/man3/Digest.3o @man man/man3/Docstrings.3o @man man/man3/Docstrings.WithMenhir.3o +@man man/man3/Domainstate.3o @man man/man3/Dynlink.3o @man man/man3/Ephemeron.3o @man man/man3/Ephemeron.GenHashTable.3o @@ -1335,6 +1349,10 @@ lib/ocaml/weak.mli @man man/man3/Strongly_connected_components.S.Id.3o @man man/man3/Syntaxerr.3o @man man/man3/Sys.3o +@man man/man3/Sys.Immediate64.3o +@man man/man3/Sys.Immediate64.Immediate.3o +@man man/man3/Sys.Immediate64.Make.3o +@man man/man3/Sys.Immediate64.Non_immediate.3o @man man/man3/Targetint.3o @man man/man3/Terminfo.3o @man man/man3/Thread.3o @@ -1355,6 +1373,10 @@ share/doc/ocaml/LICENSE share/doc/ocaml/html/ share/doc/ocaml/html/advexamples.html share/doc/ocaml/html/afl-fuzz.html +share/doc/ocaml/html/alerts.html +share/doc/ocaml/html/attributes.html +share/doc/ocaml/html/bigarray.html +share/doc/ocaml/html/bindingops.html share/doc/ocaml/html/browser.html share/doc/ocaml/html/classes.html share/doc/ocaml/html/comp.html @@ -1365,14 +1387,26 @@ share/doc/ocaml/html/core.html share/doc/ocaml/html/coreexamples.html share/doc/ocaml/html/debugger.html share/doc/ocaml/html/depend.html +share/doc/ocaml/html/doccomments.html +share/doc/ocaml/html/emptyvariants.html share/doc/ocaml/html/expr.html +share/doc/ocaml/html/extensiblevariants.html +share/doc/ocaml/html/extensionnodes.html +share/doc/ocaml/html/extensionsyntax.html share/doc/ocaml/html/extn.html +share/doc/ocaml/html/firstclassmodules.html share/doc/ocaml/html/flambda.html share/doc/ocaml/html/foreword.html +share/doc/ocaml/html/gadts.html +share/doc/ocaml/html/generalizedopens.html +share/doc/ocaml/html/generativefunctors.html share/doc/ocaml/html/index.html +share/doc/ocaml/html/indexops.html +share/doc/ocaml/html/inlinerecords.html share/doc/ocaml/html/intfc.html share/doc/ocaml/html/lablexamples.html share/doc/ocaml/html/language.html +share/doc/ocaml/html/letrecvalues.html share/doc/ocaml/html/lex.html share/doc/ocaml/html/lexyacc.html share/doc/ocaml/html/libbigarray.html @@ -1557,6 +1591,10 @@ share/doc/ocaml/html/libref/Str.html share/doc/ocaml/html/libref/Stream.html share/doc/ocaml/html/libref/String.html share/doc/ocaml/html/libref/StringLabels.html +share/doc/ocaml/html/libref/Sys.Immediate64.Immediate.html +share/doc/ocaml/html/libref/Sys.Immediate64.Make.html +share/doc/ocaml/html/libref/Sys.Immediate64.Non_immediate.html +share/doc/ocaml/html/libref/Sys.Immediate64.html share/doc/ocaml/html/libref/Sys.html share/doc/ocaml/html/libref/Thread.html share/doc/ocaml/html/libref/ThreadUnix.html @@ -1757,6 +1795,10 @@ share/doc/ocaml/html/libref/type_Str.html share/doc/ocaml/html/libref/type_Stream.html share/doc/ocaml/html/libref/type_String.html share/doc/ocaml/html/libref/type_StringLabels.html +share/doc/ocaml/html/libref/type_Sys.Immediate64.Immediate.html +share/doc/ocaml/html/libref/type_Sys.Immediate64.Make.html +share/doc/ocaml/html/libref/type_Sys.Immediate64.Non_immediate.html +share/doc/ocaml/html/libref/type_Sys.Immediate64.html share/doc/ocaml/html/libref/type_Sys.html share/doc/ocaml/html/libref/type_Thread.html share/doc/ocaml/html/libref/type_ThreadUnix.html @@ -1772,49 +1814,32 @@ share/doc/ocaml/html/libref/type_Weak.html share/doc/ocaml/html/libstr.html share/doc/ocaml/html/libthreads.html share/doc/ocaml/html/libunix.html +share/doc/ocaml/html/locallyabstract.html share/doc/ocaml/html/manual.css share/doc/ocaml/html/manual.html share/doc/ocaml/html/manual001.html -share/doc/ocaml/html/manual023.html share/doc/ocaml/html/manual024.html -share/doc/ocaml/html/manual025.html -share/doc/ocaml/html/manual026.html -share/doc/ocaml/html/manual027.html -share/doc/ocaml/html/manual028.html -share/doc/ocaml/html/manual029.html -share/doc/ocaml/html/manual030.html -share/doc/ocaml/html/manual031.html -share/doc/ocaml/html/manual032.html -share/doc/ocaml/html/manual033.html -share/doc/ocaml/html/manual034.html -share/doc/ocaml/html/manual035.html -share/doc/ocaml/html/manual036.html -share/doc/ocaml/html/manual037.html -share/doc/ocaml/html/manual038.html -share/doc/ocaml/html/manual039.html -share/doc/ocaml/html/manual040.html -share/doc/ocaml/html/manual041.html -share/doc/ocaml/html/manual042.html -share/doc/ocaml/html/manual043.html -share/doc/ocaml/html/manual044.html -share/doc/ocaml/html/manual045.html -share/doc/ocaml/html/manual046.html -share/doc/ocaml/html/manual057.html -share/doc/ocaml/html/manual072.html +share/doc/ocaml/html/manual056.html +share/doc/ocaml/html/manual071.html share/doc/ocaml/html/modtypes.html +share/doc/ocaml/html/modulealias.html share/doc/ocaml/html/moduleexamples.html share/doc/ocaml/html/modules.html +share/doc/ocaml/html/moduletypeof.html share/doc/ocaml/html/names.html share/doc/ocaml/html/native.html share/doc/ocaml/html/next_motif.gif share/doc/ocaml/html/objectexamples.html share/doc/ocaml/html/ocamldoc.html +share/doc/ocaml/html/overridingopen.html share/doc/ocaml/html/parsing.html share/doc/ocaml/html/patterns.html share/doc/ocaml/html/polymorphism.html share/doc/ocaml/html/previous_motif.gif +share/doc/ocaml/html/privatetypes.html share/doc/ocaml/html/profil.html share/doc/ocaml/html/runtime.html +share/doc/ocaml/html/signaturesubstitution.html share/doc/ocaml/html/spacetime.html share/doc/ocaml/html/stdlib.html share/doc/ocaml/html/toplevel.html diff --git a/math/ocaml-num/Makefile b/math/ocaml-num/Makefile index 4a4856e5502..58e0fc39f7a 100644 --- a/math/ocaml-num/Makefile +++ b/math/ocaml-num/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.6 2020/06/09 17:34:14 chrisz Exp $ COMMENT = library for arithmetic on big integers and rationals CATEGORIES = math V = 1.1 -REVISION = 1 +REVISION = 2 GH_ACCOUNT = ocaml GH_PROJECT = num #GH_TAGNAME = v${V} diff --git a/math/ocaml-zarith/Makefile b/math/ocaml-zarith/Makefile index 17d04bafc09..5ad3628eb29 100644 --- a/math/ocaml-zarith/Makefile +++ b/math/ocaml-zarith/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.7 2020/06/09 17:34:14 chrisz Exp $ COMMENT = arbitrary precision integer and rational arithmetic CATEGORIES = math @@ -9,7 +9,7 @@ GH_PROJECT = Zarith GH_TAGNAME = release-${V} DISTNAME = ${GH_PROJECT}-${V} PKGNAME = ocaml-zarith-${V} -REVISION = 2 +REVISION = 3 HOMEPAGE = https://github.com/ocaml/num/ MAINTAINER = Christopher Zimmermann diff --git a/net/mldonkey/Makefile b/net/mldonkey/Makefile index 69421958b62..8fd17bbf56c 100644 --- a/net/mldonkey/Makefile +++ b/net/mldonkey/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.35 2019/11/09 12:19:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.36 2020/06/09 17:34:14 chrisz Exp $ COMMENT = e-donkey client VER = 3.1.6 DISTNAME = mldonkey-${VER} -REVISION = 7 +REVISION = 8 CATEGORIES = net HOMEPAGE = http://mldonkey.sourceforge.net/Main_Page diff --git a/net/unison/2.4x/Makefile b/net/unison/2.4x/Makefile index 3b1d1f02518..f20fcf9969e 100644 --- a/net/unison/2.4x/Makefile +++ b/net/unison/2.4x/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.10 2020/06/09 17:34:14 chrisz Exp $ VER= 2.48.15 REV= v4 -REVISION= 2 +REVISION= 3 GH_TAGNAME= v${VER}${REV} PKGNAME= unison-${VER}${REV:S/^v/pl/} diff --git a/net/unison/2.5x/Makefile b/net/unison/2.5x/Makefile index f10a140566f..d1ceec4e81c 100644 --- a/net/unison/2.5x/Makefile +++ b/net/unison/2.5x/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.7 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.8 2020/06/09 17:34:14 chrisz Exp $ GH_TAGNAME= v2.51.2 -REVISION= 4 +REVISION= 5 WRKDIST= ${WRKDIR}/${PKGNAME}/src diff --git a/sysutils/findlib/Makefile b/sysutils/findlib/Makefile index 5d1ddab3e19..abfc28dff26 100644 --- a/sysutils/findlib/Makefile +++ b/sysutils/findlib/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.39 2019/09/26 09:46:11 chrisz Exp $ +# $OpenBSD: Makefile,v 1.40 2020/06/09 17:34:14 chrisz Exp $ COMMENT= OCaml package manager CATEGORIES= sysutils DISTNAME= findlib-1.8.1 -REVISION= 1 +REVISION= 2 MASTER_SITES= http://download.camlcity.org/download/ diff --git a/textproc/bibtex2html/Makefile b/textproc/bibtex2html/Makefile index b63d53bddff..17ca449b15c 100644 --- a/textproc/bibtex2html/Makefile +++ b/textproc/bibtex2html/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2019/09/18 17:49:37 chrisz Exp $ +# $OpenBSD: Makefile,v 1.7 2020/06/09 17:34:14 chrisz Exp $ COMMENT = collection of tools for translating from BibTeX to HTML DISTNAME = bibtex2html-1.99 -REVISION = 1 +REVISION = 2 CATEGORIES = textproc HOMEPAGE = https://www.lri.fr/~filliatr/bibtex2html/ diff --git a/textproc/hevea/Makefile b/textproc/hevea/Makefile index 9f6b54630d3..ee70a86fdcc 100644 --- a/textproc/hevea/Makefile +++ b/textproc/hevea/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2019/09/26 09:46:10 chrisz Exp $ +# $OpenBSD: Makefile,v 1.31 2020/06/09 17:34:15 chrisz Exp $ COMMENT= LaTeX to html translator @@ -9,7 +9,7 @@ PERMIT_PACKAGE= Yes WANTLIB= c m pthread DISTNAME = hevea-2.32 -REVISION = 1 +REVISION = 2 MASTER_SITES = http://para.inria.fr/~maranget/hevea/distri/ \ https://spacehopper.org/mirrors/ diff --git a/x11/kde-applications/kalzium/Makefile b/x11/kde-applications/kalzium/Makefile index 6e76fffdab5..70c8a008bd2 100644 --- a/x11/kde-applications/kalzium/Makefile +++ b/x11/kde-applications/kalzium/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.10 2020/06/05 05:40:24 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.11 2020/06/09 17:34:15 chrisz Exp $ COMMENT = periodic table of elements DISTNAME = kalzium-${VERSION} +REVISION = 0 CATEGORIES = education math REVISION = 1