diff options
| -rw-r--r-- | math/ocaml-zarith/Makefile | 17 | ||||
| -rw-r--r-- | math/ocaml-zarith/buildlink3.mk | 5 | ||||
| -rw-r--r-- | math/ocaml-zarith/distinfo | 12 | ||||
| -rw-r--r-- | math/ocaml-zarith/patches/patch-configure | 18 |
4 files changed, 25 insertions, 27 deletions
diff --git a/math/ocaml-zarith/Makefile b/math/ocaml-zarith/Makefile index b6f5d648749..ce2c2528a1a 100644 --- a/math/ocaml-zarith/Makefile +++ b/math/ocaml-zarith/Makefile @@ -1,13 +1,17 @@ -# $NetBSD: Makefile,v 1.6 2016/12/30 11:17:00 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2017/07/11 14:16:23 jaapb Exp $ # -DISTNAME= ocaml-zarith-1.4.1 -PKGREVISION= 5 +VERSION= 1.4.1 +GITHUB_PROJECT= Zarith +GITHUB_TAG= release-${VERSION} +DISTNAME= ${GITHUB_PROJECT}-${VERSION} +PKGNAME= ocaml-${DISTNAME:tl} +PKGREVISION= 6 CATEGORIES= math -MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1574/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml/} MAINTAINER= markd@NetBSD.org -HOMEPAGE= http://forge.ocamlcore.org/projects/zarith +HOMEPAGE= http://github.com/ocaml/Zarith COMMENT= OCaml arithmetic library for arbitrary precision integers LICENSE= gnu-lgpl-v2 @@ -17,11 +21,10 @@ MAKE_JOBS_SAFE= no HAS_CONFIGURE= yes CONFIGURE_ENV+= DESTDIR=${DESTDIR} USE_TOOLS+= gmake perl +INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/zarith OCAML_USE_FINDLIB= yes -WRKSRC= ${WRKDIR}/${DISTNAME:S/ocaml-//} - REPLACE_PERL+= z_pp.pl .include "../../devel/gmp/buildlink3.mk" diff --git a/math/ocaml-zarith/buildlink3.mk b/math/ocaml-zarith/buildlink3.mk index 1d62fd01d0c..adfab7e3f42 100644 --- a/math/ocaml-zarith/buildlink3.mk +++ b/math/ocaml-zarith/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/02/07 21:43:03 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2017/07/11 14:16:23 jaapb Exp $ BUILDLINK_TREE+= ocaml-zarith @@ -6,8 +6,11 @@ BUILDLINK_TREE+= ocaml-zarith OCAML_ZARITH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-zarith+= ocaml-zarith>=1.2.1 +BUILDLINK_ABI_DEPENDS.ocaml-zarith+= ocaml-zarith>=1.4.1nb6 BUILDLINK_PKGSRCDIR.ocaml-zarith?= ../../math/ocaml-zarith +.include "../../devel/gmp/buildlink3.mk" + .endif # OCAML_ZARITH_BUILDLINK3_MK BUILDLINK_TREE+= -ocaml-zarith diff --git a/math/ocaml-zarith/distinfo b/math/ocaml-zarith/distinfo index 6299864a0df..efead75e352 100644 --- a/math/ocaml-zarith/distinfo +++ b/math/ocaml-zarith/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2016/03/31 10:27:26 markd Exp $ +$NetBSD: distinfo,v 1.3 2017/07/11 14:16:23 jaapb Exp $ -SHA1 (ocaml-zarith-1.4.1.tar.gz) = 684d686a5e5234876dc41d247b6cecf47bd81d89 -RMD160 (ocaml-zarith-1.4.1.tar.gz) = b0c858cb3757ce9bbd8f191b90ffeb76e81c5aa1 -SHA512 (ocaml-zarith-1.4.1.tar.gz) = ef6717e3b6c19ef94fb0e02eb33b1d9f2b2103a9fe0334cb89b01b344ee953fbeeaed8a75b17daa32760faaf93d582e6778ae50e59e9cf878663f2ecba1d5659 -Size (ocaml-zarith-1.4.1.tar.gz) = 88831 bytes -SHA1 (patch-configure) = aa021e0a35d671b804a489b60f5cfba1b4c4034f +SHA1 (Zarith-1.4.1.tar.gz) = add8a775d63fb9f5e54acf46161e53c0b1854c42 +RMD160 (Zarith-1.4.1.tar.gz) = 34d1e23ac8703e116ba6b10ab008c2ce11089970 +SHA512 (Zarith-1.4.1.tar.gz) = 8bbc4cc5fa19a561301b9f81ca9487fcb73d7b9445ec1939fb377a692cf52f35892787d717ab0393582bc15a3872b20a93b36457f5e33d06de9915c4521486a4 +Size (Zarith-1.4.1.tar.gz) = 87747 bytes +SHA1 (patch-configure) = a9fadfcaf6c3b0a21ff3d1829af2cb15454904a0 SHA1 (patch-project.mak) = ae9cd0e0efb2b93b62cfbecd81122578ec007505 diff --git a/math/ocaml-zarith/patches/patch-configure b/math/ocaml-zarith/patches/patch-configure index 041eeba626d..5c1d15a7184 100644 --- a/math/ocaml-zarith/patches/patch-configure +++ b/math/ocaml-zarith/patches/patch-configure @@ -1,8 +1,9 @@ -$NetBSD: patch-configure,v 1.1 2016/02/07 21:43:03 markd Exp $ +$NetBSD: patch-configure,v 1.2 2017/07/11 14:16:23 jaapb Exp $ ---- configure.orig 2013-06-12 07:13:59.000000000 +0000 -+++ configure -@@ -304,6 +304,14 @@ case $host in +Proper operating system detection +--- configure.orig 2015-11-09 21:21:45.000000000 +0000 ++++ configure 2017-07-10 16:23:00.447649770 +0000 +@@ -307,6 +307,14 @@ arch='i686' fi ;; @@ -17,12 +18,3 @@ $NetBSD: patch-configure,v 1.1 2016/02/07 21:43:03 markd Exp $ i386-*darwin* | x86_64-*darwin*) ccdef="-DZ_UNDERSCORE_PREFIX -DZ_MACOS $ccdef" if test "x$wordsize" = "x64"; then -@@ -401,7 +409,7 @@ CFLAGS=$ccinc $ccdef $ccopt - ASFLAGS=$ccdef $asopt - LIBS=$cclib - ARCH=$arch --INSTALLDIR=$installdir -+INSTALLDIR=${DESTDIR}$installdir - AR=$ar - INSTALL=install - OCAMLFIND=ocamlfind |