From owner-svn-ports-all@FreeBSD.ORG  Mon Feb 24 13:13:40 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1B5585D1;
 Mon, 24 Feb 2014 13:13:38 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F3928147B;
 Mon, 24 Feb 2014 13:13:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1ODDb77024141;
 Mon, 24 Feb 2014 13:13:37 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1ODDbc6024140;
 Mon, 24 Feb 2014 13:13:37 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201402241313.s1ODDbc6024140@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 24 Feb 2014 13:13:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r345834 - head/devel/meta-cvs
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Feb 2014 13:13:40 -0000

Author: gahr
Date: Mon Feb 24 13:13:37 2014
New Revision: 345834
URL: http://svnweb.freebsd.org/changeset/ports/345834
QAT: https://qat.redports.org/buildarchive/r345834/

Log:
  - Better way of finding out libc's real name
  
  Obtained from:	bapt, jlh

Modified:
  head/devel/meta-cvs/Makefile

Modified: head/devel/meta-cvs/Makefile
==============================================================================
--- head/devel/meta-cvs/Makefile	Mon Feb 24 13:13:31 2014	(r345833)
+++ head/devel/meta-cvs/Makefile	Mon Feb 24 13:13:37 2014	(r345834)
@@ -31,15 +31,11 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 post-patch:
-#	libc.so is now a symlink, see
+#	libc.so is now a symlink, let's find out the real name of the libc
+#	shared library. See:
 #	http://svnweb.freebsd.org/base/head/lib/libc/libc.ldscript?revision=251668&view=markup
-	(if [ -h /usr/lib/libc.so ]; then \
-	    rep=libc.so; \
-	else \
-	    rep=`${SED} -e '1d; s|^.*\(/lib/libc\.so\.[0-9]*\).*$$|\1|' /usr/lib/libc.so`; \
-	fi; \
-	${REINPLACE_CMD} -e "s|libc.so.6|$$rep|" ${WRKSRC}/code/clisp-ffi.lisp)
-
+	rep=$$(${BASENAME} $$(${LDCONFIG} -r | ${AWK} '/libc.so/ { print $$3 }')); \
+	    ${REINPLACE_CMD} -e "s|libc.so.6|$$rep|" ${WRKSRC}/code/clisp-ffi.lisp
 	${REINPLACE_CMD} -e '232s|make|${GMAKE}|g' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|type -P|which|g;s|$$(prefix)/lib|${DATADIR}|g' ${WRKSRC}/Makefile