From owner-svn-ports-all@freebsd.org Mon Jan 16 07:59:10 2017 Return-Path: Delivered-To: svn-ports-all@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 43A36CB2A7A; Mon, 16 Jan 2017 07:59:10 +0000 (UTC) (envelope-from madpilot@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 E0559130D; Mon, 16 Jan 2017 07:59:09 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0G7x9md025277; Mon, 16 Jan 2017 07:59:09 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0G7x89s025275; Mon, 16 Jan 2017 07:59:08 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201701160759.v0G7x89s025275@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 16 Jan 2017 07:59:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431617 - in head/x11-toolkits/ocaml-lablgtk2: . 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jan 2017 07:59:10 -0000 Author: madpilot Date: Mon Jan 16 07:59:08 2017 New Revision: 431617 URL: https://svnweb.freebsd.org/changeset/ports/431617 Log: Fix ocaml-lablgtk2 after r431473 (ocaml-findlib update to 1.7.1). After this update ocamlfindlib returns two paths separated by a colon for the destdir, but lablgtk2 configure scripts is not separating them so it installs things in the wrong place where they are not grabbed when building the package. Make it extract only the firsst coponent of the path list. This fixes build of unison and other dependent ports. Added: head/x11-toolkits/ocaml-lablgtk2/files/ head/x11-toolkits/ocaml-lablgtk2/files/patch-configure (contents, props changed) Modified: head/x11-toolkits/ocaml-lablgtk2/Makefile Modified: head/x11-toolkits/ocaml-lablgtk2/Makefile ============================================================================== --- head/x11-toolkits/ocaml-lablgtk2/Makefile Mon Jan 16 06:52:25 2017 (r431616) +++ head/x11-toolkits/ocaml-lablgtk2/Makefile Mon Jan 16 07:59:08 2017 (r431617) @@ -3,6 +3,7 @@ PORTNAME= lablgtk2 PORTVERSION= 2.18.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://forge.ocamlcore.org/frs/download.php/1479/ \ LOCAL/bf Added: head/x11-toolkits/ocaml-lablgtk2/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/ocaml-lablgtk2/files/patch-configure Mon Jan 16 07:59:08 2017 (r431617) @@ -0,0 +1,11 @@ +--- configure.orig 2014-10-29 07:51:05 UTC ++++ configure +@@ -2677,7 +2677,7 @@ if test "$OCAMLFIND" = no; then + FINDLIBDIR="" + OCAMLLDCONF="" + else +-FINDLIBDIR="`ocamlfind printconf destdir | tr -d '\\r'`" ++FINDLIBDIR="`ocamlfind printconf destdir | sed 's/:.*//' | tr -d '\\r'`" + echo "$OCAMLFIND library path is $FINDLIBDIR" + OCAMLLDCONF="`ocamlfind printconf ldconf | tr -d '\\r'`" + echo "$OCAMLFIND ldconf path is $OCAMLLDCONF"