sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update OCaml to version 4.05.0 (this is the last version where strings

Browse source 
are unsafe by default, which is the main motivation why it was picked,
but not the very latest one) and synchronize the rest of the stack and
dependent ports with it, particularly:

  - Update `devel/ocaml-ocamlbuild' to version 0.14.0 and unbreak,
    register build dependency on all ports that require it (should
    be part of USE_OCAML, but we do not want to make any Mk-related
    changes the for time being)
  - Update `devel/ocaml-camlp4' to version 4.05+2
  - Update `devel/ocaml-camlp5' to version 7.07 (the project had
    moved to GitHub)
  - Mark `devel/ocaml-deriving-ocsigen' as BROKEN for now, it is
    very outdated and requires quite a lot of work
  - Update `x11-toolkits/ocaml-labltk' to version 8.06.3

PR:		218333
Exp-run by:	antoine
This commit is contained in:
Alexey Dokuchaev 2019-06-24 10:14:57 +00:00
parent cbe8c05f72
commit b51d447684
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=505020
55 changed files with 1209 additions and 236 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
converters/ocaml-base64/Makefile
View file

@ -10,6 +10,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Base64 encoding and decoding in OCaml COMMENT= Base64 encoding and decoding in OCaml
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= mirage GH_ACCOUNT= mirage
GH_PROJECT= ocaml-base64 GH_PROJECT= ocaml-base64

1
converters/ocaml-jsonm/Makefile
View file

@ -13,6 +13,7 @@ COMMENT= Non-blocking streaming JSON codec for OCaml
LICENSE= BSD3CLAUSE LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf BUILD_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf
BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
RUN_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf RUN_DEPENDS= ${SA_DIR}/uutf/uutf.a:devel/ocaml-uutf
USES= tar:tbz USES= tar:tbz

2
databases/ocaml-sqlite3/Makefile
View file

@ -15,6 +15,8 @@ LICENSE_NAME= OCaml-SQLite3 unique permissive license
LICENSE_FILE= ${WRKSRC}/COPYING.txt LICENSE_FILE= ${WRKSRC}/COPYING.txt
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USES= compiler:features gmake pkgconfig sqlite USES= compiler:features gmake pkgconfig sqlite
USE_OCAML= yes USE_OCAML= yes
USE_OCAML_FINDLIB= yes USE_OCAML_FINDLIB= yes

1
devel/aifad/Makefile
View file

@ -13,6 +13,7 @@ LICENSE= LGPL21+
BUILD_DEPENDS= menhir:devel/menhir \ BUILD_DEPENDS= menhir:devel/menhir \
ocaml-cfg>0:devel/ocaml-cfg \ ocaml-cfg>0:devel/ocaml-cfg \
ocamlbuild:devel/ocaml-ocamlbuild \
ocaml-pcre>0:devel/ocaml-pcre \ ocaml-pcre>0:devel/ocaml-pcre \
ocaml-res>0:devel/ocaml-res ocaml-res>0:devel/ocaml-res
LIB_DEPENDS= libpcre.so:devel/pcre LIB_DEPENDS= libpcre.so:devel/pcre

2
devel/cil/Makefile
View file

@ -15,6 +15,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
CONFLICTS= ccured-[0-9]* CONFLICTS= ccured-[0-9]*
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS= i386 amd64
USES= gmake perl5 USES= gmake perl5
USE_OCAML= yes USE_OCAML= yes

2
devel/menhir/Makefile
View file

@ -12,6 +12,8 @@ COMMENT= LR(1) parser generator for OCaml
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USES= gmake shebangfix USES= gmake shebangfix
USE_OCAML= yes USE_OCAML= yes
USE_OCAML_FINDLIB= yes USE_OCAML_FINDLIB= yes

1
devel/ocaml-camljava/Makefile
View file

@ -23,6 +23,7 @@ post-patch:
-e "s,^\(CC=\).*,#\&,g" \ -e "s,^\(CC=\).*,#\&,g" \
-e "s,i386,${ARCH},g" \ -e "s,i386,${ARCH},g" \
${WRKSRC}/Makefile.config ${WRKSRC}/Makefile.config
@${REINPLACE_CMD} -e 's,(int64,&_t,' ${WRKSRC}/lib/jnistubs.c
test: test:
@${ECHO_CMD} "Testing IDL library" @${ECHO_CMD} "Testing IDL library"

7
devel/ocaml-camlp4/Makefile
View file

@ -2,16 +2,17 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= camlp4 PORTNAME= camlp4
PORTVERSION= 4.02.1+1 PORTVERSION= 4.05+2
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
PKGNAMEPREFIX= ocaml- PKGNAMEPREFIX= ocaml-
MAINTAINER= michipili@gmail.com MAINTAINER= michipili@gmail.com
COMMENT= Camlp4 is a system for writing extensible parsers for OCaml COMMENT= System for writing extensible parsers for OCaml
LICENSE= LGPL20 LICENSE= LGPL20
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= ocaml GH_ACCOUNT= ocaml

6
devel/ocaml-camlp4/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1464772487 TIMESTAMP = 1533176554
SHA256 (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 06ec2c075a3960a757ba133bba468f06622624f9a44e18e3de7d609fa06f62d2 SHA256 (ocaml-camlp4-4.05+2_GH0.tar.gz) = db242c0f4896ddd9dc7d6e8064cba8bf099fb9a4d4f5ed35120978501cd3a935
SIZE (ocaml-camlp4-4.02.1+1_GH0.tar.gz) = 645754 SIZE (ocaml-camlp4-4.05+2_GH0.tar.gz) = 647609

15
devel/ocaml-camlp4/files/patch-Makefile
View file

@ -1,18 +1,11 @@
--- Makefile.orig 2014-10-21 11:41:15 UTC --- Makefile.orig 2017-10-11 20:17:38 UTC
+++ Makefile +++ Makefile
@@ -19,12 +19,12 @@ all: byte native @@ -21,7 +21,7 @@ all: byte native
.PHONY: install .PHONY: install
install: install:
- ./build/install.sh - env DESTDIR=$(DESTDIR) sh ./build/install.sh
+ env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) ./build/install.sh + env LIBDIR=$(LIBDIR) BINDIR=$(BINDIR) DESTDIR=$(DESTDIR) sh ./build/install.sh
.PHONY: install-META .PHONY: install-META
install-META: camlp4/META install-META: camlp4/META
- mkdir -p ${PKGDIR}/camlp4/
- cp -f camlp4/META ${PKGDIR}/camlp4/
+ mkdir -p ${DESTDIR}${PKGDIR}/camlp4/
+ cp -f camlp4/META ${DESTDIR}${PKGDIR}/camlp4/
camlp4/META: camlp4/META.in
sed -e s/@@VERSION@@/${version}/g $? > $@

13
devel/ocaml-camlp4/files/patch-build_install.sh
View file

@ -1,13 +0,0 @@
--- build/install.sh.orig 2014-10-21 11:41:15 UTC
+++ build/install.sh
@@ -26,8 +26,8 @@ SAVED_LIBDIR="${LIBDIR}"
. ./config.sh
-BINDIR="${SAVED_BINDIR:-${BINDIR}}"
-LIBDIR="${SAVED_LIBDIR:-${LIBDIR}}"
+BINDIR="${DESTDIR}${SAVED_BINDIR:-${BINDIR}}"
+LIBDIR="${DESTDIR}${SAVED_LIBDIR:-${LIBDIR}}"
not_installed=$PWD/_build/not_installed

7
devel/ocaml-camlp5/Makefile
View file

@ -2,11 +2,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= camlp5 PORTNAME= camlp5
PORTVERSION= 6.16 PORTVERSION= 7.07
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/ \
http://cristal.inria.fr/~ddr/camlp5/distrib/src/ \
http://pauillac.inria.fr/~ddr/camlp5/distrib/src/
PKGNAMEPREFIX= ocaml- PKGNAMEPREFIX= ocaml-
DIST_SUBDIR= ${PKGBASE} DIST_SUBDIR= ${PKGBASE}
@ -19,6 +16,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
USES= tar:tgz USES= tar:tgz
USE_GITHUB= yes
GH_TAGNAME= rel${PORTVERSION:S/.//}
USE_OCAML= yes USE_OCAML= yes
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix ${PREFIX} CONFIGURE_ARGS= --prefix ${PREFIX}

5
devel/ocaml-camlp5/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (ocaml-camlp5/camlp5-6.16.tgz) = fd446cff6421f5144a521c7cecfdc7217b1424908186cddd3d5be543b35058b1 TIMESTAMP = 1539160056
SIZE (ocaml-camlp5/camlp5-6.16.tgz) = 759877 SHA256 (ocaml-camlp5/camlp5-camlp5-7.07-rel707_GH0.tar.gz) = a2c493b833b217adf94d2000eb19015b990c4e441beb35cf36b1d33ed2351991
SIZE (ocaml-camlp5/camlp5-camlp5-7.07-rel707_GH0.tar.gz) = 813500

2
devel/ocaml-camlp5/pkg-plist
View file

@ -8,6 +8,8 @@ bin/mkcamlp5
bin/mkcamlp5.opt bin/mkcamlp5.opt
bin/ocpp5 bin/ocpp5
lib/ocaml/camlp5/META lib/ocaml/camlp5/META
lib/ocaml/camlp5/ast2pt.cmi
lib/ocaml/camlp5/ast2pt.mli
lib/ocaml/camlp5/camlp5.a lib/ocaml/camlp5/camlp5.a
lib/ocaml/camlp5/camlp5.cma lib/ocaml/camlp5/camlp5.cma
lib/ocaml/camlp5/camlp5.cmxa lib/ocaml/camlp5/camlp5.cmxa

1
devel/ocaml-cfg/Makefile
View file

@ -14,6 +14,7 @@ LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.txt LICENSE_FILE= ${WRKSRC}/COPYING.txt
BUILD_DEPENDS= menhir:devel/menhir BUILD_DEPENDS= menhir:devel/menhir
BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= mmottl GH_ACCOUNT= mmottl

2
devel/ocaml-cmdliner/Makefile
View file

@ -11,6 +11,8 @@ COMMENT= OCaml module for handling of command line interfaces
LICENSE= BSD3CLAUSE LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USES= tar:tbz USES= tar:tbz
USE_OCAML= yes USE_OCAML= yes
USE_OCAML_FINDLIB= yes USE_OCAML_FINDLIB= yes

2
devel/ocaml-deriving-ocsigen/Makefile
View file

@ -11,6 +11,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Function derivation library COMMENT= Function derivation library
BROKEN= old version, incompatible with modern OCaml
LICENSE= MIT LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING

8
devel/ocaml-findlib/Makefile
View file

@ -36,12 +36,18 @@ TOOLBOX_CONFIGURE_ON= -with-toolbox
TOOLBOX_RUN_DEPENDS= labltk:x11-toolkits/ocaml-labltk TOOLBOX_RUN_DEPENDS= labltk:x11-toolkits/ocaml-labltk
TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS} TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS}
.include <bsd.port.pre.mk>
post-install: post-install:
cd ${STAGEDIR}${PREFIX} && \ cd ${STAGEDIR}${PREFIX} && \
${STRIP_CMD} bin/ocamlfind \ ${STRIP_CMD} bin/ocamlfind \
${OCAML_SITELIBDIR}/findlib/findlib.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \
${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \
${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs
# Spacetime profiling is only available for native code on 64-bit targets
.if ${ARCH} == i386 || ${ARCH} == powerpc
@${REINPLACE_CMD} -e '/raw_spacetime/d' ${TMPPLIST}
.endif
post-install-TOOLBOX-on: post-install-TOOLBOX-on:
${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \ ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \
@ -52,4 +58,4 @@ post-install-DOCS-on:
cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \ cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
"! -regex .*ref-man.*" "! -regex .*ref-man.*"
.include <bsd.port.mk> .include <bsd.port.post.mk>

2
devel/ocaml-findlib/pkg-plist
View file

@ -40,8 +40,8 @@ bin/safe_camlp4
%%OCAML_SITELIBDIR%%/num-top/num_top.cmi %%OCAML_SITELIBDIR%%/num-top/num_top.cmi
%%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi %%OCAML_SITELIBDIR%%/num-top/num_top_printers.cmi
%%OCAML_SITELIBDIR%%/num/META %%OCAML_SITELIBDIR%%/num/META
%%OCAML_SITELIBDIR%%/ocamlbuild/META
%%OCAML_SITELIBDIR%%/ocamldoc/META %%OCAML_SITELIBDIR%%/ocamldoc/META
%%OCAML_SITELIBDIR%%/raw_spacetime/META
%%OCAML_SITELIBDIR%%/stdlib/META %%OCAML_SITELIBDIR%%/stdlib/META
%%OCAML_SITELIBDIR%%/str/META %%OCAML_SITELIBDIR%%/str/META
%%OCAML_SITELIBDIR%%/threads/META %%OCAML_SITELIBDIR%%/threads/META

1
devel/ocaml-ipaddr/Makefile
View file

@ -9,6 +9,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= OCaml library for manipulation of IP address representations COMMENT= OCaml library for manipulation of IP address representations
BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib
BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib RUN_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/sexplib/sexplib.a:devel/ocaml-sexplib
USE_GITHUB= yes USE_GITHUB= yes

2
devel/ocaml-lacaml/Makefile
View file

@ -14,6 +14,8 @@ COMMENT= OCaml interface to BLAS and LAPACK libraries
LICENSE= LGPL21 LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.txt LICENSE_FILE= ${WRKSRC}/COPYING.txt
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USE_OCAML= yes USE_OCAML= yes
USE_OCAML_FINDLIB=yes USE_OCAML_FINDLIB=yes
USE_OCAMLFIND_PLIST=yes USE_OCAMLFIND_PLIST=yes

5
devel/ocaml-lwt/Makefile
View file

@ -13,6 +13,7 @@ LICENSE= LGPL21
BUILD_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \ BUILD_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \
${SA_DIR}/ssl/ssl.a:security/ocaml-ssl ${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
RUN_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \ RUN_DEPENDS= ${SA_DIR}/react/react.a:devel/ocaml-react \
${SA_DIR}/ssl/ssl.a:security/ocaml-ssl ${SA_DIR}/ssl/ssl.a:security/ocaml-ssl
@ -51,6 +52,10 @@ DOCS_RUN_DEPENDS= ${SA_DIR}/text/text.a:textproc/ocaml-text
post-patch: post-patch:
@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \ @${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \
${WRKSRC}/setup.ml ${WRKSRC}/setup.ml
@${REINPLACE_CMD} -e 's,| O_CLOEXEC,& | O_KEEPEXEC, \
; s,else Unix\.socketpair ,&?cloexec:None,' \
${WRKSRC}/src/unix/lwt_unix.ml \
${WRKSRC}/src/unix/lwt_unix.mli
do-configure: do-configure:
cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS} cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS}

6
devel/ocaml-ocamlbuild/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= ocamlbuild PORTNAME= ocamlbuild
PORTVERSION= 0.9.3 PORTVERSION= 0.14.0
CATEGORIES= devel CATEGORIES= devel
PKGNAMEPREFIX= ocaml- PKGNAMEPREFIX= ocaml-
@ -11,8 +11,6 @@ COMMENT= Build tool for OCaml libraries and programs
LICENSE= GPLv2 LICENSE= GPLv2
BROKEN= conflicts with ocaml
USES= gmake USES= gmake
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= ocaml GH_ACCOUNT= ocaml
@ -20,6 +18,4 @@ USE_OCAML= yes
ALL_TARGET= configure all ALL_TARGET= configure all
MAKE_ARGS= CHECK_IF_PREINSTALLED=false # XXX: remove after 4.03.0+
.include <bsd.port.mk> .include <bsd.port.mk>

6
devel/ocaml-ocamlbuild/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1475804532 TIMESTAMP = 1550933160
SHA256 (ocaml-ocamlbuild-0.9.3_GH0.tar.gz) = 32e4824906888c61244909eab0d2c22d31f18fc9579873a070a4cf7947c2c0a9 SHA256 (ocaml-ocamlbuild-0.14.0_GH0.tar.gz) = 87b29ce96958096c0a1a8eeafeb6268077b2d11e1bf2b3de0f5ebc9cf8d42e78
SIZE (ocaml-ocamlbuild-0.9.3_GH0.tar.gz) = 191583 SIZE (ocaml-ocamlbuild-0.14.0_GH0.tar.gz) = 198267

3
devel/ocaml-ocamlbuild/pkg-plist
View file

@ -19,4 +19,7 @@ lib/ocaml/ocamlbuild/ocamlbuild_unix_plugin.o
lib/ocaml/ocamlbuild/ocamlbuildlib.a lib/ocaml/ocamlbuild/ocamlbuildlib.a
lib/ocaml/ocamlbuild/ocamlbuildlib.cma lib/ocaml/ocamlbuild/ocamlbuildlib.cma
lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa lib/ocaml/ocamlbuild/ocamlbuildlib.cmxa
lib/ocaml/ocamlbuild/signatures.cmi
lib/ocaml/ocamlbuild/signatures.cmti
lib/ocaml/ocamlbuild/signatures.mli lib/ocaml/ocamlbuild/signatures.mli
man/man1/ocamlbuild.1.gz

2
devel/ocaml-parmap/Makefile
View file

@ -12,6 +12,8 @@ COMMENT= Minimalistic library allowing to exploit multicore architecture
LICENSE= GPLv2 LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= rdicosmo GH_ACCOUNT= rdicosmo

1
devel/ocaml-pcre/Makefile
View file

@ -13,6 +13,7 @@ COMMENT= Perl compatible regular expressions for Objective Caml
LICENSE= LGPL21 LICENSE= LGPL21
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
LIB_DEPENDS= libpcre.so:devel/pcre LIB_DEPENDS= libpcre.so:devel/pcre
USE_GITHUB= yes USE_GITHUB= yes

2
devel/ocaml-pomap/Makefile
View file

@ -13,6 +13,8 @@ COMMENT= OCaml library to maintain a list of partially ordered elements
LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21 LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.txt LICENSE_FILE= ${WRKSRC}/COPYING.txt
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= mmottl GH_ACCOUNT= mmottl

3
devel/ocaml-ppx-tools/Makefile
View file

@ -3,7 +3,8 @@
PORTNAME= ppx-tools PORTNAME= ppx-tools
PORTVERSION= 5.0 PORTVERSION= 5.0
DISTVERSIONSUFFIX= +4.02.0 PORTREVISION= 1
DISTVERSIONSUFFIX= +4.05.0
CATEGORIES= devel CATEGORIES= devel
PKGNAMEPREFIX= ocaml- PKGNAMEPREFIX= ocaml-

6
devel/ocaml-ppx-tools/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1462286829 TIMESTAMP = 1488115400
SHA256 (ocaml-ppx-ppx_tools-5.0+4.02.0_GH0.tar.gz) = 2c9b80f1755a6155820fc165b603f7184998ec2f097ff2c74169a2f86c264f66 SHA256 (ocaml-ppx-ppx_tools-5.0+4.05.0_GH0.tar.gz) = 031e05e2f98fd77a412cff00f19262e186b0c8a1804fece06d2af05e37a563b7
SIZE (ocaml-ppx-ppx_tools-5.0+4.02.0_GH0.tar.gz) = 17443 SIZE (ocaml-ppx-ppx_tools-5.0+4.05.0_GH0.tar.gz) = 17893

2
devel/ocaml-re/Makefile
View file

@ -12,6 +12,8 @@ COMMENT= Pure OCaml regular expressions
LICENSE= LGPL21 LICENSE= LGPL21
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USES= gmake USES= gmake
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes MAKE_JOBS_UNSAFE= yes

2
devel/ocaml-react/Makefile
View file

@ -12,6 +12,8 @@ COMMENT= OCaml module for functional reactive programming
LICENSE= BSD3CLAUSE LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USES= tar:tbz USES= tar:tbz
USE_OCAML= yes USE_OCAML= yes
OPTIONS_DEFINE= X11 OPTIONS_DEFINE= X11

2
devel/ocaml-res/Makefile
View file

@ -13,6 +13,8 @@ COMMENT= Automatically Resizing Contiguous Memory for OCaml
LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21 LICENSE= LGPL20+ # source says LGPL20+, COPYING says LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING.txt LICENSE_FILE= ${WRKSRC}/COPYING.txt
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USE_OCAML= yes USE_OCAML= yes
USE_OCAML_FINDLIB=yes USE_OCAML_FINDLIB=yes
USE_OCAMLFIND_PLIST=yes USE_OCAMLFIND_PLIST=yes

1
devel/ocaml-sexplib/Makefile
View file

@ -16,6 +16,7 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.txt
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE-Tywith.txt LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE-Tywith.txt
BUILD_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv BUILD_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv
BUILD_DEPENDS+= ocamlbuild:devel/ocaml-ocamlbuild
RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv RUN_DEPENDS= ocaml-type_conv>=0:devel/ocaml-type_conv
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS

46
devel/ocaml-sexplib/files/patch-lib_conv.ml Normal file
View file

@ -0,0 +1,46 @@
From cba80ebe02962504fbe404b1baf484a5000f44b4
From: Jeremie Dimino <jdimino@janestreet.com>
Date: Tue, 12 Jul 2016 17:08:10 +0100
Subject: [PATCH] 114.01+04
--- lib/conv.ml.orig 2016-03-09 15:44:55 UTC
+++ lib/conv.ml
@@ -185,7 +185,7 @@ module Exn_converter = struct
(* [Obj.extension_id] works on both the exception itself, and the extension slot of the
exception. *)
- let rec clean_up_handler (slot : Obj.t) =
+ let rec clean_up_handler (slot : extension_constructor) =
let id = Obj.extension_id slot in
let old_exn_id_map = !exn_id_map in
let new_exn_id_map = Exn_ids.remove id old_exn_id_map in
@@ -196,7 +196,7 @@ module Exn_converter = struct
exn_id_map := new_exn_id_map
let add_auto ?(finalise = true) exn sexp_of_exn =
- let id = Obj.extension_id exn in
+ let id = Obj.extension_id (Obj.extension_constructor exn) in
let rec loop () =
let old_exn_id_map = !exn_id_map in
let new_exn_id_map = Exn_ids.add id sexp_of_exn old_exn_id_map in
@@ -205,13 +205,18 @@ module Exn_converter = struct
loop ()
else begin
exn_id_map := new_exn_id_map;
- if finalise then Gc.finalise clean_up_handler (Obj.extension_slot exn)
+ if finalise then
+ try
+ Gc.finalise clean_up_handler (Obj.extension_constructor exn)
+ with Invalid_argument _ ->
+ (* Pre-allocated extension constructors cannot be finalised *)
+ ()
end
in
loop ()
let find_auto exn =
- let id = Obj.extension_id exn in
+ let id = Obj.extension_id (Obj.extension_constructor exn) in
match Exn_ids.find id !exn_id_map with
| exception Not_found -> None
| sexp_of_exn -> Some (sexp_of_exn exn)

2
devel/ocaml-type_conv/Makefile
View file

@ -13,6 +13,8 @@ COMMENT= Type conversion routines for OCaml
LICENSE= APACHE20 BSD3CLAUSE LICENSE= APACHE20 BSD3CLAUSE
LICENSE_COMB= multi LICENSE_COMB= multi
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS
CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX} CONFIGURE_ARGS= --disable-docs --prefix ${PREFIX}

2
devel/ocaml-ulex/Makefile
View file

@ -11,6 +11,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Lexer generator for Unicode and OCaml COMMENT= Lexer generator for Unicode and OCaml
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USES= gmake USES= gmake
USE_OCAML= true USE_OCAML= true
USE_OCAML_FINDLIB= true USE_OCAML_FINDLIB= true

2
devel/ocaml-uutf/Makefile
View file

@ -12,6 +12,8 @@ COMMENT= Non-blocking streaming Unicode codec for OCaml
LICENSE= BSD3CLAUSE LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USES= tar:tbz USES= tar:tbz
USE_OCAML= yes USE_OCAML= yes

1
lang/ocaml-camlidl/Makefile
View file

@ -35,6 +35,7 @@ post-extract:
@${REINPLACE_CMD} -e \ @${REINPLACE_CMD} -e \
"/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_SCRIPT},g" \ "/^install/,/^$$/s,\([ \t]*\)cp,\1${INSTALL_SCRIPT},g" \
-e 's,$$(OCAMLC),& -warn-error -a,' \
${WRKSRC}/compiler/Makefile ${WRKSRC}/compiler/Makefile
@${REINPLACE_CMD} -e \ @${REINPLACE_CMD} -e \

10
lang/ocaml/Makefile
View file

@ -3,7 +3,7 @@
# for committer: bump PORTREVISION for math/facile whenever ocaml gets updated # for committer: bump PORTREVISION for math/facile whenever ocaml gets updated
PORTNAME= ocaml PORTNAME= ocaml
PORTVERSION= 4.02.3 PORTVERSION= 4.05.0
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \ MASTER_SITES= http://caml.inria.fr/pub/distrib/${DISTNAME:R}/ GENTOO \
http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs http://caml.inria.fr/pub/distrib/${DISTNAME:R}/:docs
@ -118,7 +118,8 @@ post-patch:
-e "\|nativecclinkopts=|s|''|\"${LDFLAGS:C/-Wl,//}\"|" \ -e "\|nativecclinkopts=|s|''|\"${LDFLAGS:C/-Wl,//}\"|" \
${WRKSRC}/configure ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \ @${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \
${WRKSRC}/Makefile ${WRKSRC}/asmrun/Makefile \ ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tools \
${WRKSRC}/asmrun/Makefile \
${WRKSRC}/otherlibs/systhreads/Makefile \ ${WRKSRC}/otherlibs/systhreads/Makefile \
${WRKSRC}/testsuite/makefiles/Makefile.common \ ${WRKSRC}/testsuite/makefiles/Makefile.common \
${WRKSRC}/testsuite/tests/asmcomp/Makefile ${WRKSRC}/testsuite/tests/asmcomp/Makefile
@ -127,7 +128,6 @@ post-configure:
@${REINPLACE_CMD} -E \ @${REINPLACE_CMD} -E \
-e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \ -e '/^PTHREAD_LINK/s,-pthread,${THR_LD},g' \
${WRKSRC}/config/Makefile ${WRKSRC}/config/Makefile
# INSTALL* safeness (which preserves the correct permissions despite # INSTALL* safeness (which preserves the correct permissions despite
# user's umask(1) # user's umask(1)
@${FIND} ${WRKDIR} -type f -name Makefile -print0 | \ @${FIND} ${WRKDIR} -type f -name Makefile -print0 | \
@ -150,5 +150,9 @@ post-install:
${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.ps.gz ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${_DISTDIR}${DOCSDISTNAME}-refman.pdf ${STAGEDIR}${DOCSDIR}
.endif .endif
# Spacetime profiling is only available for native code on 64-bit targets
.if ${ARCH} == i386 || ${ARCH} == powerpc
@${REINPLACE_CMD} -e '/raw_spacetime_lib/d' ${TMPPLIST}
.endif
.include <bsd.port.post.mk> .include <bsd.port.post.mk>

17
lang/ocaml/distinfo
View file

@ -1,8 +1,9 @@
SHA256 (ocaml-4.02.3.tar.xz) = 83c6697e135b599a196fd7936eaf8a53dd6b8f3155a796d18407b56f91df9ce3 TIMESTAMP = 1532851883
SIZE (ocaml-4.02.3.tar.xz) = 2058552 SHA256 (ocaml-4.05.0.tar.xz) = 04a527ba14b4d7d1b2ea7b2ae21aefecfa8d304399db94f35a96df1459e02ef9
SHA256 (ocaml-4.02-refman-html.tar.gz) = 1d3b7e5494c075d86c760f6320acba086d686e7409cb75f8267bccfb6ad5f3a8 SIZE (ocaml-4.05.0.tar.xz) = 2442036
SIZE (ocaml-4.02-refman-html.tar.gz) = 612839 SHA256 (ocaml-4.05-refman-html.tar.gz) = 2524723648dbbc34b42cbe2fe06822b79837299429d26ff037169b568888cd9c
SHA256 (ocaml-4.02-refman.ps.gz) = b14b5aec1e4e1aded2d36e78ceeedfc3c19c3369b257ab507f6a0755651e8f4a SIZE (ocaml-4.05-refman-html.tar.gz) = 882287
SIZE (ocaml-4.02-refman.ps.gz) = 1111960 SHA256 (ocaml-4.05-refman.ps.gz) = 1540f86028a9460313b5ab3e0544e280052577d5dc4966f80647e1f49c5ab8df
SHA256 (ocaml-4.02-refman.pdf) = 5575824bf0c94b07d3c618c378e02ea0d5341b9e319b4e8c5b331d0ff51898d8 SIZE (ocaml-4.05-refman.ps.gz) = 1221553
SIZE (ocaml-4.02-refman.pdf) = 1519190 SHA256 (ocaml-4.05-refman.pdf) = 3d3a82a676668ccf66fa6d88f46a2496c89b1488ee6098585a6b7f22a9171eef
SIZE (ocaml-4.05-refman.pdf) = 1741857

167
lang/ocaml/files/patch-configure
View file

@ -1,62 +1,30 @@
--- configure.orig 2015-05-12 14:46:37 UTC --- configure.orig 2017-07-13 08:56:44 UTC
+++ configure +++ configure
@@ -446,7 +446,7 @@ esac @@ -838,6 +838,7 @@ if test $with_sharedlibs = "yes"; then
# Configure compiler to use in further tests
-cc="$bytecc -O $bytecclinkopts"
+cc="$bytecc $bytecclinkopts"
export cc cclibs verbose
# Check C compiler
@@ -688,9 +688,9 @@ if test $with_sharedlibs = "yes"; then
mksharedlib="$flexlink"
mkmaindll="$flexlink -maindll"
shared_libraries_supported=true;;
- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
+ *-*-linux-gnu|*-*-linux|*-*-dragonfly*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*|*-*-haiku*)
sharedcccompopts="-fPIC"
- mksharedlib="$bytecc -shared"
+ mksharedlib="$bytecc $bytecclinkopts -shared"
bytecclinkopts="$bytecclinkopts -Wl,-E"
byteccrpath="-Wl,-rpath,"
mksharedlibrpath="-Wl,-rpath,"
@@ -790,9 +790,11 @@ if test $with_sharedlibs = "yes"; then
fi;;
x86_64-*-darwin*) natdynlink=true;; x86_64-*-darwin*) natdynlink=true;;
s390x*-*-linux*) natdynlink=true;;
powerpc*-*-linux*) natdynlink=true;; powerpc*-*-linux*) natdynlink=true;;
+ powerpc*-*-freebsd*) natdynlink=true;; + powerpc*-*-freebsd*) natdynlink=true;;
sparc*-*-linux*) natdynlink=true;; sparc*-*-linux*) natdynlink=true;;
i686-*-kfreebsd*) natdynlink=true;; i686-*-kfreebsd*) natdynlink=true;;
x86_64-*-kfreebsd*) natdynlink=true;; x86_64-*-kfreebsd*) natdynlink=true;;
+ x86_64-*-dragonfly*) natdynlink=true;; @@ -854,6 +855,7 @@ if test $with_sharedlibs = "yes"; then
i[3456]86-*-freebsd*) natdynlink=true;;
x86_64-*-freebsd*) natdynlink=true;;
i[3456]86-*-openbsd*) natdynlink=true;;
@@ -804,6 +806,7 @@ if test $with_sharedlibs = "yes"; then
arm*-*-linux*) natdynlink=true;;
arm*-*-freebsd*) natdynlink=true;; arm*-*-freebsd*) natdynlink=true;;
earm*-*-netbsd*) natdynlink=true;;
aarch64-*-linux*) natdynlink=true;; aarch64-*-linux*) natdynlink=true;;
+ aarch64-*-freebsd*) natdynlink=true;; + aarch64-*-freebsd*) natdynlink=true;;
esac esac
fi fi
@@ -844,6 +847,7 @@ case "$target" in @@ -921,6 +923,7 @@ case "$target" in
i[3456]86-*-gnu*) arch=i386; system=gnu;; powerpc*-*-linux*) arch=power;
i[3456]86-*-mingw*) arch=i386; system=mingw;; if $arch64; then model=ppc64; else model=ppc; fi
powerpc*-*-linux*) arch=power; model=ppc; system=elf;; system=elf;;
+ powerpc-*-freebsd*) arch=power; model=ppc; system=bsd_elf;; + powerpc-*-freebsd*) arch=power; model=ppc; system=bsd_elf;;
powerpc-*-netbsd*) arch=power; model=ppc; system=elf;; powerpc-*-netbsd*) arch=power; model=ppc; system=elf;;
powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;; powerpc-*-openbsd*) arch=power; model=ppc; system=bsd_elf;;
powerpc-*-rhapsody*) arch=power; model=ppc; system=rhapsody;; s390x*-*-linux*) arch=s390x; model=z10; system=elf;;
@@ -862,12 +866,14 @@ case "$target" in @@ -946,6 +949,7 @@ case "$target" in
zaurus*-*-openbsd*) arch=arm; system=bsd;;
x86_64-*-linux*) arch=amd64; system=linux;;
x86_64-*-gnu*) arch=amd64; system=gnu;;
+ x86_64-*-dragonfly*) arch=amd64; system=dragonfly;;
x86_64-*-freebsd*) arch=amd64; system=freebsd;;
x86_64-*-netbsd*) arch=amd64; system=netbsd;;
x86_64-*-openbsd*) arch=amd64; system=openbsd;;
x86_64-*-darwin*) arch=amd64; system=macosx;; x86_64-*-darwin*) arch=amd64; system=macosx;;
x86_64-*-mingw*) arch=amd64; system=mingw;; x86_64-*-mingw*) arch=amd64; system=mingw;;
aarch64-*-linux*) arch=arm64; system=linux;; aarch64-*-linux*) arch=arm64; system=linux;;
@ -64,106 +32,25 @@
x86_64-*-cygwin*) arch=amd64; system=cygwin;; x86_64-*-cygwin*) arch=amd64; system=cygwin;;
esac esac
@@ -889,7 +895,7 @@ else @@ -1051,10 +1055,12 @@ case "$arch,$system" in
fi
nativecccompopts=''
-nativecclinkopts=''
+nativecclinkopts=""
# FIXME the naming of nativecclinkopts is broken: these are options for
# ld (for shared libs), not for cc
nativeccrpath="$byteccrpath"
@@ -932,6 +938,8 @@ case "$arch,$system" in
esac;;
arm,freebsd) as="${TOOLPREF}cc -c"
aspp="${TOOLPREF}cc -c";;
+ *,dragonfly) as="${TOOLPREF}as"
+ aspp="${TOOLPREF}cc -c";;
*,freebsd) as="${TOOLPREF}as"
aspp="${TOOLPREF}cc -c";;
amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
@@ -955,9 +963,11 @@ case "$arch,$system" in
case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;; case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
amd64,linux) profiling='prof';; amd64,linux) profiling='true';;
amd64,openbsd) profiling='prof';; amd64,openbsd) profiling='true';;
+ amd64,dragonfly) profiling='prof';; + amd64,dragonfly) profiling='true';;
amd64,freebsd) profiling='prof';; amd64,freebsd) profiling='true';;
amd64,netbsd) profiling='prof';; amd64,netbsd) profiling='true';;
amd64,gnu) profiling='prof';; arm,netbsd) profiling='true';;
+ arm,freebsd) profiling='prof';; amd64,gnu) profiling='true';;
arm,linux*) profiling='prof';; + arm,freebsd) profiling='true';;
power,elf) profiling='prof';; arm,linux*) profiling='true';;
power,bsd*) profiling='prof';; power,elf) profiling='true';;
@@ -1415,6 +1425,8 @@ if test "$pthread_wanted" = "yes"; then power,bsd*) profiling='true';;
case "$target" in @@ -2029,7 +2035,7 @@ MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib
*-*-solaris*) pthread_link="-lpthread -lposix4" #ml Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s"
pthread_caml_link="-cclib -lpthread -cclib -lposix4";; #ml out opts files out;;
+ *-*-dragon*) pthread_link="-pthread"
+ pthread_caml_link="-cclib -pthread";;
*-*-freebsd*) pthread_link="-pthread"
pthread_caml_link="-cclib -pthread";;
*-*-openbsd*) pthread_link="-pthread"
@@ -1431,7 +1443,7 @@ if test "$pthread_wanted" = "yes"; then
bytecccompopts="$bytecccompopts -D_REENTRANT"
nativecccompopts="$nativecccompopts -D_REENTRANT"
case "$target" in
- *-*-freebsd*)
+ *-*-freebsd*|*-*-dragonfly*)
bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
*-*-openbsd*)
@@ -1601,6 +1613,7 @@ if test "$x11_include" = "not found"; then
else
x11_libs="-L$dir"
case "$target" in
+ *-*-freebsd*|*-*-dragonfly*) x11_link="-L$dir -lX11";;
*-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
*-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
*) x11_link="-L$dir -lX11";;
@@ -1644,10 +1657,10 @@ echo "X11_LINK=$x11_link" >> Makefile
# Look for BFD library
if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
- sh ./hasgot -DPACKAGE=ocaml -lbfd -ldl -liberty -lz bfd_openr; then
+ sh ./hasgot -DPACKAGE=ocaml -lbfd $dllib -liberty -lz bfd_openr; then
inf "BFD library found."
echo "#define HAS_LIBBFD" >> s.h
- echo "LIBBFD_LINK=-lbfd -ldl -liberty -lz" >> Makefile
+ echo "LIBBFD_LINK=-lbfd $dllib -liberty -lz" >> Makefile
else
wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files."
echo "LIBBFD_LINK=" >> Makefile
@@ -1686,12 +1699,6 @@ if $no_naked_pointers; then
echo "#define NO_NAKED_POINTERS" >> m.h
fi
-# Add Unix-style optimization flag
-bytecccompopts="-O $bytecccompopts"
-dllcccompopts="-O $dllcccompopts"
-nativecccompopts="-O $nativecccompopts"
-sharedcccompopts="-O $sharedcccompopts"
-
# Final twiddling of compiler options to work around known bugs
nativeccprofopts="$nativecccompopts"
@@ -1701,6 +1708,11 @@ case "$buggycc" in
nativecccompopts="$nativecccompopts -fomit-frame-pointer";;
esac
+# Allow user-defined C compiler flags
+
+bytecccompopts="$bytecccompopts $CFLAGS"
+nativecccompopts="$nativecccompopts $CFLAGS"
+
# Finish generated files
cclibs="$cclibs $mathlib"
@@ -1723,7 +1735,7 @@ SYSLIB=-l\$(1)
MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib \$(1)
#ml let mklib out files opts = Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s" out opts files out;;
EOF EOF
-echo "ARCH=$arch" >> Makefile -echo "ARCH=$arch" >> Makefile
+echo "SYSTEM_ARCH=$arch" >> Makefile +echo "SYSTEM_ARCH=$arch" >> Makefile
echo "MODEL=$model" >> Makefile echo "MODEL=$model" >> Makefile
echo "SYSTEM=$system" >> Makefile echo "SYSTEM=$system" >> Makefile
echo "NATIVECC=$nativecc" >> Makefile echo "NATIVECC=$nativecc $nativecccompopts" >> Makefile

2
lang/ocaml/pkg-descr
View file

@ -16,4 +16,4 @@ of processors. Compilation takes longer and generates bigger code, but
the generated programs deliver excellent performance, while retaining the generated programs deliver excellent performance, while retaining
the moderate memory requirements of the bytecode compiler. the moderate memory requirements of the bytecode compiler.
WWW: http://caml.inria.fr/ocaml/ WWW: http://ocaml.org/

845
lang/ocaml/pkg-plist
View file

File diff suppressed because it is too large Load diff

1
math/facile/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= facile PORTNAME= facile
PORTVERSION= 1.1.3 PORTVERSION= 1.1.3
PORTREVISION= 1
CATEGORIES= math CATEGORIES= math
MASTER_SITES= http://opti.recherche.enac.fr/facile/distrib/ MASTER_SITES= http://opti.recherche.enac.fr/facile/distrib/

1
math/ocamlgsl/Makefile
View file

@ -14,6 +14,7 @@ LICENSE= GPLv3
LIB_DEPENDS= libgsl.so:math/gsl LIB_DEPENDS= libgsl.so:math/gsl
BUILD_DEPENDS= gawk:lang/gawk \ BUILD_DEPENDS= gawk:lang/gawk \
ocamlbuild:devel/ocaml-ocamlbuild \
${OCAMLC_DEPEND} ${OCAMLC_DEPEND}
RUN_DEPENDS= ocamlfind:devel/ocaml-findlib RUN_DEPENDS= ocamlfind:devel/ocaml-findlib

6
net-p2p/mldonkey/Makefile
View file

@ -117,10 +117,12 @@ post-patch:
${WRKSRC}/src/daemon/common/commonOptions.ml \ ${WRKSRC}/src/daemon/common/commonOptions.ml \
${WRKSRC}/src/networks/donkey/donkeyServers.ml ${WRKSRC}/src/networks/donkey/donkeyServers.ml
@${REINPLACE_CMD} \ @${REINPLACE_CMD} \
-e 's/[u(]int32/&_t/' ${WRKSRC}/src/utils/cdk/zlibstubs.c -e 's/[u(]int32/&_t/' ${WRKSRC}/src/utils/cdk/zlibstubs.c \
${WRKSRC}/src/utils/cdk/gdstubs.c
@${REINPLACE_CMD} \ @${REINPLACE_CMD} \
-e 's/int64/&_t/' ${WRKSRC}/src/config/unix/os_stubs_c.c \ -e 's/int64/&_t/' ${WRKSRC}/src/config/unix/os_stubs_c.c \
${WRKSRC}/src/utils/lib/os_stubs.h ${WRKSRC}/src/utils/lib/os_stubs.h \
${WRKSRC}/src/utils/lib/fst_hash.c
do-install: do-install:
.if ${PORT_OPTIONS:MCORE} .if ${PORT_OPTIONS:MCORE}

5
security/ocaml-cryptokit/Makefile
View file

@ -10,6 +10,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Variety of cryptographic primitives for Objective Caml COMMENT= Variety of cryptographic primitives for Objective Caml
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
DESTDIRNAME= destdir DESTDIRNAME= destdir
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_ARGS= --docdir ${OCAML_DOCSDIR} CONFIGURE_ARGS= --docdir ${OCAML_DOCSDIR}
@ -27,7 +29,8 @@ OPTIONS_DEFINE= DOCS
DOCS_ALL_TARGET= doc DOCS_ALL_TARGET= doc
post-patch: post-patch:
${REINPLACE_CMD} 's,"install","install" :: "-ldconf ignore",' \ @${REINPLACE_CMD} 's,"install","install" :: "-ldconf ignore",' \
${WRKSRC}/setup.ml ${WRKSRC}/setup.ml
@${REINPLACE_CMD} -e 's,uint32,&_t,' ${WRKSRC}/src/stubs-md5.c
.include <bsd.port.mk> .include <bsd.port.mk>

5
security/sks/Makefile
View file

@ -5,6 +5,8 @@ PORTVERSION= 1.1.6
CATEGORIES= security CATEGORIES= security
MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/ MASTER_SITES= http://bitbucket.org/skskeyserver/sks-keyserver/downloads/
EXTRA_PATCHES= ${FILESDIR}/debian-bug-870150:-p1
MAINTAINER= johans@FreeBSD.org MAINTAINER= johans@FreeBSD.org
COMMENT= Synchronizing Key Server, a fast OpenPGP keyserver COMMENT= Synchronizing Key Server, a fast OpenPGP keyserver
@ -32,9 +34,6 @@ post-extract:
@cd ${WRKSRC} && ${RM} .depend @cd ${WRKSRC} && ${RM} .depend
post-patch: post-patch:
@${REINPLACE_CMD} -Ee '/^CC=/d; /^CFLAGS=/s/=/+=/' \
-e '/^install/,$$s/\$$\((PREFIX|MANDIR)\)/$$(DESTDIR)&/' \
-e '/patch/s/-p 0/-p0/' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/s/=/+=/' ${WRKSRC}/bdb/Makefile @${REINPLACE_CMD} -e '/^CC=/d; /^CFLAGS=/s/=/+=/' ${WRKSRC}/bdb/Makefile
pre-build: pre-build:

144
security/sks/files/debian-bug-870150 Normal file
View file

@ -0,0 +1,144 @@
Description: Fix FTBFS with OCaml 4.05.0
Author: Stephane Glondu <glondu@debian.org>
Bug-Debian: https://bugs.debian.org/870150
Last-Update: 2017-08-01
--- sks-1.1.6.orig/eventloop.ml
+++ sks-1.1.6/eventloop.ml
@@ -26,6 +26,7 @@ open MoreLabels
open Printf
open Common
open Packet
+let unix_socket = Unix.socket
module Unix = UnixLabels
open Unix
@@ -129,7 +130,7 @@ let create_sock addr =
let domain =
Unix.domain_of_sockaddr addr in
let sock =
- socket ~domain ~kind:SOCK_STREAM ~protocol:0 in
+ unix_socket domain SOCK_STREAM 0 in
setsockopt sock SO_REUSEADDR true;
if domain = PF_INET6 then
setsockopt sock IPV6_ONLY true;
--- sks-1.1.6.orig/reconComm.ml
+++ sks-1.1.6/reconComm.ml
@@ -26,6 +26,7 @@ open Printf
open Common
open Packet
+let unix_socket = Unix.socket
module Unix = UnixLabels
module Map = PMap.Map
@@ -37,10 +38,10 @@ open DbMessages
(** send DbMessages message and wait for response *)
let send_dbmsg msg =
- let s = Unix.socket
- ~domain:(Unix.domain_of_sockaddr db_command_addr)
- ~kind:Unix.SOCK_STREAM
- ~protocol:0 in
+ let s = unix_socket
+ (Unix.domain_of_sockaddr db_command_addr)
+ Unix.SOCK_STREAM
+ 0 in
protect ~f:(fun () ->
Unix.connect s ~addr:db_command_addr;
let cin = Channel.sys_in_from_fd s in
@@ -54,10 +55,10 @@ let send_dbmsg msg =
(** send DbMessages message, don't wait for response *)
let send_dbmsg_noreply msg =
- let s = Unix.socket
- ~domain:(Unix.domain_of_sockaddr db_command_addr)
- ~kind:Unix.SOCK_STREAM
- ~protocol:0 in
+ let s = unix_socket
+ (Unix.domain_of_sockaddr db_command_addr)
+ Unix.SOCK_STREAM
+ 0 in
protect ~f:(fun () ->
Unix.connect s ~addr:db_command_addr;
let cout = Channel.sys_out_from_fd s in
@@ -75,10 +76,10 @@ let is_content_type line =
let http_status_ok_regexp = Str.regexp "^HTTP/[0-9]+\\.[0-9]+ 2"
let get_keystrings_via_http addr hashes =
- let s = Unix.socket
- ~domain:(Unix.domain_of_sockaddr addr)
- ~kind:Unix.SOCK_STREAM
- ~protocol:0 in
+ let s = unix_socket
+ (Unix.domain_of_sockaddr addr)
+ Unix.SOCK_STREAM
+ 0 in
protect ~f:(fun () ->
Unix.bind s ~addr:(match_client_recon_addr addr);
Unix.connect s ~addr;
--- sks-1.1.6.orig/sks_do.ml
+++ sks-1.1.6/sks_do.ml
@@ -27,6 +27,7 @@ open Printf
open Common
open Packet
open DbMessages
+let unix_socket = Unix.socket
module Unix = UnixLabels
module PTree = PrefixTree
module Map = PMap.Map
@@ -37,10 +38,10 @@ let fail reason =
exit (-1)
let send_dbmsg msg =
- let s = Unix.socket
- ~domain:(Unix.domain_of_sockaddr db_command_addr)
- ~kind:Unix.SOCK_STREAM
- ~protocol:0 in
+ let s = unix_socket
+ (Unix.domain_of_sockaddr db_command_addr)
+ Unix.SOCK_STREAM
+ 0 in
protect ~f:(fun () ->
Unix.connect s ~addr:db_command_addr;
let cin = Channel.sys_in_from_fd s in
--- sks-1.1.6.orig/tester.ml
+++ sks-1.1.6/tester.ml
@@ -26,6 +26,7 @@ open Printf
open Common
open Packet
open DbMessages
+let unix_socket = Unix.socket
module Unix = UnixLabels
let settings = {
@@ -46,10 +47,10 @@ module Keydb = Keydb.Safe
let send_msg addr msg =
- let s = Unix.socket
- ~domain:(Unix.domain_of_sockaddr addr)
- ~kind:Unix.SOCK_STREAM
- ~protocol:0 in
+ let s = unix_socket
+ (Unix.domain_of_sockaddr addr)
+ Unix.SOCK_STREAM
+ 0 in
protect ~f:( fun () ->
Unix.connect s ~addr:addr;
let cin = Channel.sys_in_from_fd s
@@ -62,10 +63,10 @@ let send_msg addr msg =
~finally:(fun () -> Unix.close s)
let send_msg_noreply addr msg =
- let s = Unix.socket
- ~domain:(Unix.domain_of_sockaddr addr)
- ~kind:Unix.SOCK_STREAM
- ~protocol:0 in
+ let s = unix_socket
+ (Unix.domain_of_sockaddr addr)
+ Unix.SOCK_STREAM
+ 0 in
protect ~f:(fun () ->
Unix.connect s ~addr:addr;
let cout = Channel.sys_out_from_fd s in

50
security/sks/files/patch-Makefile Normal file
View file

@ -0,0 +1,50 @@
--- Makefile.orig 2019-06-06 15:28:32 UTC
+++ Makefile
@@ -15,9 +15,8 @@
# USA
#
CINCLUDES=-I`ocamlc -where`
-CC=gcc
CXX=g++
-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
+CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I .
CXXFLAGS=-O3 $(CINCLUDES) -I .
ifndef OCAMLC
@@ -135,16 +134,16 @@ keyMerge.cmx: keyMerge.ml
# Special targets
install:
- mkdir -p $(PREFIX)/bin
- install sks_build.sh sks sks_add_mail $(PREFIX)/bin
- mkdir -p $(MANDIR)/man8
- install sks.8.gz $(MANDIR)/man8
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
+ install sks.8.gz $(DESTDIR)$(MANDIR)/man8
install.bc:
- mkdir -p $(PREFIX)/bin
- install sks_build.bc.sh sks.bc sks_add_mail.bc $(PREFIX)/bin
- mkdir -p $(MANDIR)/man8
- install sks.8.gz $(MANDIR)/man8
+ mkdir -p $(DESTDIR)$(PREFIX)/bin
+ install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin
+ mkdir -p $(DESTDIR)$(MANDIR)/man8
+ install sks.8.gz $(DESTDIR)$(MANDIR)/man8
Makefile.local:
@@ -285,8 +284,9 @@ CKDIR=$(CKVER)/src
$(CKVER)/README.txt:
tar xmvfz $(CKVER).tar.gz
- patch -p 0 < $(CKVER)-sks.patch
- patch -p 0 < $(CKVER)-sks-custom_compare.patch
+ patch -p0 < $(CKVER)-sks.patch
+ patch -p0 < $(CKVER)-sks-custom_compare.patch
+ sed -i.bak -e 's,uint32,&_t,' $(CKDIR)/stubs-md5.c
$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt
cd $(CKDIR) && $(MAKE) all

2
textproc/hevea/Makefile
View file

@ -12,7 +12,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= danilo@FreeBSD.org MAINTAINER= danilo@FreeBSD.org
COMMENT= Convert LaTeX to HTML COMMENT= Convert LaTeX to HTML
BUILD_DEPENDS= ocamlc:lang/ocaml BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
OPTIONS_DEFINE= DOCS OPTIONS_DEFINE= DOCS

2
textproc/ocaml-text/Makefile
View file

@ -9,6 +9,8 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= OCaml library for dealing with text COMMENT= OCaml library for dealing with text
BUILD_DEPENDS= ocamlbuild:devel/ocaml-ocamlbuild
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= vbmithr GH_ACCOUNT= vbmithr
GH_PROJECT= ${PKGNAMEPREFIX}${PORTNAME} GH_PROJECT= ${PKGNAMEPREFIX}${PORTNAME}

5
x11-toolkits/ocaml-labltk/Makefile
View file

@ -2,10 +2,9 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= labltk PORTNAME= labltk
PORTVERSION= 8.06.0 PORTVERSION= 8.06.3
PORTREVISION= 2
CATEGORIES= x11-toolkits CATEGORIES= x11-toolkits
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1455/ MASTER_SITES= https://download.ocamlcore.org/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
PKGNAMEPREFIX= ocaml- PKGNAMEPREFIX= ocaml-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org

5
x11-toolkits/ocaml-labltk/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (labltk-8.06.0.tar.gz) = 71997dbd6c36e4eb064484dc73037d4bd10e465e180fead07a4b193d21af9764 TIMESTAMP = 1559830627
SIZE (labltk-8.06.0.tar.gz) = 368790 SHA256 (labltk-8.06.3.tar.gz) = b6b7076f6a2a7b2f63095013cb4e37a1f2a6eb3d4abb57dbb1b8cff1ae4c6ae6
SIZE (labltk-8.06.3.tar.gz) = 369924