summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskrll <skrll@pkgsrc.org>2004-02-05 20:14:05 +0000
committerskrll <skrll@pkgsrc.org>2004-02-05 20:14:05 +0000
commit0c157532de4d6050800f7afbe63b8c898968f1ca (patch)
tree54e05367b2437fe7db9c9a4ee60058d63c5a0683
parent0ab261332dfc6bb1db6d4875be00ddc6a4bb728c (diff)
downloadpkgsrc-0c157532de4d6050800f7afbe63b8c898968f1ca.tar.gz
The long awaited update libtool to 1.5.2.
Some pkgsrc things - Fix PLISTs for packages that use -release - Include canonicalisation of a couple of paths for the benefit of qt3-* - the normal version=sunos patching - fix all library_names_spec for the standard set of symlinks The libtool things some of which had already made it into pkgsrc libtool. 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.
-rw-r--r--audio/SDL_mixer/PLIST3
-rw-r--r--audio/SDL_sound/PLIST3
-rw-r--r--chat/silc-client/PLIST4
-rw-r--r--chat/silc-server/PLIST3
-rw-r--r--converters/wv/PLIST3
-rw-r--r--databases/dbh/PLIST3
-rw-r--r--devel/SDL_ttf/PLIST3
-rw-r--r--devel/SDLmm/PLIST3
-rw-r--r--devel/gscope/PLIST3
-rw-r--r--devel/libtool-base/Makefile6
-rw-r--r--devel/libtool-base/PLIST21
-rw-r--r--devel/libtool-info/Makefile11
-rw-r--r--devel/libtool/Makefile8
-rw-r--r--devel/libtool/Makefile.common16
-rw-r--r--devel/libtool/buildlink2.mk4
-rw-r--r--devel/libtool/distinfo25
-rw-r--r--devel/libtool/patches/patch-aa97
-rw-r--r--devel/libtool/patches/patch-ab300
-rw-r--r--devel/libtool/patches/patch-ac189
-rw-r--r--devel/libtool/patches/patch-ad13
-rw-r--r--devel/libtool/patches/patch-ae32
-rw-r--r--devel/libtool/patches/patch-af39
-rw-r--r--devel/libtool/patches/patch-ag70
-rw-r--r--devel/libtool/patches/patch-ah16
-rw-r--r--devel/libtool/patches/patch-ai16
-rw-r--r--devel/libtool/patches/patch-aj16
-rw-r--r--devel/libtool/patches/patch-ak16
-rw-r--r--devel/libtool/patches/patch-al16
-rw-r--r--devel/libtool/patches/patch-am63
-rw-r--r--devel/libtool/patches/patch-ao22
-rw-r--r--devel/libtool/patches/patch-aq20
-rw-r--r--devel/libtool/patches/patch-as33
-rw-r--r--devel/libusb/PLIST3
-rw-r--r--devel/smpeg/PLIST3
-rw-r--r--graphics/GUIlib/PLIST3
-rw-r--r--graphics/SDL_image/Makefile8
-rw-r--r--graphics/SDL_image/PLIST3
-rw-r--r--graphics/gimp-base/PLIST5
-rw-r--r--graphics/jasper/Makefile8
-rw-r--r--graphics/jasper/PLIST3
-rw-r--r--graphics/libvideogfx/PLIST3
-rw-r--r--graphics/libwmf/PLIST4
-rw-r--r--ham/hamlib/PLIST4
-rw-r--r--inputmethod/libtabe/PLIST4
-rw-r--r--multimedia/kdemultimedia2/PLIST4
-rw-r--r--multimedia/kdemultimedia3/PLIST7
-rw-r--r--net/SDL_net/PLIST3
-rw-r--r--net/gnet1/PLIST3
-rw-r--r--textproc/aiksaurus/PLIST3
-rw-r--r--x11/gnome--/PLIST3
50 files changed, 316 insertions, 835 deletions
diff --git a/audio/SDL_mixer/PLIST b/audio/SDL_mixer/PLIST
index 5f4e766af13..7f5579c7a57 100644
--- a/audio/SDL_mixer/PLIST
+++ b/audio/SDL_mixer/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/11 02:23:18 salo Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:05 skrll Exp $
bin/playmus
bin/playwave
include/SDL/SDL_mixer.h
-lib/libSDL_mixer-1.2.so
lib/libSDL_mixer-1.2.so.2
lib/libSDL_mixer-1.2.so.2.3
lib/libSDL_mixer.a
diff --git a/audio/SDL_sound/PLIST b/audio/SDL_sound/PLIST
index 58f1776e2cb..17c54e66454 100644
--- a/audio/SDL_sound/PLIST
+++ b/audio/SDL_sound/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2004/01/18 13:51:15 cube Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:05 skrll Exp $
bin/playsound
include/SDL/SDL_sound.h
-lib/libSDL_sound-1.0.so
lib/libSDL_sound-1.0.so.1
lib/libSDL_sound-1.0.so.1.0
lib/libSDL_sound.a
diff --git a/chat/silc-client/PLIST b/chat/silc-client/PLIST
index fdd4d48eb10..f6e223e67b3 100644
--- a/chat/silc-client/PLIST
+++ b/chat/silc-client/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.18 2004/01/14 17:09:26 salo Exp $
+@comment $NetBSD: PLIST,v 1.19 2004/02/05 20:14:05 skrll Exp $
bin/silc
-lib/silc/libsilc-1.0.so
lib/silc/libsilc-1.0.so.3
lib/silc/libsilc-1.0.so.3.0
lib/silc/libsilc.la
lib/silc/libsilc.so
-lib/silc/libsilcclient-1.0.so
lib/silc/libsilcclient-1.0.so.2
lib/silc/libsilcclient-1.0.so.2.0
lib/silc/libsilcclient.la
diff --git a/chat/silc-server/PLIST b/chat/silc-server/PLIST
index 54c8d7df6d4..c8ddb67e407 100644
--- a/chat/silc-server/PLIST
+++ b/chat/silc-server/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.12 2004/01/03 18:02:52 salo Exp $
+@comment $NetBSD: PLIST,v 1.13 2004/02/05 20:14:05 skrll Exp $
etc/rc.d/silcd
-lib/silcd/libsilc-1.0.so
lib/silcd/libsilc-1.0.so.3
lib/silcd/libsilc-1.0.so.3.0
lib/silcd/libsilc.la
diff --git a/converters/wv/PLIST b/converters/wv/PLIST
index ef42f23e559..f2bf289acdc 100644
--- a/converters/wv/PLIST
+++ b/converters/wv/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/13 23:45:12 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/05 20:14:05 skrll Exp $
bin/wvAbw
bin/wvCleanLatex
bin/wvConvert
@@ -18,7 +18,6 @@ bin/wvWml
include/wv/libole2/ms-ole-summary.h
include/wv/libole2/ms-ole.h
include/wv/wv.h
-lib/libwv-1.0.so
lib/libwv-1.0.so.0
lib/libwv-1.0.so.0.0
lib/libwv.a
diff --git a/databases/dbh/PLIST b/databases/dbh/PLIST
index 9717cbb3649..d4344045af7 100644
--- a/databases/dbh/PLIST
+++ b/databases/dbh/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/06 13:45:39 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:05 skrll Exp $
include/dbh.h
include/dbh_config.h
include/dbh_functions.h
-lib/libdbh-1.0.so
lib/libdbh-1.0.so.1
lib/libdbh-1.0.so.1.0
lib/libdbh.a
diff --git a/devel/SDL_ttf/PLIST b/devel/SDL_ttf/PLIST
index 898037369ea..a16fd6a5781 100644
--- a/devel/SDL_ttf/PLIST
+++ b/devel/SDL_ttf/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:22:13 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:05 skrll Exp $
bin/showfont
include/SDL/SDL_ttf.h
-lib/libSDL_ttf-2.0.so
lib/libSDL_ttf-2.0.so.0
lib/libSDL_ttf-2.0.so.0.3
lib/libSDL_ttf.a
diff --git a/devel/SDLmm/PLIST b/devel/SDLmm/PLIST
index 27e2ad7c996..8129983c892 100644
--- a/devel/SDLmm/PLIST
+++ b/devel/SDLmm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/07 13:52:21 salo Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:05 skrll Exp $
bin/sdlmm-config
include/SDLmm/sdlmm.h
include/SDLmm/sdlmm_audio.h
@@ -18,7 +18,6 @@ include/SDLmm/sdlmm_srect.h
include/SDLmm/sdlmm_surface.h
include/SDLmm/sdlmm_timer.h
include/SDLmm/sdlmm_videoinfo.h
-lib/libSDLmm-0.1.so
lib/libSDLmm-0.1.so.8
lib/libSDLmm-0.1.so.8.0
lib/libSDLmm.a
diff --git a/devel/gscope/PLIST b/devel/gscope/PLIST
index 9cebcfae92d..994094e28be 100644
--- a/devel/gscope/PLIST
+++ b/devel/gscope/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/19 13:00:41 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:05 skrll Exp $
bin/displaydata
bin/gscope_load
bin/gscope_load_app
@@ -7,7 +7,6 @@ include/gscope/gscope.h
include/gscope/gscope_interface.h
include/gscope/gtkscope.h
include/gscope/gtkscopeapp.h
-lib/libgscope-0.4.so
lib/libgscope-0.4.so.1
lib/libgscope-0.4.so.1.0
lib/libgscope.a
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 6f1fea43292..86d35808002 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2004/02/04 02:31:40 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/05 20:14:06 skrll Exp $
#
-.include "../../devel/libtool/Makefile.common"
+.include "../libtool/Makefile.common"
-PKGNAME= ${PKGPFX:C/-/-base-/}
+PKGNAME= ${DISTNAME:C/-/-base-/}
SVR4_PKGNAME= ltoob
COMMENT= Generic shared library support script (the script itself)
diff --git a/devel/libtool-base/PLIST b/devel/libtool-base/PLIST
index 0a832ba86da..ed046138bc6 100644
--- a/devel/libtool-base/PLIST
+++ b/devel/libtool-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/25 15:53:38 agc Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/02/05 20:14:06 skrll Exp $
bin/libtool
bin/libtoolize
${SHLIBTOOL}bin/shlibtool
@@ -6,8 +6,8 @@ include/ltdl.h
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/COPYING.LIB
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
diff --git a/devel/libtool-info/Makefile b/devel/libtool-info/Makefile
index 4e5880406e4..79294c88b53 100644
--- a/devel/libtool-info/Makefile
+++ b/devel/libtool-info/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2003/09/18 16:25:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/05 20:14:06 skrll Exp $
#
.include "../../devel/libtool/Makefile.common"
-PKGNAME= ${PKGPFX:C/-/-info-/}
+PKGNAME= ${DISTNAME:C/-/-info-/}
SVR4_PKGNAME= ltooi
COMMENT= Generic shared library support script - info pages
@@ -13,13 +13,6 @@ CONFLICTS+= libtool<1.3.5nb11
USE_MAKEINFO= YES
INFO_FILES= libtool.info
-# It seems the info-files distributed with libtool 1.3.5 are broken.
-# To test, type "info libtool|" and hold down space. See it stop with a
-# ``Cannot find the node "(/usr/pkg/info/libtool.info)Linking executables"''
-# error. Simply making sure the info-files get re-done works here.
-post-extract:
- ${RM} -f ${WRKSRC}/doc/libtool.info*
-
do-build:
cd ${WRKSRC}/doc ; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index f9ba4c6978e..c2a2fc4b761 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.39 2003/03/29 09:38:21 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2004/02/05 20:14:06 skrll Exp $
#
-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
diff --git a/devel/libtool/Makefile.common b/devel/libtool/Makefile.common
index 8313991d0db..32aed7fab20 100644
--- a/devel/libtool/Makefile.common
+++ b/devel/libtool/Makefile.common
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile.common,v 1.40 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile.common,v 1.41 2004/02/05 20:14:06 skrll 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 @@ CONFLICTS= glibtool-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-WRKSRC= ${WRKDIR}/libtool-ml
GNU_CONFIGURE= # defined
USE_BUILDLINK3= # defined
@@ -22,4 +19,11 @@ DISTINFO_FILE= ${.CURDIR}/../libtool/distinfo
FILESDIR= ${.CURDIR}/../libtool/files
PATCHDIR= ${.CURDIR}/../libtool/patches
+CONFIG_GUESS_OVERRIDE= \
+ ${WRKSRC}/config.guess \
+ ${WRKSRC}/libltdl/config.guess
+
+CONFIG_SUB_OVERRIDE= \
+ ${WRKSRC}/config.sub \
+ ${WRKSRC}/libltdl/config.sub
AUTOMAKE_OVERRIDE= NO
diff --git a/devel/libtool/buildlink2.mk b/devel/libtool/buildlink2.mk
index d0925d12bb3..21030e7dd64 100644
--- a/devel/libtool/buildlink2.mk
+++ b/devel/libtool/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/01/06 09:49:08 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 20:14:06 skrll Exp $
.if !defined(LTDL_BUILDLINK2_MK)
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
diff --git a/devel/libtool/distinfo b/devel/libtool/distinfo
index 98c6ffef8df..f1dc271b3da 100644
--- a/devel/libtool/distinfo
+++ b/devel/libtool/distinfo
@@ -1,20 +1,7 @@
-$NetBSD: distinfo,v 1.32 2004/01/05 09:50:47 cube Exp $
+$NetBSD: distinfo,v 1.33 2004/02/05 20:14:06 skrll 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-aa) = 173b8f40ebb067e3bcea798b87e822a445d5688e
+SHA1 (patch-ab) = b59ac36c8d84a919193f454d670c61688bb91fe6
+SHA1 (patch-ac) = 1afb4149326a0090713f190d19bee4c6be6942dd
diff --git a/devel/libtool/patches/patch-aa b/devel/libtool/patches/patch-aa
index d02e88f9a86..68c188acd54 100644
--- a/devel/libtool/patches/patch-aa
+++ b/devel/libtool/patches/patch-aa
@@ -1,86 +1,13 @@
-$NetBSD: patch-aa,v 1.32 2003/12/11 22:15:30 reed Exp $
+$NetBSD: patch-aa,v 1.33 2004/02/05 20:14:06 skrll 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'
+--- Makefile.in.orig 2004-01-25 12:36:36.000000000 +0000
++++ Makefile.in
+@@ -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@
diff --git a/devel/libtool/patches/patch-ab b/devel/libtool/patches/patch-ab
index 42c47115dd2..52ac757e561 100644
--- a/devel/libtool/patches/patch-ab
+++ b/devel/libtool/patches/patch-ab
@@ -1,200 +1,118 @@
-$NetBSD: patch-ab,v 1.29 2003/10/05 08:19:19 grant Exp $
+$NetBSD: patch-ab,v 1.30 2004/02/05 20:14:06 skrll Exp $
---- ltmain.sh.orig 2001-06-14 14:06:50.000000000 +1000
-+++ ltmain.sh
-@@ -211,6 +211,8 @@ do
- --mode) prevopt="--mode" prev=mode ;;
- --mode=*) mode="$optarg" ;;
+--- configure.orig 2004-01-25 12:36:38.000000000 +0000
++++ configure
+@@ -4424,10 +4424,13 @@ beos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
-+ --preserve-dup-deps) duplicate_deps="yes" ;;
+-bsdi4*)
+- lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- lt_cv_file_magic_test_file=/shlib/libc.so
++# Versions of BSD/OS prior to 4.0 did no have real dynamic linking
++bsdi1*|bsdi2*|bsdi3*)
++ dynamic_linker=no
++ ;;
+
- --quiet | --silent)
- show=:
- ;;
-@@ -256,7 +258,7 @@ if test -z "$show_help"; then
- # Infer the operation mode.
- if test -z "$mode"; then
- case $nonopt in
-- *cc | *++ | gcc* | *-gcc*)
-+ *cc | *++ | gcc* | *-gcc* | *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
- 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` "*) ;;
-- *)
-+ "`$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 ;;
-+ 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
- # Evaluate the configuration.
-@@ -528,8 +540,6 @@ if test -z "$show_help"; then
- # else
- # echo "$modename: using $tagname tagged configuration"
- fi
-- ;;
-- esac
- fi
++bsdi*)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
- 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
- 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` "*) ;;
-- *)
-+ "`$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 ;;
-+ 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
- # Evaluate the configuration.
-@@ -1562,8 +1582,6 @@ EOF
- # else
- # echo "$modename: using $tagname tagged configuration"
- fi
-- ;;
-- esac
- fi
+ cygwin*)
+@@ -8135,9 +8138,10 @@ beos*)
+ shlibpath_var=LIBRARY_PATH
+ ;;
- 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
+-bsdi4*)
+- version_type=linux
++bsdi*)
++ version_type=sunox
+ 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 +8257,15 @@ kfreebsd*-gnu)
-@@ -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
+ 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}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ version_type=sunos
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ case $objformat in
++ elf*)
++ 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'
++ *)
+ need_version=yes
+ ;;
+ esac
+@@ -8340,12 +8344,7 @@ hpux9* | hpux10* | hpux11*)
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+- *)
+- if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
+- else
+- version_type=irix
+- fi ;;
++ *) version_type=sunos ;;
+ esac
+ need_lib_prefix=no
+ need_version=no
+@@ -8381,7 +8380,7 @@ linux*oldld* | linux*aout* | linux*coff*
-@@ -2564,8 +2592,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"
-+ 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
- ;;
+ # 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}'
+@@ -8505,7 +8504,7 @@ sco3.2v5*)
+ ;;
- irix)
-- 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
+ solaris*)
+- 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}'
+@@ -10854,6 +10853,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 +11232,14 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+ esac
+ done
- # 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 "$host_os" in
++ netbsd*)
++ if test -n "$cpprt0_file"; then
++ predep_objects_CXX=`eval echo $predep_objects_CXX | sed -e 's:/usr/lib/c++rt0.o:$cpprt0_file:'`
++ fi
++ ;;
++ esac
++
+ # Clean up.
+ rm -f a.out a.exe
+ else
diff --git a/devel/libtool/patches/patch-ac b/devel/libtool/patches/patch-ac
index d8f52d31ad7..1ab0922a149 100644
--- a/devel/libtool/patches/patch-ac
+++ b/devel/libtool/patches/patch-ac
@@ -1,60 +1,131 @@
-$NetBSD: patch-ac,v 1.8 2001/06/14 14:55:47 skrll Exp $
+$NetBSD: patch-ac,v 1.9 2004/02/05 20:14:06 skrll Exp $
---- config.guess.orig Thu Apr 12 05:05:02 2001
-+++ 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
-- # 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)
-- 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
-- os=netbsdelf
-- fi
-- ;;
-- *)
-- os=netbsd
-- ;;
-- esac
-- # The OS release
-- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- # 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/[-_].*/\./'`
- exit 0 ;;
- alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+--- ltmain.sh.orig 2004-01-25 12:40:26.000000000 +0000
++++ ltmain.sh
+@@ -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 | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
++ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc* | *CC)
+ mode=link
+ for arg
+ do
+@@ -525,10 +525,26 @@ if test -z "$show_help"; then
+ case $base_compile in
+ # Blanks in the command may have been stripped by the calling shell,
+ # 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.
+ *)
++ 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
++ ;;
++ 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
+ # Evaluate the configuration.
+@@ -554,8 +570,6 @@ if test -z "$show_help"; then
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
+- ;;
+- esac
+ fi
+
+ for arg in $later; do
+@@ -912,10 +926,26 @@ EOF
+ case $base_compile in
+ # Blanks in the command may have been stripped by the calling shell,
+ # 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.
+ *)
++ 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
++ ;;
++ 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
+ # Evaluate the configuration.
+@@ -941,8 +971,6 @@ EOF
+ # else
+ # $echo "$modename: using $tagname tagged configuration"
+ fi
+- ;;
+- esac
+ fi
+
+ # We need to know -static, to get the right output filenames.
+@@ -1180,6 +1208,13 @@ EOF
+ exit 1
+ ;;
+ esac
++ # Canonicalise the pathname
++ tmp=""
++ while test "$arg" != "$tmp"
++ do
++ tmp=$arg
++ arg=`$echo "X$arg" | $Xsed -e 's%[^/.][^/.]*/\.\.%%g' -e 's%/\./%/%g' -e 's%//*%/%g' -e 's%/$%%g'`
++ done
+ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+@@ -2967,8 +3002,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"
++ 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"
+@@ -5365,8 +5400,16 @@ relink_command=\"$relink_command\""
+ exit 1
+ fi
+
+- # Strip any trailing slash from the destination.
+- dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
++ # Canonicalise the pathname:
++ # - remove foo/../
++ # - replace //
++ # - remove /./
++ # - strip any trailing /
++ tmp=""
++ while test "$dest" != "$tmp"; do
++ tmp=$arg
++ dest=`$echo "X$dest" | $Xsed -e 's%[^/.][^/.]*/\.\.%%g' -e 's%/\./%/%g' -e 's%//*%/%g' -e 's%/$%%g'`
++ done
+
+ # Check to see that the destination is a directory.
+ test -d "$dest" && isdir=yes
diff --git a/devel/libtool/patches/patch-ad b/devel/libtool/patches/patch-ad
deleted file mode 100644
index 23bb26d9bca..00000000000
--- a/devel/libtool/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2001/06/14 14:55:47 skrll Exp $
-
---- Makefile.in.orig Wed May 23 05:07:23 2001
-+++ Makefile.in
-@@ -93,7 +93,7 @@
-
- AUTOMAKE_OPTIONS = 1.3e gnu
-
--BUILD_SUBDIRS = . libltdl doc tests
-+BUILD_SUBDIRS = . libltdl tests
- SUBDIRS = $(BUILD_SUBDIRS)
- DIST_SUBDIRS = $(BUILD_SUBDIRS) $(CONF_SUBDIRS)
-
diff --git a/devel/libtool/patches/patch-ae b/devel/libtool/patches/patch-ae
deleted file mode 100644
index 67a83623ddc..00000000000
--- a/devel/libtool/patches/patch-ae
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ae,v 1.6 2003/12/11 22:15:30 reed Exp $
-
---- configure.orig Thu Jun 14 00:06:29 2001
-+++ configure Mon Dec 8 21:54:21 2003
-@@ -1448,8 +1448,13 @@
- 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
- ;;
-@@ -1533,9 +1538,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
- ;;
-
diff --git a/devel/libtool/patches/patch-af b/devel/libtool/patches/patch-af
deleted file mode 100644
index 793a35f724f..00000000000
--- a/devel/libtool/patches/patch-af
+++ /dev/null
@@ -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
diff --git a/devel/libtool/patches/patch-ag b/devel/libtool/patches/patch-ag
deleted file mode 100644
index 9666e40599f..00000000000
--- a/devel/libtool/patches/patch-ag
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-ag,v 1.8 2003/09/25 02:09:03 danw Exp $
-
---- 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=
-+ # 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_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 @@
-
- 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
diff --git a/devel/libtool/patches/patch-ah b/devel/libtool/patches/patch-ah
deleted file mode 100644
index 65b009937d3..00000000000
--- a/devel/libtool/patches/patch-ah
+++ /dev/null
@@ -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
- ;;
-
diff --git a/devel/libtool/patches/patch-ai b/devel/libtool/patches/patch-ai
deleted file mode 100644
index 52a051de656..00000000000
--- a/devel/libtool/patches/patch-ai
+++ /dev/null
@@ -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
- ;;
-
diff --git a/devel/libtool/patches/patch-aj b/devel/libtool/patches/patch-aj
deleted file mode 100644
index 607246f86cc..00000000000
--- a/devel/libtool/patches/patch-aj
+++ /dev/null
@@ -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
- ;;
-
diff --git a/devel/libtool/patches/patch-ak b/devel/libtool/patches/patch-ak
deleted file mode 100644
index 9cd38bf9126..00000000000
--- a/devel/libtool/patches/patch-ak
+++ /dev/null
@@ -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
- ;;
-
diff --git a/devel/libtool/patches/patch-al b/devel/libtool/patches/patch-al
deleted file mode 100644
index 2ab56418190..00000000000
--- a/devel/libtool/patches/patch-al
+++ /dev/null
@@ -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
- ;;
-
diff --git a/devel/libtool/patches/patch-am b/devel/libtool/patches/patch-am
deleted file mode 100644
index 2a3724fa674..00000000000
--- a/devel/libtool/patches/patch-am
+++ /dev/null
@@ -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
diff --git a/devel/libtool/patches/patch-ao b/devel/libtool/patches/patch-ao
deleted file mode 100644
index 443d3dbd16a..00000000000
--- a/devel/libtool/patches/patch-ao
+++ /dev/null
@@ -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-* \
diff --git a/devel/libtool/patches/patch-aq b/devel/libtool/patches/patch-aq
deleted file mode 100644
index c4e6fd39ae9..00000000000
--- a/devel/libtool/patches/patch-aq
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2003/12/11 22:15:30 reed Exp $
-
---- libltdl/configure.orig Mon Dec 8 21:48:50 2003
-+++ libltdl/configure Mon Dec 8 21:50:33 2003
-@@ -1561,8 +1561,13 @@
- 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
- ;;
diff --git a/devel/libtool/patches/patch-as b/devel/libtool/patches/patch-as
deleted file mode 100644
index f2c5433e560..00000000000
--- a/devel/libtool/patches/patch-as
+++ /dev/null
@@ -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;
diff --git a/devel/libusb/PLIST b/devel/libusb/PLIST
index 7aeecaea4e3..115276b32e2 100644
--- a/devel/libusb/PLIST
+++ b/devel/libusb/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2002/11/18 06:25:51 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/02/05 20:14:05 skrll Exp $
bin/libusb-config
include/usb.h
-lib/libusb-0.1.so
lib/libusb-0.1.so.7
lib/libusb-0.1.so.7.0
lib/libusb.a
diff --git a/devel/smpeg/PLIST b/devel/smpeg/PLIST
index 3263a0498b9..743dffc67d5 100644
--- a/devel/smpeg/PLIST
+++ b/devel/smpeg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/15 10:01:39 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:05 skrll Exp $
bin/glmovie
bin/gtv
bin/plaympeg
@@ -14,7 +14,6 @@ include/smpeg/MPEGstream.h
include/smpeg/MPEGsystem.h
include/smpeg/MPEGvideo.h
include/smpeg/smpeg.h
-lib/libsmpeg-0.4.so
lib/libsmpeg-0.4.so.1
lib/libsmpeg-0.4.so.1.3
lib/libsmpeg.a
diff --git a/graphics/GUIlib/PLIST b/graphics/GUIlib/PLIST
index ea25c04cecf..d10607ab9e1 100644
--- a/graphics/GUIlib/PLIST
+++ b/graphics/GUIlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:07 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:05 skrll Exp $
include/GUI/GUI.h
include/GUI/GUI_C.h
include/GUI/GUI_area.h
@@ -13,7 +13,6 @@ include/GUI/GUI_status.h
include/GUI/GUI_termwin.h
include/GUI/GUI_widget.h
include/GUI/GUI_widgets.h
-lib/libGUI-1.1.so
lib/libGUI-1.1.so.0
lib/libGUI-1.1.so.0.0
lib/libGUI.a
diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile
index a047c2ecc9c..11cf19062ad 100644
--- a/graphics/SDL_image/Makefile
+++ b/graphics/SDL_image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/02/03 01:27:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2004/02/05 20:14:05 skrll Exp $
#
DISTNAME= SDL_image-1.2.3
@@ -29,12 +29,6 @@ post-install:
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "FreeBSD"
-PLIST_SUBST+= AVAILABLE="@comment "
-.else
-PLIST_SUBST+= AVAILABLE=
-.endif
-
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/SDL_image/PLIST b/graphics/SDL_image/PLIST
index e716b0c60ee..f16076cb062 100644
--- a/graphics/SDL_image/PLIST
+++ b/graphics/SDL_image/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/03 01:27:37 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/05 20:14:05 skrll Exp $
bin/showimage
include/SDL/SDL_image.h
-${AVAILABLE}lib/libSDL_image-1.2.so
lib/libSDL_image-1.2.so.1
lib/libSDL_image-1.2.so.1.2
lib/libSDL_image.a
diff --git a/graphics/gimp-base/PLIST b/graphics/gimp-base/PLIST
index 59c442df6c1..766488a256c 100644
--- a/graphics/gimp-base/PLIST
+++ b/graphics/gimp-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/06/18 10:26:55 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/02/05 20:14:05 skrll Exp $
bin/gimp
bin/gimp-1.2
bin/gimp-config
@@ -250,19 +250,16 @@ lib/gimp/1.2/plug-ins/xjt
lib/gimp/1.2/plug-ins/xpm
lib/gimp/1.2/plug-ins/xwd
lib/gimp/1.2/plug-ins/zealouscrop
-lib/libgck-1.2.so
lib/libgck-1.2.so.0
lib/libgck-1.2.so.0.5
lib/libgck.a
lib/libgck.la
lib/libgck.so
-lib/libgimp-1.2.so
lib/libgimp-1.2.so.0
lib/libgimp-1.2.so.0.5
lib/libgimp.a
lib/libgimp.la
lib/libgimp.so
-lib/libgimpui-1.2.so
lib/libgimpui-1.2.so.0
lib/libgimpui-1.2.so.0.5
lib/libgimpui.a
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 1fa56504620..a38eac2cd69 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/04 12:17:08 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/05 20:14:05 skrll Exp $
#
DISTNAME= jasper-1.600.0
@@ -25,11 +25,5 @@ post-install:
.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
-PLIST_SUBST+= AVAILABLE="@comment "
-.else
-PLIST_SUBST+= AVAILABLE=
-.endif
-
.include "../../graphics/jpeg/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jasper/PLIST b/graphics/jasper/PLIST
index 8e532915216..be62cbdaf61 100644
--- a/graphics/jasper/PLIST
+++ b/graphics/jasper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/02/03 01:16:40 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/02/05 20:14:05 skrll Exp $
bin/imgcmp
bin/imginfo
bin/jasper
@@ -16,7 +16,6 @@ include/jasper/jas_tvp.h
include/jasper/jas_types.h
include/jasper/jas_version.h
include/jasper/jasper.h
-${AVAILABLE}lib/libjasper-1.600.so
lib/libjasper-1.600.so.0
lib/libjasper-1.600.so.0.0
lib/libjasper.a
diff --git a/graphics/libvideogfx/PLIST b/graphics/libvideogfx/PLIST
index 641f9e6246e..0ae88985b02 100644
--- a/graphics/libvideogfx/PLIST
+++ b/graphics/libvideogfx/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/13 18:55:41 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:05 skrll Exp $
bin/libvideogfx-config
include/libvideogfx.hh
include/libvideogfx/arch/cpu.hh
@@ -52,7 +52,6 @@ include/libvideogfx/x11/dispimg.hh
include/libvideogfx/x11/draw_x11.hh
include/libvideogfx/x11/imgwin.hh
include/libvideogfx/x11/server.hh
-lib/libvideogfx-1.0.so
lib/libvideogfx-1.0.so.3
lib/libvideogfx-1.0.so.3.0
lib/libvideogfx.a
diff --git a/graphics/libwmf/PLIST b/graphics/libwmf/PLIST
index 7f0affd2429..dd3aca12a85 100644
--- a/graphics/libwmf/PLIST
+++ b/graphics/libwmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/09/21 21:47:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/02/05 20:14:06 skrll Exp $
bin/libwmf-config
bin/libwmf-fontmap
bin/wmf2eps
@@ -20,13 +20,11 @@ include/libwmf/macro.h
include/libwmf/svg.h
include/libwmf/types.h
include/libwmf/x.h
-lib/libwmf-0.2.so
lib/libwmf-0.2.so.8
lib/libwmf-0.2.so.8.0
lib/libwmf.a
lib/libwmf.la
lib/libwmf.so
-lib/libwmflite-0.2.so
lib/libwmflite-0.2.so.7
lib/libwmflite-0.2.so.7.1
lib/libwmflite.a
diff --git a/ham/hamlib/PLIST b/ham/hamlib/PLIST
index 9b6d8a9339a..88862d23d91 100644
--- a/ham/hamlib/PLIST
+++ b/ham/hamlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/04 12:49:43 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:06 skrll Exp $
include/hamlib/rig.h
include/hamlib/riglist.h
include/hamlib/rig_dll.h
@@ -8,7 +8,6 @@ include/hamlib/rigclass.h
include/hamlib/rotclass.h
lib/libhamlib-1.1.4.so.1.0
lib/libhamlib-1.1.4.so.1
-lib/libhamlib-1.1.4.so
lib/libhamlib.la
lib/libhamlib.so
lib/libhamlib.a
@@ -60,7 +59,6 @@ lib/hamlib-rotorez.a
lib/libhamlib++.la
lib/libhamlib++.so
lib/libhamlib++.a
-lib/libhamlib++-1.1.4.so
lib/libhamlib++-1.1.4.so.1
lib/libhamlib++-1.1.4.so.1.0
bin/rigctl
diff --git a/inputmethod/libtabe/PLIST b/inputmethod/libtabe/PLIST
index 98ffcb37bee..27b73e60659 100644
--- a/inputmethod/libtabe/PLIST
+++ b/inputmethod/libtabe/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/08/25 19:22:59 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:06 skrll Exp $
bin/tsiadd
bin/tsidel
bin/tsidump
@@ -6,13 +6,11 @@ bin/tsiyincheck
bin/tsiyindump
include/bims.h
include/tabe.h
-lib/libbims-${PKGVERSION}.so
lib/libbims-${PKGVERSION}.so.2
lib/libbims-${PKGVERSION}.so.2.1
lib/libbims.a
lib/libbims.la
lib/libbims.so
-lib/${PKGNAME}.so
lib/${PKGNAME}.so.2
lib/${PKGNAME}.so.2.1
lib/libtabe.a
diff --git a/multimedia/kdemultimedia2/PLIST b/multimedia/kdemultimedia2/PLIST
index f3f4c6ad57d..ac95a873dfc 100644
--- a/multimedia/kdemultimedia2/PLIST
+++ b/multimedia/kdemultimedia2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/26 15:40:00 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:06 skrll Exp $
bin/aktion
bin/artsbuilder
bin/artscontrol
@@ -133,7 +133,6 @@ lib/libaktion.la
lib/libaktion.so
lib/libaktion.so.1
lib/libaktion.so.1.0
-lib/libarts_mpeglib-0.3.0.so
lib/libarts_mpeglib-0.3.0.so.0
lib/libarts_mpeglib-0.3.0.so.0.3
lib/libarts_mpeglib.a
@@ -201,7 +200,6 @@ lib/libkmixapplet.so.1.0
lib/libliszt.a
lib/libliszt.la
lib/libliszt.so
-lib/libmpeg-0.3.0.so
lib/libmpeg-0.3.0.so.0
lib/libmpeg-0.3.0.so.0.3
lib/libmpeg.a
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
index 94e09c38bc2..4e5bafb4572 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/02/05 07:43:30 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:06 skrll Exp $
bin/artsbuilder
bin/artscontrol
bin/kaboodle
@@ -227,9 +227,8 @@ lib/kde3/noatunsimple.la
lib/kde3/noatunsimple.so
lib/kde3/videothumbnail.la
lib/kde3/videothumbnail.so
-lib/libarts_mpeglib-0.3.0.so
-lib/libarts_mpeglib-0.3.0.so.0
-lib/libarts_mpeglib-0.3.0.so.0.3
+${XV_WORKAROUND}lib/libarts_mpeglib-0.3.0.so.0
+${XV_WORKAROUND}lib/libarts_mpeglib-0.3.0.so.0.3
lib/libarts_mpeglib.la
lib/libarts_mpeglib.so
lib/libarts_splay.la
diff --git a/net/SDL_net/PLIST b/net/SDL_net/PLIST
index 1548711e9d3..60b13d1eeba 100644
--- a/net/SDL_net/PLIST
+++ b/net/SDL_net/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2003/07/25 16:25:28 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/05 20:14:06 skrll Exp $
include/SDL/SDL_net.h
-lib/libSDL_net-1.2.so
lib/libSDL_net-1.2.so.0
lib/libSDL_net-1.2.so.0.5
lib/libSDL_net.a
diff --git a/net/gnet1/PLIST b/net/gnet1/PLIST
index e8abe5d0a82..dfd815af082 100644
--- a/net/gnet1/PLIST
+++ b/net/gnet1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/15 11:49:02 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/05 20:14:06 skrll Exp $
bin/gnet-config
include/gnet/conn.h
include/gnet/gnet.h
@@ -15,7 +15,6 @@ include/gnet/udp.h
include/gnet/unix.h
include/gnet/url.h
lib/gnet/include/gnetconfig.h
-lib/libgnet-1.1.so
lib/libgnet-1.1.so.7
lib/libgnet-1.1.so.7.1
lib/libgnet.a
diff --git a/textproc/aiksaurus/PLIST b/textproc/aiksaurus/PLIST
index fa9e3034928..dd54aa1d4f1 100644
--- a/textproc/aiksaurus/PLIST
+++ b/textproc/aiksaurus/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/26 20:04:15 recht Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/02/05 20:14:06 skrll Exp $
bin/aiksaurus
bin/caiksaurus
include/Aiksaurus/Aiksaurus.h
include/Aiksaurus/AiksaurusC.h
-lib/libAiksaurus-1.0.so
lib/libAiksaurus-1.0.so.0
lib/libAiksaurus-1.0.so.0.1
lib/libAiksaurus.a
diff --git a/x11/gnome--/PLIST b/x11/gnome--/PLIST
index be351a42538..8c5da1af843 100644
--- a/x11/gnome--/PLIST
+++ b/x11/gnome--/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/09/12 16:19:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/02/05 20:14:06 skrll Exp $
include/gnome--.h
include/gnome--/about.h
include/gnome--/affinetrans.h
@@ -117,7 +117,6 @@ include/gnome--/propertybox.h
include/gnome--/stock.h
include/gnome--/types.h
lib/gnomemmConf.sh
-lib/libgnomemm-1.2.so
lib/libgnomemm-1.2.so.10
lib/libgnomemm-1.2.so.10.4
lib/libgnomemm.a