From owner-svn-ports-head@FreeBSD.ORG  Sun Feb  9 22:00:36 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 97FE9D21;
 Sun,  9 Feb 2014 22:00:36 +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 838781B9A;
 Sun,  9 Feb 2014 22:00:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s19M0aD5048844;
 Sun, 9 Feb 2014 22:00:36 GMT (envelope-from tijl@svn.freebsd.org)
Received: (from tijl@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s19M0aP6048843;
 Sun, 9 Feb 2014 22:00:36 GMT (envelope-from tijl@svn.freebsd.org)
Message-Id: <201402092200.s19M0aP6048843@svn.freebsd.org>
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Sun, 9 Feb 2014 22:00:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343547 - head/Mk/Uses
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Feb 2014 22:00:36 -0000

Author: tijl
Date: Sun Feb  9 22:00:35 2014
New Revision: 343547
URL: http://svnweb.freebsd.org/changeset/ports/343547
QAT: https://qat.redports.org/buildarchive/r343547/

Log:
  - Support libtool 1.3 which has an ltconfig script.
  - Support -shrext command line option.  (Used in audio/pd.)

Modified:
  head/Mk/Uses/libtool.mk

Modified: head/Mk/Uses/libtool.mk
==============================================================================
--- head/Mk/Uses/libtool.mk	Sun Feb  9 21:55:52 2014	(r343546)
+++ head/Mk/Uses/libtool.mk	Sun Feb  9 22:00:35 2014	(r343547)
@@ -17,18 +17,24 @@ libtool_ARGS?=
 _INCLUDE_USES_LIBTOOL_POST_MK=	yes
 
 patch-libtool:
-	@${FIND} ${WRKDIR} -type f -name configure |			\
-		${XARGS} ${REINPLACE_CMD}				\
+	@${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \)	\
+		-type f | ${XARGS} ${REINPLACE_CMD}			\
 		-e '/link_all_deplibs=/s/=unknown/=no/'			\
 		-e '/objformat=/s/echo aout/echo elf/'
 
 .if ! ${libtool_ARGS:Moldver}
-	@${FIND} ${WRKDIR} -type f -name configure |			\
-		${XARGS} ${REINPLACE_CMD}				\
-		-e "/freebsd-elf\*)/,+1 s/library_names_spec=.*/	\
-		    library_names_spec='\$$libname\$$release.so\$$versuffix \
-			\$$libname\$$release.so\$$major	\$$libname.so'	\
-		    soname_spec='\$$libname\$$release.so\$$major'/"
+	@${FIND} ${WRKDIR} \( -name configure -or -name ltconfig \)	\
+		-type f | ${XARGS} ${REINPLACE_CMD}			\
+		-e "/freebsd-elf\\*)/,/;;/ {				\
+		    /library_names_spec=.*\\.so/			\
+		    s/=.*/='\$$libname\$$release.so\$$versuffix		\
+			\$$libname\$$release.so\$$major \$$libname.so'	\
+		    soname_spec='\$$libname\$$release.so\$$major'/;	\
+		    /library_names_spec=.*shared_ext/			\
+		    s/=.*/='\$$libname\$$release\$$shared_ext\$$versuffix \
+			\$$libname\$$release\$$shared_ext\$$major	\
+			\$$libname\$$shared_ext'			\
+		    soname_spec='\$$libname\$$release\$$shared_ext\$$major'/; }"
 
 	@${FIND} ${WRKDIR} -type f -name ltmain.sh |			\
 		${XARGS} ${REINPLACE_CMD}				\