Our libtool + buildlink2 avoids the usual libtool bug with uninstalled

libtool archives.

3 files changed, 35 insertions, 13 deletions

diff --git a/textproc/libpspell/distinfo b/textproc/libpspell/distinfo
index 3ea5018a139..44f836fc5e4 100644
--- a/textproc/libpspell/distinfo
+++ b/textproc/libpspell/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/01/24 13:49:40 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/10/02 08:46:57 jlam Exp $
 
 SHA1 (pspell-.12.2.tar.gz) = dc3f2757433d5e79d7bf024f55111e00f91905b7
 Size (pspell-.12.2.tar.gz) = 434193 bytes
-SHA1 (patch-aa) = 8baf2f8a4d41e61277aef439c87d1f172b482e1d
-SHA1 (patch-ab) = a6ef26433470bcbd45184f6ea5081056eae4a90c
+SHA1 (patch-aa) = 3ae44fc151112599dc96bdc9a575f91d96a24d5d
+SHA1 (patch-ab) = 5ea563bfea4c819af465fe9b321f08ee4cb0a0c3
diff --git a/textproc/libpspell/patches/patch-aa b/textproc/libpspell/patches/patch-aa
index 07bde60374b..1093f18a56d 100644
--- a/textproc/libpspell/patches/patch-aa
+++ b/textproc/libpspell/patches/patch-aa
@@ -1,13 +1,24 @@
-$NetBSD: patch-aa,v 1.3 2002/01/24 13:49:41 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2002/10/02 08:46:58 jlam Exp $
 
---- interface/Makefile.am.orig	Wed May 30 04:31:51 2001
+--- interface/Makefile.am.orig	Tue May 29 19:31:51 2001
 +++ interface/Makefile.am
-@@ -11,7 +11,7 @@
+@@ -3,17 +3,13 @@ DEFS = @DEFS@ -DDATADIR=\"${pkgdatadir}\
+ 
+ INCLUDES = $(INCLTDL) -I../modules/ -I./
+ 
+-# Note: The the -L.../.libs are there becuase of a bug in Libtool.
+-#       Bug #416981 (Problem building .12.1 on linux)
+-#       http://sourceforge.net/tracker/index.php?func=detail&aid=416981&group_id=2791&atid=102791
+-
+ lib_LTLIBRARIES = libpspell.la libpspell-impl.la
  
  libpspell_la_LDFLAGS      = ${extra_ldflags} -version-info 4:3:0
  
 -libpspell_la_LIBADD = $(LIBLTDL) -L../modules/.libs ../modules/libpspell-modules.la
-+libpspell_la_LIBADD = $(LIBLTDL) -L../modules/.libs ../modules/libpspell-modules.la -lstdc++
++libpspell_la_LIBADD = $(LIBLTDL) ../modules/libpspell-modules.la -lstdc++
+ 
+-libpspell_impl_la_LIBADD  = -L./.libs libpspell.la 
++libpspell_impl_la_LIBADD  = libpspell.la 
  
- libpspell_impl_la_LIBADD  = -L./.libs libpspell.la 
+ libpspell_impl_la_LDFLAGS = ${extra_ldflags} -version-info 6:0:0
  
diff --git a/textproc/libpspell/patches/patch-ab b/textproc/libpspell/patches/patch-ab
index 76955097971..47c51597859 100644
--- a/textproc/libpspell/patches/patch-ab
+++ b/textproc/libpspell/patches/patch-ab
@@ -1,13 +1,24 @@
-$NetBSD: patch-ab,v 1.1 2002/01/24 13:49:41 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/02 08:46:58 jlam Exp $
 
---- interface/Makefile.in.orig	Thu Jan 24 13:46:21 2002
+--- interface/Makefile.in.orig	Tue May 29 19:35:26 2001
 +++ interface/Makefile.in
-@@ -95,7 +95,7 @@
+@@ -87,17 +87,13 @@ DEFS = @DEFS@ -DDATADIR=\"${pkgdatadir}\
+ 
+ INCLUDES = $(INCLTDL) -I../modules/ -I./
+ 
+-# Note: The the -L.../.libs are there becuase of a bug in Libtool.
+-#       Bug #416981 (Problem building .12.1 on linux)
+-#       http://sourceforge.net/tracker/index.php?func=detail&aid=416981&group_id=2791&atid=102791
+-
+ lib_LTLIBRARIES = libpspell.la libpspell-impl.la
  
  libpspell_la_LDFLAGS = ${extra_ldflags} -version-info 4:3:0
  
 -libpspell_la_LIBADD = $(LIBLTDL) -L../modules/.libs ../modules/libpspell-modules.la
-+libpspell_la_LIBADD = $(LIBLTDL) -L../modules/.libs ../modules/libpspell-modules.la -lstdc++
++libpspell_la_LIBADD = $(LIBLTDL) ../modules/libpspell-modules.la -lstdc++
+ 
+-libpspell_impl_la_LIBADD = -L./.libs libpspell.la 
++libpspell_impl_la_LIBADD = libpspell.la 
  
- libpspell_impl_la_LIBADD = -L./.libs libpspell.la 
+ libpspell_impl_la_LDFLAGS = ${extra_ldflags} -version-info 6:0:0