Date: Mon, 16 Jan 2017 07:59:08 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> 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 Message-ID: <201701160759.v0G7x89s025275@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701160759.v0G7x89s025275>