[Midnightbsd-cvs] mports [17982] trunk/devel/libtool: more midnightbsd patches

[laffer1 at midnightbsd.org]

Revision: 17982
          http://svnweb.midnightbsd.org/mports/?rev=17982
Author:   laffer1
Date:     2015-01-03 15:51:40 -0500 (Sat, 03 Jan 2015)
Log Message:
-----------
more midnightbsd patches

Modified Paths:
--------------
    trunk/devel/libtool/Makefile
    trunk/devel/libtool/files/patch-build-aux_ltmain.sh

Modified: trunk/devel/libtool/Makefile
===================================================================
--- trunk/devel/libtool/Makefile	2015-01-02 22:48:24 UTC (rev 17981)
+++ trunk/devel/libtool/Makefile	2015-01-03 20:51:40 UTC (rev 17982)
@@ -3,7 +3,7 @@
 # $MidnightBSD$
 
 PORTNAME=	libtool
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Generic shared library support script
 
@@ -16,7 +16,10 @@
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-ltdl-install
+CONFIGURE_ARGS=	--disable-ltdl-install \
+		--host=${ARCH}-portbld-freebsd9.1 \
+		--target=${ARCH}-portbld-freebsd9.1 \
+		--build=${ARCH}-portbld-freebsd9.1
 MAKE_ARGS=	MAKEINFOFLAGS=--no-split
 USES+=		makeinfo
 

Modified: trunk/devel/libtool/files/patch-build-aux_ltmain.sh
===================================================================
--- trunk/devel/libtool/files/patch-build-aux_ltmain.sh	2015-01-02 22:48:24 UTC (rev 17981)
+++ trunk/devel/libtool/files/patch-build-aux_ltmain.sh	2015-01-03 20:51:40 UTC (rev 17982)
@@ -1,11 +1,29 @@
 --- build-aux/ltmain.sh.orig	2013-10-26 18:53:58.000000000 -0400
-+++ build-aux/ltmain.sh	2014-12-17 22:53:02.964009896 -0500
++++ build-aux/ltmain.sh	2015-01-03 15:30:17.521382190 -0500
+@@ -6871,7 +6871,7 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test X-lc = "X$arg" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test X-lc = "X$arg" && continue
+ 	    ;;
+@@ -6891,7 +6891,7 @@
+ 	  esac
+ 	elif test X-lc_r = "X$arg"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
 @@ -8598,13 +8598,13 @@
  	  #
  	  case $version_type in
  	  # correct linux to gnu/linux during the next big refactor
 -	  darwin|linux|osf|windows|none)
-+	  darwin|freebsd-elf|midnightbsd|linux|osf|windows|none)
++	  darwin|freebsd-elf|midnightbsd-elf|midnightbsd|linux|osf|windows|none)
  	    func_arith $number_major + $number_minor
  	    current=$func_arith_result
  	    age=$number_minor
@@ -23,7 +41,7 @@
 -	freebsd-elf)
 -	  major=.$current
 -	  versuffix=.$current
-+	freebsd-elf|midnightbsd)
++	freebsd-elf|midnightbsd|midnightbsd-elf)
 +	  func_arith $current - $age
 +	  major=.$func_arith_result
 +	  versuffix=$major.$age.$revision
@@ -30,3 +48,12 @@
  	  ;;
  
  	irix | nonstopux)
+@@ -8909,7 +8910,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *-*-sco3.2v5* | *-*-sco5v6*)