Upgrade to libtool 1.5 after repo-copy.

10 files changed, 115 insertions, 108 deletions

diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index d695e994da67..b6bb08299ae2 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	libtool
-PORTVERSION=	1.4.3
-PORTREVISION?=	1
+PORTVERSION=	1.5
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	libtool
@@ -16,14 +16,14 @@ DISTNAME=	libtool-${PORTVERSION}
 MAINTAINER=	ade@FreeBSD.org
 COMMENT?=	Generic shared library support script
 
-BUILD_VERSION=	14
+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}
-INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	PREFIX=${PREFIX} PACKAGE=libtool${BUILD_VERSION}
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
 .if defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
@@ -36,13 +36,15 @@ pre-everything:
 	@${FALSE}
 .endif # defined(USE_LIBTOOL) || defined(USE_LIBTOOL_VER)
 
-post-extract:
+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
-	@${MV} -f ${WRKSRC}/doc/libtool.info ${WRKSRC}/doc/libtool${BUILD_VERSION}.info
-	@${MV} -f ${WRKSRC}/doc/libtool.texi ${WRKSRC}/doc/libtool${BUILD_VERSION}.texi
 
 .if ${PORTNAME} == "libtool"
 post-install:
diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo
index 7cace71782d6..fae8a631cef1 100644
--- a/devel/libtool15/distinfo
+++ b/devel/libtool15/distinfo
@@ -1 +1 @@
-MD5 (libtool-1.4.3.tar.gz) = d11a3c835449d7fa50a025dc9c01ad81
+MD5 (libtool-1.5.tar.gz) = 0e1844f25e2ad74c3715b5776d017545
diff --git a/devel/libtool15/files/patch-aa b/devel/libtool15/files/patch-aa
index 8ba2b3510563..56803617e979 100644
--- a/devel/libtool15/files/patch-aa
+++ b/devel/libtool15/files/patch-aa
@@ -1,15 +1,19 @@
---- doc/libtool14.info.orig	Wed Oct 23 02:26:36 2002
-+++ doc/libtool14.info	Mon Feb 17 01:46:42 2003
-@@ -3,5 +3,5 @@
- 
--INFO-DIR-SECTION GNU programming tools
-+INFO-DIR-SECTION Programming & development tools
- START-INFO-DIR-ENTRY
+--- doc/libtool.texi.orig	Mon Apr 14 22:10:10 2003
++++ doc/libtool.texi	Wed Jul  2 18:01:14 2003
+@@ -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,3 +15,3 @@
+ @direntry
 -* Libtool: (libtool).           Generic shared library support script.
-+* Libtool: (libtool14).           Generic shared library support script.
- END-INFO-DIR-ENTRY
-@@ -10,3 +10,3 @@
- START-INFO-DIR-ENTRY
++* Libtool15: (libtool15).           Generic shared library support script.
+ @end direntry
+@@ -20,3 +20,3 @@
+ @direntry
 -* libtoolize: (libtool)Invoking libtoolize.     Adding libtool support.
-+* libtoolize: (libtool14)Invoking libtoolize.     Adding libtool support.
- END-INFO-DIR-ENTRY
++* libtoolize15: (libtool15)Invoking libtoolize.     Adding libtool support.
+ @end direntry
diff --git a/devel/libtool15/files/patch-ab b/devel/libtool15/files/patch-ab
index 384c86a0bd18..eecf8914e1a6 100644
--- a/devel/libtool15/files/patch-ab
+++ b/devel/libtool15/files/patch-ab
@@ -1,50 +1,54 @@
---- doc/Makefile.in.orig	Wed Oct 23 02:51:04 2002
-+++ doc/Makefile.in	Mon Feb 17 02:01:16 2003
-@@ -72,3 +72,3 @@
- LN_S = @LN_S@
+--- 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@
-@@ -85,4 +85,4 @@
+@@ -160,4 +160,4 @@
  AUTOMAKE_OPTIONS = gnits
 -info_TEXINFOS = libtool.texi
 -libtool_TEXINFOS = PLATFORMS fdl.texi
-+info_TEXINFOS = libtool14.texi
-+libtool14_TEXINFOS = PLATFORMS fdl.texi
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -90,6 +90,6 @@
- TEXI2DVI = texi2dvi
++info_TEXINFOS = libtool15.texi
++libtool15_TEXINFOS = PLATFORMS fdl.texi
+ subdir = doc
+@@ -167,8 +167,8 @@
+ am__TEXINFO_TEX_DIR = $(srcdir)
 -INFO_DEPS = libtool.info
 -DVIS = libtool.dvi
+-PDFS = libtool.pdf
+-PSS = libtool.ps
 -TEXINFOS = libtool.texi
--DIST_COMMON =  $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \
-+INFO_DEPS = libtool14.info
-+DVIS = libtool14.dvi
-+TEXINFOS = libtool14.texi
-+DIST_COMMON =  $(libtool14_TEXINFOS) Makefile.am Makefile.in mdate-sh \
- stamp-vti texinfo.tex version.texi
-@@ -115,4 +115,4 @@
- 
--$(srcdir)/stamp-vti: libtool.texi $(top_srcdir)/configure.in
--	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool.texi`" > vti.tmp
-+$(srcdir)/stamp-vti: libtool14.texi $(top_srcdir)/configure.in
-+	@echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh $(srcdir)/libtool14.texi`" > vti.tmp
- 	@echo "@set EDITION $(VERSION)" >> vti.tmp
-@@ -135,4 +135,4 @@
- 
+-DIST_COMMON = $(libtool_TEXINFOS) Makefile.am Makefile.in mdate-sh \
++INFO_DEPS = libtool15.info
++DVIS = libtool15.dvi
++PDFS = libtool15.pdf
++PSS = libtool15.ps
++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)
-+libtool14.info: libtool14.texi version.texi $(libtool14_TEXINFOS)
-+libtool14.dvi: libtool14.texi version.texi $(libtool14_TEXINFOS)
- 
-@@ -235,6 +235,6 @@
+-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
+-	@(dir=.; test -f ./libtool.texi || dir=$(srcdir); \
+-	set `$(SHELL) $(srcdir)/mdate-sh $$dir/libtool.texi`; \
++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 @@
  mostlyclean-aminfo:
--	-rm -f libtool.aux libtool.cp libtool.cps libtool.dvi libtool.fn \
--	  libtool.fns libtool.ky libtool.kys libtool.ps libtool.log \
--	  libtool.pg libtool.toc libtool.tp libtool.tps libtool.vr \
--	  libtool.vrs libtool.op libtool.tr libtool.cv libtool.cn
-+	-rm -f libtool14.aux libtool14.cp libtool14.cps libtool14.dvi libtool14.fn \
-+	  libtool14.fns libtool14.ky libtool14.kys libtool14.ps libtool14.log \
-+	  libtool14.pg libtool14.toc libtool14.tp libtool14.tps libtool14.vr \
-+	  libtool14.vrs libtool14.op libtool14.tr libtool14.cv libtool14.cn
+-	-rm -f 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 \
++	  libtool15.log libtool15.pg libtool15.tmp libtool15.toc libtool15.tp \
++	  libtool15.vr libtool15.dvi libtool15.pdf libtool15.ps
  
diff --git a/devel/libtool15/files/patch-ae b/devel/libtool15/files/patch-ae
index 62aeecd4ae60..4a2214cfef50 100644
--- a/devel/libtool15/files/patch-ae
+++ b/devel/libtool15/files/patch-ae
@@ -1,14 +1,14 @@
---- configure.orig	Wed Oct 23 02:26:05 2002
-+++ configure	Mon Feb 17 02:04:57 2003
-@@ -865,3 +865,3 @@
- 
--PACKAGE=libtool
-+PACKAGE=libtool14
- 
-@@ -6089,6 +6089,2 @@
-       esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
- 
+--- 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
index 1298dce981e1..c1caa93c1e1f 100644
--- a/devel/libtool15/files/patch-af
+++ b/devel/libtool15/files/patch-af
@@ -1,37 +1,32 @@
---- libltdl/Makefile.in.orig	Wed Oct 23 02:26:07 2002
-+++ libltdl/Makefile.in	Mon Feb 17 02:06:58 2003
-@@ -342,3 +342,3 @@
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
-+	-chmod 555 $(distdir)
- 	@for file in $(DISTFILES); do \
-@@ -346,9 +346,8 @@
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    echo no copy dir $$d/$$file; \
+--- 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 \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+-	    || cp -p $$d/$$file $(distdir)/$$file \
+-	    || exit 1; \
 +	    install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \
  	  fi; \
- 	done
-+	-chmod a+x $(distdir)/configure
- info-am:
-@@ -452,4 +451,4 @@
+@@ -586,4 +584,4 @@
  local-install-files: $(DISTFILES)
 -	-rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
 -	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
-+	-rm -rf $(DESTDIR)$(datadir)/libtool14/libltdl
-+	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool14/libltdl
++	-rm -rf $(DESTDIR)$(datadir)/libtool15/libltdl
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/libtool15/libltdl
  	@for file in $(DISTFILES); do \
-@@ -457,6 +456,6 @@
+@@ -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)/libtool14/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)/libtool14/libltdl/$$file \
-+	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool14/libltdl/$$file || :; \
++	    test -f $(DESTDIR)$(datadir)/libtool15/libltdl/$$file \
++	    || cp $$d/$$file $(DESTDIR)$(datadir)/libtool15/libltdl/$$file || :; \
  	  fi; \
diff --git a/devel/libtool15/files/patch-libtoolize.in b/devel/libtool15/files/patch-libtoolize.in
index b92bbeb9d8e9..786ca8d9fe21 100644
--- a/devel/libtool15/files/patch-libtoolize.in
+++ b/devel/libtool15/files/patch-libtoolize.in
@@ -4,6 +4,6 @@
  
 -libtool_m4="$aclocaldir/libtool.m4"
 -ltdl_m4="$aclocaldir/ltdl.m4"
-+libtool_m4="$aclocaldir/libtool14.m4"
-+ltdl_m4="$aclocaldir/ltdl14.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 eb77e13cf2c0..2a30a0c9ef22 100644
--- a/devel/libtool15/files/patch-ltmain.sh
+++ b/devel/libtool15/files/patch-ltmain.sh
@@ -1,11 +1,7 @@
---- ltmain.sh.orig	Fri Jun 27 19:46:40 2003
-+++ ltmain.sh	Fri Jun 27 19:46:52 2003
-@@ -1061,7 +1061,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
+--- ltmain.sh.orig	Wed Jul  2 16:56:39 2003
++++ ltmain.sh	Wed Jul  2 16:58:03 2003
+@@ -1279,3 +1279,3 @@
+ 	 case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
+ 	   # Do not include libc_r directly, use -pthread flag.
diff --git a/devel/libtool15/pkg-plist b/devel/libtool15/pkg-plist
index 68516f0dab46..b01cc723189d 100644
--- a/devel/libtool15/pkg-plist
+++ b/devel/libtool15/pkg-plist
@@ -17,11 +17,16 @@ 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.in
+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/stamp-h.in
+share/libtool%%BUILD_VERSION%%/libltdl/ltmain.sh
+share/libtool%%BUILD_VERSION%%/libltdl/missing
+share/libtool%%BUILD_VERSION%%/libltdl/mkinstalldirs
 share/libtool%%BUILD_VERSION%%/ltmain.sh
 @dirrm share/libtool%%BUILD_VERSION%%/libltdl
 @dirrm share/libtool%%BUILD_VERSION%%
diff --git a/devel/libtool15/pkg-plist.libltdl b/devel/libtool15/pkg-plist.libltdl
index 1a8458d1a65c..be04b5c3b893 100644
--- a/devel/libtool15/pkg-plist.libltdl
+++ b/devel/libtool15/pkg-plist.libltdl
@@ -1,5 +1,6 @@
 @comment $FreeBSD$
 include/ltdl.h
 lib/libltdl.a
+lib/libltdl.la
 lib/libltdl.so
 lib/libltdl.so.4