From 9c2d582fc9678b1f1e5902ac348cb99812ed5f52 Mon Sep 17 00:00:00 2001 From: agc Date: Thu, 4 Jan 2001 15:10:17 +0000 Subject: The way that shared objects were handled in the PLISTs and bsd.pkg.mk was out of date - it was based on a.out OBJECT_FMT, and added entries in the generated PLISTs to reflect the symlinks that ELF packages uses. It also tried to be clever, and removed and recreated any symbolic links that were created, which has resulted in some fun, especially with packages which use dlopen(3) to load modules. Some recent changes to our ld.so to bring it more into line with other Operating Systems also exposed some cracks. + Modify bsd.pkg.mk and its shared object handling, so that PLISTs now contain the ELF symlinks. + Don't mess about with file system entries when handling shared objects in bsd.pkg.mk, since it's likely that libtool and the BSD *.mk processing will have got it right, and have a much better idea than we do. + Modify PLISTs to contain "ELF symlinks" + On a.out platforms, delete any "ELF symlinks" from the generated PLISTs + On ELF platforms, no extra processing needs to be done in bsd.pkg.mk + Modify print-PLIST target in bsd.pkg.mk to add dummy symlink entries on a.out platforms + Update the documentation in Packages.txt With many thanks to Thomas Klausner for keeping me honest with this. --- textproc/icu/pkg/PLIST | 10 +++++++++- textproc/libpspell/pkg/PLIST | 8 +++++++- textproc/libunicode/pkg/PLIST | 4 +++- textproc/libxml/pkg/PLIST | 4 +++- textproc/t1lib/pkg/PLIST | 6 +++++- 5 files changed, 27 insertions(+), 5 deletions(-) (limited to 'textproc') diff --git a/textproc/icu/pkg/PLIST b/textproc/icu/pkg/PLIST index d7d1382fe5b..76d230cad89 100644 --- a/textproc/icu/pkg/PLIST +++ b/textproc/icu/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2000/12/21 18:14:21 skrll Exp $ +@comment $NetBSD: PLIST,v 1.3 2001/01/04 15:10:56 agc Exp $ etc/icu/convrtrs.txt include/unicode/bidi.h include/unicode/brkiter.h @@ -86,9 +86,17 @@ lib/icu/1.7/icudata.so lib/icu/1.7/libicudt17l.so lib/icu/Makefile.inc lib/icu/current +lib/libicui18n.so +lib/libicui18n.so.17 lib/libicui18n.so.17.0 +lib/libicutoolutil.so +lib/libicutoolutil.so.17 lib/libicutoolutil.so.17.0 +lib/libicuuc.so +lib/libicuuc.so.17 lib/libicuuc.so.17.0 +lib/libustdio.so +lib/libustdio.so.17 lib/libustdio.so.17.0 man/man5/cnvalias.dat.5 man/man5/convrtrs.txt.5 diff --git a/textproc/libpspell/pkg/PLIST b/textproc/libpspell/pkg/PLIST index 26ad2fdfef0..c5a54c998ed 100644 --- a/textproc/libpspell/pkg/PLIST +++ b/textproc/libpspell/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/22 09:30:43 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:56 agc Exp $ bin/pspell-config include/pspell/app_string.hh include/pspell/conf.h @@ -27,12 +27,18 @@ include/pspell/string_pair_emulation.h include/pspell/wordlist.h lib/libpspell-impl.a lib/libpspell-impl.la +lib/libpspell-impl.so +lib/libpspell-impl.so.3 lib/libpspell-impl.so.3.1 lib/libpspell-modules.a lib/libpspell-modules.la +lib/libpspell-modules.so +lib/libpspell-modules.so.1 lib/libpspell-modules.so.1.1 lib/libpspell.a lib/libpspell.la +lib/libpspell.so +lib/libpspell.so.2 lib/libpspell.so.2.2 share/doc/pspell/man-html/1_Introduction.html share/doc/pspell/man-html/2_Getting.html diff --git a/textproc/libunicode/pkg/PLIST b/textproc/libunicode/pkg/PLIST index aa47c769ebc..eb963915192 100644 --- a/textproc/libunicode/pkg/PLIST +++ b/textproc/libunicode/pkg/PLIST @@ -1,6 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/29 14:24:32 rh Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/01/04 15:10:56 agc Exp $ bin/unicode-config include/unicode.h lib/libunicode.a lib/libunicode.la +lib/libunicode.so +lib/libunicode.so.0 lib/libunicode.so.0.0 diff --git a/textproc/libxml/pkg/PLIST b/textproc/libxml/pkg/PLIST index 75bd724199a..9a7f9e20094 100644 --- a/textproc/libxml/pkg/PLIST +++ b/textproc/libxml/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2000/10/17 23:58:18 jlam Exp $ +@comment $NetBSD: PLIST,v 1.10 2001/01/04 15:10:56 agc Exp $ bin/xml-config include/gnome-xml/HTMLparser.h include/gnome-xml/HTMLtree.h @@ -19,6 +19,8 @@ include/gnome-xml/xmlmemory.h include/gnome-xml/xpath.h lib/libxml.a lib/libxml.la +lib/libxml.so +lib/libxml.so.9 lib/libxml.so.9.10 lib/xmlConf.sh share/gnome-xml/html/gnome-xml/DOM.gif diff --git a/textproc/t1lib/pkg/PLIST b/textproc/t1lib/pkg/PLIST index 3cc48641a47..60e33c9afb8 100644 --- a/textproc/t1lib/pkg/PLIST +++ b/textproc/t1lib/pkg/PLIST @@ -1,13 +1,17 @@ -@comment $NetBSD: PLIST,v 1.5 2000/06/21 01:58:40 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:57 agc Exp $ bin/type1afm bin/xglyph include/t1lib.h include/t1libx.h lib/libt1.a lib/libt1.la +lib/libt1.so +lib/libt1.so.1 lib/libt1.so.1.1 lib/libt1x.a lib/libt1x.la +lib/libt1x.so +lib/libt1x.so.1 lib/libt1x.so.1.1 share/doc/t1lib/Makefile share/doc/t1lib/Makefile.in -- cgit v1.2.3