svn commit: r424051 - in head/math/ocaml-zarith: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sun Oct 16 09:03:43 2016
New Revision: 424051
URL: https://svnweb.freebsd.org/changeset/ports/424051

Log:
  - Fix license
  - Add LICENSE_FILE
  - Fix build on arm

Modified:
  head/math/ocaml-zarith/Makefile
  head/math/ocaml-zarith/files/patch-configure

Modified: head/math/ocaml-zarith/Makefile
==============================================================================
--- head/math/ocaml-zarith/Makefile	Sun Oct 16 08:07:09 2016	(r424050)
+++ head/math/ocaml-zarith/Makefile	Sun Oct 16 09:03:43 2016	(r424051)
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	OCaml arithmetic library for arbitrary precision integers
 
-LICENSE=	GPLv2
+LICENSE=	LGPL20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
@@ -22,13 +23,12 @@ OCAMLFIND_LDCONF=	/dev/null
 HAS_CONFIGURE=		yes
 ALL_TARGET=		all
 SHEBANG_FILES=		z_pp.pl
-CONFIGURE_ENV+=		DESTDIR=${STAGEDIR}
+CONFIGURE_ENV=		DESTDIR=${STAGEDIR}
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 MAKE_JOBS_UNSAFE=	yes
 
-BROKEN_armv6=	binary /nxb-bin/usr/bin/cc: not found
 PORTDOCS=	html
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 
@@ -37,7 +37,7 @@ OPTIONS_DEFINE=	DOCS
 DOCS_ALL_TARGET=doc
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MV} ${WRKSRC}/html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/math/ocaml-zarith/files/patch-configure
==============================================================================
--- head/math/ocaml-zarith/files/patch-configure	Sun Oct 16 08:07:09 2016	(r424050)
+++ head/math/ocaml-zarith/files/patch-configure	Sun Oct 16 09:03:43 2016	(r424051)
@@ -1,6 +1,17 @@
---- configure.orig	2013-06-12 07:13:59.000000000 +0000
+--- configure.orig	2013-06-12 07:13:59 UTC
 +++ configure
-@@ -304,6 +304,14 @@ case $host in
+@@ -127,6 +127,10 @@ searchbin()
+ {
+     if test "x$1" = "x"; then return 0; fi
+     echo_n "binary $1: "
++    if test -x "$1"; then
++        echo "found"
++        return 1
++    fi
+     IFS=':'
+     for i in $PATH
+     do
+@@ -304,6 +308,14 @@ case $host in
              arch='i686'
          fi
  	;;
@@ -15,7 +26,7 @@
      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
+@@ -401,7 +413,7 @@ CFLAGS=$ccinc $ccdef $ccopt
  ASFLAGS=$ccdef $asopt
  LIBS=$cclib
  ARCH=$arch