Subject: pkg/24291: devel/libtool* update to 1.5.2
To: None <gnats-bugs@gnats.NetBSD.org>
From: Min Sik Kim <minskim@bawi.org>
List: netbsd-bugs
Date: 02/01/2004 11:59:29
>Number: 24291
>Category: pkg
>Synopsis: devel/libtool* update to 1.5.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Sun Feb 01 18:00:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator: Min Sik Kim
>Release: NetBSD 1.6ZH
>Organization:
>Environment:
System: NetBSD sulley.infnis.com 1.6ZH NetBSD 1.6ZH (SULLEY) #5: Sun Jan 18 00:17:12 CST 2004 root@sulley.infnis.com:/usr/obj/sys/arch/i386/compile/SULLEY i386
Architecture: i386
Machine: i386
>Description:
New in 1.5.2: 2004-01-25; CVS version 1.5.0a, Libtool team:
* lt_dlrealloc is an official part of the libltdl API.
* --tag, --silent and --debug options are preserved and reused when libtool
calls itself for relinking etc.
* `-pthread' and similar options are honoured when linking shared libraries.
* -no-suppress in compile mode shows compiler output for both PIC and non-PIC
object compilation.
* New link mode option `-precious-files-regex' to prevent accidental removal
of files you want to keep, such as test coverage data, from the temporary
output directory.
* Directories specified in /etc/ld.so.conf are no longer hardcoded on Linux.
* Recognises the 'R' symbol type on Solaris so read-only symbols can be
exported.
* Bug fixes.
New in 1.5: 2003-04-14; CVS version 1.4e, Libtool team:
* First stable release of multi-language architecture.
* libtool and libltdl support for Mac OS/X.
* libltdl will now use cygwins dlopen API instead of always forcing
LoadLibrary.
* Support auto-import patch to binutils on cygwin for much improved dll
support.
* Bug fixes.
New in 1.4.3: 2002-10-13; CVS version 1.4.2a, Robert Boehne:
* The libltdl subdirectory now bootstraps correctly with Automake 1.5.
* srcdir != builddir builds with Automake 1.5 work correctly.
* Support for mips-compaq-nonstopux.
* New command line argument, --preserve-dup-deps prevents removal of
duplicate dependent libraries.
New in 1.4d: 2002-01-07; CVS version 1.4c, Libtool team:
* Help strings display correctly again.
* Better error messages when library linking fails.
* Better error messages from libltdl when loading fails.
* Better search path management in libltdl with `lt_dlinsertsearchdir' call.
* Support /lib/w32api in recent cygwin releases.
* Support cross compilation to mingw.
* Support for .rc files (Windows resource compiler).
* Improved handling of mingw gcc.
* Improved handling of $PATH with entries containing spaces.
* Improved support for linking with gcc on aix4* and aix5*.
* Improved support for GCC 3.0.
* Initial support for QNX RTOS, UnixWare 7 and OpenUNIX 8.
* Bug fixes to the OpenBSD port.
* Bug fixes.
New in 1.4.2: 2001-09-11; CVS version 1.4.1a, Gary V. Vaughan:
* libltdl now builds on solaris again
* diagnose and warn about not-quite-working combinations of gcc and
ld on solaris.
* Improved OpenBSD support.
* Improved cygwin support.
* Bugfixes.
New in 1.4.1: 2001-09-03; CVS version 1.4.0a, Libtool team:
* Better error messages from libltdl when loading fails.
* Don't leave here-doc files behind.
* Improved support for OpenBSD.
* Libtool will build with autoconf-2.50 and higher.
* Plug memory management bugs in libltdl.
* Prefer shl_load to dlopen for better operation on HP-UX.
New in 1.4b: 2001-07-09; CVS version 1.4a, Libtool team:
* Now bootstraps with autoconf-2.50 and automake-1.4-p4.
* Always try to build at least a static lib, even if both static and
shared libs were disabled.
* Full support for C++ compiler.
* Support for GNU gcj compiler.
* libltdl can now load all modules in a given path according to user
supplied criteria with `lt_dlforeachfile' call.
* Improved support for AIX ia64, djgpp, HPUX, hurd, OpenBSD, sco3.2*.
* Internal mutex handling no longer has namespace clashes on NCR MP-RAS.
* New pdemo and tagdemo tests.
* Bug fixes.
>How-To-Repeat:
>Fix:
Tested on NetBSD-current/i386 and Linux/i386.
Index: libtool/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- libtool/Makefile 2003/03/29 09:38:21 1.39
+++ libtool/Makefile 2004/02/01 07:57:11
@@ -4,11 +4,10 @@
DISTFILES= # empty
.include "Makefile.common"
-PKGNAME= ${PKGPFX}
SVR4_PKGNAME= ltool
-DEPENDS+= ${PKGPFX:S/-/-base-/}${PKGREVISION:C/[0-9]*/nb/}${PKGREVISION}:../libtool-base
-DEPENDS+= ${PKGPFX:S/-/-info-/}${PKGREVISION:C/[0-9]*/nb/}${PKGREVISION}:../libtool-info
+DEPENDS+= ${DISTNAME:S/-/-base-/}${PKGREVISION:C/[0-9]*/nb/}${PKGREVISION}:../libtool-base
+DEPENDS+= ${DISTNAME:S/-/-info-/}${PKGREVISION:C/[0-9]*/nb/}${PKGREVISION}:../libtool-info
COMMENT= Generic shared library support script
Index: libtool/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/Makefile.common,v
retrieving revision 1.40
diff -u -r1.40 Makefile.common
--- libtool/Makefile.common 2004/01/20 12:13:28 1.40
+++ libtool/Makefile.common 2004/02/01 07:57:11
@@ -1,11 +1,9 @@
# $NetBSD: Makefile.common,v 1.40 2004/01/20 12:13:28 agc Exp $
#
-DISTNAME= libtool-ml-20010614
-PKGPFX= ${DISTNAME:C/ml-/1.4./}
-PKGREVISION= 19
+DISTNAME= libtool-1.5.2
CATEGORIES= devel pkgtools
-MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITES= ${MASTER_SITE_GNU:=libtool/}
MAINTAINER= skrll@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/libtool/libtool.html
@@ -14,7 +12,6 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/libtool-ml
GNU_CONFIGURE= # defined
USE_BUILDLINK3= # defined
Index: libtool/buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/buildlink2.mk,v
retrieving revision 1.3
diff -u -r1.3 buildlink2.mk
--- libtool/buildlink2.mk 2003/01/06 09:49:08 1.3
+++ libtool/buildlink2.mk 2004/02/01 07:57:11
@@ -4,7 +4,7 @@
LTDL_BUILDLINK2_MK= # defined
BUILDLINK_PACKAGES+= ltdl
-BUILDLINK_DEPENDS.ltdl?= libtool-base>=1.4.20010614nb1
+BUILDLINK_DEPENDS.ltdl?= libtool-base>=1.5.2
BUILDLINK_PKGSRCDIR.ltdl?= ../../devel/libtool-base
EVAL_PREFIX+= BUILDLINK_PREFIX.ltdl=libtool-base
Index: libtool/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/distinfo,v
retrieving revision 1.32
diff -u -r1.32 distinfo
--- libtool/distinfo 2004/01/05 09:50:47 1.32
+++ libtool/distinfo 2004/02/01 07:57:11
@@ -1,20 +1,10 @@
$NetBSD: distinfo,v 1.32 2004/01/05 09:50:47 cube Exp $
-SHA1 (libtool-ml-20010614.tar.gz) = ff746666737e420592c3017d65bf4c47f1430dac
-Size (libtool-ml-20010614.tar.gz) = 784246 bytes
-SHA1 (patch-aa) = 5224d88d08c6fdbbc820d269a5d46a1ca68b3591
-SHA1 (patch-ab) = 76d0762ff80ddeac72a740383797502ab2ee4921
-SHA1 (patch-ac) = 61196acaa12edee0b1209b2ba7c6414453bfa438
-SHA1 (patch-ad) = 6aab76688d0f55648e35adc45a3492ba9c87acfb
-SHA1 (patch-ae) = 1b354c98637d4c6e3646056e022652d1dc264c94
-SHA1 (patch-af) = 2a0630e92b355ee86800c4f3a7993fbb126a0999
-SHA1 (patch-ag) = df18e0d735df9b102d70b054e0cbaa1fd209bfff
-SHA1 (patch-ah) = 7f0a0153f5e23aab4a3fcd6ae395b5b56d2b52a1
-SHA1 (patch-ai) = bf5296409ccba34bccbc5ed289eeaa8350d7176e
-SHA1 (patch-aj) = 5382fc0a6a58687da5523c596118a4eeb948f675
-SHA1 (patch-ak) = 7e7c6a515361863b683bbc8be24c8146501ca864
-SHA1 (patch-al) = 22f1b7289d9ba477255e66364ae23af24a298dd0
-SHA1 (patch-am) = 2c99398e34686ea5bcecaae254b1b240b53e46df
-SHA1 (patch-ao) = 4e115e9d6ddde556205dc786cde471bfee5a5e9e
-SHA1 (patch-aq) = 7555ca198cacec6029a95562984673ef562aade1
-SHA1 (patch-as) = 1cdaa6963858fa509d12a1303ce1658902ac9c95
+SHA1 (libtool-1.5.2.tar.gz) = d6f1e8fb544d71b3c88fb959521b34b9b6290260
+Size (libtool-1.5.2.tar.gz) = 2653072 bytes
+SHA1 (patch-ab) = 0e49a4d2515b10264f30c02c8536adea755c0c18
+SHA1 (patch-ac) = 11165bd4ed90fbdfb55816b7ecee6bb961d37679
+SHA1 (patch-ad) = af987e4b8fa4ba58c166d8dfdaa84dd307455ce6
+SHA1 (patch-ae) = d0784147089d86256ba897b4392a90a3917b9448
+SHA1 (patch-ag) = 573abbf5c61a8657037fb93960ca6233622f839f
+SHA1 (patch-aq) = 062f8d771191d089683fb11c17a7e6643bcf09fc
Index: libtool/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-aa,v
retrieving revision 1.32
diff -u -r1.32 patch-aa
--- libtool/patches/patch-aa 2003/12/11 22:15:30 1.32
+++ libtool/patches/patch-aa 2004/02/01 07:57:11
@@ -1,86 +0,0 @@
-$NetBSD: patch-aa,v 1.32 2003/12/11 22:15:30 reed Exp $
-
---- ltconfig.in.orig Mon May 21 00:05:06 2001
-+++ ltconfig.in Mon Dec 8 21:47:31 2003
-@@ -1051,9 +1051,10 @@
- lt_cv_dlopen_self=yes
- ;;
-
--bsdi4*)
-- version_type=linux
-+bsdi*)
-+ version_type=sunos
- need_version=no
-+ need_lib_prefix=no
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
- soname_spec='${libname}${release}.so$major'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-@@ -1104,7 +1105,7 @@
- version_type=darwin
- need_lib_prefix=no
- need_version=no
-- library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.$`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
-+ library_names_spec='${libname}${release}${versuffix}.`test .$module = .yes && echo so || echo dylib` ${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib` ${libname}.`test .$module = .yes && echo so || echo dylib`'
- soname_spec='${libname}${release}${major}.`test .$module = .yes && echo so || echo dylib`'
- shlibpath_overrides_runpath=yes
- shlibpath_var=DYLD_LIBRARY_PATH
-@@ -1116,16 +1117,17 @@
-
- freebsd*)
- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-- version_type=freebsd-$objformat
-- case $version_type in
-- freebsd-elf*)
-- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-+ version_type=sunos
-+ case $objformat in
-+ elf*)
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-+ soname_spec='${libname}${release}.so$major'
- need_version=no
- need_lc=no
- need_lib_prefix=no
- ;;
-- freebsd-*)
-- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-+ *)
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
- need_version=yes
- ;;
- esac
-@@ -1167,7 +1169,7 @@
- ;;
-
- irix5* | irix6*)
-- version_type=irix
-+ version_type=sunos
- need_lib_prefix=no
- need_version=no
- soname_spec='${libname}${release}.so$major'
-@@ -1198,7 +1200,7 @@
-
- # This must be Linux ELF.
- linux-gnu*)
-- version_type=linux
-+ version_type=sunos
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
-@@ -1236,6 +1238,8 @@
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=yes
- hardcode_into_libs=yes
-+ sys_lib_dlsearch_path_spec="/usr/lib"
-+ sys_lib_search_path_spec="/usr/lib"
- ;;
-
- newsos6)
-@@ -1282,7 +1286,7 @@
- ;;
-
- solaris*)
-- version_type=linux
-+ version_type=sunos
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
Index: libtool/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ab,v
retrieving revision 1.29
diff -u -r1.29 patch-ab
--- libtool/patches/patch-ab 2003/10/05 08:19:19 1.29
+++ libtool/patches/patch-ab 2004/02/01 07:57:11
@@ -1,200 +1,97 @@
-$NetBSD: patch-ab,v 1.29 2003/10/05 08:19:19 grant Exp $
+$NetBSD$
---- ltmain.sh.orig 2001-06-14 14:06:50.000000000 +1000
+--- ltmain.sh.orig 2004-01-25 06:40:26.000000000 -0600
+++ ltmain.sh
-@@ -211,6 +211,8 @@ do
- --mode) prevopt="--mode" prev=mode ;;
- --mode=*) mode="$optarg" ;;
-
-+ --preserve-dup-deps) duplicate_deps="yes" ;;
-+
- --quiet | --silent)
- show=:
- ;;
-@@ -256,7 +258,7 @@ if test -z "$show_help"; then
- # Infer the operation mode.
- if test -z "$mode"; then
+@@ -318,7 +318,7 @@ if test -z "$show_help"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+ $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
case $nonopt in
-- *cc | *++ | gcc* | *-gcc*)
-+ *cc | *++ | gcc* | *-gcc* | *CC)
+- *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
++ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc* | *CC)
mode=link
for arg
do
-@@ -494,11 +496,21 @@ if test -z "$show_help"; then
- # command doesn't match the default compiler.
- if test -n "$available_tags" && test -z "$tagname"; then
+@@ -525,10 +525,20 @@ if test -z "$show_help"; then
case $base_compile in
-- "$CC "*) ;;
-+ "$CC "*) tagname=CC ;;
# Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when ltconfig was run.
-- "`$echo $CC` "*) ;;
+ # but not from the CC environment variable when configure was run.
+- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) tagname=CC ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
- *)
-+ "`$echo $CC` "*) tagname=CC ;;
+ *) base_compiler=`echo $base_compile | awk '{ print $1 }'`
-+ case $base_compiler in
-+ *cc) tagname=CC ;;
-+ *++)
-+ tagname=CXX
-+ eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-+ ;;
-+ esac ;;
++ case $base_compiler in
++ *cc) tagname=CC ;;
++ *++)
++ tagname=CXX
++ eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++ ;;
++ esac ;;
+ esac
+ fi
+ if test -n "$available_tags" && test -z "$tagname"; then
- for z in $available_tags; do
- if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+ for z in $available_tags; do
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
# Evaluate the configuration.
-@@ -528,8 +540,6 @@ if test -z "$show_help"; then
+@@ -554,8 +564,6 @@ if test -z "$show_help"; then
# else
- # echo "$modename: using $tagname tagged configuration"
- fi
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
- ;;
- esac
fi
- objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-@@ -1528,11 +1538,21 @@ EOF
- # command doesn't match the default compiler.
- if test -n "$available_tags" && test -z "$tagname"; then
+ for arg in $later; do
+@@ -912,10 +920,20 @@ EOF
case $base_compile in
-- "$CC "*) ;;
-+ "$CC "*) tagname=CC ;;
# Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when ltconfig was run.
-- "`$echo $CC` "*) ;;
+ # but not from the CC environment variable when configure was run.
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
++ "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) tagname=CC ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
- *)
-+ "`$echo $CC` "*) tagname=CC ;;
+ *) base_compiler=`echo $base_compile | awk '{ print $1 }'`
-+ case $base_compiler in
-+ *cc) tagname=CC ;;
-+ *++)
-+ tagname=CXX
-+ eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-+ ;;
-+ esac ;;
++ case $base_compiler in
++ *cc) tagname=CC ;;
++ *++)
++ tagname=CXX
++ eval "`sed -n -e '/^### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++ ;;
++ esac ;;
+ esac
+ fi
+ if test -n "$available_tags" && test -z "$tagname"; then
- for z in $available_tags; do
- if grep "^### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+ for z in $available_tags; do
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
# Evaluate the configuration.
-@@ -1562,8 +1582,6 @@ EOF
+@@ -941,8 +959,6 @@ EOF
# else
- # echo "$modename: using $tagname tagged configuration"
- fi
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
- ;;
- esac
fi
-
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1619,9 +1637,11 @@ EOF
- # Find all interdependent deplibs by searching for libraries
- # that are linked more than once (e.g. -la -lb -la)
- for deplib in $deplibs; do
-+ if test "X$duplicate_deps" = "Xyes" ; then
- case "$libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
-+ fi
- libs="$libs $deplib"
- done
-
-@@ -1632,12 +1652,14 @@ EOF
- # $postdeps and mark them as special (i.e., whose duplicates are
- # not to be eliminated).
- pre_post_deps=
-+ if test "X$duplicate_deps" = "Xyes" ; then
- for pre_post_dep in $predeps $postdeps; do
- case "$pre_post_deps " in
- *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
- esac
- pre_post_deps="$pre_post_deps $pre_post_dep"
- done
-+ fi
- pre_post_deps=
- fi
-
-@@ -1861,9 +1883,11 @@ EOF
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
-+ if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
-+ fi
- tmp_libs="$tmp_libs $deplib"
- done
- elif test $linkmode != prog && test $linkmode != lib; then
-@@ -1986,9 +2010,11 @@ EOF
- # or/and link against static libraries
- newdependency_libs="$deplib $newdependency_libs"
- fi
-+ if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
-+ fi
- tmp_libs="$tmp_libs $deplib"
- done # for deplib
- continue
-@@ -2287,9 +2313,11 @@ EOF
- tmp_libs=
- for deplib in $dependency_libs; do
- newdependency_libs="$deplib $newdependency_libs"
-+ if test "X$duplicate_deps" = "Xyes" ; then
- case "$tmp_libs " in
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
- esac
-+ fi
- tmp_libs="$tmp_libs $deplib"
- done
-@@ -2564,8 +2592,8 @@ EOF
+ # We need to know -static, to get the right output filenames.
+@@ -2967,8 +2983,8 @@ EOF
darwin)
# Like Linux, but with the current version available in
# verstring for coding it into the library header
- major=.`expr $current - $age`
- versuffix="$major.$age.$revision"
-+ major=".$current"
++ major==".$current"
+ versuffix=".$current.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-@@ -2582,7 +2610,7 @@ EOF
+@@ -2985,7 +3001,7 @@ EOF
;;
- irix)
+ irix | nonstopux)
- major=`expr $current - $age + 1`
+ major=`expr $current - $age`
- verstring="sgi$major.$revision"
-
- # Add in all the interfaces that we are compatible with.
-@@ -2642,7 +2670,16 @@ EOF
- # Clear the version info if we defaulted, and they specified a release.
- if test -z "$vinfo" && test -n "$release"; then
- major=
-- verstring="0.0"
-+ case $version_type in
-+ darwin)
-+ # we can't check for "0.0" in archive_cmds due to quoting
-+ # problems, so we reset it completely
-+ verstring=
-+ ;;
-+ *)
-+ verstring="0.0"
-+ ;;
-+ esac
- if test "$need_version" = no; then
- versuffix=
- else
-@@ -5053,7 +5090,7 @@ relink_command=\"$relink_command\""
- fi
- # Now prepare to actually exec the command.
-- exec_cmd='"$cmd"$args'
-+ exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
Index: libtool/patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ac,v
retrieving revision 1.8
diff -u -r1.8 patch-ac
--- libtool/patches/patch-ac 2001/06/14 14:55:47 1.8
+++ libtool/patches/patch-ac 2004/02/01 07:57:11
@@ -1,46 +1,36 @@
-$NetBSD: patch-ac,v 1.8 2001/06/14 14:55:47 skrll Exp $
+$NetBSD$
---- config.guess.orig Thu Apr 12 05:05:02 2001
+--- config.guess.orig 2004-01-25 06:21:05.000000000 -0600
+++ config.guess
-@@ -135,41 +135,24 @@
- # compatibility and a consistent mechanism for selecting the
- # object file format.
- # Determine the machine/vendor (is the vendor relevant).
-- case "${UNAME_MACHINE}" in
-- amiga) machine=m68k-unknown ;;
-- arm32) machine=arm-unknown ;;
-- atari*) machine=m68k-atari ;;
-- sun3*) machine=m68k-sun ;;
-- mac68k) machine=m68k-apple ;;
-- macppc) machine=powerpc-apple ;;
-- hp3[0-9][05]) machine=m68k-hp ;;
-- ibmrt|romp-ibm) machine=romp-ibm ;;
-- *) machine=${UNAME_MACHINE}-unknown ;;
-+ PATH=$PATH:/sbin:/usr/sbin
-+ UNAME_MACHINE_ARCH=`(uname -p || sysctl -n hw.machine_arch || echo unknown) 2>/dev/null`
-+ case "${UNAME_MACHINE_ARCH}:${UNAME_RELEASE}" in
-+ arm26:*) UNAME_MACHINE_ARCH=armv2;;
-+ arm32:*) UNAME_MACHINE_ARCH=arm;;
-+ mips:*) UNAME_MACHINE_ARCH=mipsel;;
-+ i386:*|m68k:*|ns32k:*|sparc:*|vax:*)
-+ # The Operating System including object format.
-+ if echo __ELF__ | $CC_FOR_BUILD -E - | grep -q __ELF__; then
-+ UNAME_OBJFORMAT=
-+ else
-+ UNAME_OBJFORMAT=elf
-+ fi;;
- esac
+@@ -154,48 +154,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+- armeb) machine=armeb-unknown ;;
+- arm*) machine=arm-unknown ;;
+- sh3el) machine=shl-unknown ;;
+- sh3eb) machine=sh-unknown ;;
+- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+- esac
- # The Operating System including object format, if it has switched
- # to ELF recently, or will in the future.
-- case "${UNAME_MACHINE}" in
-- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+- case "${UNAME_MACHINE_ARCH}" in
+- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep __ELF__ >/dev/null
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
- os=netbsd
-- else
++ arm26) UNAME_MACHINE_ARCH=armv2;;
++ arm32) UNAME_MACHINE_ARCH=arm;;
++ mips) UNAME_MACHINE_ARCH=mipsel;;
++ i386|m68k|ns32k|sparc|vax)
++ # The Operating System including object format.
++ if echo __ELF__ | $CC_FOR_BUILD -E - | grep -q __ELF__; then
++ UNAME_OBJFORMAT=
+ else
- os=netbsdelf
- fi
- ;;
@@ -49,12 +39,25 @@
- ;;
- esac
- # The OS release
-- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+- # Debian GNU/NetBSD machines have a different userland, and
+- # thus, need a distinct triplet. However, they do not need
+- # kernel version information, so it can be replaced with a
+- # suitable tag, in the style of linux-gnu.
+- case "${UNAME_VERSION}" in
+- Debian*)
+- release='-gnu'
+- ;;
+- *)
+- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+- ;;
++ UNAME_OBJFORMAT=elf
++ fi;;
+ esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
-+ echo ${UNAME_MACHINE_ARCH}-netbsd${UNAME_OBJFORMAT}`echo ${UNAME_RELEASE} | sed -e 's/[-_].*/\./'`
++ echo ${UNAME_MACHINE_ARCH}-netbsd${UNAME_OBJFORMAT}`echo ${UNAME_RELEASE} | sed -e 's/[-_].*/\./'`
exit 0 ;;
- alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
Index: libtool/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ad,v
retrieving revision 1.5
diff -u -r1.5 patch-ad
--- libtool/patches/patch-ad 2001/06/14 14:55:47 1.5
+++ libtool/patches/patch-ad 2004/02/01 07:57:11
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.5 2001/06/14 14:55:47 skrll Exp $
+$NetBSD$
---- Makefile.in.orig Wed May 23 05:07:23 2001
+--- Makefile.in.orig 2004-01-25 06:36:36.000000000 -0600
+++ Makefile.in
-@@ -93,7 +93,7 @@
-
+@@ -202,7 +202,7 @@ subdirs = @subdirs@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
AUTOMAKE_OPTIONS = 1.3e gnu
-
-BUILD_SUBDIRS = . libltdl doc tests
+BUILD_SUBDIRS = . libltdl tests
SUBDIRS = $(BUILD_SUBDIRS)
DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
-
+ CPPLAGS = @CPPFLAGS@
Index: libtool/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ae,v
retrieving revision 1.6
diff -u -r1.6 patch-ae
--- libtool/patches/patch-ae 2003/12/11 22:15:30 1.6
+++ libtool/patches/patch-ae 2004/02/01 07:57:12
@@ -1,8 +1,137 @@
-$NetBSD: patch-ae,v 1.6 2003/12/11 22:15:30 reed Exp $
+$NetBSD$
---- configure.orig Thu Jun 14 00:06:29 2001
-+++ configure Mon Dec 8 21:54:21 2003
-@@ -1448,8 +1448,13 @@
+--- configure.orig 2004-01-25 06:36:38.000000000 -0600
++++ configure
+@@ -1156,7 +1156,7 @@ esac
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+- cd "$ac_popdir"
++ cd $ac_popdir
+ done
+ fi
+
+@@ -2580,7 +2580,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2638,7 +2639,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2754,7 +2756,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2808,7 +2811,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2853,7 +2857,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2897,7 +2902,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3543,7 +3549,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3601,7 +3608,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3672,7 +3680,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3716,7 +3725,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4002,7 +4012,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4051,7 +4062,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4424,8 +4436,13 @@ beos*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -17,16 +146,621 @@
+ lt_cv_deplibs_check_method=pass_all
lt_cv_file_magic_cmd='/usr/bin/file -L'
lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+@@ -4745,7 +4762,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5296,7 +5314,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5466,7 +5485,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5533,7 +5553,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7457,7 +7478,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7517,7 +7539,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8135,9 +8158,10 @@ beos*)
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+-bsdi4*)
+- version_type=linux
++bsdi*)
++ version_type=sunos
+ need_version=no
++ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -8253,15 +8277,16 @@ kfreebsd*-gnu)
+
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
++ version_type=sunos
++ case $objformat in
++ elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++ *)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ need_version=yes
+ ;;
+ esac
+@@ -8342,9 +8367,9 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=sunos
+ else
+- version_type=irix
++ version_type=sunos
+ fi ;;
+ esac
+ need_lib_prefix=no
+@@ -8381,7 +8406,7 @@ linux*oldld* | linux*aout* | linux*coff*
+
+ # This must be Linux ELF.
+ linux*)
+- version_type=linux
++ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -8708,7 +8733,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8811,7 +8837,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8876,7 +8903,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8969,7 +8997,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9034,7 +9063,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9100,7 +9130,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9166,7 +9197,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10411,7 +10443,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10472,7 +10505,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10854,6 +10888,13 @@ if test -z "$aix_libpath"; then aix_libp
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
++ # Determine if we need to override the c++rt0 that is
++ # picked up by analysing output_verbose_link_cmds
++ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
++ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
++ else
++ cpprt0_file=
++ fi
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+ hardcode_direct_CXX=yes
+ hardcode_shlibpath_var_CXX=no
+@@ -11226,6 +11267,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ esac
+ done
+
++ case "$host_os" in
++ netbsd*)
++ if test -n "$cpprt0_file"; then
++ predep_objects=`eval echo $predep_objects | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
++ fi
++ ;;
++ esac
++
+ # Clean up.
+ rm -f a.out a.exe
+ else
+@@ -11828,9 +11877,10 @@ beos*)
+ shlibpath_var=LIBRARY_PATH
;;
-@@ -1533,9 +1538,9 @@
+
+-bsdi4*)
+- version_type=linux
++bsdi*)
++ version_type=sunos
+ need_version=no
++ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -11946,15 +11996,16 @@ kfreebsd*-gnu)
+
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
++ version_type=sunos
++ case $objformat in
++ elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++ *)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ need_version=yes
+ ;;
+ esac
+@@ -12035,9 +12086,9 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=sunos
+ else
+- version_type=irix
++ version_type=sunos
+ fi ;;
+ esac
+ need_lib_prefix=no
+@@ -12074,7 +12125,7 @@ linux*oldld* | linux*aout* | linux*coff*
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
- else
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
- fi
+ # This must be Linux ELF.
+ linux*)
+- version_type=linux
++ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -12401,7 +12452,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12504,7 +12556,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12569,7 +12622,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12662,7 +12716,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12727,7 +12782,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12793,7 +12849,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12859,7 +12916,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_cxx_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14300,7 +14358,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14350,7 +14409,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_f77_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14968,9 +15028,10 @@ beos*)
+ shlibpath_var=LIBRARY_PATH
;;
+
+-bsdi4*)
+- version_type=linux
++bsdi*)
++ version_type=sunos
+ need_version=no
++ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -15086,15 +15147,16 @@ kfreebsd*-gnu)
+
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
++ version_type=sunos
++ case $objformat in
++ elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++ *)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ need_version=yes
+ ;;
+ esac
+@@ -15175,9 +15237,9 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=sunos
+ else
+- version_type=irix
++ version_type=sunos
+ fi ;;
+ esac
+ need_lib_prefix=no
+@@ -15214,7 +15276,7 @@ linux*oldld* | linux*aout* | linux*coff*
+
+ # This must be Linux ELF.
+ linux*)
+- version_type=linux
++ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -16639,7 +16701,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16699,7 +16762,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17317,9 +17381,10 @@ beos*)
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+-bsdi4*)
+- version_type=linux
++bsdi*)
++ version_type=sunos
+ need_version=no
++ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -17435,15 +17500,16 @@ kfreebsd*-gnu)
+
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
++ version_type=sunos
++ case $objformat in
++ elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++ *)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ need_version=yes
+ ;;
+ esac
+@@ -17524,9 +17590,9 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=sunos
+ else
+- version_type=irix
++ version_type=sunos
+ fi ;;
+ esac
+ need_lib_prefix=no
+@@ -17563,7 +17629,7 @@ linux*oldld* | linux*aout* | linux*coff*
+
+ # This must be Linux ELF.
+ linux*)
+- version_type=linux
++ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17890,7 +17956,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17993,7 +18060,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18058,7 +18126,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18151,7 +18220,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18216,7 +18286,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18282,7 +18353,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18348,7 +18420,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { ac_try='test -z "$ac_c_werror_flag"
++ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -20503,6 +20576,11 @@ esac
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+ esac
+
++ if test x"$ac_file" != x-; then
++ { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++ rm -f "$ac_file"
++ fi
+ # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # use $as_me), people would be surprised to read:
+ # /* config.h. Generated by config.status. */
+@@ -20541,12 +20619,6 @@ echo "$as_me: error: cannot find input f
+ fi;;
+ esac
+ done` || { (exit 1); exit 1; }
+-
+- if test x"$ac_file" != x-; then
+- { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+- rm -f "$ac_file"
+- fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+ sed "$ac_vpsub
+@@ -20987,7 +21059,7 @@ echo "$as_me: error: $ac_sub_configure f
+ { (exit 1); exit 1; }; }
+ fi
+
+- cd "$ac_popdir"
++ cd $ac_popdir
+ done
+ fi
Index: libtool/patches/patch-af
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-af,v
retrieving revision 1.4
diff -u -r1.4 patch-af
--- libtool/patches/patch-af 2002/03/01 15:40:45 1.4
+++ libtool/patches/patch-af 2004/02/01 07:57:12
@@ -1,39 +0,0 @@
-$NetBSD: patch-af,v 1.4 2002/03/01 15:40:45 skrll Exp $
-
---- doc/libtool.texi.orig Fri Apr 6 05:05:10 2001
-+++ doc/libtool.texi
-@@ -1068,6 +1068,15 @@
- Display basic configuration options. This provides a way for packages
- to determine whether shared or static libraries will be built.
-
-+@item --preserve-dup-deps
-+Do not remove duplicate dependencies in libraries. When building packages
-+with static libraries, the libraries may depend circularly on each other
-+(shared libs can too, but for those it doesn't matter), so there are
-+situations, where -la -lb -la is required, and the second -la may not be
-+stripped or the link will fail. In cases where these duplications are
-+required, this option will preserve them, only stripping the libraries
-+that libtool knows it can safely.
-+
- @item --finish
- Same as @samp{--mode=finish}.
-
-@@ -4449,15 +4458,9 @@
- other's symbols, it might be necessary to list one of those archives
- both before and after the other one. Libtool does not currently cope
- with this situation well, since dupicate libraries are removed from
--thr link line.
--
--If you find yourself developing on a host that requires you to list
--libraries multiple times in order for it to generate correctly linked
--objects, you can defeat libtool's removal algorithm like this:
--
--@example
--$ libtool ... -lfoo -lbar -Wl,-lfoo
--@end example
-+the link line by default. Libtool provides the command line option
-+@samp{--preserve-dup-deps} to preserve all duplicate dependencies
-+in cases where it is necessary.
-
- @node Archivers
- @subsection Archivers
Index: libtool/patches/patch-ag
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ag,v
retrieving revision 1.8
diff -u -r1.8 patch-ag
--- libtool/patches/patch-ag 2003/09/25 02:09:03 1.8
+++ libtool/patches/patch-ag 2004/02/01 07:57:12
@@ -1,63 +1,97 @@
-$NetBSD: patch-ag,v 1.8 2003/09/25 02:09:03 danw Exp $
+$NetBSD$
---- ltcf-cxx.sh.orig Wed May 23 05:05:06 2001
-+++ ltcf-cxx.sh
-@@ -382,8 +382,40 @@
- ;;
- esac
- ;;
-+ darwin* | rhapsody*)
-+ case "$host_os" in
-+ rhapsody* | darwin1.[012])
-+ allow_undefined_flag='-undefined suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
-+ ;;
-+ esac
-+ archive_cmds='$CC $(if test .$module = .yes; then echo -bundle; else echo -dynamiclib; fi) $allow_undefined_flag -o $lib $libobjs $deplibs $linker_flags -install_name $rpath/$soname $verstring'
-+ # We need to add '_' to the symbols in $export_symbols first
-+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ whole_archive_flag_spec='-all_load $convenience'
-+ ;;
- netbsd*)
-- # NetBSD uses g++ - do we need to do anything?
-+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+ # Surely {pre|post}dep_objects should be added here!
-+ archive_cmds='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+ wlarc=
+--- acinclude.m4.orig 2004-01-25 06:36:25.000000000 -0600
++++ acinclude.m4
+@@ -1182,9 +1182,10 @@ beos*)
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+-bsdi4*)
+- version_type=linux
++bsdi*)
++ version_type=sunos
+ need_version=no
++ need_lib_prefix=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+@@ -1300,15 +1301,16 @@ kfreebsd*-gnu)
+
+ freebsd*)
+ objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+- version_type=freebsd-$objformat
+- case $version_type in
+- freebsd-elf*)
++ version_type=sunos
++ case $objformat in
++ elf*)
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
+ need_version=no
+ need_lib_prefix=no
+ ;;
+- freebsd-*)
+- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++ *)
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ need_version=yes
+ ;;
+ esac
+@@ -1389,9 +1391,9 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=sunos
+ else
+- version_type=irix
++ version_type=sunos
+ fi ;;
+ esac
+ need_lib_prefix=no
+@@ -1428,7 +1430,7 @@ linux*oldld* | linux*aout* | linux*coff*
+
+ # This must be Linux ELF.
+ linux*)
+- version_type=linux
++ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2110,8 +2112,13 @@ beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-bsdi4*)
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++# Versions of BSD/OS prior to 4.0 did not have real dynamic linking
++bsdi1*|bsdi2*|bsdi3*)
++ dynamic_linker=no
++ ;;
++
++bsdi*)
++ lt_cv_deplibs_check_method=pass_all
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+@@ -3197,6 +3204,13 @@ case $host_os in
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+ # Determine if we need to override the c++rt0 that is
+ # picked up by analysing output_verbose_link_cmds
+ if test -f ${PREFIX}/lib/c++rt0/c++rt0.o.PIC; then
-+ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
++ cpprt0_file="${PREFIX}/lib/c++rt0/c++rt0.o.PIC"
+ else
-+ cpprt0_file=
++ cpprt0_file=
+ fi
-+ hardcode_direct=yes
-+ hardcode_libdir_flag_spec='-R$libdir'
-+ hardcode_shlibpathvar_var=no
-+ fi
-+ # Workaround for some pre-1.5 ELF toolchains
-+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | egrep conftest.$objext | sed -e "s/-lgcc -lc -lgcc//"'
- ;;
- osf3*)
- if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
-@@ -690,7 +722,7 @@
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
-- lt_cv_prog_cc_pic='-fno-common'
-+ ac_cv_prog_cc_pic='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
-@@ -982,6 +1014,14 @@
-
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -3622,6 +3636,14 @@ if AC_TRY_EVAL(ac_compile); then
esac
done
-+
+
+ case "$host_os" in
+ netbsd*)
+ if test -n "$cpprt0_file"; then
@@ -65,6 +99,7 @@
+ fi
+ ;;
+ esac
-
++
# Clean up.
- rm -f a.out
+ rm -f a.out a.exe
+ else
Index: libtool/patches/patch-ah
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ah,v
retrieving revision 1.3
diff -u -r1.3 patch-ah
--- libtool/patches/patch-ah 2002/03/21 09:00:13 1.3
+++ libtool/patches/patch-ah 2004/02/01 07:57:12
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/03/21 09:00:13 skrll Exp $
-
---- demo/configure.orig Wed Mar 20 10:42:55 2002
-+++ demo/configure
-@@ -1573,9 +1573,9 @@
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
- else
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
- fi
- ;;
-
Index: libtool/patches/patch-ai
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ai,v
retrieving revision 1.3
diff -u -r1.3 patch-ai
--- libtool/patches/patch-ai 2002/03/21 09:00:13 1.3
+++ libtool/patches/patch-ai 2004/02/01 07:57:12
@@ -1,16 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2002/03/21 09:00:13 skrll Exp $
-
---- cdemo/configure.orig Wed Mar 20 10:42:55 2002
-+++ cdemo/configure
-@@ -1497,9 +1497,9 @@
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
- else
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
- fi
- ;;
-
Index: libtool/patches/patch-aj
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-aj,v
retrieving revision 1.3
diff -u -r1.3 patch-aj
--- libtool/patches/patch-aj 2002/03/21 09:00:13 1.3
+++ libtool/patches/patch-aj 2004/02/01 07:57:12
@@ -1,16 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2002/03/21 09:00:13 skrll Exp $
-
---- pdemo/configure.orig Wed Mar 20 10:42:55 2002
-+++ pdemo/configure
-@@ -1573,9 +1573,9 @@
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
- else
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
- fi
- ;;
-
Index: libtool/patches/patch-ak
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ak,v
retrieving revision 1.3
diff -u -r1.3 patch-ak
--- libtool/patches/patch-ak 2002/03/21 09:00:13 1.3
+++ libtool/patches/patch-ak 2004/02/01 07:57:12
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2002/03/21 09:00:13 skrll Exp $
-
---- tagdemo/configure.orig Wed Mar 20 10:43:26 2002
-+++ tagdemo/configure
-@@ -1913,9 +1913,9 @@
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
- else
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
- fi
- ;;
-
Index: libtool/patches/patch-al
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-al,v
retrieving revision 1.3
diff -u -r1.3 patch-al
--- libtool/patches/patch-al 2002/03/21 09:00:13 1.3
+++ libtool/patches/patch-al 2004/02/01 07:57:12
@@ -1,16 +0,0 @@
-$NetBSD: patch-al,v 1.3 2002/03/21 09:00:13 skrll Exp $
-
---- mdemo/configure.orig Wed Mar 20 10:43:26 2002
-+++ mdemo/configure
-@@ -1584,9 +1584,9 @@
-
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$$'
- else
-- lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
-+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$$'
- fi
- ;;
-
Index: libtool/patches/patch-am
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-am,v
retrieving revision 1.6
diff -u -r1.6 patch-am
--- libtool/patches/patch-am 2003/09/25 02:09:03 1.6
+++ libtool/patches/patch-am 2004/02/01 07:57:12
@@ -1,63 +0,0 @@
-$NetBSD: patch-am,v 1.6 2003/09/25 02:09:03 danw Exp $
-
---- ltcf-c.sh.orig 2001-04-25 04:05:02.000000000 +0000
-+++ ltcf-c.sh
-@@ -173,23 +173,13 @@ EOF
- $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
- ;;
-
-- darwin* | rhapsody*)
-- allow_undefined_flag='-undefined suppress'
-- archive_cmds='$CC `test .$module = .yes && echo -bundle || echo -dynamiclib` $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname `test -n "$verstring" -a x$verstring != x0.0 && echo $verstring`'
-- # We need to add '_' to the symbols in $export_symbols first
-- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- whole_archive_flag_spec='-all_load $convenience'
-- ;;
--
- netbsd*)
- if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- wlarc=
- else
-- archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- fi
- ;;
-
-@@ -379,6 +369,23 @@ else
- fix_srcfile_path='`cygpath -w "$srcfile"`'
- ;;
-
-+ darwin* | rhapsody*)
-+ case "$host_os" in
-+ rhapsody* | darwin1.[012])
-+ allow_undefined_flag='-undefined suppress'
-+ ;;
-+ *) # Darwin 1.3 on
-+ allow_undefined_flag='-flat_namespace -undefined suppress'
-+ ;;
-+ esac
-+ archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
-+ # We need to add '_' to the symbols in $export_symbols first
-+ #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
-+ hardcode_direct=yes
-+ hardcode_shlibpath_var=no
-+ whole_archive_flag_spec='-all_load $convenience'
-+ ;;
-+
- freebsd1*)
- ld_shlibs=no
- ;;
-@@ -644,7 +651,7 @@ else
- darwin* | rhapsody*)
- # PIC is the default on this platform
- # Common symbols not allowed in MH_DYLIB files
-- lt_cv_prog_cc_pic='-fno-common'
-+ ac_cv_prog_cc_pic='-fno-common'
- ;;
- *djgpp*)
- # DJGPP does not support shared libraries at all
Index: libtool/patches/patch-ao
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-ao,v
retrieving revision 1.1
diff -u -r1.1 patch-ao
--- libtool/patches/patch-ao 2001/07/06 00:55:11 1.1
+++ libtool/patches/patch-ao 2004/02/01 07:57:12
@@ -1,22 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2001/07/06 00:55:11 enami Exp $
-
---- config.sub 2001/07/03 09:00:29 1.1
-+++ config.sub 2001/07/03 08:57:19
-@@ -227,7 +227,7 @@
- | we32k | ns16k | clipper | i370 | sh | sh[34] \
- | powerpc | powerpcle \
- | 1750a | dsp16xx | pdp10 | pdp11 \
-- | mips16 | mips64 | mipsel | mips64el \
-+ | mips16 | mips64 | mipseb | mipsel | mips64el \
- | mips64orion | mips64orionel | mipstx39 | mipstx39el \
- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
- | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
-@@ -271,7 +271,7 @@
- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
- | clipper-* | orion-* \
- | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
-- | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
-+ | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipseb-* | mipsel-* \
- | mips64el-* | mips64orion-* | mips64orionel-* \
- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
- | mipstx39-* | mipstx39el-* | mcore-* \
Index: libtool/patches/patch-aq
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-aq,v
retrieving revision 1.1
diff -u -r1.1 patch-aq
--- libtool/patches/patch-aq 2003/12/11 22:15:30 1.1
+++ libtool/patches/patch-aq 2004/02/01 07:57:12
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.1 2003/12/11 22:15:30 reed Exp $
+$NetBSD$
---- libltdl/configure.orig Mon Dec 8 21:48:50 2003
-+++ libltdl/configure Mon Dec 8 21:50:33 2003
-@@ -1561,8 +1561,13 @@
+--- libltdl/configure.orig 2004-01-25 06:36:58.000000000 -0600
++++ libltdl/configure
+@@ -3642,8 +3642,13 @@ beos*)
lt_cv_deplibs_check_method=pass_all
;;
Index: libtool/patches/patch-as
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool/patches/patch-as,v
retrieving revision 1.1
diff -u -r1.1 patch-as
--- libtool/patches/patch-as 2004/01/05 09:50:47 1.1
+++ libtool/patches/patch-as 2004/02/01 07:57:12
@@ -1,33 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/01/05 09:50:47 cube Exp $
-
---- libltdl/ltdl.c.orig 2001-04-25 06:05:03.000000000 +0200
-+++ libltdl/ltdl.c
-@@ -1156,6 +1156,7 @@ presym_add_symlist (preloaded)
- tmp = LT_DLMALLOC (lt_dlsymlists_t, 1);
- if (tmp)
- {
-+ memset (tmp, 0, 1*sizeof(lt_dlsymlists_t));
- tmp->syms = preloaded;
- tmp->next = preloaded_symbols;
- preloaded_symbols = tmp;
-@@ -2023,10 +2024,7 @@ lt_dlopen (filename)
- return 0;
- }
-
-- handle->info.ref_count = 0;
-- handle->depcount = 0;
-- handle->deplibs = 0;
-- handle->caller_data = 0;
-+ memset (handle, 0, 1*sizeof(struct lt_dlhandle_struct));
- newhandle = handle;
-
- /* lt_dlclose()ing yourself is very bad! Disallow it. */
-@@ -2266,7 +2264,7 @@ lt_dlopen (filename)
- goto cleanup;
- }
-
-- handle->info.ref_count = 0;
-+ memset (handle, 0, 1*sizeof(struct lt_dlhandle_struct));
- if (load_deplibs (handle, deplibs) == 0)
- {
- newhandle = handle;
Index: libtool-base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool-base/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- libtool-base/Makefile 2004/01/07 21:18:12 1.19
+++ libtool-base/Makefile 2004/02/01 07:57:12
@@ -3,7 +3,7 @@
.include "../../devel/libtool/Makefile.common"
-PKGNAME= ${PKGPFX:C/-/-base-/}
+PKGNAME= ${DISTNAME:C/-/-base-/}
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
@@ -34,6 +34,9 @@
BUILD_SHLIBTOOL?= YES
BUILDING_SHLIBTOOL?= NO
+
+post-patch:
+ ${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in
.PHONY: fix-libtool
fix-libtool:
Index: libtool-base/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool-base/PLIST,v
retrieving revision 1.5
diff -u -r1.5 PLIST
--- libtool-base/PLIST 2003/01/25 15:53:38 1.5
+++ libtool-base/PLIST 2004/02/01 07:57:12
@@ -6,8 +6,8 @@
lib/libltdl.a
lib/libltdl.la
lib/libltdl.so
-lib/libltdl.so.3
-lib/libltdl.so.3.0
+lib/libltdl.so.4
+lib/libltdl.so.4.0
share/aclocal/libtool.m4
share/aclocal/ltdl.m4
share/libtool/config.guess
@@ -16,19 +16,18 @@
share/libtool/libltdl/Makefile.am
share/libtool/libltdl/Makefile.in
share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
share/libtool/libltdl/acinclude.m4
share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
+share/libtool/libltdl/config-h.in
+share/libtool/libltdl/config.guess
+share/libtool/libltdl/config.sub
share/libtool/libltdl/configure
-share/libtool/libltdl/configure.in
+share/libtool/libltdl/configure.ac
+share/libtool/libltdl/install-sh
share/libtool/libltdl/ltdl.c
share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/stamp-h.in
-share/libtool/ltcf-c.sh
-share/libtool/ltcf-cxx.sh
-share/libtool/ltcf-gcj.sh
-share/libtool/ltconfig
+share/libtool/libltdl/ltmain.sh
+share/libtool/libltdl/missing
share/libtool/ltmain.sh
@dirrm share/libtool/libltdl
@dirrm share/libtool
Index: libtool-info/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libtool-info/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- libtool-info/Makefile 2003/09/18 16:25:13 1.12
+++ libtool-info/Makefile 2004/02/01 07:57:12
@@ -3,7 +3,7 @@
.include "../../devel/libtool/Makefile.common"
-PKGNAME= ${PKGPFX:C/-/-info-/}
+PKGNAME= ${DISTNAME:C/-/-info-/}
SVR4_PKGNAME= ltooi
COMMENT= Generic shared library support script - info pages
@@ -19,6 +19,9 @@
# error. Simply making sure the info-files get re-done works here.
post-extract:
${RM} -f ${WRKSRC}/doc/libtool.info*
+
+post-patch:
+ ${TOUCH} ${WRKSRC}/aclocal.m4 ${WRKSRC}/Makefile.in
do-build:
cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
>Release-Note:
>Audit-Trail:
>Unformatted: