CVS commit: pkgsrc/devel/ocaml-extlib

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed May 15 09:01:03 UTC 2019

Modified Files:
        pkgsrc/devel/ocaml-extlib: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/ocaml-extlib/patches: patch-Makefile

Log Message:
Changed devel/ocaml-extlib to build on non-opt archs, revbump


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/ocaml-extlib/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/ocaml-extlib/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/ocaml-extlib/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/devel/ocaml-extlib/patches/patch-Makefile

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

Modified files:

Index: pkgsrc/devel/ocaml-extlib/Makefile
diff -u pkgsrc/devel/ocaml-extlib/Makefile:1.17 pkgsrc/devel/ocaml-extlib/Makefile:1.18
--- pkgsrc/devel/ocaml-extlib/Makefile:1.17     Tue Mar  5 18:30:38 2019
+++ pkgsrc/devel/ocaml-extlib/Makefile  Wed May 15 09:01:03 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2019/03/05 18:30:38 jaapb Exp $
+# $NetBSD: Makefile,v 1.18 2019/05/15 09:01:03 jaapb Exp $
 
 VERSION=       1.7.6
+PKGREVISION=   1
 GITHUB_PROJECT=        ocaml-extlib
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=    devel
@@ -12,13 +13,16 @@ COMMENT=    Alternative standard library fo
 LICENSE=       gnu-lgpl-v2.1
 
 USE_TOOLS+=    gmake
-MAKE_JOBS_SAFE=        no
 
 OCAML_USE_FINDLIB=     yes
 
 .include "../../mk/ocaml.mk"
 
+.if ${OCAML_USE_OPT_COMPILER} == "yes"
 BUILD_TARGET=  build
+.else
+BUILD_TARGET=  all
+.endif
 
 .include "../../devel/ocaml-cppo/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ocaml-extlib/buildlink3.mk
diff -u pkgsrc/devel/ocaml-extlib/buildlink3.mk:1.8 pkgsrc/devel/ocaml-extlib/buildlink3.mk:1.9
--- pkgsrc/devel/ocaml-extlib/buildlink3.mk:1.8 Tue Mar  5 18:30:38 2019
+++ pkgsrc/devel/ocaml-extlib/buildlink3.mk     Wed May 15 09:01:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2019/03/05 18:30:38 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2019/05/15 09:01:03 jaapb Exp $
 
 BUILDLINK_TREE+=       ocaml-extlib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        ocaml-extlib
 OCAML_EXTLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-extlib+=   ocaml-extlib>=1.7.0
-BUILDLINK_ABI_DEPENDS.ocaml-extlib+=   ocaml-extlib>=1.7.6
+BUILDLINK_ABI_DEPENDS.ocaml-extlib+=   ocaml-extlib>=1.7.6nb1
 BUILDLINK_PKGSRCDIR.ocaml-extlib?=     ../../devel/ocaml-extlib
 
 .endif # OCAML_EXTLIB_BUILDLINK3_MK

Index: pkgsrc/devel/ocaml-extlib/distinfo
diff -u pkgsrc/devel/ocaml-extlib/distinfo:1.7 pkgsrc/devel/ocaml-extlib/distinfo:1.8
--- pkgsrc/devel/ocaml-extlib/distinfo:1.7      Tue Mar  5 18:30:38 2019
+++ pkgsrc/devel/ocaml-extlib/distinfo  Wed May 15 09:01:03 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2019/03/05 18:30:38 jaapb Exp $
+$NetBSD: distinfo,v 1.8 2019/05/15 09:01:03 jaapb Exp $
 
 SHA1 (ocaml-extlib-1.7.6.tar.gz) = fa54b96888b688f9bc664325d83aeff448518367
 RMD160 (ocaml-extlib-1.7.6.tar.gz) = cc6edefa6ec989f395b2ea9be33e9599f5f2bad2
 SHA512 (ocaml-extlib-1.7.6.tar.gz) = 3065e2474fb0e480ed076aa1156584a4a6c839cd5d9e59f341e41113abb1736241354aa7ee7cb492967698bc392969522fd5bf30d1ad7f94754c4e10f376afa8
 Size (ocaml-extlib-1.7.6.tar.gz) = 88068 bytes
+SHA1 (patch-Makefile) = b79f3bcb7c5ae20a3e960b9879101b631593e3cb

Added files:

Index: pkgsrc/devel/ocaml-extlib/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/ocaml-extlib/patches/patch-Makefile:1.3
--- /dev/null   Wed May 15 09:01:03 2019
+++ pkgsrc/devel/ocaml-extlib/patches/patch-Makefile    Wed May 15 09:01:03 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile,v 1.3 2019/05/15 09:01:03 jaapb Exp $
+
+Lift all, opt and cmxs targets to main Makefile
+--- Makefile.orig      2019-03-03 16:33:48.000000000 +0000
++++ Makefile
+@@ -10,8 +10,8 @@ endif
+ .SUFFIXES:
+ .PHONY: build clean test doc release install
+ 
+-build:
+-      $(MAKE) -C src build
++build all opt cmxs:
++      $(MAKE) -C src $@
+ 
+ install:
+       $(MAKE) -C src VERSION=$(VERSION) install