pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

multiple: Catch up with mk/ocaml.mk move to lang/ocaml/ocaml.mk



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat Nov 12 06:30:22 2022 -0500
Changeset:	c2c33759f5107d6d2655ba9a67afba5a8c272a9d

Modified Files:
	ocaml-comparelib/Makefile
	ocaml-enumerate/Makefile
	ocaml-fieldslib/Makefile
	ocaml-gen/Makefile
	ocaml-gmetadom/Makefile
	ocaml-obuild/Makefile
	ocaml-odoc/Makefile
	ocaml-ounit/Makefile
	ocaml-ptmap/Makefile
	ocaml-sedlex/Makefile
	ocaml-sha/Makefile

Log Message:
multiple: Catch up with mk/ocaml.mk move to lang/ocaml/ocaml.mk

This is a mechanical, untested commit, because the previous code was
wrong and mk/ocaml.mk is about to be removed.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c2c33759f5107d6d2655ba9a67afba5a8c272a9d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ocaml-comparelib/Makefile | 2 +-
 ocaml-enumerate/Makefile  | 2 +-
 ocaml-fieldslib/Makefile  | 2 +-
 ocaml-gen/Makefile        | 2 +-
 ocaml-gmetadom/Makefile   | 2 +-
 ocaml-obuild/Makefile     | 2 +-
 ocaml-odoc/Makefile       | 2 +-
 ocaml-ounit/Makefile      | 2 +-
 ocaml-ptmap/Makefile      | 2 +-
 ocaml-sedlex/Makefile     | 2 +-
 ocaml-sha/Makefile        | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diffs:
diff --git a/ocaml-comparelib/Makefile b/ocaml-comparelib/Makefile
index 0b12c548bf..f2788764d5 100644
--- a/ocaml-comparelib/Makefile
+++ b/ocaml-comparelib/Makefile
@@ -15,5 +15,5 @@ LICENSE=	apache-2.0
 OCAML_USE_OASIS=	yes
 
 .include "../../devel/ocaml-type_conv/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-enumerate/Makefile b/ocaml-enumerate/Makefile
index 9e28c304ae..39015dce54 100644
--- a/ocaml-enumerate/Makefile
+++ b/ocaml-enumerate/Makefile
@@ -15,5 +15,5 @@ LICENSE=	apache-2.0
 OCAML_USE_OASIS=	yes
 
 .include "../../devel/ocaml-type_conv/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-fieldslib/Makefile b/ocaml-fieldslib/Makefile
index 4b4d7f89ac..92f1d2f4ab 100644
--- a/ocaml-fieldslib/Makefile
+++ b/ocaml-fieldslib/Makefile
@@ -15,5 +15,5 @@ LICENSE=	apache-2.0
 OCAML_USE_OASIS=	yes
 
 .include "../../devel/ocaml-type_conv/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-gen/Makefile b/ocaml-gen/Makefile
index ba6ddfe043..1e324ceb20 100644
--- a/ocaml-gen/Makefile
+++ b/ocaml-gen/Makefile
@@ -15,6 +15,6 @@ LICENSE=	2-clause-bsd
 OCAML_USE_DUNE=		yes
 TEST_TARGET=		test
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-gmetadom/Makefile b/ocaml-gmetadom/Makefile
index 2ddd3beb0b..11cd872dae 100644
--- a/ocaml-gmetadom/Makefile
+++ b/ocaml-gmetadom/Makefile
@@ -10,7 +10,7 @@ MAKE_JOBS_SAFE=		no
 post-install:
 	${RM} -r ${DESTDIR}${PREFIX}/lib/pkgconfig
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../textproc/gdome2/buildlink3.mk"
 BUILDLINK_DEPMETHOD.libxslt?=  build
 .include "../../textproc/libxslt/buildlink3.mk"
diff --git a/ocaml-obuild/Makefile b/ocaml-obuild/Makefile
index a49b8413eb..453ef8cbb5 100644
--- a/ocaml-obuild/Makefile
+++ b/ocaml-obuild/Makefile
@@ -24,5 +24,5 @@ bootstrap-obuild:
 OCAML_USE_DUNE=	yes
 
 .include "../../lang/ocaml/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-odoc/Makefile b/ocaml-odoc/Makefile
index b3946f133b..2342003df0 100644
--- a/ocaml-odoc/Makefile
+++ b/ocaml-odoc/Makefile
@@ -17,5 +17,5 @@ OCAML_USE_DUNE=	yes
 .include "../../devel/ocaml-fpath/buildlink3.mk"
 .include "../../devel/ocaml-astring/buildlink3.mk"
 .include "../../devel/ocaml-cmdliner/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-ounit/Makefile b/ocaml-ounit/Makefile
index d9f4a59a1e..a4daf1073f 100644
--- a/ocaml-ounit/Makefile
+++ b/ocaml-ounit/Makefile
@@ -12,5 +12,5 @@ LICENSE=	mit
 
 OCAML_USE_OASIS=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-ptmap/Makefile b/ocaml-ptmap/Makefile
index c6cbe2a463..1901d341cb 100644
--- a/ocaml-ptmap/Makefile
+++ b/ocaml-ptmap/Makefile
@@ -15,5 +15,5 @@ LICENSE=	gnu-lgpl-v2.1
 BUILD_DEPENDS+=	ocaml-obuild-[0-9]*:../../wip/ocaml-obuild
 
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-sedlex/Makefile b/ocaml-sedlex/Makefile
index cf97ecb57b..45c6525eaa 100644
--- a/ocaml-sedlex/Makefile
+++ b/ocaml-sedlex/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+=	gmake
 OCAML_USE_DUNE=	yes
 BUILD_DEPENDS+=	ocaml-odoc-[0-9]*:../../wip/ocaml-odoc
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../devel/ocaml-ppx_tools/buildlink3.mk"
 .include "../../wip/ocaml-gen/buildlink3.mk"
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/ocaml-sha/Makefile b/ocaml-sha/Makefile
index 1fcead7067..e66a318412 100644
--- a/ocaml-sha/Makefile
+++ b/ocaml-sha/Makefile
@@ -14,5 +14,5 @@ LICENSE=	isc
 
 OCAML_USE_DUNE=	yes
 
-.include "../../mk/ocaml.mk"
+.include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index