summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/ocaml-mysql/Makefile3
-rw-r--r--devel/menhir/Makefile3
-rw-r--r--devel/ocaml-batteries/Makefile3
-rw-r--r--devel/ocaml-extlib/Makefile3
-rw-r--r--devel/ocaml-findlib/Makefile3
-rw-r--r--devel/ocaml-lwt/Makefile3
-rw-r--r--devel/ocaml-re/Makefile3
-rw-r--r--devel/ocaml-reactiveData/Makefile3
-rw-r--r--devel/ocaml-sexplib/Makefile8
-rw-r--r--devel/ocaml-type_conv/Makefile8
-rw-r--r--devel/ocamlgraph/Makefile3
-rw-r--r--devel/ocamlify/Makefile3
-rw-r--r--devel/ocamlmod/Makefile3
-rw-r--r--devel/pcre-ocaml/Makefile3
-rw-r--r--lang/camlp5/Makefile3
-rw-r--r--misc/ocaml-cudf/Makefile3
-rw-r--r--mk/ocaml.mk4
-rw-r--r--net/ocamlnet/Makefile3
-rw-r--r--security/ocaml-cryptokit/Makefile3
-rw-r--r--security/ocaml-ssl/Makefile6
-rw-r--r--textproc/ocaml-uutf/Makefile3
-rw-r--r--time/ocaml-calendar/Makefile3
-rw-r--r--x11/ocaml-lablgtk/Makefile3
23 files changed, 39 insertions, 44 deletions
diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile
index de0d7ffde14..4227148c40b 100644
--- a/databases/ocaml-mysql/Makefile
+++ b/databases/ocaml-mysql/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2015/06/30 11:52:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/06 12:10:32 jaapb Exp $
#
DISTNAME= ocaml-mysql-1.1.2
-PKGNAME= ${DISTNAME} # to avoid prefixing with ocaml-
PKGREVISION= 1
CATEGORIES= databases
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1308/
diff --git a/devel/menhir/Makefile b/devel/menhir/Makefile
index 96ee891e238..5188a16a1ca 100644
--- a/devel/menhir/Makefile
+++ b/devel/menhir/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2015/06/30 11:52:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.15 2016/02/06 12:10:33 jaapb Exp $
#
-PKGNAME= ${DISTNAME} # defined to avoid prefixing with ocaml-
DISTNAME= menhir-20140422
PKGREVISION= 2
CATEGORIES= devel
diff --git a/devel/ocaml-batteries/Makefile b/devel/ocaml-batteries/Makefile
index c2ce4bdfaee..71cff4afa56 100644
--- a/devel/ocaml-batteries/Makefile
+++ b/devel/ocaml-batteries/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2015/08/07 11:20:33 jaapb Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/06 12:10:32 jaapb Exp $
DISTNAME= batteries-2.3
+PKGNAME= ocaml-${DISTNAME}
PKGREVISION= 3
CATEGORIES= devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1465/
diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile
index 40729c1d03e..422dee5efbf 100644
--- a/devel/ocaml-extlib/Makefile
+++ b/devel/ocaml-extlib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
DISTNAME= extlib-1.6.1
+PKGNAME= ocaml-${DISTNAME}
PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= https://ocaml-extlib.googlecode.com/files/
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index 7b029a01492..97bb9582ee1 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2016/02/02 11:41:45 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2016/02/06 12:06:07 jaapb Exp $
DISTNAME= findlib-1.6.1
+PKGNAME= ocaml-${DISTNAME}
CATEGORIES= devel
MASTER_SITES= http://download.camlcity.org/download/
diff --git a/devel/ocaml-lwt/Makefile b/devel/ocaml-lwt/Makefile
index 234a26ddcdb..b4d5f0972f9 100644
--- a/devel/ocaml-lwt/Makefile
+++ b/devel/ocaml-lwt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2016/02/06 11:35:14 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2016/02/06 12:10:33 jaapb Exp $
#
DISTNAME= lwt-2.5.1
+PKGNAME= ocaml-${DISTNAME}
CATEGORIES= devel
#MASTER_SITES= http://github.com/ocsigen/lwt/archive/
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
diff --git a/devel/ocaml-re/Makefile b/devel/ocaml-re/Makefile
index a47f21b681d..ec505fd7565 100644
--- a/devel/ocaml-re/Makefile
+++ b/devel/ocaml-re/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:57 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
DISTNAME= ocaml-re-1.2.2
PKGREVISION= 2
-PKGNAME= ${DISTNAME} # avoid prefixing with ocaml-
CATEGORIES= devel
MASTER_SITES= https://github.com/ocaml/ocaml-re/archive/
diff --git a/devel/ocaml-reactiveData/Makefile b/devel/ocaml-reactiveData/Makefile
index 1a1b5f2ae23..72b7948786f 100644
--- a/devel/ocaml-reactiveData/Makefile
+++ b/devel/ocaml-reactiveData/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2016/02/06 11:23:41 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
GITHUB_PROJECT= reactiveData
DISTNAME= ${GITHUB_PROJECT}-0.2
+PKGNAME= ocaml-${DISTNAME}
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile
index a7310a3e87f..c5c683338af 100644
--- a/devel/ocaml-sexplib/Makefile
+++ b/devel/ocaml-sexplib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2015/08/07 11:20:34 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
DISTNAME= sexplib-${VERS}
-VERS= 112.01.00
-PKGREVISION= 2
+PKGNAME= ocaml-${DISTNAME}
+VERS= 113.00.00
CATEGORIES= devel
-MASTER_SITES= https://github.com/janestreet/sexplib/archive/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/sexplib/archive/}
DISTFILES= ${VERS}${EXTRACT_SUFX}
DIST_SUBDIR= ocaml-sexplib
diff --git a/devel/ocaml-type_conv/Makefile b/devel/ocaml-type_conv/Makefile
index 2df9782426e..eb4de714e81 100644
--- a/devel/ocaml-type_conv/Makefile
+++ b/devel/ocaml-type_conv/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2015/08/07 11:20:32 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2016/02/06 12:10:33 jaapb Exp $
DISTNAME= type_conv-${VERS}
-VERS= 111.13.00
-PKGREVISION= 4
+PKGNAME= ocaml-${DISTNAME}
+VERS= 113.00.02
CATEGORIES= devel
-MASTER_SITES= https://github.com/janestreet/type_conv/archive/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/type_conv/archive/}
DISTFILES= ${VERS}${EXTRACT_SUFX}
DIST_SUBDIR= ocaml-type_conv
diff --git a/devel/ocamlgraph/Makefile b/devel/ocamlgraph/Makefile
index 3241b23b134..d3c4a92278f 100644
--- a/devel/ocamlgraph/Makefile
+++ b/devel/ocamlgraph/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2015/10/10 01:58:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2016/02/06 12:10:33 jaapb Exp $
DISTNAME= ocamlgraph-1.8.5
-PKGNAME= ${DISTNAME} # avoid prefixing with ocaml-
PKGREVISION= 5
CATEGORIES= devel
MASTER_SITES= http://ocamlgraph.lri.fr/download/
diff --git a/devel/ocamlify/Makefile b/devel/ocamlify/Makefile
index b31894959ae..10cc9209440 100644
--- a/devel/ocamlify/Makefile
+++ b/devel/ocamlify/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:57 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
-PKGNAME= ${DISTNAME} # defined to avoid prefixing with ocaml-
DISTNAME= ocamlify-0.0.2
PKGREVISION= 2
CATEGORIES= devel
diff --git a/devel/ocamlmod/Makefile b/devel/ocamlmod/Makefile
index 131985f4e14..82f20751101 100644
--- a/devel/ocamlmod/Makefile
+++ b/devel/ocamlmod/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:57 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
-PKGNAME=${DISTNAME} # defined to avoid prefixing with ocaml-
DISTNAME= ocamlmod-0.0.7
PKGREVISION= 2
CATEGORIES= devel
diff --git a/devel/pcre-ocaml/Makefile b/devel/pcre-ocaml/Makefile
index 5e7ff863d48..6c9122a4658 100644
--- a/devel/pcre-ocaml/Makefile
+++ b/devel/pcre-ocaml/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2016/02/03 13:16:31 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2016/02/06 12:10:32 jaapb Exp $
DISTNAME= pcre-ocaml-7.1.6
-PKGNAME= ${DISTNAME} # avoid prefixing with ocaml
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=mmottl/}
GITHUB_RELEASE= v${PKGVERSION_NOREV}
diff --git a/lang/camlp5/Makefile b/lang/camlp5/Makefile
index ceb6ddd5af7..3906a6d4a8e 100644
--- a/lang/camlp5/Makefile
+++ b/lang/camlp5/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2015/08/07 11:19:13 jaapb Exp $
+# $NetBSD: Makefile,v 1.24 2016/02/06 12:10:33 jaapb Exp $
#
DISTNAME= camlp5-6.14
-PKGNAME= ${DISTNAME} # to avoid being called ocaml-camlp5
CATEGORIES= lang
MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/
EXTRACT_SUFX= .tgz
diff --git a/misc/ocaml-cudf/Makefile b/misc/ocaml-cudf/Makefile
index bf69f5f6259..319e15dc07f 100644
--- a/misc/ocaml-cudf/Makefile
+++ b/misc/ocaml-cudf/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:58 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
DISTNAME= cudf-0.7
+PKGNAME= ocaml-${DISTNAME}
PKGREVISION= 2
CATEGORIES= misc
MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/33593/
diff --git a/mk/ocaml.mk b/mk/ocaml.mk
index 3a649b771c8..4aab02d081c 100644
--- a/mk/ocaml.mk
+++ b/mk/ocaml.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ocaml.mk,v 1.4 2015/04/20 02:36:05 hiramatsu Exp $
+# $NetBSD: ocaml.mk,v 1.5 2016/02/06 12:10:34 jaapb Exp $
#
# This Makefile fragment handles the common variables used by OCaml packages.
#
@@ -41,8 +41,6 @@ _DEF_VARS.ocaml= \
_SYS_VARS.ocaml= \
OCAML_SITELIBDIR
-PKGNAME?= ocaml-${DISTNAME}
-
# Default value of OCAML_USE_FINDLIB
OCAML_USE_FINDLIB?= no
diff --git a/net/ocamlnet/Makefile b/net/ocamlnet/Makefile
index 1db38c89af5..d4845b551aa 100644
--- a/net/ocamlnet/Makefile
+++ b/net/ocamlnet/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2016/02/03 13:19:26 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2016/02/06 12:10:34 jaapb Exp $
#
DISTNAME= ocamlnet-4.0.4
-PKGNAME= ${DISTNAME} # in order to avoid prefixing with ocaml-
CATEGORIES= net
MASTER_SITES= http://download.camlcity.org/download/
diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile
index 980a8c61201..f77949e9d0f 100644
--- a/security/ocaml-cryptokit/Makefile
+++ b/security/ocaml-cryptokit/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2015/08/07 11:20:32 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2016/02/06 12:10:34 jaapb Exp $
#
DISTNAME= cryptokit-1.9
+PKGNAME= ocaml-${DISTNAME}
PKGREVISION= 3
CATEGORIES= security
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1229/
diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile
index 871f733862c..1c184f18aed 100644
--- a/security/ocaml-ssl/Makefile
+++ b/security/ocaml-ssl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2016/02/03 12:48:38 jaapb Exp $
+# $NetBSD: Makefile,v 1.20 2016/02/06 12:10:34 jaapb Exp $
#
-PKGNAME= ${DISTNAME} # to avoid prefixing with ocaml-
DISTNAME= ocaml-ssl-0.5.2
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GITHUB:=savonet/}
@@ -11,9 +10,6 @@ HOMEPAGE= http://github.com/savonet/ocaml-ssl
COMMENT= SSL library for OCaml
LICENSE= gnu-lgpl-v2.1
-# ssl.cmo used before written
-MAKE_JOBS_SAFE= no
-
HAS_CONFIGURE= yes
USE_TOOLS+= autoconf gmake
diff --git a/textproc/ocaml-uutf/Makefile b/textproc/ocaml-uutf/Makefile
index ddd8cae94b2..86316ca5ce2 100644
--- a/textproc/ocaml-uutf/Makefile
+++ b/textproc/ocaml-uutf/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2015/06/30 11:52:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.6 2016/02/06 12:10:34 jaapb Exp $
DISTNAME= uutf-0.9.3
+PKGNAME= ocaml-${DISTNAME}
PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= http://erratique.ch/software/uutf/releases/
diff --git a/time/ocaml-calendar/Makefile b/time/ocaml-calendar/Makefile
index 2dcb9c53466..c9a7467242c 100644
--- a/time/ocaml-calendar/Makefile
+++ b/time/ocaml-calendar/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2015/06/30 11:52:59 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2016/02/06 12:10:34 jaapb Exp $
#
DISTNAME= calendar-2.04
+PKGNAME= ocaml-${DISTNAME}
PKGREVISION= 1
CATEGORIES= time devel
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1481/
diff --git a/x11/ocaml-lablgtk/Makefile b/x11/ocaml-lablgtk/Makefile
index 854d9494c35..20b8ab764c6 100644
--- a/x11/ocaml-lablgtk/Makefile
+++ b/x11/ocaml-lablgtk/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:40 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2016/02/06 12:10:34 jaapb Exp $
DISTNAME= lablgtk-2.18.3
+PKGNAME= ocaml-${DISTNAME}
PKGREVISION= 6
CATEGORIES= x11
MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1479/