Update to 1.5.10, use INFO, and other minor cleanups.

10 files changed, 50 insertions, 98 deletions

diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index dadb47a08685..c4af60d427b2 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	libtool
-PORTVERSION=	1.5.8
+PORTVERSION=	1.5.10
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -25,6 +25,7 @@ CONFIGURE_ARGS+= --program-suffix=${BUILD_VERSION}
 CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
+INFO=		libtool${BUILD_VERSION}
 
 post-patch:
 	@(cd ${WRKSRC}/doc && \
@@ -39,10 +40,12 @@ post-patch:
 .if ${PORTNAME} == "libtool"
 post-install:
 	@-${RM} -fr ${PREFIX}/libexec/libtool${BUILD_VERSION}
-	${MKDIR} ${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}
+	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} ${PREFIX}/libexec/libtool${BUILD_VERSION}/${i}
 .endfor
 .endif
 
+	@install-info ${PREFIX}/info/libtool${BUILD_VERSION}.info \
+		${PREFIX}/info/dir
 .include <bsd.port.mk>
diff --git a/devel/gnu-libtool/distinfo b/devel/gnu-libtool/distinfo
index 9e2695932045..c6034865779d 100644
--- a/devel/gnu-libtool/distinfo
+++ b/devel/gnu-libtool/distinfo
@@ -1,2 +1,2 @@
-MD5 (libtool-1.5.8.tar.gz) = ed04093bc9d88faa3e476ac6f4db8d50
-SIZE (libtool-1.5.8.tar.gz) = 2682583
+MD5 (libtool-1.5.10.tar.gz) = e2093a85f6d48f1562c36920087502d6
+SIZE (libtool-1.5.10.tar.gz) = 2699923
diff --git a/devel/gnu-libtool/files/patch-aa b/devel/gnu-libtool/files/patch-aa
index 56803617e979..8058e0035a50 100644
--- a/devel/gnu-libtool/files/patch-aa
+++ b/devel/gnu-libtool/files/patch-aa
@@ -1,5 +1,5 @@
---- doc/libtool.texi.orig	Mon Apr 14 22:10:10 2003
-+++ doc/libtool.texi	Wed Jul  2 18:01:14 2003
+--- 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
@@ -7,13 +7,13 @@
 +@setfilename libtool15.info
 +@settitle Libtool15
  @c For double-sided printing, uncomment:
-@@ -15,3 +15,3 @@
+@@ -15,8 +15,3 @@
  @direntry
 -* Libtool: (libtool).           Generic shared library support script.
-+* Libtool15: (libtool15).           Generic shared library support script.
- @end direntry
-@@ -20,3 +20,3 @@
- @direntry
+-@end direntry
+-
+-@dircategory Individual utilities
+-@direntry
 -* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
-+* libtoolize15: (libtool15)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
index 1fc56922035a..e8a022f2d8d8 100644
--- a/devel/gnu-libtool/files/patch-ab
+++ b/devel/gnu-libtool/files/patch-ab
@@ -1,17 +1,11 @@
---- 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@
+--- 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 \
- 	$(srcdir)/version.texi mdate-sh texinfo.tex
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -46,13 +46,13 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
+@@ -49,9 +49,9 @@
  DIST_SOURCES =
 -INFO_DEPS = $(srcdir)/libtool.info
 +INFO_DEPS = $(srcdir)/libtool15.info
@@ -27,32 +21,20 @@
 +HTMLS = libtool15.html
 +TEXINFOS = libtool15.texi
  TEXI2DVI = texi2dvi
- TEXI2PDF = $(TEXI2DVI) --pdf --batch
- MAKEINFOHTML = $(MAKEINFO) --html
-@@ -116,7 +116,7 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
+@@ -119,3 +119,3 @@
  LTLIBOBJS = @LTLIBOBJS@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  NM = @NM@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-@@ -183,8 +183,8 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -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
- 
- .SUFFIXES:
-@@ -268,14 +268,14 @@
- 	 -o $@ $<
- 	if test ! -d $@ && test -d $(@:.html=); then \
- 	  mv $(@:.html=) $@; else :; fi
+@@ -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)
@@ -69,11 +51,7 @@
 +	@(dir=.; test -f ./libtool15.texi || dir=$(srcdir); \
 +	set `$(SHELL) $(srcdir)/mdate-sh $$dir/libtool15.texi`; \
  	echo "@set UPDATED $$1 $$2 $$3"; \
- 	echo "@set UPDATED-MONTH $$2 $$3"; \
- 	echo "@set EDITION $(VERSION)"; \
-@@ -332,9 +332,9 @@
- 	done
- 
+@@ -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 \
@@ -82,5 +60,3 @@
 +	  libtool15.log libtool15.pg libtool15.tmp libtool15.toc libtool15.tp \
 +	  libtool15.vr libtool15.dvi libtool15.pdf libtool15.ps libtool15.html
  
- maintainer-clean-aminfo:
- 	@list='$(INFO_DEPS)'; for i in $$list; do \
diff --git a/devel/gnu-libtool/pkg-plist b/devel/gnu-libtool/pkg-plist
index 7676e017ddf2..1c04c4a6fff6 100644
--- a/devel/gnu-libtool/pkg-plist
+++ b/devel/gnu-libtool/pkg-plist
@@ -3,9 +3,6 @@ bin/libtool%%BUILD_VERSION%%
 bin/libtoolize%%BUILD_VERSION%%
 libexec/libtool%%BUILD_VERSION%%/libtool
 libexec/libtool%%BUILD_VERSION%%/libtoolize
-@unexec install-info --delete %D/info/libtool%%BUILD_VERSION%%.info %D/info/dir
-info/libtool%%BUILD_VERSION%%.info
-@exec install-info %D/info/libtool%%BUILD_VERSION%%.info %D/info/dir
 share/aclocal/libtool%%BUILD_VERSION%%.m4
 share/aclocal/ltdl%%BUILD_VERSION%%.m4
 share/libtool%%BUILD_VERSION%%/config.guess
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index dadb47a08685..c4af60d427b2 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	libtool
-PORTVERSION=	1.5.8
+PORTVERSION=	1.5.10
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
@@ -25,6 +25,7 @@ CONFIGURE_ARGS+= --program-suffix=${BUILD_VERSION}
 CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
+INFO=		libtool${BUILD_VERSION}
 
 post-patch:
 	@(cd ${WRKSRC}/doc && \
@@ -39,10 +40,12 @@ post-patch:
 .if ${PORTNAME} == "libtool"
 post-install:
 	@-${RM} -fr ${PREFIX}/libexec/libtool${BUILD_VERSION}
-	${MKDIR} ${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}
+	@${LN} -sf ${PREFIX}/bin/${i}${BUILD_VERSION} ${PREFIX}/libexec/libtool${BUILD_VERSION}/${i}
 .endfor
 .endif
 
+	@install-info ${PREFIX}/info/libtool${BUILD_VERSION}.info \
+		${PREFIX}/info/dir
 .include <bsd.port.mk>
diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo
index 9e2695932045..c6034865779d 100644
--- a/devel/libtool15/distinfo
+++ b/devel/libtool15/distinfo
@@ -1,2 +1,2 @@
-MD5 (libtool-1.5.8.tar.gz) = ed04093bc9d88faa3e476ac6f4db8d50
-SIZE (libtool-1.5.8.tar.gz) = 2682583
+MD5 (libtool-1.5.10.tar.gz) = e2093a85f6d48f1562c36920087502d6
+SIZE (libtool-1.5.10.tar.gz) = 2699923
diff --git a/devel/libtool15/files/patch-aa b/devel/libtool15/files/patch-aa
index 56803617e979..8058e0035a50 100644
--- a/devel/libtool15/files/patch-aa
+++ b/devel/libtool15/files/patch-aa
@@ -1,5 +1,5 @@
---- doc/libtool.texi.orig	Mon Apr 14 22:10:10 2003
-+++ doc/libtool.texi	Wed Jul  2 18:01:14 2003
+--- 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
@@ -7,13 +7,13 @@
 +@setfilename libtool15.info
 +@settitle Libtool15
  @c For double-sided printing, uncomment:
-@@ -15,3 +15,3 @@
+@@ -15,8 +15,3 @@
  @direntry
 -* Libtool: (libtool).           Generic shared library support script.
-+* Libtool15: (libtool15).           Generic shared library support script.
- @end direntry
-@@ -20,3 +20,3 @@
- @direntry
+-@end direntry
+-
+-@dircategory Individual utilities
+-@direntry
 -* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
-+* libtoolize15: (libtool15)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
index 1fc56922035a..e8a022f2d8d8 100644
--- a/devel/libtool15/files/patch-ab
+++ b/devel/libtool15/files/patch-ab
@@ -1,17 +1,11 @@
---- 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@
+--- 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 \
- 	$(srcdir)/version.texi mdate-sh texinfo.tex
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -46,13 +46,13 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
+@@ -49,9 +49,9 @@
  DIST_SOURCES =
 -INFO_DEPS = $(srcdir)/libtool.info
 +INFO_DEPS = $(srcdir)/libtool15.info
@@ -27,32 +21,20 @@
 +HTMLS = libtool15.html
 +TEXINFOS = libtool15.texi
  TEXI2DVI = texi2dvi
- TEXI2PDF = $(TEXI2DVI) --pdf --batch
- MAKEINFOHTML = $(MAKEINFO) --html
-@@ -116,7 +116,7 @@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
+@@ -119,3 +119,3 @@
  LTLIBOBJS = @LTLIBOBJS@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
  NM = @NM@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-@@ -183,8 +183,8 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -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
- 
- .SUFFIXES:
-@@ -268,14 +268,14 @@
- 	 -o $@ $<
- 	if test ! -d $@ && test -d $(@:.html=); then \
- 	  mv $(@:.html=) $@; else :; fi
+@@ -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)
@@ -69,11 +51,7 @@
 +	@(dir=.; test -f ./libtool15.texi || dir=$(srcdir); \
 +	set `$(SHELL) $(srcdir)/mdate-sh $$dir/libtool15.texi`; \
  	echo "@set UPDATED $$1 $$2 $$3"; \
- 	echo "@set UPDATED-MONTH $$2 $$3"; \
- 	echo "@set EDITION $(VERSION)"; \
-@@ -332,9 +332,9 @@
- 	done
- 
+@@ -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 \
@@ -82,5 +60,3 @@
 +	  libtool15.log libtool15.pg libtool15.tmp libtool15.toc libtool15.tp \
 +	  libtool15.vr libtool15.dvi libtool15.pdf libtool15.ps libtool15.html
  
- maintainer-clean-aminfo:
- 	@list='$(INFO_DEPS)'; for i in $$list; do \
diff --git a/devel/libtool15/pkg-plist b/devel/libtool15/pkg-plist
index 7676e017ddf2..1c04c4a6fff6 100644
--- a/devel/libtool15/pkg-plist
+++ b/devel/libtool15/pkg-plist
@@ -3,9 +3,6 @@ bin/libtool%%BUILD_VERSION%%
 bin/libtoolize%%BUILD_VERSION%%
 libexec/libtool%%BUILD_VERSION%%/libtool
 libexec/libtool%%BUILD_VERSION%%/libtoolize
-@unexec install-info --delete %D/info/libtool%%BUILD_VERSION%%.info %D/info/dir
-info/libtool%%BUILD_VERSION%%.info
-@exec install-info %D/info/libtool%%BUILD_VERSION%%.info %D/info/dir
 share/aclocal/libtool%%BUILD_VERSION%%.m4
 share/aclocal/ltdl%%BUILD_VERSION%%.m4
 share/libtool%%BUILD_VERSION%%/config.guess