Conversion to a single libtool environment.

Approved by:	portmgr (kris)

8 files changed, 75 insertions, 230 deletions

diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index f4797adffba4..85675bdd9a03 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -7,46 +7,21 @@
 
 PORTNAME?=	libtool
 PORTVERSION=	1.5.22
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
 DISTNAME=	libtool-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
-COMMENT?=	Generic shared library support script (1.5)
+COMMENT?=	Generic shared library support script
 
-BUILD_VERSION=	15
-LATEST_LINK?=	libtool${BUILD_VERSION}
-PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
 GNU_CONFIGURE=	 yes
 CONFIGURE_ARGS?= --disable-ltdl-install
-CONFIGURE_ARGS+= --program-suffix=${BUILD_VERSION} --infodir=${PREFIX}/info
-CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
+CONFIGURE_ARGS+= --infodir=${PREFIX}/info
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
-
-.if ${PORTNAME} == "libtool"
-INFO=		libtool${BUILD_VERSION}
-.endif
-
-post-patch:
-	@(cd ${WRKSRC}/doc && \
-		${RM} -f *.info* && \
-		${MV} libtool.texi libtool${BUILD_VERSION}.texi && \
-		${REINPLACE_CMD} -E 's,(libtool|libtoolize)\),\1${BUILDVERSION}\),g' libtool${BUILD_VERSION}.texi)
-	@${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool${BUILD_VERSION}.m4
-	@${MV} -f ${WRKSRC}/ltdl.m4 ${WRKSRC}/ltdl${BUILD_VERSION}.m4
-	@${REINPLACE_CMD} -e 's|libtool.m4|libtool${BUILD_VERSION}.m4|g' \
-			  -e 's|ltdl.m4|ltdl${BUILD_VERSION}.m4|g' ${WRKSRC}/Makefile.in
-
-.if ${PORTNAME} == "libtool"
-post-install:
-	@-${RM} -fr ${PREFIX}/libexec/libtool${BUILD_VERSION}
-	@${MKDIR} ${PREFIX}/libexec/libtool${BUILD_VERSION}
-.for i in libtool libtoolize
-	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} ${PREFIX}/libexec/libtool${BUILD_VERSION}/${i}
-.endfor
-.endif
+INFO?=		libtool
 
 .include <bsd.port.mk>
diff --git a/devel/libtool15/files/patch-aa b/devel/libtool15/files/patch-aa
deleted file mode 100644
index 8058e0035a50..000000000000
--- a/devel/libtool15/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- doc/libtool.texi.orig	Fri Jan 23 06:05:27 2004
-+++ doc/libtool.texi	Thu Oct 14 20:26:28 2004
-@@ -2,4 +2,4 @@
- @c %**start of header
--@setfilename libtool.info
--@settitle Libtool
-+@setfilename libtool15.info
-+@settitle Libtool15
- @c For double-sided printing, uncomment:
-@@ -15,8 +15,3 @@
- @direntry
--* Libtool: (libtool).           Generic shared library support script.
--@end direntry
--
--@dircategory Individual utilities
--@direntry
--* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
-+* Libtool15: (libtool15).           Generic shared library support script.
- @end direntry
diff --git a/devel/libtool15/files/patch-ab b/devel/libtool15/files/patch-ab
deleted file mode 100644
index e8a022f2d8d8..000000000000
--- a/devel/libtool15/files/patch-ab
+++ /dev/null
@@ -1,62 +0,0 @@
---- doc/Makefile.in.orig	Sun Sep 19 12:21:58 2004
-+++ doc/Makefile.in	Thu Oct 14 19:42:38 2004
-@@ -37,3 +37,3 @@
- subdir = doc
--DIST_COMMON = $(libtool_TEXINFOS) $(srcdir)/Makefile.am \
-+DIST_COMMON = $(libtool15_TEXINFOS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
-@@ -49,9 +49,9 @@
- DIST_SOURCES =
--INFO_DEPS = $(srcdir)/libtool.info
-+INFO_DEPS = $(srcdir)/libtool15.info
- am__TEXINFO_TEX_DIR = $(srcdir)
--DVIS = libtool.dvi
--PDFS = libtool.pdf
--PSS = libtool.ps
--HTMLS = libtool.html
--TEXINFOS = libtool.texi
-+DVIS = libtool15.dvi
-+PDFS = libtool15.pdf
-+PSS = libtool15.ps
-+HTMLS = libtool15.html
-+TEXINFOS = libtool15.texi
- TEXI2DVI = texi2dvi
-@@ -119,3 +119,3 @@
- LTLIBOBJS = @LTLIBOBJS@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
-@@ -188,4 +188,4 @@
- AUTOMAKE_OPTIONS = gnits
--info_TEXINFOS = libtool.texi
--libtool_TEXINFOS = PLATFORMS fdl.texi
-+info_TEXINFOS = libtool15.texi
-+libtool15_TEXINFOS = PLATFORMS fdl.texi
- all: all-am
-@@ -276,10 +276,10 @@
- 	fi
--$(srcdir)/libtool.info: libtool.texi $(srcdir)/version.texi $(libtool_TEXINFOS)
--libtool.dvi: libtool.texi $(srcdir)/version.texi $(libtool_TEXINFOS)
--libtool.pdf: libtool.texi $(srcdir)/version.texi $(libtool_TEXINFOS)
--libtool.html: libtool.texi $(srcdir)/version.texi $(libtool_TEXINFOS)
-+$(srcdir)/libtool15.info: libtool15.texi $(srcdir)/version.texi $(libtool15_TEXINFOS)
-+libtool15.dvi: libtool15.texi $(srcdir)/version.texi $(libtool15_TEXINFOS)
-+libtool15.pdf: libtool15.texi $(srcdir)/version.texi $(libtool15_TEXINFOS)
-+libtool15.html: libtool15.texi $(srcdir)/version.texi $(libtool15_TEXINFOS)
- $(srcdir)/version.texi:  $(srcdir)/stamp-vti
--$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure
--	@(dir=.; test -f ./libtool.texi || dir=$(srcdir); \
--	set `$(SHELL) $(srcdir)/mdate-sh $$dir/libtool.texi`; \
-+$(srcdir)/stamp-vti: libtool15.texi $(top_srcdir)/configure
-+	@(dir=.; test -f ./libtool15.texi || dir=$(srcdir); \
-+	set `$(SHELL) $(srcdir)/mdate-sh $$dir/libtool15.texi`; \
- 	echo "@set UPDATED $$1 $$2 $$3"; \
-@@ -340,5 +340,5 @@
- mostlyclean-aminfo:
--	-rm -rf libtool.aux libtool.cp libtool.cps libtool.fn libtool.ky libtool.kys \
--	  libtool.log libtool.pg libtool.tmp libtool.toc libtool.tp \
--	  libtool.vr libtool.dvi libtool.pdf libtool.ps libtool.html
-+	-rm -rf libtool15.aux libtool15.cp libtool15.cps libtool15.fn libtool15.ky libtool15.kys \
-+	  libtool15.log libtool15.pg libtool15.tmp libtool15.toc libtool15.tp \
-+	  libtool15.vr libtool15.dvi libtool15.pdf libtool15.ps libtool15.html
- 
diff --git a/devel/libtool15/files/patch-ae b/devel/libtool15/files/patch-ae
deleted file mode 100644
index 4a2214cfef50..000000000000
--- a/devel/libtool15/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Mon Apr 14 17:29:24 2003
-+++ configure	Fri Apr 18 20:43:44 2003
-@@ -424,4 +424,4 @@
- # Identity of this package.
--PACKAGE_NAME='libtool'
--PACKAGE_TARNAME='libtool'
-+PACKAGE_NAME='libtool15'
-+PACKAGE_TARNAME='libtool15'
- PACKAGE_VERSION='1.5'
-@@ -1782,3 +1782,3 @@
- # Define the identity of the package.
-- PACKAGE=libtool
-+ PACKAGE=libtool15
-  VERSION=1.5
diff --git a/devel/libtool15/files/patch-af b/devel/libtool15/files/patch-af
deleted file mode 100644
index ac073636313d..000000000000
--- a/devel/libtool15/files/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
---- libltdl/Makefile.in.orig	Mon May 16 02:34:13 2005
-+++ libltdl/Makefile.in	Thu Jun 16 19:29:09 2005
-@@ -437,9 +437,7 @@
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
--	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	      echo no cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
--	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	    echo no cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
--	    test -f $(distdir)/$$file \
--	    || cp -p $$d/$$file $(distdir)/$$file \
--	    || exit 1; \
-+	    install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \
- 	  fi; \
diff --git a/devel/libtool15/files/patch-libtoolize.in b/devel/libtool15/files/patch-libtoolize.in
deleted file mode 100644
index 786ca8d9fe21..000000000000
--- a/devel/libtool15/files/patch-libtoolize.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- libtoolize.in.orig	Sun Oct 13 16:21:38 2002
-+++ libtoolize.in	Mon Feb 17 01:56:19 2003
-@@ -39,4 +39,4 @@
- 
--libtool_m4="$aclocaldir/libtool.m4"
--ltdl_m4="$aclocaldir/ltdl.m4"
-+libtool_m4="$aclocaldir/libtool15.m4"
-+ltdl_m4="$aclocaldir/ltdl15.m4"
- 
diff --git a/devel/libtool15/files/patch-ltmain.sh b/devel/libtool15/files/patch-ltmain.sh
index c3730b423d3a..dbfac1c8e3a7 100644
--- a/devel/libtool15/files/patch-ltmain.sh
+++ b/devel/libtool15/files/patch-ltmain.sh
@@ -1,27 +1,47 @@
---- ltmain.sh.orig	Sun Dec 18 17:14:54 2005
-+++ ltmain.sh	Sat Dec 24 12:22:07 2005
-@@ -1604,11 +1604,18 @@
- 	compiler_flags="$compiler_flags $arg"
- 	compile_command="$compile_command $arg"
+--- ltmain.sh.orig	Sun Dec 18 14:14:54 2005
++++ ltmain.sh	Mon Feb 20 17:37:04 2006
+@@ -228,2 +228,16 @@
+ {
++    # FreeBSD-specific: where we install compilers with non-standard names
++    tag_compilers_CC="*cc cc* *gcc gcc*"
++    tag_compilers_CXX="*c++ c++* *g++ g++*"
++    base_compiler=`set -- "$@"; echo $1`
++
++    # If $tagname isn't set, then try to infer if the default "CC" tag applies
++    if test -z "$tagname"; then
++      for zp in $tag_compilers_CC; do
++        case $base_compiler in
++	 $zp) tagname="CC"; break;;
++	esac
++      done
++    fi
++
+     if test -n "$available_tags" && test -z "$tagname"; then
+@@ -268,3 +282,18 @@
+ 	    esac
+-	  fi
++
++	    # FreeBSD-specific: try compilers based on inferred tag
++	    if test -z "$tagname"; then
++	      eval "tag_compilers=\$tag_compilers_${z}"
++	      if test -n "$tag_compilers"; then
++		for zp in $tag_compilers; do
++		  case $base_compiler in   
++		    $zp) tagname=$z; break;;
++		  esac
++		done
++		if test -n "$tagname"; then
++		  break
++		fi
++	      fi
++            fi
++          fi
+ 	done
+@@ -1606,2 +1635,3 @@
  	finalize_command="$finalize_command $arg"
 +	deplibs="$deplibs $arg"
  	continue
- 	;;
- 
-       -module)
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
- 	;;
- 
-@@ -2101,6 +2108,29 @@
- 	  else
- 	    compiler_flags="$compiler_flags $deplib"
+@@ -2103,2 +2133,25 @@
  	  fi
 +
 +	  case $linkmode in
@@ -47,37 +67,9 @@
 +	  esac # linkmode
 +
  	  continue
- 	  ;;
- 	-l*)
-@@ -4705,6 +4735,9 @@
-             ;;
+@@ -4706,2 +4759,5 @@
            esac
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
 +	  ;;
- 	*)
- 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
- 	  exit $EXIT_FAILURE
-@@ -5995,10 +6028,17 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	case $host in
 +	*-*-freebsd*)
-+	  # Do not install the useless pseudo-library
-+	  ;;
-+	*)
-+	  name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	  instname="$dir/$name"i
-+	  $show "$install_prog $instname $destdir/$name"
-+	  $run eval "$install_prog $instname $destdir/$name" || exit $?
-+	  ;;
-+	esac
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++	  # FreeBSD doesn't need this...
+ 	  ;;
diff --git a/devel/libtool15/pkg-plist b/devel/libtool15/pkg-plist
index 486a7113986e..b198e3d307fa 100644
--- a/devel/libtool15/pkg-plist
+++ b/devel/libtool15/pkg-plist
@@ -1,30 +1,27 @@
 @comment $FreeBSD$
-bin/libtool%%BUILD_VERSION%%
-bin/libtoolize%%BUILD_VERSION%%
-libexec/libtool%%BUILD_VERSION%%/libtool
-libexec/libtool%%BUILD_VERSION%%/libtoolize
-share/aclocal/libtool%%BUILD_VERSION%%.m4
-share/aclocal/ltdl%%BUILD_VERSION%%.m4
-share/libtool%%BUILD_VERSION%%/config.guess
-share/libtool%%BUILD_VERSION%%/config.sub
-share/libtool%%BUILD_VERSION%%/install-sh
-share/libtool%%BUILD_VERSION%%/libltdl/COPYING.LIB
-share/libtool%%BUILD_VERSION%%/libltdl/Makefile.am
-share/libtool%%BUILD_VERSION%%/libltdl/Makefile.in
-share/libtool%%BUILD_VERSION%%/libltdl/README
-share/libtool%%BUILD_VERSION%%/libltdl/acinclude.m4
-share/libtool%%BUILD_VERSION%%/libltdl/aclocal.m4
-share/libtool%%BUILD_VERSION%%/libltdl/config-h.in
-share/libtool%%BUILD_VERSION%%/libltdl/config.guess
-share/libtool%%BUILD_VERSION%%/libltdl/config.sub
-share/libtool%%BUILD_VERSION%%/libltdl/configure
-share/libtool%%BUILD_VERSION%%/libltdl/configure.ac
-share/libtool%%BUILD_VERSION%%/libltdl/install-sh
-share/libtool%%BUILD_VERSION%%/libltdl/ltdl.c
-share/libtool%%BUILD_VERSION%%/libltdl/ltdl.h
-share/libtool%%BUILD_VERSION%%/libltdl/ltmain.sh
-share/libtool%%BUILD_VERSION%%/libltdl/missing
-share/libtool%%BUILD_VERSION%%/ltmain.sh
-@dirrm share/libtool%%BUILD_VERSION%%/libltdl
-@dirrm share/libtool%%BUILD_VERSION%%
-@dirrm libexec/libtool%%BUILD_VERSION%%
+bin/libtool
+bin/libtoolize
+share/aclocal/libtool.m4
+share/aclocal/ltdl.m4
+share/libtool/config.guess
+share/libtool/config.sub
+share/libtool/install-sh
+share/libtool/libltdl/COPYING.LIB
+share/libtool/libltdl/Makefile.am
+share/libtool/libltdl/Makefile.in
+share/libtool/libltdl/README
+share/libtool/libltdl/acinclude.m4
+share/libtool/libltdl/aclocal.m4
+share/libtool/libltdl/config-h.in
+share/libtool/libltdl/config.guess
+share/libtool/libltdl/config.sub
+share/libtool/libltdl/configure
+share/libtool/libltdl/configure.ac
+share/libtool/libltdl/install-sh
+share/libtool/libltdl/ltdl.c
+share/libtool/libltdl/ltdl.h
+share/libtool/libltdl/ltmain.sh
+share/libtool/libltdl/missing
+share/libtool/ltmain.sh
+@dirrm share/libtool/libltdl
+@dirrm share/libtool