"Updated" package x11/ocaml-graphics to version 2.0.0.

The package itself hasn't changed, it is just distributed differently;
as a separate package rather than with ocaml itself. The version has
thus regressed from OCaml's 4.07 to an independent 2.0.0, which means
that people will have to manually "upgrade" the package.

5 files changed, 42 insertions, 91 deletions

diff --git a/x11/ocaml-graphics/DESCR b/x11/ocaml-graphics/DESCR
index f8d71e9a51e..01bd07837d6 100644
--- a/x11/ocaml-graphics/DESCR
+++ b/x11/ocaml-graphics/DESCR
@@ -1 +1,2 @@
-This package provides the graphics library that comes with the ocaml compiler.
+This package provides the graphics library that used to be distributed
+with the ocaml compiler.
diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile
index a6ca47f18f8..515a1026f60 100644
--- a/x11/ocaml-graphics/Makefile
+++ b/x11/ocaml-graphics/Makefile
@@ -1,77 +1,19 @@
-# $NetBSD: Makefile,v 1.38 2018/11/12 16:10:17 jaapb Exp $
+# $NetBSD: Makefile,v 1.39 2019/05/14 16:01:17 jaapb Exp $
 
-.include "../../lang/ocaml/Makefile.common"
-DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo
-PATCHDIR= ${PKGDIR}/../../lang/ocaml/patches
+GITHUB_PROJECT=	graphics
+DISTNAME=	ocaml-${GITHUB_PROJECT}-2.0.0
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
-PKGNAME=		${DISTNAME:S/ocaml/ocaml-graphics/}
-PKGREVISION=	13
+MAINTAINER=	jaapb@NetBSD.org
+HOMEPAGE=	https://github.com/ocaml/graphics/
+COMMENT=	OCaml graphics library
+LICENSE=	gnu-lgpl-v2.1
 
-COMMENT+=		(graphics library)
+WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
-CONFIGURE_ARGS+=	-x11include ${X11BASE}/include
-CONFIGURE_ARGS+=	-x11lib ${X11BASE}/lib
-
-BUILD_DIRS=		otherlibs/graph
-BUILD_TARGET=		all
-INSTALL_TARGET=		install
+OCAML_USE_DUNE=	yes
 
 .include "../../mk/ocaml.mk"
-
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-BUILD_TARGET+=		allopt
-INSTALL_TARGET+=	installopt
-.endif
-
-PLIST_VARS+=		natdynlib
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64")
-.  if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
-      !empty(MACHINE_PLATFORM:MDarwin-*-*) || \
-      !empty(MACHINE_PLATFORM:MFreeBSD-*-*) || \
-      !empty(MACHINE_PLATFORM:MDragonFly-*-*) || \
-      !empty(MACHINE_PLATFORM:MNetBSD-*-*)
-PLIST.natdynlib=		yes
-.  endif
-.endif
-
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
-.if ${OPSYS} == "Darwin"
-PLIST_SRC+=	${PKGDIR}/PLIST.stub
-.endif
-
-BUILDLINK_DEPMETHOD.ocaml=	full
-
-SUBST_CLASSES+=		depend
-SUBST_STAGE.depend=	pre-configure
-SUBST_FILES.depend=	otherlibs/graph/.depend
-SUBST_SED.depend=	-e 's,/usr/X11R6,${X11BASE},g'
-SUBST_MESSAGE.depend=	Fixing .depend in otherlibs/graph.
-
-SUBST_CLASSES+=		mklib
-SUBST_STAGE.mklib=	pre-configure
-SUBST_FILES.mklib=	otherlibs/Makefile.shared
-SUBST_SED.mklib=	-e 's,^MKLIB=.*,MKLIB=ocamlmklib,g'
-SUBST_MESSAGE.mklib=	Fixing MKLIB in otherlibs/Makefile.shared.
-
-SUBST_CLASSES+=		comp
-SUBST_STAGE.comp=	pre-configure
-SUBST_FILES.comp=	otherlibs/Makefile
-SUBST_SED.comp=		-e 's,^CAMLC=.*,CAMLC=ocamlc,g'
-SUBST_SED.comp+=	-e '/^CAMLOPT=/{;N;s,^CAMLOPT=.*,CAMLOPT=ocamlopt,g;}'
-SUBST_SED.comp+=	-e 's,^MKLIB=.*,MKLIB=ocamlmklib,g'
-SUBST_MESSAGE.comp=	Fixing CAMLC OCAMLOPT MKLIB in otherlibs/Makefile.
-
-SUBST_CLASSES+=		comp2
-SUBST_STAGE.comp2=	pre-configure
-SUBST_FILES.comp2=	otherlibs/graph/Makefile
-SUBST_SED.comp2=	-e 's,..CAMLRUN..*ocamldep,ocamldep,g'
-SUBST_MESSAGE.comp2=	Fixing ocamldep in otherlibs/graph/Makefile.
-
-INSTALLATION_DIRS+=	lib/ocaml/stublibs
-
-post-build:
-	${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
-
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ocaml-graphics/PLIST b/x11/ocaml-graphics/PLIST
index 6d5cadbf98f..eda0096a17b 100644
--- a/x11/ocaml-graphics/PLIST
+++ b/x11/ocaml-graphics/PLIST
@@ -1,15 +1,25 @@
-@comment $NetBSD: PLIST,v 1.10 2018/01/01 22:30:04 rillig Exp $
-${PLIST.ocaml-opt}lib/ocaml/graphics.a
-lib/ocaml/graphics.cma
-lib/ocaml/graphics.cmi
-lib/ocaml/graphics.cmti
-lib/ocaml/graphics.cmx
-${PLIST.ocaml-opt}lib/ocaml/graphics.cmxa
-${PLIST.natdynlib}lib/ocaml/graphics.cmxs
-lib/ocaml/graphics.mli
-lib/ocaml/graphicsX11.cmi
-lib/ocaml/graphicsX11.cmti
-lib/ocaml/graphicsX11.cmx
-lib/ocaml/graphicsX11.mli
-lib/ocaml/libgraphics.a
-lib/ocaml/stublibs/dllgraphics.so
+@comment $NetBSD: PLIST,v 1.11 2019/05/14 16:01:17 jaapb Exp $
+${OCAML_SITELIB}/graphics/META
+${OCAML_SITELIB}/graphics/dune-package
+${PLIST.ocaml-opt}${OCAML_SITELIB}/graphics/graphics.a
+${OCAML_SITELIB}/graphics/graphics.cma
+${OCAML_SITELIB}/graphics/graphics.cmi
+${OCAML_SITELIB}/graphics/graphics.cmt
+${OCAML_SITELIB}/graphics/graphics.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/graphics/graphics.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/graphics/graphics.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/graphics/graphics.cmxs
+${OCAML_SITELIB}/graphics/graphics.ml
+${OCAML_SITELIB}/graphics/graphics.mli
+${OCAML_SITELIB}/graphics/graphicsX11.cmi
+${OCAML_SITELIB}/graphics/graphicsX11.cmt
+${OCAML_SITELIB}/graphics/graphicsX11.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/graphics/graphicsX11.cmx
+${OCAML_SITELIB}/graphics/graphicsX11.ml
+${OCAML_SITELIB}/graphics/graphicsX11.mli
+${PLIST.ocaml-opt}${OCAML_SITELIB}/graphics/libgraphics_stubs.a
+${OCAML_SITELIB}/graphics/opam
+${OCAML_SITELIB}/stublibs/dllgraphics_stubs.so
+share/doc/graphics/CHANGES.md
+share/doc/graphics/LICENSE
+share/doc/graphics/README.md
diff --git a/x11/ocaml-graphics/PLIST.stub b/x11/ocaml-graphics/PLIST.stub
deleted file mode 100644
index cef3d057cd6..00000000000
--- a/x11/ocaml-graphics/PLIST.stub
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.stub,v 1.2 2009/06/14 22:06:41 joerg Exp $
-lib/ocaml/stublibs/dllgraphics.so
diff --git a/x11/ocaml-graphics/buildlink3.mk b/x11/ocaml-graphics/buildlink3.mk
index 1fa13f25637..70160eef134 100644
--- a/x11/ocaml-graphics/buildlink3.mk
+++ b/x11/ocaml-graphics/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.24 2018/11/12 16:10:17 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.25 2019/05/14 16:01:17 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-graphics
 
 .if !defined(OCAML_GRAPHICS_BUILDLINK3_MK)
 OCAML_GRAPHICS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-graphics+=	ocaml-graphics>=3.08.2
-BUILDLINK_ABI_DEPENDS.ocaml-graphics+=	ocaml-graphics>=4.07.1nb13
+BUILDLINK_API_DEPENDS.ocaml-graphics+=	ocaml-graphics>=2.0.0
 BUILDLINK_PKGSRCDIR.ocaml-graphics?=	../../x11/ocaml-graphics
 
 .include "../../lang/ocaml/buildlink3.mk"
-.endif # OCAML_GRAPHICS_BUILDLINK3_MK
+.include "../../x11/libX11/buildlink3.mk"
+.endif	# OCAML_GRAPHICS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-ocaml-graphics