Sat Feb 6 12:10:34 2016 UTC ()
Removed the automatic setting of PKGNAME to ocaml-${DISTNAME} from
ocaml.mk. It was becoming more trouble than it was worth: only a minority
of packages used it, and it only made Makefiles more confusing.
(I've left out some packages: these will be updated forthwith)


(jaapb)
diff -r1.18 -r1.19 pkgsrc/databases/ocaml-mysql/Makefile
diff -r1.14 -r1.15 pkgsrc/devel/menhir/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/ocaml-batteries/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/ocaml-extlib/Makefile
diff -r1.19 -r1.20 pkgsrc/devel/ocaml-lwt/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/ocaml-re/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/ocaml-reactiveData/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/ocaml-sexplib/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/ocaml-type_conv/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/ocamlgraph/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/ocamlify/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/ocamlmod/Makefile
diff -r1.21 -r1.22 pkgsrc/devel/pcre-ocaml/Makefile
diff -r1.23 -r1.24 pkgsrc/lang/camlp5/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/ocaml-cudf/Makefile
diff -r1.4 -r1.5 pkgsrc/mk/ocaml.mk
diff -r1.25 -r1.26 pkgsrc/net/ocamlnet/Makefile
diff -r1.9 -r1.10 pkgsrc/security/ocaml-cryptokit/Makefile
diff -r1.19 -r1.20 pkgsrc/security/ocaml-ssl/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/ocaml-uutf/Makefile
diff -r1.12 -r1.13 pkgsrc/time/ocaml-calendar/Makefile
diff -r1.10 -r1.11 pkgsrc/x11/ocaml-lablgtk/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/databases/ocaml-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/ocaml-mysql/Makefile 2015/06/30 11:52:56 1.18
+++ pkgsrc/databases/ocaml-mysql/Makefile 2016/02/06 12:10:32 1.19
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.18 2015/06/30 11:52:56 jaapb Exp $ 1# $NetBSD: Makefile,v 1.19 2016/02/06 12:10:32 jaapb Exp $
2# 2#
3 3
4DISTNAME= ocaml-mysql-1.1.2 4DISTNAME= ocaml-mysql-1.1.2
5PKGNAME= ${DISTNAME} # to avoid prefixing with ocaml- 
6PKGREVISION= 1 5PKGREVISION= 1
7CATEGORIES= databases 6CATEGORIES= databases
8MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1308/ 7MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1308/
9 8
10MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
11HOMEPAGE= http://ocaml-mysql.forge.ocamlcore.org/ 10HOMEPAGE= http://ocaml-mysql.forge.ocamlcore.org/
12COMMENT= Ocaml library for MySQL database access 11COMMENT= Ocaml library for MySQL database access
13LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
14 13
15USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_TOOLS+= gmake 16USE_TOOLS+= gmake
18 17
cvs diff -r1.14 -r1.15 pkgsrc/devel/menhir/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/menhir/Makefile 2015/06/30 11:52:56 1.14
+++ pkgsrc/devel/menhir/Makefile 2016/02/06 12:10:33 1.15
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.14 2015/06/30 11:52:56 jaapb Exp $ 1# $NetBSD: Makefile,v 1.15 2016/02/06 12:10:33 jaapb Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME} # defined to avoid prefixing with ocaml- 
5DISTNAME= menhir-20140422 4DISTNAME= menhir-20140422
6PKGREVISION= 2 5PKGREVISION= 2
7CATEGORIES= devel 6CATEGORIES= devel
8MASTER_SITES= http://cristal.inria.fr/~fpottier/menhir/ 7MASTER_SITES= http://cristal.inria.fr/~fpottier/menhir/
9 8
10MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
11HOMEPAGE= http://cristal.inria.fr/~fpottier/menhir/ 10HOMEPAGE= http://cristal.inria.fr/~fpottier/menhir/
12COMMENT= LR(1) parser generator in OCaml 11COMMENT= LR(1) parser generator in OCaml
13LICENSE= qpl-v1.0 12LICENSE= qpl-v1.0
14 13
15USE_TOOLS+= gmake 14USE_TOOLS+= gmake
16MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
17 16
cvs diff -r1.6 -r1.7 pkgsrc/devel/ocaml-batteries/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-batteries/Makefile 2015/08/07 11:20:33 1.6
+++ pkgsrc/devel/ocaml-batteries/Makefile 2016/02/06 12:10:32 1.7
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.6 2015/08/07 11:20:33 jaapb Exp $ 1# $NetBSD: Makefile,v 1.7 2016/02/06 12:10:32 jaapb Exp $
2 2
3DISTNAME= batteries-2.3 3DISTNAME= batteries-2.3
 4PKGNAME= ocaml-${DISTNAME}
4PKGREVISION= 3 5PKGREVISION= 3
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1465/ 7MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1465/
7 8
8MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://batteries.forge.ocamlcore.org/ 10HOMEPAGE= http://batteries.forge.ocamlcore.org/
10COMMENT= Alternative standard library for OCaml 11COMMENT= Alternative standard library for OCaml
11LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
12 13
13USE_TOOLS+= gmake 14USE_TOOLS+= gmake
14 15
15MAKE_ENV= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" 16MAKE_ENV= DESTDIR="${DESTDIR}" PREFIX="${PREFIX}"
16 17
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocaml-extlib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-extlib/Makefile 2015/06/30 11:52:56 1.3
+++ pkgsrc/devel/ocaml-extlib/Makefile 2016/02/06 12:10:33 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:56 jaapb Exp $ 1# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
2 2
3DISTNAME= extlib-1.6.1 3DISTNAME= extlib-1.6.1
 4PKGNAME= ocaml-${DISTNAME}
4PKGREVISION= 2 5PKGREVISION= 2
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= https://ocaml-extlib.googlecode.com/files/ 7MASTER_SITES= https://ocaml-extlib.googlecode.com/files/
7 8
8MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://code.google.com/p/ocaml-extlib/ 10HOMEPAGE= http://code.google.com/p/ocaml-extlib/
10COMMENT= Alternative standard library for OCaml 11COMMENT= Alternative standard library for OCaml
11LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
12 13
13USE_TOOLS+= gmake 14USE_TOOLS+= gmake
14MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
15 16
16OCAML_USE_FINDLIB= yes 17OCAML_USE_FINDLIB= yes
cvs diff -r1.19 -r1.20 pkgsrc/devel/ocaml-lwt/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-lwt/Makefile 2016/02/06 11:35:14 1.19
+++ pkgsrc/devel/ocaml-lwt/Makefile 2016/02/06 12:10:33 1.20
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.19 2016/02/06 11:35:14 jaapb Exp $ 1# $NetBSD: Makefile,v 1.20 2016/02/06 12:10:33 jaapb Exp $
2# 2#
3 3
4DISTNAME= lwt-2.5.1 4DISTNAME= lwt-2.5.1
 5PKGNAME= ocaml-${DISTNAME}
5CATEGORIES= devel 6CATEGORIES= devel
6#MASTER_SITES= http://github.com/ocsigen/lwt/archive/ 7#MASTER_SITES= http://github.com/ocsigen/lwt/archive/
7MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
8GITHUB_PROJECT= lwt 9GITHUB_PROJECT= lwt
9 10
10MAINTAINER= jaapb@NetBSD.org 11MAINTAINER= jaapb@NetBSD.org
11HOMEPAGE= http://www.ocsigen.org/ 12HOMEPAGE= http://www.ocsigen.org/
12COMMENT= Cooperative threading library for OCaml 13COMMENT= Cooperative threading library for OCaml
13LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
14 15
15DEPENDS= ocaml-react-[0-9]*:../../devel/ocaml-react 16DEPENDS= ocaml-react-[0-9]*:../../devel/ocaml-react
16BUILDLINK_API_DEPENDS.ocaml-ssl+= ocaml-ssl>=0.5.0 17BUILDLINK_API_DEPENDS.ocaml-ssl+= ocaml-ssl>=0.5.0
17 18
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocaml-re/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-re/Makefile 2015/06/30 11:52:57 1.3
+++ pkgsrc/devel/ocaml-re/Makefile 2016/02/06 12:10:33 1.4
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:57 jaapb Exp $ 1# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
2 2
3DISTNAME= ocaml-re-1.2.2 3DISTNAME= ocaml-re-1.2.2
4PKGREVISION= 2 4PKGREVISION= 2
5PKGNAME= ${DISTNAME} # avoid prefixing with ocaml- 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= https://github.com/ocaml/ocaml-re/archive/ 6MASTER_SITES= https://github.com/ocaml/ocaml-re/archive/
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://github.com/ocaml/ocaml-re/ 9HOMEPAGE= http://github.com/ocaml/ocaml-re/
11COMMENT= Pure OCaml regular expression library 10COMMENT= Pure OCaml regular expression library
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14USE_TOOLS+= gmake 13USE_TOOLS+= gmake
15OCAML_USE_FINDLIB= yes 14OCAML_USE_FINDLIB= yes
16CONFIGURE_ARGS+= --prefix ${PREFIX} 15CONFIGURE_ARGS+= --prefix ${PREFIX}
17 16
18WRKSRC= ${WRKDIR}/ocaml-re-${DISTNAME} 17WRKSRC= ${WRKDIR}/ocaml-re-${DISTNAME}
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocaml-reactiveData/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-reactiveData/Makefile 2016/02/06 11:23:41 1.3
+++ pkgsrc/devel/ocaml-reactiveData/Makefile 2016/02/06 12:10:33 1.4
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.3 2016/02/06 11:23:41 jaapb Exp $ 1# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
2 2
3GITHUB_PROJECT= reactiveData 3GITHUB_PROJECT= reactiveData
4DISTNAME= ${GITHUB_PROJECT}-0.2 4DISTNAME= ${GITHUB_PROJECT}-0.2
 5PKGNAME= ocaml-${DISTNAME}
5CATEGORIES= devel 6CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
7 8
8MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://github.com/ocsigen/reactiveData 10HOMEPAGE= http://github.com/ocsigen/reactiveData
10COMMENT= Functional reactive programming library 11COMMENT= Functional reactive programming library
11LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
12 13
13OCAML_USE_FINDLIB= yes 14OCAML_USE_FINDLIB= yes
14 15
15.include "../../mk/ocaml.mk" 16.include "../../mk/ocaml.mk"
16 17
17INSTALL_FILES= cma cmi mli 18INSTALL_FILES= cma cmi mli
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocaml-sexplib/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-sexplib/Makefile 2015/08/07 11:20:34 1.3
+++ pkgsrc/devel/ocaml-sexplib/Makefile 2016/02/06 12:10:33 1.4
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.3 2015/08/07 11:20:34 jaapb Exp $ 1# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
2 2
3DISTNAME= sexplib-${VERS} 3DISTNAME= sexplib-${VERS}
4VERS= 112.01.00 4PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 2 5VERS= 113.00.00
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= https://github.com/janestreet/sexplib/archive/ 7MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/sexplib/archive/}
8DISTFILES= ${VERS}${EXTRACT_SUFX} 8DISTFILES= ${VERS}${EXTRACT_SUFX}
9DIST_SUBDIR= ocaml-sexplib 9DIST_SUBDIR= ocaml-sexplib
10 10
11MAINTAINER= jaapb@NetBSD.org 11MAINTAINER= jaapb@NetBSD.org
12HOMEPAGE= https://github.com/janestreet/sexplib/ 12HOMEPAGE= https://github.com/janestreet/sexplib/
13COMMENT= S-Expressions with Type Converters for OCaml 13COMMENT= S-Expressions with Type Converters for OCaml
14LICENSE= modified-bsd AND apache-2.0 14LICENSE= modified-bsd AND apache-2.0
15 15
16OCAML_USE_OASIS= yes 16OCAML_USE_OASIS= yes
17 17
18.include "../../devel/ocaml-type_conv/buildlink3.mk" 18.include "../../devel/ocaml-type_conv/buildlink3.mk"
19.include "../../mk/ocaml.mk" 19.include "../../mk/ocaml.mk"
20.include "../../mk/bsd.pkg.mk" 20.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/devel/ocaml-type_conv/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-type_conv/Attic/Makefile 2015/08/07 11:20:32 1.5
+++ pkgsrc/devel/ocaml-type_conv/Attic/Makefile 2016/02/06 12:10:33 1.6
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.5 2015/08/07 11:20:32 jaapb Exp $ 1# $NetBSD: Makefile,v 1.6 2016/02/06 12:10:33 jaapb Exp $
2 2
3 3
4DISTNAME= type_conv-${VERS} 4DISTNAME= type_conv-${VERS}
5VERS= 111.13.00 5PKGNAME= ocaml-${DISTNAME}
6PKGREVISION= 4 6VERS= 113.00.02
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= https://github.com/janestreet/type_conv/archive/ 8MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/type_conv/archive/}
9DISTFILES= ${VERS}${EXTRACT_SUFX} 9DISTFILES= ${VERS}${EXTRACT_SUFX}
10DIST_SUBDIR= ocaml-type_conv 10DIST_SUBDIR= ocaml-type_conv
11 11
12MAINTAINER= jaapb@NetBSD.org 12MAINTAINER= jaapb@NetBSD.org
13HOMEPAGE= https://github.com/janestreet/type_conv/ 13HOMEPAGE= https://github.com/janestreet/type_conv/
14COMMENT= Support library for OCaml preprocessor type conversions 14COMMENT= Support library for OCaml preprocessor type conversions
15LICENSE= apache-2.0 AND modified-bsd 15LICENSE= apache-2.0 AND modified-bsd
16 16
17WRKSRC= ${WRKDIR}/type_conv-${VERS} 17WRKSRC= ${WRKDIR}/type_conv-${VERS}
18USE_TOOLS+= gmake 18USE_TOOLS+= gmake
19 19
20OCAML_USE_FINDLIB= yes 20OCAML_USE_FINDLIB= yes
21 21
cvs diff -r1.6 -r1.7 pkgsrc/devel/ocamlgraph/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocamlgraph/Makefile 2015/10/10 01:58:05 1.6
+++ pkgsrc/devel/ocamlgraph/Makefile 2016/02/06 12:10:33 1.7
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.6 2015/10/10 01:58:05 ryoon Exp $ 1# $NetBSD: Makefile,v 1.7 2016/02/06 12:10:33 jaapb Exp $
2 2
3DISTNAME= ocamlgraph-1.8.5 3DISTNAME= ocamlgraph-1.8.5
4PKGNAME= ${DISTNAME} # avoid prefixing with ocaml- 
5PKGREVISION= 5 4PKGREVISION= 5
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= http://ocamlgraph.lri.fr/download/ 6MASTER_SITES= http://ocamlgraph.lri.fr/download/
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://ocamlgraph.lri.fr/ 9HOMEPAGE= http://ocamlgraph.lri.fr/
11COMMENT= Graph library for OCaml 10COMMENT= Graph library for OCaml
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
15USE_TOOLS+= gmake 14USE_TOOLS+= gmake
16INSTALL_TARGET= install-findlib 15INSTALL_TARGET= install-findlib
17OCAML_USE_FINDLIB= yes 16OCAML_USE_FINDLIB= yes
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocamlify/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocamlify/Makefile 2015/06/30 11:52:57 1.3
+++ pkgsrc/devel/ocamlify/Makefile 2016/02/06 12:10:33 1.4
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:57 jaapb Exp $ 1# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
2 2
3PKGNAME= ${DISTNAME} # defined to avoid prefixing with ocaml- 
4DISTNAME= ocamlify-0.0.2 3DISTNAME= ocamlify-0.0.2
5PKGREVISION= 2 4PKGREVISION= 2
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1209/ 6MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1209/
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://forge.ocamlcore.org/projects/ocamlify/ 9HOMEPAGE= http://forge.ocamlcore.org/projects/ocamlify/
11COMMENT= Allows embedding external resources as OCaml code 10COMMENT= Allows embedding external resources as OCaml code
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14OCAML_USE_OASIS= yes 13OCAML_USE_OASIS= yes
15 14
16.include "../../mk/ocaml.mk" 15.include "../../mk/ocaml.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocamlmod/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocamlmod/Makefile 2015/06/30 11:52:57 1.3
+++ pkgsrc/devel/ocamlmod/Makefile 2016/02/06 12:10:33 1.4
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:57 jaapb Exp $ 1# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
2 2
3PKGNAME=${DISTNAME} # defined to avoid prefixing with ocaml- 
4DISTNAME= ocamlmod-0.0.7 3DISTNAME= ocamlmod-0.0.7
5PKGREVISION= 2 4PKGREVISION= 2
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1350/ 6MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1350/
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://forge.ocamlcore.org/projects/ocamlmod/ 9HOMEPAGE= http://forge.ocamlcore.org/projects/ocamlmod/
11COMMENT= Generate OCaml modules from source files 10COMMENT= Generate OCaml modules from source files
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14OCAML_USE_OASIS= yes 13OCAML_USE_OASIS= yes
15 14
16.include "../../mk/ocaml.mk" 15.include "../../mk/ocaml.mk"
cvs diff -r1.21 -r1.22 pkgsrc/devel/pcre-ocaml/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/pcre-ocaml/Makefile 2016/02/03 13:16:31 1.21
+++ pkgsrc/devel/pcre-ocaml/Makefile 2016/02/06 12:10:32 1.22
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.21 2016/02/03 13:16:31 jaapb Exp $ 1# $NetBSD: Makefile,v 1.22 2016/02/06 12:10:32 jaapb Exp $
2 2
3DISTNAME= pcre-ocaml-7.1.6 3DISTNAME= pcre-ocaml-7.1.6
4PKGNAME= ${DISTNAME} # avoid prefixing with ocaml 
5CATEGORIES= devel 4CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mmottl/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=mmottl/}
7GITHUB_RELEASE= v${PKGVERSION_NOREV} 6GITHUB_RELEASE= v${PKGVERSION_NOREV}
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://github.com/mmottl/pcre-ocaml 9HOMEPAGE= http://github.com/mmottl/pcre-ocaml
11COMMENT= Perl compatible regular expressions for OCaml 10COMMENT= Perl compatible regular expressions for OCaml
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14OCAML_USE_OASIS= yes 13OCAML_USE_OASIS= yes
15USE_TOOLS= pax 14USE_TOOLS= pax
16MAKE_JOBS_SAFE= no 15MAKE_JOBS_SAFE= no
17 16
cvs diff -r1.23 -r1.24 pkgsrc/lang/camlp5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/camlp5/Makefile 2015/08/07 11:19:13 1.23
+++ pkgsrc/lang/camlp5/Makefile 2016/02/06 12:10:33 1.24
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.23 2015/08/07 11:19:13 jaapb Exp $ 1# $NetBSD: Makefile,v 1.24 2016/02/06 12:10:33 jaapb Exp $
2# 2#
3 3
4DISTNAME= camlp5-6.14 4DISTNAME= camlp5-6.14
5PKGNAME= ${DISTNAME} # to avoid being called ocaml-camlp5 
6CATEGORIES= lang 5CATEGORIES= lang
7MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/ 6MASTER_SITES= http://camlp5.gforge.inria.fr/distrib/src/
8EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
9 8
10MAINTAINER= tonio@NetBSD.org 9MAINTAINER= tonio@NetBSD.org
11HOMEPAGE= http://camlp5.gforge.inria.fr/ 10HOMEPAGE= http://camlp5.gforge.inria.fr/
12COMMENT= Camlp5 is a preprocessor-pretty-printer of ocaml 11COMMENT= Camlp5 is a preprocessor-pretty-printer of ocaml
13LICENSE= modified-bsd 12LICENSE= modified-bsd
14 13
15HAS_CONFIGURE= yes 14HAS_CONFIGURE= yes
16USE_LANGUAGES= c # needed for optimised compiler 15USE_LANGUAGES= c # needed for optimised compiler
17MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
18 17
cvs diff -r1.3 -r1.4 pkgsrc/misc/ocaml-cudf/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/ocaml-cudf/Makefile 2015/06/30 11:52:58 1.3
+++ pkgsrc/misc/ocaml-cudf/Makefile 2016/02/06 12:10:33 1.4
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.3 2015/06/30 11:52:58 jaapb Exp $ 1# $NetBSD: Makefile,v 1.4 2016/02/06 12:10:33 jaapb Exp $
2 2
3DISTNAME= cudf-0.7 3DISTNAME= cudf-0.7
 4PKGNAME= ocaml-${DISTNAME}
4PKGREVISION= 2 5PKGREVISION= 2
5CATEGORIES= misc 6CATEGORIES= misc
6MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/33593/ 7MASTER_SITES= https://gforge.inria.fr/frs/download.php/file/33593/
7 8
8MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://www.mancoosi.org/cudf/ 10HOMEPAGE= http://www.mancoosi.org/cudf/
10COMMENT= OCaml library for the Common Upgradeability Description Format 11COMMENT= OCaml library for the Common Upgradeability Description Format
11LICENSE= gnu-lgpl-v3 12LICENSE= gnu-lgpl-v3
12 13
13USE_TOOLS+= gmake pkg-config pod2man 14USE_TOOLS+= gmake pkg-config pod2man
14OCAML_USE_FINDLIB= yes 15OCAML_USE_FINDLIB= yes
15MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
16 17
cvs diff -r1.4 -r1.5 pkgsrc/mk/Attic/ocaml.mk (expand / switch to unified diff)

--- pkgsrc/mk/Attic/ocaml.mk 2015/04/20 02:36:05 1.4
+++ pkgsrc/mk/Attic/ocaml.mk 2016/02/06 12:10:34 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: ocaml.mk,v 1.4 2015/04/20 02:36:05 hiramatsu Exp $ 1# $NetBSD: ocaml.mk,v 1.5 2016/02/06 12:10:34 jaapb Exp $
2# 2#
3# This Makefile fragment handles the common variables used by OCaml packages. 3# This Makefile fragment handles the common variables used by OCaml packages.
4# 4#
5# Build def variables: 5# Build def variables:
6# OCAML_USE_OPT_COMPILER  6# OCAML_USE_OPT_COMPILER
7# if set to yes, will enable optimised (native code) compilation 7# if set to yes, will enable optimised (native code) compilation
8# default value: depends on architecture 8# default value: depends on architecture
9# 9#
10# PLIST variable: 10# PLIST variable:
11# PLIST.ocaml-opt for files only installed when using the optimised compiler 11# PLIST.ocaml-opt for files only installed when using the optimised compiler
12# Set based on OCAML_USE_OPT_COMPILER 12# Set based on OCAML_USE_OPT_COMPILER
13#  13#
14# Package-settable variables: 14# Package-settable variables:
@@ -31,28 +31,26 @@ OCAML_MK= # defined @@ -31,28 +31,26 @@ OCAML_MK= # defined
31BUILD_DEFS+= OCAML_USE_OPT_COMPILER 31BUILD_DEFS+= OCAML_USE_OPT_COMPILER
32 32
33_VARGROUPS+= ocaml 33_VARGROUPS+= ocaml
34_PKG_VARS.ocaml= \ 34_PKG_VARS.ocaml= \
35 OCAML_USE_FINDLIB \ 35 OCAML_USE_FINDLIB \
36 OCAML_USE_OASIS \ 36 OCAML_USE_OASIS \
37 OCAML_USE_OPAM \ 37 OCAML_USE_OPAM \
38 OCAML_BUILD_ARGS 38 OCAML_BUILD_ARGS
39_DEF_VARS.ocaml= \ 39_DEF_VARS.ocaml= \
40 OCAML_USE_OPT_COMPILER 40 OCAML_USE_OPT_COMPILER
41_SYS_VARS.ocaml= \ 41_SYS_VARS.ocaml= \
42 OCAML_SITELIBDIR 42 OCAML_SITELIBDIR
43 43
44PKGNAME?= ocaml-${DISTNAME} 
45 
46# Default value of OCAML_USE_FINDLIB 44# Default value of OCAML_USE_FINDLIB
47OCAML_USE_FINDLIB?= no 45OCAML_USE_FINDLIB?= no
48 46
49# Default value of OCAML_USE_OASIS 47# Default value of OCAML_USE_OASIS
50OCAML_USE_OASIS?= no 48OCAML_USE_OASIS?= no
51 49
52# Default value of OCAML_USE_OPAM 50# Default value of OCAML_USE_OPAM
53OCAML_USE_OPAM?= no 51OCAML_USE_OPAM?= no
54 52
55# Default value of OASIS_BUILD_ARGS 53# Default value of OASIS_BUILD_ARGS
56OASIS_BUILD_ARGS?= # empty 54OASIS_BUILD_ARGS?= # empty
57 55
58# Default value of OCAML_ENABLE_BINARY_COMPILER 56# Default value of OCAML_ENABLE_BINARY_COMPILER
cvs diff -r1.25 -r1.26 pkgsrc/net/ocamlnet/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ocamlnet/Makefile 2016/02/03 13:19:26 1.25
+++ pkgsrc/net/ocamlnet/Makefile 2016/02/06 12:10:34 1.26
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.25 2016/02/03 13:19:26 jaapb Exp $ 1# $NetBSD: Makefile,v 1.26 2016/02/06 12:10:34 jaapb Exp $
2# 2#
3 3
4DISTNAME= ocamlnet-4.0.4 4DISTNAME= ocamlnet-4.0.4
5PKGNAME= ${DISTNAME} # in order to avoid prefixing with ocaml- 
6CATEGORIES= net 5CATEGORIES= net
7MASTER_SITES= http://download.camlcity.org/download/ 6MASTER_SITES= http://download.camlcity.org/download/
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://projects.camlcity.org/projects/ocamlnet.html 9HOMEPAGE= http://projects.camlcity.org/projects/ocamlnet.html
11COMMENT= Library focusing on application-level network protocols (OCaml) 10COMMENT= Library focusing on application-level network protocols (OCaml)
12LICENSE= zlib AND gnu-gpl-v2 11LICENSE= zlib AND gnu-gpl-v2
13 12
14MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
15 14
16HAS_CONFIGURE= yes 15HAS_CONFIGURE= yes
17CONFIGURE_ARGS+= -without-nethttpd -disable-tcl -disable-apache \ 16CONFIGURE_ARGS+= -without-nethttpd -disable-tcl -disable-apache \
18 -enable-pcre -enable-zip 17 -enable-pcre -enable-zip
cvs diff -r1.9 -r1.10 pkgsrc/security/ocaml-cryptokit/Makefile (expand / switch to unified diff)

--- pkgsrc/security/ocaml-cryptokit/Makefile 2015/08/07 11:20:32 1.9
+++ pkgsrc/security/ocaml-cryptokit/Makefile 2016/02/06 12:10:34 1.10
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2015/08/07 11:20:32 jaapb Exp $ 1# $NetBSD: Makefile,v 1.10 2016/02/06 12:10:34 jaapb Exp $
2# 2#
3 3
4DISTNAME= cryptokit-1.9 4DISTNAME= cryptokit-1.9
 5PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 3 6PKGREVISION= 3
6CATEGORIES= security 7CATEGORIES= security
7MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1229/ 8MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1229/
8 9
9MAINTAINER= jaapb@kerguelen.org 10MAINTAINER= jaapb@kerguelen.org
10HOMEPAGE= http://forge.ocamlcore.org/projects/cryptokit/ 11HOMEPAGE= http://forge.ocamlcore.org/projects/cryptokit/
11COMMENT= Cryptographic primitives library for Objective Caml 12COMMENT= Cryptographic primitives library for Objective Caml
12LICENSE= gnu-lgpl-v2 # with static compilation exception 13LICENSE= gnu-lgpl-v2 # with static compilation exception
13 14
14OCAML_USE_OASIS= yes 15OCAML_USE_OASIS= yes
15 16
16.include "../../mk/ocaml.mk" 17.include "../../mk/ocaml.mk"
17 18
cvs diff -r1.19 -r1.20 pkgsrc/security/ocaml-ssl/Makefile (expand / switch to unified diff)

--- pkgsrc/security/ocaml-ssl/Makefile 2016/02/03 12:48:38 1.19
+++ pkgsrc/security/ocaml-ssl/Makefile 2016/02/06 12:10:34 1.20
@@ -1,29 +1,25 @@ @@ -1,29 +1,25 @@
1# $NetBSD: Makefile,v 1.19 2016/02/03 12:48:38 jaapb Exp $ 1# $NetBSD: Makefile,v 1.20 2016/02/06 12:10:34 jaapb Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME} # to avoid prefixing with ocaml- 
5DISTNAME= ocaml-ssl-0.5.2 4DISTNAME= ocaml-ssl-0.5.2
6CATEGORIES= security 5CATEGORIES= security
7MASTER_SITES= ${MASTER_SITE_GITHUB:=savonet/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=savonet/}
8 7
9MAINTAINER= jaapb@NetBSD.org 8MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://github.com/savonet/ocaml-ssl 9HOMEPAGE= http://github.com/savonet/ocaml-ssl
11COMMENT= SSL library for OCaml 10COMMENT= SSL library for OCaml
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14# ssl.cmo used before written 
15MAKE_JOBS_SAFE= no 
16 
17HAS_CONFIGURE= yes 13HAS_CONFIGURE= yes
18USE_TOOLS+= autoconf gmake 14USE_TOOLS+= autoconf gmake
19 15
20OCAML_USE_FINDLIB= yes 16OCAML_USE_FINDLIB= yes
21OCAML_FINDLIB_REGISTER= yes 17OCAML_FINDLIB_REGISTER= yes
22 18
23pre-configure: 19pre-configure:
24 cd ${WRKSRC} && autoconf 20 cd ${WRKSRC} && autoconf
25 21
26.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
27 23
28.include "../../mk/ocaml.mk" 24.include "../../mk/ocaml.mk"
29.include "../../security/openssl/buildlink3.mk" 25.include "../../security/openssl/buildlink3.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/ocaml-uutf/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/ocaml-uutf/Makefile 2015/06/30 11:52:59 1.5
+++ pkgsrc/textproc/ocaml-uutf/Makefile 2016/02/06 12:10:34 1.6
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2015/06/30 11:52:59 jaapb Exp $ 1# $NetBSD: Makefile,v 1.6 2016/02/06 12:10:34 jaapb Exp $
2 2
3DISTNAME= uutf-0.9.3 3DISTNAME= uutf-0.9.3
 4PKGNAME= ocaml-${DISTNAME}
4PKGREVISION= 2 5PKGREVISION= 2
5CATEGORIES= textproc 6CATEGORIES= textproc
6MASTER_SITES= http://erratique.ch/software/uutf/releases/ 7MASTER_SITES= http://erratique.ch/software/uutf/releases/
7EXTRACT_SUFX= .tbz 8EXTRACT_SUFX= .tbz
8 9
9MAINTAINER= jaapb@NetBSD.org 10MAINTAINER= jaapb@NetBSD.org
10HOMEPAGE= http://erratique.ch/software/uutf/releases/ 11HOMEPAGE= http://erratique.ch/software/uutf/releases/
11COMMENT= Unicode library for OCaml 12COMMENT= Unicode library for OCaml
12LICENSE= modified-bsd 13LICENSE= modified-bsd
13 14
14INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/uutf 15INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/uutf
15OCAML_USE_FINDLIB= yes 16OCAML_USE_FINDLIB= yes
16 17
cvs diff -r1.12 -r1.13 pkgsrc/time/ocaml-calendar/Makefile (expand / switch to unified diff)

--- pkgsrc/time/ocaml-calendar/Makefile 2015/06/30 11:52:59 1.12
+++ pkgsrc/time/ocaml-calendar/Makefile 2016/02/06 12:10:34 1.13
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.12 2015/06/30 11:52:59 jaapb Exp $ 1# $NetBSD: Makefile,v 1.13 2016/02/06 12:10:34 jaapb Exp $
2# 2#
3 3
4DISTNAME= calendar-2.04 4DISTNAME= calendar-2.04
 5PKGNAME= ocaml-${DISTNAME}
5PKGREVISION= 1 6PKGREVISION= 1
6CATEGORIES= time devel 7CATEGORIES= time devel
7MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1481/ 8MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1481/
8 9
9MAINTAINER= jaapb@kerguelen.org 10MAINTAINER= jaapb@kerguelen.org
10HOMEPAGE= http://calendar.forge.ocamlcore.org/ 11HOMEPAGE= http://calendar.forge.ocamlcore.org/
11COMMENT= OCaml library managing dates and times 12COMMENT= OCaml library managing dates and times
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
15USE_TOOLS+= gmake 16USE_TOOLS+= gmake
16OCAML_USE_FINDLIB= yes 17OCAML_USE_FINDLIB= yes
17 18
cvs diff -r1.10 -r1.11 pkgsrc/x11/ocaml-lablgtk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/ocaml-lablgtk/Makefile 2015/12/29 04:54:40 1.10
+++ pkgsrc/x11/ocaml-lablgtk/Makefile 2016/02/06 12:10:34 1.11
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.10 2015/12/29 04:54:40 dholland Exp $ 1# $NetBSD: Makefile,v 1.11 2016/02/06 12:10:34 jaapb Exp $
2 2
3DISTNAME= lablgtk-2.18.3 3DISTNAME= lablgtk-2.18.3
 4PKGNAME= ocaml-${DISTNAME}
4PKGREVISION= 6 5PKGREVISION= 6
5CATEGORIES= x11 6CATEGORIES= x11
6MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1479/ 7MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1479/
7 8
8MAINTAINER= jaapb@NetBSD.org 9MAINTAINER= jaapb@NetBSD.org
9HOMEPAGE= http://lablgtk.forge.ocamlcore.org/ 10HOMEPAGE= http://lablgtk.forge.ocamlcore.org/
10COMMENT= GTK+ 2.x bindings for Objective Caml 11COMMENT= GTK+ 2.x bindings for Objective Caml
11# for installed files; more restrictions on applications/ 12# for installed files; more restrictions on applications/
12LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
13 14
14# remove on next update 15# remove on next update
15DIST_SUBDIR= lablgtk-2.18.3 16DIST_SUBDIR= lablgtk-2.18.3
16 17