Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 29 Jan 2017 23:13:59 +0000 (UTC)
From:      John Marino <marino@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432805 - in head/math/ocaml-zarith: . files
Message-ID:  <201701292313.v0TNDxXF032827@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: marino
Date: Sun Jan 29 23:13:59 2017
New Revision: 432805
URL: https://svnweb.freebsd.org/changeset/ports/432805

Log:
  math/ocaml-zarith: Unbreak after ocaml-findlib change
  
  Use the same technique madpilot used on x11-toolkits/ocaml-lablgtk2
  to restore the build after the (unexpected) changed to the output
  of ocamlfindlib during its update to 1.7.1

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 Jan 29 23:04:45 2017	(r432804)
+++ head/math/ocaml-zarith/Makefile	Sun Jan 29 23:13:59 2017	(r432805)
@@ -13,8 +13,6 @@ COMMENT=	OCaml arithmetic library for ar
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		does not build
-
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=			gmake perl5 shebangfix tar:tgz

Modified: head/math/ocaml-zarith/files/patch-configure
==============================================================================
--- head/math/ocaml-zarith/files/patch-configure	Sun Jan 29 23:04:45 2017	(r432804)
+++ head/math/ocaml-zarith/files/patch-configure	Sun Jan 29 23:13:59 2017	(r432805)
@@ -11,6 +11,15 @@
      IFS=':'
      for i in $PATH
      do
+@@ -258,7 +262,7 @@ searchbin ocamlfind
+ if test $? -eq 1 -a $ocamlfind != "no"; then 
+     instmeth='findlib'
+     if test "$installdir" = "auto"
+-    then installdir=`ocamlfind printconf destdir`; fi
++    then installdir=`ocamlfind printconf destdir | sed 's/:.*//'`; fi
+ else
+     searchbin install
+     if test $? -eq 1; then instmeth='install'
 @@ -304,6 +308,14 @@ case $host in
              arch='i686'
          fi

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701292313.v0TNDxXF032827>