s,Graphics,graphics, in COMMENT too.
--
Sent from a phone, apologies for poor formatting.
On 21 September 2019 07:54:55 Christopher Zimmermann <chr...@openbsd.org>
wrote:
Hi,
OCaml 4.09 will no longer ship with the Graphics module, which is now
shipped as separate project. To simplify the upgrade I would like to
move it to a separate port before the upgrade.
Are quirks needed when a subpackage is moved in this way? OK?
Christopher
Index: lang/ocaml/Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- lang/ocaml/Makefile 18 Sep 2019 17:49:37 -0000 1.84
+++ lang/ocaml/Makefile 21 Sep 2019 06:51:13 -0000
@@ -1,19 +1,15 @@
# $OpenBSD: Makefile,v 1.84 2019/09/18 17:49:37 chrisz Exp $
-MULTI_PACKAGES = -graphics -main
-
-COMMENT-main = ML language with complete class-based
objective system -COMMENT-graphics = OCaml Graphics library providing
basic drawing primitives +COMMENT = ML language with complete
class-based objective system
# XXX Don't even think of updating ocaml alone.
# Do check that the ports that depend on it still work, or repair them.
VERSION= 4.08.1
-PKGNAME-main = ocaml-${VERSION}
-PKGNAME-graphics = ocaml-graphics-${VERSION}
+PKGNAME = ocaml-${VERSION}
# OCaml has no binary compatibility between releases.
-PKGSPEC-main = ocaml-=${VERSION}
+PKGSPEC = ocaml-=${VERSION}
CATEGORIES= lang
# Remove last version component ocaml-X.XX.X -> ocaml-X.XX
@@ -45,13 +41,11 @@ LDFLAGS+= -Wl,-z,notext
USE_GMAKE= Yes
-RUN_DEPENDS-graphics += lang/ocaml
-WANTLIB-main = c m pthread
-WANTLIB-graphics = X11
+WANTLIB = c m pthread
# for libbfd (used by ocamlobjinfo on .cmxs files)
BUILD_DEPENDS += devel/gdb
-WANTLIB-main += iberty z
+WANTLIB += iberty z
.include <bsd.port.arch.mk>
Index: graphics/ocaml-cairo/Makefile
===================================================================
RCS file: /cvs/ports/graphics/ocaml-cairo/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- graphics/ocaml-cairo/Makefile 18 Sep 2019 17:49:36
-0000 1.4 +++ graphics/ocaml-cairo/Makefile 21 Sep 2019
06:51:13 -0000 @@ -21,7 +21,7 @@ MODULES = lang/ocaml
# findlib provides the ocaml-graphics META file
BUILD_DEPENDS = devel/dune \
sysutils/findlib \
- lang/ocaml,-graphics \
+ graphics/ocaml-graphics \
x11/lablgtk2
LIB_DEPENDS = devel/pango \
Index: graphics/Makefile
===================================================================
RCS file: /cvs/ports/graphics/Makefile,v
retrieving revision 1.485
diff -u -p -r1.485 Makefile
--- graphics/Makefile 10 Aug 2019 03:56:39 -0000 1.485
+++ graphics/Makefile 21 Sep 2019 06:51:13 -0000
@@ -173,6 +173,7 @@
SUBDIR += netpbm
SUBDIR += nomacs
SUBDIR += ocaml-cairo
+ SUBDIR += ocaml-graphics
SUBDIR += ocrad
SUBDIR += openbsd-backgrounds
SUBDIR += opencolorio
Index: sysutils/findlib/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/findlib/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- sysutils/findlib/Makefile 18 Sep 2019 17:49:36 -0000
1.38 +++ sysutils/findlib/Makefile 21 Sep 2019 06:51:13 -0000
@@ -17,7 +17,7 @@ MODULES+= x11/tk
WANTLIB += c m
RUN_DEPENDS += lang/ocaml
-BUILD_DEPENDS += lang/ocaml,-graphics
+BUILD_DEPENDS = ${RUN_DEPENDS}
CONFIGURE_STYLE=simple
CONFIGURE_ARGS= -no-custom \
Index: sysutils/findlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/findlib/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- sysutils/findlib/pkg/PLIST 4 Mar 2019 12:51:16 -0000
1.18 +++ sysutils/findlib/pkg/PLIST 21 Sep 2019 06:51:13 -0000
@@ -28,9 +28,10 @@ lib/ocaml/findlib/fl_package_base.cmi
lib/ocaml/findlib/fl_package_base.mli
lib/ocaml/findlib/topfind.cmi
lib/ocaml/findlib/topfind.mli
+@comment will be installed by graphics/ocaml-graphics
+@comment lib/ocaml/graphics/
+@comment lib/ocaml/graphics/META
@comment will be installed by devel/ocaml-ocamlbuild
-lib/ocaml/graphics/
-lib/ocaml/graphics/META
@comment lib/ocaml/ocamlbuild/
@comment lib/ocaml/ocamlbuild/META
lib/ocaml/ocamldoc/META
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
