From owner-svn-ports-head@freebsd.org  Sun Jan 29 23:14:01 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 337CECC7ECD;
 Sun, 29 Jan 2017 23:14:01 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E9BFB13AE;
 Sun, 29 Jan 2017 23:14:00 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0TNE0pv032831;
 Sun, 29 Jan 2017 23:14:00 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0TNDxXF032827;
 Sun, 29 Jan 2017 23:13:59 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201701292313.v0TNDxXF032827@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Sun, 29 Jan 2017 23:13:59 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Jan 2017 23:14:01 -0000

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