Yozo TODA writes:
> graphics/ocaml-cairo still uses "tar.gz" archive and
> ocamlfind shows (version: n/a).
we don't need patches now because dune is updated, and
WRKDIST should be overwritten.
revised updates here.
(the revision bumped but I'm not sure if it's necessary...)
-- yozo.
cvs server: Diffing .
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/ocaml-cairo/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 10 Dec 2021 04:10:59 -0000 1.10
+++ Makefile 26 Dec 2021 17:50:21 -0000
@@ -3,10 +3,13 @@
COMMENT = binding to cairo, a 2D vector graphics library
CATEGORIES = graphics
-GH_ACCOUNT = Chris00
-GH_PROJECT = ocaml-cairo
-GH_TAGNAME = 0.6.2
-REVISION = 1
+PROJECT = ocaml-cairo
+TAGNAME = 0.6.2
+DISTNAME = ocaml-cairo-${TAGNAME}{cairo2-${TAGNAME}}
+MASTER_SITES =
https://github.com/Chris00/ocaml-cairo/releases/download/${TAGNAME}/
+EXTRACT_SUFX = .tbz
+PKGNAME = ${PROJECT}-${TAGNAME}
+REVISION = 2
# LGPL 3.0
PERMIT_PACKAGE = Yes
@@ -29,11 +32,12 @@ LIB_DEPENDS = devel/pango \
graphics/gdk-pixbuf2 \
x11/gtk+2
+WRKDIST = ${WRKDIR}/cairo2-${TAGNAME}
ALL_TARGET =
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${GH_PROJECT}
- mv ${PREFIX}/doc/* ${PREFIX}/share/doc/ocaml-${GH_PROJECT}/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ocaml-${PROJECT}
+ mv ${PREFIX}/doc/* ${PREFIX}/share/doc/ocaml-${PROJECT}/
rmdir ${PREFIX}/doc
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/ocaml-cairo/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 11 Feb 2021 04:07:39 -0000 1.2
+++ distinfo 26 Dec 2021 17:50:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (ocaml-cairo-0.6.2.tar.gz) =
LASXjuL2RRFj9AsLxOM0zadWXIU36fUo+DUYS0L7QS4=
-SIZE (ocaml-cairo-0.6.2.tar.gz) = 109948
+SHA256 (ocaml-cairo-0.6.2.tbz) = a7P1kiVmIwT6Fhtwxs29ffgO4iexsulxUoc9cnJmEK4=
+SIZE (ocaml-cairo-0.6.2.tbz) = 90428
cvs server: Diffing patches
Index: patches/patch-cairo2_opam
===================================================================
RCS file: patches/patch-cairo2_opam
diff -N patches/patch-cairo2_opam
--- patches/patch-cairo2_opam 11 Feb 2021 04:07:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-cairo2_opam,v 1.1 2021/02/11 04:07:39 daniel Exp $
-
-we're not on dune 2.x yet
-
-Index: cairo2.opam
---- cairo2.opam.orig
-+++ cairo2.opam
-@@ -18,7 +18,7 @@ depends: [
- "ocaml" {>= "4.02"}
- "base-bigarray"
- "dune"
-- "dune-configurator"
-+ "dune.configurator"
- "conf-cairo"
- ]
- depopts: [
Index: patches/patch-config_dune
===================================================================
RCS file: patches/patch-config_dune
diff -N patches/patch-config_dune
--- patches/patch-config_dune 11 Feb 2021 04:07:39 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-config_dune,v 1.1 2021/02/11 04:07:39 daniel Exp $
-
-we're not on dune 2.x yet
-
-Index: config/dune
---- config/dune.orig
-+++ config/dune
-@@ -2,4 +2,4 @@
- (executable
- (name discover)
- (modules discover)
-- (libraries dune-configurator str))
-+ (libraries dune.configurator str))
cvs server: Diffing pkg
