3 files changed, 72 insertions, 41 deletions

diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index c47c0b4fc314..cd4fa90278e8 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -6,13 +6,11 @@
 #
 
 PORTNAME?=	libtool
-PORTVERSION=	1.5
+PORTVERSION=	1.5.2
 PORTREVISION?=	0
 CATEGORIES=	devel
-#MASTER_SITES=	${MASTER_SITE_GNU}
-#MASTER_SITE_SUBDIR=	libtool
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ade/gnu
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	libtool
 DISTNAME=	libtool-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
diff --git a/devel/gnu-libtool/distinfo b/devel/gnu-libtool/distinfo
index fae8a631cef1..63b064f9a310 100644
--- a/devel/gnu-libtool/distinfo
+++ b/devel/gnu-libtool/distinfo
@@ -1 +1,2 @@
-MD5 (libtool-1.5.tar.gz) = 0e1844f25e2ad74c3715b5776d017545
+MD5 (libtool-1.5.2.tar.gz) = db66ba05502f533ad0cfd84dc0e03bd5
+SIZE (libtool-1.5.2.tar.gz) = 2653072
diff --git a/devel/gnu-libtool/files/patch-ab b/devel/gnu-libtool/files/patch-ab
index eecf8914e1a6..1fc56922035a 100644
--- a/devel/gnu-libtool/files/patch-ab
+++ b/devel/gnu-libtool/files/patch-ab
@@ -1,54 +1,86 @@
---- doc/Makefile.in.orig	Mon Apr 14 17:29:22 2003
-+++ doc/Makefile.in	Fri Apr 18 20:22:58 2003
-@@ -93,3 +93,3 @@
- LTLIBOBJS = @LTLIBOBJS@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- NM = @NM@
-@@ -160,4 +160,4 @@
- AUTOMAKE_OPTIONS = gnits
--info_TEXINFOS = libtool.texi
--libtool_TEXINFOS = PLATFORMS fdl.texi
-+info_TEXINFOS = libtool15.texi
-+libtool15_TEXINFOS = PLATFORMS fdl.texi
+--- doc/Makefile.in.orig	Sun Jan 25 13:36:36 2004
++++ doc/Makefile.in	Fri Feb 13 14:57:56 2004
+@@ -34,7 +34,7 @@
+ POST_UNINSTALL = :
+ host_triplet = @host@
  subdir = doc
-@@ -167,8 +167,8 @@
+-DIST_COMMON = $(libtool_TEXINFOS) $(srcdir)/Makefile.am \
++DIST_COMMON = $(libtool15_TEXINFOS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
+ 	$(srcdir)/version.texi mdate-sh texinfo.tex
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -46,13 +46,13 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-INFO_DEPS = $(srcdir)/libtool.info
++INFO_DEPS = $(srcdir)/libtool15.info
  am__TEXINFO_TEX_DIR = $(srcdir)
--INFO_DEPS = libtool.info
 -DVIS = libtool.dvi
 -PDFS = libtool.pdf
 -PSS = libtool.ps
+-HTMLS = libtool.html
 -TEXINFOS = libtool.texi
--DIST_COMMON = $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \
-+INFO_DEPS = libtool15.info
 +DVIS = libtool15.dvi
 +PDFS = libtool15.pdf
 +PSS = libtool15.ps
++HTMLS = libtool15.html
 +TEXINFOS = libtool15.texi
-+DIST_COMMON = $(libtool15_TEXINFOS) Makefile.am Makefile.in mdate-sh \
- 	stamp-vti texinfo.tex version.texi
-@@ -207,9 +207,9 @@
- 	$(TEXI2PDF) `test -f '$<' || echo '$(srcdir)/'`$<
--libtool.info: libtool.texi version.texi $(libtool_TEXINFOS)
--libtool.dvi: libtool.texi version.texi $(libtool_TEXINFOS)
--libtool.pdf: libtool.texi version.texi $(libtool_TEXINFOS)
-+libtool15.info: libtool15.texi version.texi $(libtool15_TEXINFOS)
-+libtool15.dvi: libtool15.texi version.texi $(libtool15_TEXINFOS)
-+libtool15.pdf: libtool15.texi version.texi $(libtool15_TEXINFOS)
- version.texi:  stamp-vti
--stamp-vti: libtool.texi $(top_srcdir)/configure
+ TEXI2DVI = texi2dvi
+ TEXI2PDF = $(TEXI2DVI) --pdf --batch
+ MAKEINFOHTML = $(MAKEINFO) --html
+@@ -116,7 +116,7 @@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ NM = @NM@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+@@ -183,8 +183,8 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = gnits
+-info_TEXINFOS = libtool.texi
+-libtool_TEXINFOS = PLATFORMS fdl.texi
++info_TEXINFOS = libtool15.texi
++libtool15_TEXINFOS = PLATFORMS fdl.texi
+ all: all-am
+ 
+ .SUFFIXES:
+@@ -268,14 +268,14 @@
+ 	 -o $@ $<
+ 	if test ! -d $@ && test -d $(@:.html=); then \
+ 	  mv $(@:.html=) $@; else :; 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`; \
-+stamp-vti: libtool15.texi $(top_srcdir)/configure
++$(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"; \
-@@ -270,5 +270,5 @@
+ 	echo "@set UPDATED-MONTH $$2 $$3"; \
+ 	echo "@set EDITION $(VERSION)"; \
+@@ -332,9 +332,9 @@
+ 	done
+ 
  mostlyclean-aminfo:
--	-rm -f libtool.aux libtool.cp libtool.cps libtool.fn libtool.ky libtool.kys \
+-	-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
-+	-rm -f libtool15.aux libtool15.cp libtool15.cps libtool15.fn libtool15.ky libtool15.kys \
+-	  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.vr libtool15.dvi libtool15.pdf libtool15.ps libtool15.html
  
+ maintainer-clean-aminfo:
+ 	@list='$(INFO_DEPS)'; for i in $$list; do \