On Tue, 21 Oct 2014 19:05:21 +0100 Anil Madhavapeddy <a...@recoil.org> wrote:
> There is a newer upstream release available, which is camlp4-4.02.1+1
> (a bugfix release over the 4.02.1 release). We should bump to that
> instead, but it should be a trivial upgrade against your patch below.
>
> -anil
Done. I also removed GH_COMMIT, since it has no effect at all.
The PKGSPEC might be controversial. To make it actually work, all ports
installing camlp4 syntax extensions need to RUN_DEPEND on camlp4.
Christopher
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml-camlp4/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 3 Sep 2014 10:22:03 -0000 1.2
+++ Makefile 21 Oct 2014 19:02:30 -0000
@@ -3,14 +3,15 @@
COMMENT = OCaml Preprocessor and Pretty-Printer
CATEGORIES = lang
-V = 4.02.0
-REVISION = 0
+V = 4.02.1+1
GH_ACCOUNT = ocaml
GH_PROJECT = camlp4
GH_TAGNAME = ${V}
-GH_COMMIT = 0bb620fad7005850beadbf3aafeeb17d28c8fecd
DISTNAME = ${GH_PROJECT}-${GH_TAGNAME}
+WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME:S/+/-/}
PKGNAME = ocaml-${DISTNAME}
+# No dynlink compatibility between releases
+PKGSPEC = ocaml-camlp4-=${V}
HOMEPAGE = https://github.com/ocaml/camlp4/
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ocaml-camlp4/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 2 Sep 2014 08:47:36 -0000 1.1.1.1
+++ distinfo 21 Oct 2014 19:02:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (camlp4-4.02.0.tar.gz) = 6MuTgKfxtKhiadSr4hr8zws9lsbyB7hVwnFfOVgIu94=
-SIZE (camlp4-4.02.0.tar.gz) = 697243
+SHA256 (camlp4-4.02.1+1.tar.gz) = BuwsB1o5YKdXuhM7ukaPBmImJPmkThjj3n1gn6BvYtI=
+SIZE (camlp4-4.02.1+1.tar.gz) = 645754
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 4 Sep 2014 16:46:37 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2014/09/04 16:46:37 chrisz Exp $
-
-fix bytecode only building. Already included upstream.
-
---- Makefile.orig Thu Sep 4 18:35:01 2014
-+++ Makefile Thu Sep 4 18:35:04 2014
-@@ -1,6 +1,8 @@
- OB := ocamlbuild -classic-display -no-ocamlfind
- -include config.sh
-
-+OB += $(OB_FLAGS)
-+
- .PHONY: default
- default: byte
-
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
signature.asc
Description: PGP signature
