Page MenuHomeFreeBSD
Files F174970354

D2434.id5162.diff
No OneTemporary
Actions

D2434.id5162.diff
View Options

Index: Mk/bsd.ocaml.mk
===================================================================
--- Mk/bsd.ocaml.mk
+++ Mk/bsd.ocaml.mk
@@ -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_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_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 @@
. 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
Index: astro/planets/Makefile
===================================================================
--- astro/planets/Makefile
+++ astro/planets/Makefile
@@ -15,6 +15,8 @@
USES= gmake tar:tgz
USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
+USE_OCAML_TK= yes
USE_XORG= x11
ALL_TARGET= ${PORTNAME}
Index: databases/ocaml-mysql/Makefile
===================================================================
--- databases/ocaml-mysql/Makefile
+++ databases/ocaml-mysql/Makefile
@@ -15,6 +15,7 @@
USE_MYSQL= yes
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes
Index: deskutils/wyrd/Makefile
===================================================================
--- deskutils/wyrd/Makefile
+++ deskutils/wyrd/Makefile
@@ -12,11 +12,11 @@
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
Index: devel/coccinelle/Makefile
===================================================================
--- devel/coccinelle/Makefile
+++ devel/coccinelle/Makefile
@@ -17,6 +17,7 @@
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}
Index: devel/ocaml-camomile/Makefile
===================================================================
--- devel/ocaml-camomile/Makefile
+++ devel/ocaml-camomile/Makefile
@@ -15,6 +15,7 @@
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
Index: devel/ocaml-deriving-ocsigen/Makefile
===================================================================
--- devel/ocaml-deriving-ocsigen/Makefile
+++ devel/ocaml-deriving-ocsigen/Makefile
@@ -12,6 +12,7 @@
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes
Index: devel/ocaml-extlib/Makefile
===================================================================
--- devel/ocaml-extlib/Makefile
+++ devel/ocaml-extlib/Makefile
@@ -17,6 +17,7 @@
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
+USE_OCAML_CAMLP4=yes
USE_OCAMLFIND_PLIST=yes
USES= gmake
Index: devel/ocaml-typeconv/Makefile
===================================================================
--- devel/ocaml-typeconv/Makefile
+++ devel/ocaml-typeconv/Makefile
@@ -17,6 +17,7 @@
USE_OCAML= yes
USE_OCAML_FINDLIB=yes
+USE_OCAML_CAMLP4=yes
USE_OCAMLFIND_PLIST=yes
OCAML_PKGDIRS= ${PORTNAME:S,-,_,}
Index: devel/ocaml-ulex/Makefile
===================================================================
--- devel/ocaml-ulex/Makefile
+++ devel/ocaml-ulex/Makefile
@@ -11,11 +11,10 @@
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
Index: devel/ocaml-xstrp4/Makefile
===================================================================
--- devel/ocaml-xstrp4/Makefile
+++ devel/ocaml-xstrp4/Makefile
@@ -18,6 +18,7 @@
USES= gmake
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAMLFIND_PLIST= yes
HAS_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
Index: graphics/ocaml-lablgl/Makefile
===================================================================
--- graphics/ocaml-lablgl/Makefile
+++ graphics/ocaml-lablgl/Makefile
@@ -21,6 +21,8 @@
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
Index: math/ocamlgsl/Makefile
===================================================================
--- math/ocamlgsl/Makefile
+++ math/ocamlgsl/Makefile
@@ -21,6 +21,7 @@
USES= gmake
USE_OCAML= YES
USE_OCAML_FINDLIB= YES
+USE_OCAML_CAMLP4= YES
USE_OCAML_LDCONFIG= YES
OCAML_PKGDIRS= gsl
HAS_CONFIGURE= YES
Index: math/orpie/Makefile
===================================================================
--- math/orpie/Makefile
+++ math/orpie/Makefile
@@ -16,6 +16,7 @@
USES= gmake
USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
Index: net-p2p/liberator/Makefile
===================================================================
--- net-p2p/liberator/Makefile
+++ net-p2p/liberator/Makefile
@@ -13,6 +13,7 @@
USES= tar:bzip2
USE_OCAML= yes
+USE_OCAML_CAMLP4=yes
ALL_TARGET= all opt
MAKE_JOBS_UNSAFE=yes
Index: net-p2p/mldonkey/Makefile
===================================================================
--- net-p2p/mldonkey/Makefile
+++ net-p2p/mldonkey/Makefile
@@ -12,12 +12,12 @@
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"
Index: security/sks/Makefile
===================================================================
--- security/sks/Makefile
+++ security/sks/Makefile
@@ -9,11 +9,10 @@
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
Index: textproc/ocaml-text/Makefile
===================================================================
--- textproc/ocaml-text/Makefile
+++ textproc/ocaml-text/Makefile
@@ -19,6 +19,7 @@
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAML_LDCONFIG= yes
USE_OCAMLFIND_PLIST= yes
Index: www/ocaml-net/Makefile
===================================================================
--- www/ocaml-net/Makefile
+++ www/ocaml-net/Makefile
@@ -21,6 +21,7 @@
USES= gmake
USE_OCAML= yes
USE_OCAML_FINDLIB= yes
+USE_OCAML_CAMLP4= yes
USE_OCAML_LDCONFIG= yes
USE_OCAMLFIND_PLIST= yes
HAS_CONFIGURE= yes
Index: x11-toolkits/ocaml-lablgtk2/Makefile
===================================================================
--- x11-toolkits/ocaml-lablgtk2/Makefile
+++ x11-toolkits/ocaml-lablgtk2/Makefile
@@ -13,6 +13,8 @@
MAINTAINER= bf@FreeBSD.org
COMMENT= Objective Caml interface to GTK+ 2.x
+BUILD_DEPENDS= camlp4:${PORTSDIR}/devel/ocaml-camlp4
+
LICENSE= LGPL21
USES= gmake pkgconfig
@@ -22,6 +24,7 @@
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes
USE_OCAML_WASH= yes
+USE_OCAML_CAMLP4= yes
OPTIONS_DEFINE= GLADE GNOMECANVAS GNOMEUI GTKGLAREA GTKSOURCEVIEW2 \
GTKSPELL LIBRSVG2 DOCS EXAMPLES

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 8, 7:02 AM (8 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40391409
Default Alt Text
D2434.id5162.diff (8 KB)

Event Timeline