10 files changed, 53 insertions, 243 deletions

diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index 92a14c4fe74a..89cb280a367f 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -5,50 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	libtool
+PORTNAME=	libtool
 PORTVERSION=	1.5.10
-PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
+PKGNAMEPREFIX=	gnu-
 DISTNAME=	libtool-${PORTVERSION}
 
-MAINTAINER=	ade@FreeBSD.org
-COMMENT?=	Generic shared library support script (version 1.5)
+MAINTAINER=	marcus@FreeBSD.org
+COMMENT=	Generic shared library support script (version 1.5)
+
+PREFIX?=	${LOCALBASE}/gnu-autotools
 
-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}
-CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
+GNU_CONFIGURE=	yes
+NO_MTREE=	yes
+CONFIGURE_ARGS=	--disable-ltdl-install
+CONFIGURE_ENV=	PREFIX=${PREFIX}
 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
-	@install-info ${PREFIX}/info/libtool${BUILD_VERSION}.info \
-		${PREFIX}/info/dir
-.endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/gnu-libtool/files/patch-aa b/devel/gnu-libtool/files/patch-aa
deleted file mode 100644
index 8058e0035a50..000000000000
--- a/devel/gnu-libtool/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/gnu-libtool/files/patch-ab b/devel/gnu-libtool/files/patch-ab
deleted file mode 100644
index e8a022f2d8d8..000000000000
--- a/devel/gnu-libtool/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/gnu-libtool/files/patch-ae b/devel/gnu-libtool/files/patch-ae
deleted file mode 100644
index 4a2214cfef50..000000000000
--- a/devel/gnu-libtool/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/gnu-libtool/files/patch-af b/devel/gnu-libtool/files/patch-af
deleted file mode 100644
index c1caa93c1e1f..000000000000
--- a/devel/gnu-libtool/files/patch-af
+++ /dev/null
@@ -1,32 +0,0 @@
---- libltdl/Makefile.in.orig	Mon Apr 14 17:29:35 2003
-+++ libltdl/Makefile.in	Fri Apr 18 20:27:46 2003
-@@ -404,9 +404,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; \
-@@ -586,4 +584,4 @@
- local-install-files: $(DISTFILES)
--	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
--	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
-+	-rm -rf $(DESTDIR)$(datadir)/libtool15/libltdl
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool15/libltdl
- 	@for file in $(DISTFILES); do \
-@@ -591,6 +589,6 @@
- 	  if test -d $$d/$$file; then \
--	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
-+	    cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file; \
- 	  else \
--	    test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
--	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
-+	    test -f $(DESTDIR)$(datadir)/libtool15/libltdl/$$file \
-+	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file || :; \
- 	  fi; \
diff --git a/devel/gnu-libtool/files/patch-libtoolize.in b/devel/gnu-libtool/files/patch-libtoolize.in
deleted file mode 100644
index 786ca8d9fe21..000000000000
--- a/devel/gnu-libtool/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/gnu-libtool/files/patch-ltmain.sh b/devel/gnu-libtool/files/patch-ltmain.sh
deleted file mode 100644
index 62eb47a4d9ca..000000000000
--- a/devel/gnu-libtool/files/patch-ltmain.sh
+++ /dev/null
@@ -1,44 +0,0 @@
---- ltmain.sh.orig	Sun Apr 11 05:44:45 2004
-+++ ltmain.sh	Wed Jun  9 18:21:15 2004
-@@ -1358,3 +1358,3 @@
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
-@@ -1375,2 +1375,8 @@
- 	module=yes
-+	case $host in
-+	*-*-freebsd*)
-+	  # Do not build the useless static library
-+	  build_old_libs=no
-+	  ;;
-+	esac
- 	continue
-@@ -1858,2 +1864,3 @@
- 	    deplibs="$deplib $deplibs"
-+	    test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- 	  fi
-@@ -4409,2 +4416,5 @@
- 	  ;;
-+	*-*-freebsd*)
-+	  # FreeBSD doesn't need this...
-+	  ;;
- 	*)
-@@ -5549,6 +5559,13 @@
- 	# 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
- 
diff --git a/devel/gnu-libtool/pkg-descr b/devel/gnu-libtool/pkg-descr
index 1dea88bf6d51..1a513e1f97f4 100644
--- a/devel/gnu-libtool/pkg-descr
+++ b/devel/gnu-libtool/pkg-descr
@@ -5,4 +5,9 @@ interface.
 To use libtool, add the new generic library building commands to your
 Makefile, Makefile.in, or Makefile.am.
 
+This port is specifically designed for developers that want to create
+cross-platform software distributions on FreeBSD.  This version of libtool
+should _NEVER_ be used with the FreeBSD ports system as a replacement for the
+versioned copies of libtool.
+
 WWW: http://www.gnu.org/software/libtool/
diff --git a/devel/gnu-libtool/pkg-message b/devel/gnu-libtool/pkg-message
new file mode 100644
index 000000000000..6927fd47099b
--- /dev/null
+++ b/devel/gnu-libtool/pkg-message
@@ -0,0 +1,9 @@
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!CAUTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+This port is specifically designed for developers that want to create
+cross-platform software distributions on FreeBSD.  This version of libtool
+should _NEVER_ be used with the FreeBSD ports system as a replacement for the
+versioned copies of libtool.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!CAUTION!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/devel/gnu-libtool/pkg-plist b/devel/gnu-libtool/pkg-plist
index 1c04c4a6fff6..73a3e1cb928b 100644
--- a/devel/gnu-libtool/pkg-plist
+++ b/devel/gnu-libtool/pkg-plist
@@ -1,29 +1,28 @@
-@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%%/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
+@unexec install-info --delete %D/info/libtool.info %D/info/dir
+info/libtool.info
+@exec install-info %D/info/libtool.info %D/info/dir
+share/aclocal/libtool.m4
+share/aclocal/ltdl.m4
+share/libtool/config.guess
+share/libtool/config.sub
+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