From owner-svn-ports-all@FreeBSD.ORG Mon May 4 15:47:02 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83E0EB97; Mon, 4 May 2015 15:47:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6F9611F71; Mon, 4 May 2015 15:47:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t44Fl2kY081995; Mon, 4 May 2015 15:47:02 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t44FkqC5081891; Mon, 4 May 2015 15:46:52 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201505041546.t44FkqC5081891@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 4 May 2015 15:46:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385413 - in head: Mk astro/planets databases/ocaml-mysql deskutils/wyrd devel/coccinelle devel/frama-c devel/monotone-viz devel/ocaml-camomile devel/ocaml-deriving-ocsigen devel/ocaml-... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2015 15:47:02 -0000 Author: madpilot Date: Mon May 4 15:46:51 2015 New Revision: 385413 URL: https://svnweb.freebsd.org/changeset/ports/385413 Log: - 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) Deleted: head/x11-toolkits/ocaml-lablgtk2/files/ Modified: head/Mk/bsd.ocaml.mk head/astro/planets/Makefile head/databases/ocaml-mysql/Makefile head/deskutils/wyrd/Makefile head/devel/coccinelle/Makefile head/devel/frama-c/Makefile head/devel/monotone-viz/Makefile head/devel/ocaml-camomile/Makefile head/devel/ocaml-deriving-ocsigen/Makefile head/devel/ocaml-extlib/Makefile head/devel/ocaml-typeconv/Makefile head/devel/ocaml-ulex/Makefile head/devel/ocaml-xstrp4/Makefile head/games/freetennis/Makefile head/graphics/ocaml-lablgl/Makefile head/graphics/ocaml-lablgl/distinfo head/graphics/ocaml-lablgl/pkg-descr head/graphics/ocaml-lablgl/pkg-plist head/math/alt-ergo/Makefile head/math/coq/Makefile head/math/ocaml-ocamlgraph/Makefile head/math/ocamlgsl/Makefile head/math/orpie/Makefile head/net-p2p/liberator/Makefile head/net-p2p/mldonkey/Makefile head/net/unison-devel/Makefile head/net/unison/Makefile head/net/unison232/Makefile head/net/unison240/Makefile head/security/sks/Makefile head/textproc/ocaml-text/Makefile head/www/ocaml-net/Makefile head/x11-toolkits/ocaml-lablgtk2/Makefile head/x11-toolkits/ocaml-lablgtk2/distinfo Modified: head/Mk/bsd.ocaml.mk ============================================================================== --- head/Mk/bsd.ocaml.mk Mon May 4 15:39:41 2015 (r385412) +++ head/Mk/bsd.ocaml.mk Mon May 4 15:46:51 2015 (r385413) @@ -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 @@ -68,6 +74,18 @@ OCAMLFIND_PORT?= ${PORTSDIR}/devel/ocaml 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 # OCAML_DOCSDIR= ${PREFIX}/share/doc/ocaml @@ -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 Modified: head/astro/planets/Makefile ============================================================================== --- head/astro/planets/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/astro/planets/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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} Modified: head/databases/ocaml-mysql/Makefile ============================================================================== --- head/databases/ocaml-mysql/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/databases/ocaml-mysql/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/deskutils/wyrd/Makefile ============================================================================== --- head/deskutils/wyrd/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/deskutils/wyrd/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/devel/coccinelle/Makefile ============================================================================== --- head/devel/coccinelle/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/coccinelle/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -17,6 +17,7 @@ USES= gmake perl5 pkgconfig:build pytho 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} Modified: head/devel/frama-c/Makefile ============================================================================== --- head/devel/frama-c/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/frama-c/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -4,6 +4,7 @@ PORTNAME= frama-c DISTVERSIONPREFIX= Sodium- DISTVERSION= 20150201 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://frama-c.com/download/ Modified: head/devel/monotone-viz/Makefile ============================================================================== --- head/devel/monotone-viz/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/monotone-viz/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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/ Modified: head/devel/ocaml-camomile/Makefile ============================================================================== --- head/devel/ocaml-camomile/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/ocaml-camomile/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/devel/ocaml-deriving-ocsigen/Makefile ============================================================================== --- head/devel/ocaml-deriving-ocsigen/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/ocaml-deriving-ocsigen/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/devel/ocaml-extlib/Makefile ============================================================================== --- head/devel/ocaml-extlib/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/ocaml-extlib/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -17,6 +17,7 @@ OPTIONS_DEFINE= DOCS USE_OCAML= yes USE_OCAML_FINDLIB=yes +USE_OCAML_CAMLP4=yes USE_OCAMLFIND_PLIST=yes USES= gmake Modified: head/devel/ocaml-typeconv/Makefile ============================================================================== --- head/devel/ocaml-typeconv/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/ocaml-typeconv/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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,-,_,} Modified: head/devel/ocaml-ulex/Makefile ============================================================================== --- head/devel/ocaml-ulex/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/ocaml-ulex/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/devel/ocaml-xstrp4/Makefile ============================================================================== --- head/devel/ocaml-xstrp4/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/devel/ocaml-xstrp4/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/games/freetennis/Makefile ============================================================================== --- head/games/freetennis/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/games/freetennis/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -3,7 +3,7 @@ PORTNAME= freetennis PORTVERSION= 0.4.8 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF Modified: head/graphics/ocaml-lablgl/Makefile ============================================================================== --- head/graphics/ocaml-lablgl/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/graphics/ocaml-lablgl/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 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 Modified: head/graphics/ocaml-lablgl/distinfo ============================================================================== --- head/graphics/ocaml-lablgl/distinfo Mon May 4 15:39:41 2015 (r385412) +++ head/graphics/ocaml-lablgl/distinfo Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/graphics/ocaml-lablgl/pkg-descr ============================================================================== --- head/graphics/ocaml-lablgl/pkg-descr Mon May 4 15:39:41 2015 (r385412) +++ head/graphics/ocaml-lablgl/pkg-descr Mon May 4 15:46:51 2015 (r385413) @@ -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/ Modified: head/graphics/ocaml-lablgl/pkg-plist ============================================================================== --- head/graphics/ocaml-lablgl/pkg-plist Mon May 4 15:39:41 2015 (r385412) +++ head/graphics/ocaml-lablgl/pkg-plist Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/math/alt-ergo/Makefile ============================================================================== --- head/math/alt-ergo/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/math/alt-ergo/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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}/ Modified: head/math/coq/Makefile ============================================================================== --- head/math/coq/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/math/coq/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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/ Modified: head/math/ocaml-ocamlgraph/Makefile ============================================================================== --- head/math/ocaml-ocamlgraph/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/math/ocaml-ocamlgraph/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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/ Modified: head/math/ocamlgsl/Makefile ============================================================================== --- head/math/ocamlgsl/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/math/ocamlgsl/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -21,6 +21,7 @@ RUN_DEPENDS= ocamlfind:${PORTSDIR}/devel USES= gmake USE_OCAML= YES USE_OCAML_FINDLIB= YES +USE_OCAML_CAMLP4= YES USE_OCAML_LDCONFIG= YES OCAML_PKGDIRS= gsl HAS_CONFIGURE= YES Modified: head/math/orpie/Makefile ============================================================================== --- head/math/orpie/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/math/orpie/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -16,6 +16,7 @@ LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/ USES= gmake USE_OCAML= yes +USE_OCAML_CAMLP4=yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes Modified: head/net-p2p/liberator/Makefile ============================================================================== --- head/net-p2p/liberator/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/net-p2p/liberator/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -13,6 +13,7 @@ COMMENT= Command line client to FreeNet USES= tar:bzip2 USE_OCAML= yes +USE_OCAML_CAMLP4=yes ALL_TARGET= all opt MAKE_JOBS_UNSAFE=yes Modified: head/net-p2p/mldonkey/Makefile ============================================================================== --- head/net-p2p/mldonkey/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/net-p2p/mldonkey/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -12,12 +12,12 @@ COMMENT?= OCAML client for multiple peer 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" Modified: head/net/unison-devel/Makefile ============================================================================== --- head/net/unison-devel/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/net/unison-devel/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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]* Modified: head/net/unison/Makefile ============================================================================== --- head/net/unison/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/net/unison/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 synchronizatio 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]* Modified: head/net/unison232/Makefile ============================================================================== --- head/net/unison232/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/net/unison232/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 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="" Modified: head/net/unison240/Makefile ============================================================================== --- head/net/unison240/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/net/unison240/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 synchronizatio 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="" Modified: head/security/sks/Makefile ============================================================================== --- head/security/sks/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/security/sks/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -9,11 +9,10 @@ MASTER_SITES= http://cdn.bitbucket.org/s 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 Modified: head/textproc/ocaml-text/Makefile ============================================================================== --- head/textproc/ocaml-text/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/textproc/ocaml-text/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/www/ocaml-net/Makefile ============================================================================== --- head/www/ocaml-net/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/www/ocaml-net/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -21,6 +21,7 @@ CONFLICTS= ocaml-equeue-2* ocaml-netclie USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes +USE_OCAML_CAMLP4= yes USE_OCAML_LDCONFIG= yes USE_OCAMLFIND_PLIST= yes HAS_CONFIGURE= yes Modified: head/x11-toolkits/ocaml-lablgtk2/Makefile ============================================================================== --- head/x11-toolkits/ocaml-lablgtk2/Makefile Mon May 4 15:39:41 2015 (r385412) +++ head/x11-toolkits/ocaml-lablgtk2/Makefile Mon May 4 15:46:51 2015 (r385413) @@ -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 Modified: head/x11-toolkits/ocaml-lablgtk2/distinfo ============================================================================== --- head/x11-toolkits/ocaml-lablgtk2/distinfo Mon May 4 15:39:41 2015 (r385412) +++ head/x11-toolkits/ocaml-lablgtk2/distinfo Mon May 4 15:46:51 2015 (r385413) @@ -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