1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

- Add USE_OCAML_CAMLP4 and USE_OCAML_TK to bsd.ocaml.mk which add

depends on the camlp4 language and labltk ocaml modules, which are
  now in separate ports.
- Update x11-toolkits/ocaml-lablgtk2 to 2.18.3
- Update graphics/ocaml-lablgl to 1.05
- Make unison ports use USE_OCAML
- Convert ports to the new flags where needed
- Bump PORTREVISION on ports depending on ocaml-lablgtk2, those need to be rebuilt

PR:			199845
Submitted by:		jbeich@
Differential Revision:	https://reviews.freebsd.org/D2434
Approved by:		portmgr (mat)
This commit is contained in:
Guido Falsi 2015-05-04 15:46:51 +00:00
parent cb214a8a7b
commit 2c44e6acd0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=385413
35 changed files with 83 additions and 1781 deletions

View File

@ -17,6 +17,10 @@
# USE_OCAML_FINDLIB - Set if your port uses ocamlfind to install
# packages. Package direcories will be
# automatically deleted.
# USE_OCAML_CAMLP4 - Set if your port uses camlp4 to build.
# USE_OCAML_TK - Set if you port needs ocaml-labltk.
# NO_OCAMLTK_BUILDDEPENDS - Don't add labltk to BUILD|EXTRACT|PATCH_DEPENDS.
# NO_OCAMLTK_RUNDEPENDS - Don't add labltk to RUN_DEPENDS.
# USE_OCAML_LDCONFIG - Set if your port installs shared libraries
# into ocaml site-lib dir. OCaml ld.conf file
# will be automatically processed.
@ -44,6 +48,8 @@ OCAMLC?= ${LOCALBASE}/bin/ocamlc
OCAMLC_OPT?= ${LOCALBASE}/bin/ocamlc.opt
OCAMLCP?= ${LOCALBASE}/bin/ocamlcp
OCAMLFIND?= ${LOCALBASE}/bin/ocamlfind
CAMLP4?= ${LOCALBASE}/bin/camlp4
OCAMLTK?= ${LOCALBASE}/bin/labltk
#
# OCaml library directory
@ -67,6 +73,18 @@ OCAMLC_DEPEND?= ${OCAMLC}:${OCAMLC_PORT}
OCAMLFIND_PORT?= ${PORTSDIR}/devel/ocaml-findlib
OCAMLFIND_DEPEND?= ${OCAMLFIND}:${OCAMLFIND_PORT}
#
# OCaml camlp4 port dependency
#
CAMLP4_PORT?= ${PORTSDIR}/devel/ocaml-camlp4
CAMLP4_DEPEND?= ${CAMLP4}:${CAMLP4_PORT}
#
# OCaml TK bindings dependency
#
OCAMLTK_PORT?= ${PORTSDIR}/x11-toolkits/ocaml-labltk
OCAMLTK_DEPENDS?= ${OCAMLTK}:${OCAMLTK_PORT}
#
# Common OCaml examples and documents location
#
@ -136,6 +154,21 @@ ocaml-findlib:
. endif
.endif
.if defined(USE_OCAML_CAMLP4)
BUILD_DEPENDS+= ${CAMLP4_DEPEND}
.endif
.if defined(USE_OCAML_TK)
. if !defined(NO_OCAMLTK_BUILDDEPENDS)
EXTRACT_DEPENDS+= ${OCAMLTK_DEPENDS}
PATCH_DEPENDS+= ${OCAMLTK_DEPENDS}
BUILD_DEPENDS+= ${OCAMLTK_DEPENDS}
. endif
. if !defined(NO_OCAMLTK_RUNDEPENDS)
RUN_DEPENDS+= ${OCAMLTK_DEPENDS}
. endif
.endif
.if defined(USE_OCAML_LDCONFIG)
#
# Directories under PREFIX for appending to ld.conf

View File

@ -15,6 +15,8 @@ LICENSE= GPLv2
USES= gmake tar:tgz
USE_OCAML= yes
USE_OCAML_CAMLP4=yes
USE_OCAML_TK= yes
USE_XORG= x11
ALL_TARGET= ${PORTNAME}

View File

@ -15,6 +15,7 @@ USES= gmake
USE_MYSQL= yes
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes

View File

@ -12,11 +12,11 @@ COMMENT= Text-based front-end to Remind
LICENSE= GPLv2
BUILD_DEPENDS= camlp4o:${PORTSDIR}/devel/ocaml-camlp4
RUN_DEPENDS= remind:${PORTSDIR}/deskutils/remind
USES= gmake ncurses
USE_OCAML= yes
USE_OCAML_CAMLP4=yes
GNU_CONFIGURE= yes
PLIST_FILES= bin/wyrd etc/wyrdrc man/man1/wyrd.1.gz man/man5/wyrdrc.5.gz

View File

@ -17,6 +17,7 @@ USES= gmake perl5 pkgconfig:build python tar:tgz
GNU_CONFIGURE= yes
USE_PERL5= build
USE_OCAML= 3.0+
USE_OCAML_CAMLP4=yes
MAKE_ARGS+= PYTHON_VERSION=${PYTHON_VER}
CONFIGURE_ENV+= PYVER=${PYTHON_VER} PYTHON=${PYTHON_CMD}

View File

@ -4,6 +4,7 @@
PORTNAME= frama-c
DISTVERSIONPREFIX= Sodium-
DISTVERSION= 20150201
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://frama-c.com/download/

View File

@ -3,7 +3,7 @@
PORTNAME= monotone-viz
PORTVERSION= 1.0.2
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel
MASTER_SITES= http://oandrieu.nerim.net/monotone-viz/

View File

@ -15,6 +15,7 @@ LICENSE= LGPL21
USES= gmake tar:bzip2
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
USE_OCAML_CAMLP4=yes
USE_OCAML_LDCONFIG=yes
USE_OCAML_WASH= yes
GNU_CONFIGURE= yes

View File

@ -12,6 +12,7 @@ COMMENT= Function derivation library
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes

View File

@ -17,6 +17,7 @@ OPTIONS_DEFINE= DOCS
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
USE_OCAML_CAMLP4=yes
USE_OCAMLFIND_PLIST=yes
USES= gmake

View File

@ -17,6 +17,7 @@ LICENSE_COMB= multi
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
USE_OCAML_CAMLP4=yes
USE_OCAMLFIND_PLIST=yes
OCAML_PKGDIRS= ${PORTNAME:S,-,_,}

View File

@ -11,11 +11,10 @@ PKGNAMEPREFIX= ocaml-
MAINTAINER= johans@FreeBSD.org
COMMENT= Lexer generator for Unicode and OCaml
BUILD_DEPENDS= camlp4:${PORTSDIR}/devel/ocaml-camlp4
USES= gmake
USE_OCAML= true
USE_OCAML_FINDLIB= true
USE_OCAML_CAMLP4= true
USE_OCAML_LDCONFIG= true
USE_OCAMLFIND_PLIST= yes

View File

@ -18,6 +18,7 @@ OPTIONS_DEFINE= EXAMPLES
USES= gmake
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
HAS_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes

View File

@ -3,7 +3,7 @@
PORTNAME= freetennis
PORTVERSION= 0.4.8
PORTREVISION= 12
PORTREVISION= 13
CATEGORIES= games
MASTER_SITES= SF

View File

@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= lablgl
PORTVERSION= 20120306
PORTREVISION= 3
PORTVERSION= 1.05
PORTEPOCH= 1
CATEGORIES= graphics
MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/ \
https://forge.ocamlcore.org/frs/download.php/816/
https://forge.ocamlcore.org/frs/download.php/1254/
PKGNAMEPREFIX= ocaml-
MAINTAINER= bf@FreeBSD.org
@ -14,16 +14,17 @@ COMMENT= OpenGL interface for Objective Caml
LICENSE= BSD3CLAUSE
CONFLICTS= ocaml-notk-[0-9]* ocaml-nox11-[0-9]*
CONFLICTS= ocaml-nox11-[0-9]*
USES= gmake tk:84,85
USE_XORG= x11 xext xmu
USE_GL= glut
USE_OCAML= yes
USE_OCAML_WASH= yes
USE_OCAML_CAMLP4=yes
USE_OCAML_TK= yes
ALL_TARGET= all opt
MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/lablGL
DOCSDIR= ${PREFIX}/share/doc/ocaml/lablgl
EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/lablgl

View File

@ -1,2 +1,2 @@
SHA256 (lablgl-20120306.tar.gz) = 39017555724ca67807e73543b9fca1fcf9aab285f723635c9eee4034ac88adf0
SIZE (lablgl-20120306.tar.gz) = 423411
SHA256 (lablgl-1.05.tar.gz) = d8ff03e35b970d2b23a942f9e6ed65da5a6c123986bd0ecf5424a6205af34b61
SIZE (lablgl-1.05.tar.gz) = 296597

View File

@ -9,4 +9,4 @@ related functions.
Please see ${PREFIX}/share/doc/ocaml/lablgl/README for further information.
WWW: http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html
WWW: https://forge.ocamlcore.org/projects/lablgl/

View File

@ -106,8 +106,6 @@ lib/ocaml/stublibs/dlltogl.so
%%EXAMPLESDIR%%/lablglut/caml-images/OCamlMakefile
%%EXAMPLESDIR%%/lablglut/caml-images/main.ml
%%EXAMPLESDIR%%/lablglut/caml-images/ppm.ppm
%%EXAMPLESDIR%%/lablglut/etc/draw2d.ml
%%EXAMPLESDIR%%/lablglut/etc/in-progress/scene_graph.ml
%%EXAMPLESDIR%%/lablglut/lablGL/README
%%EXAMPLESDIR%%/lablglut/lablGL/checker.ml
%%EXAMPLESDIR%%/lablglut/lablGL/gears.ml

View File

@ -3,7 +3,7 @@
PORTNAME= alt-ergo
PORTVERSION= 0.95.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MASTER_SITES= http://alt-ergo.ocamlpro.com/http/alt-ergo-${PORTVERSION}/

View File

@ -3,7 +3,7 @@
PORTNAME= coq
PORTVERSION= 8.4.5
PORTEPOCH= 1
PORTEPOCH= 2
CATEGORIES= math
MASTER_SITES= http://coq.inria.fr/distrib/V${COQVERSION}/files/ \
ftp://ftp.stack.nl/pub/users/johans/coq/

View File

@ -3,6 +3,7 @@
PORTNAME= ocamlgraph
PORTVERSION= 1.8.6
PORTREVISION= 1
CATEGORIES= math
MASTER_SITES= http://ocamlgraph.lri.fr/download/ \
ftp://ftp.stack.nl/pub/users/johans/ocamlgraph/

View File

@ -21,6 +21,7 @@ RUN_DEPENDS= ocamlfind:${PORTSDIR}/devel/ocaml-findlib
USES= gmake
USE_OCAML= YES
USE_OCAML_FINDLIB= YES
USE_OCAML_CAMLP4= YES
USE_OCAML_LDCONFIG= YES
OCAML_PKGDIRS= gsl
HAS_CONFIGURE= YES

View File

@ -16,6 +16,7 @@ LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl
USES= gmake
USE_OCAML= yes
USE_OCAML_CAMLP4=yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes

View File

@ -13,6 +13,7 @@ COMMENT= Command line client to FreeNet Network
USES= tar:bzip2
USE_OCAML= yes
USE_OCAML_CAMLP4=yes
ALL_TARGET= all opt
MAKE_JOBS_UNSAFE=yes

View File

@ -12,12 +12,12 @@ COMMENT?= OCAML client for multiple peer-to-peer networks
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/Copying.txt
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]*
USES= iconv tar:bzip2 gmake
USE_AUTOTOOLS= autoconf:env
USE_OCAML= yes
USE_OCAML_CAMLP4=yes
GNU_CONFIGURE= yes
ALL_TARGET= opt
MAKE_ENV+= OCAMLRUNPARAM="l=256M"

View File

@ -18,10 +18,10 @@ IGNORE= No devel release available. \
LICENSE= GPLv3
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
CONFLICTS= unison-[0-9]* unison-nox11-[0-9]*

View File

@ -3,7 +3,7 @@
PORTNAME= unison
PORTVERSION= 2.48.3
PORTREVISION?= 1
PORTREVISION?= 2
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
DISTFILES= ${EXTRACT_ONLY} ${EXTRA_DOCS}
@ -15,10 +15,10 @@ COMMENT?= User-level file synchronization tool
LICENSE= GPLv3
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""
CONFLICTS?= unison-devel-[0-9]* unison-nox11-[0-9]*

View File

@ -3,7 +3,7 @@
PORTNAME= unison
PORTVERSION= 2.32.52
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= 232
@ -17,10 +17,10 @@ COMMENT= User-level file synchronization tool
LICENSE= GPLv3
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""

View File

@ -3,7 +3,7 @@
PORTNAME= unison
PORTVERSION= 2.40.128
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${DISTNAME}/
PKGNAMESUFFIX= 240
@ -16,10 +16,10 @@ COMMENT?= User-level file synchronization tool
LICENSE= GPLv3
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
PLIST_SUB= PORTVERSION=${PORTVERSION}
USES= gmake
USE_OCAML= yes
NO_OCAML_RUNDEPENDS=yes
WANT_GNOME= yes
MAKE_ARGS= CFLAGS=""

View File

@ -9,11 +9,10 @@ MASTER_SITES= http://cdn.bitbucket.org/skskeyserver/sks-keyserver/downloads/
MAINTAINER= johans@FreeBSD.org
COMMENT= Synchronizing Key Server, a fast OpenPGP keyserver
BUILD_DEPENDS= camlp4:${PORTSDIR}/devel/ocaml-camlp4
PROJECTHOST= sks-keyserver
USE_OCAML= yes
USE_OCAML_CAMLP4=yes
USE_BDB= 5
USES= perl5 gmake shebangfix tar:tgz
USE_PERL5= build

View File

@ -19,6 +19,7 @@ CONFIGURE_ARGS= --prefix ${PREFIX} \
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_CAMLP4= yes
USE_OCAML_LDCONFIG= yes
USE_OCAMLFIND_PLIST= yes

View File

@ -21,6 +21,7 @@ CONFLICTS= ocaml-equeue-2* ocaml-netclient-0*
USES= gmake
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAML_CAMLP4= yes
USE_OCAML_LDCONFIG= yes
USE_OCAMLFIND_PLIST= yes
HAS_CONFIGURE= yes

View File

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= lablgtk2
PORTVERSION= 2.16.0
PORTREVISION= 2
PORTVERSION= 2.18.3
CATEGORIES= x11-toolkits
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/979/ \
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1479/ \
LOCAL/bf
PKGNAMEPREFIX= ocaml-
DISTNAME= lablgtk-${PORTVERSION}
@ -20,6 +19,7 @@ USE_GNOME= gtk20
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_CAMLP4= yes
USE_OCAML_LDCONFIG= yes
USE_OCAML_WASH= yes

View File

@ -1,2 +1,2 @@
SHA256 (lablgtk-2.16.0.tar.gz) = a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f
SIZE (lablgtk-2.16.0.tar.gz) = 787217
SHA256 (lablgtk-2.18.3.tar.gz) = 975bebf2f9ca74dc3bf7431ebb640ff6a924bb80c8ee5f4467c475a7e4b0cbaf
SIZE (lablgtk-2.18.3.tar.gz) = 788177

File diff suppressed because it is too large Load Diff