- use SHLIBTOOL_OVERRIDE instead of LIBTOOL_OVERRIDE, the ugly static

  libraries hack is now gone
- fix typo in patch-ab

3 files changed, 6 insertions, 19 deletions

diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 97817ae728d..13be9c9e344 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/01/08 23:53:53 salo Exp $
+# $NetBSD: Makefile,v 1.21 2003/01/26 14:35:07 salo Exp $
 
 DISTNAME=		silc-client-0.9.11
 CATEGORIES=		chat security
@@ -18,7 +18,7 @@ USE_GMAKE=		YES
 USE_GNU_ICONV=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \
 			${WRKSRC}/lib/silcmath/mpi/libtool
 
 BUILDLINK_DEPENDS.iconv=	libiconv>=1.7
@@ -78,19 +78,6 @@ CONFIGURE_ARGS+=	--disable-asm
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
-# Ugly hack which prevents installation of static libraries.
-#
-post-build:
-	for f in \
-	${WRKSRC}/lib/libsilc.la \
-	${WRKSRC}/lib/libsilcclient.la \
-	${WRKSRC}/lib/.libs/libsilc.la \
-	${WRKSRC}/lib/.libs/libsilcclient.la ; \
-	do \
-		${CP} $$f $$f.orig ; \
-		${SED} "s|^old_library|#&|" $$f.orig > $$f ; \
-	done
-
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/glib/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo
index 6e7c9cdc2b2..3d28cf0ea0f 100644
--- a/chat/silc-client/distinfo
+++ b/chat/silc-client/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2003/01/08 23:53:53 salo Exp $
+$NetBSD: distinfo,v 1.18 2003/01/26 14:35:07 salo Exp $
 
 SHA1 (silc-client-0.9.11.tar.bz2) = 4a6a7f63ce3ef487b0d0575ce31dc1bba2538a5f
 Size (silc-client-0.9.11.tar.bz2) = 1492223 bytes
 SHA1 (patch-aa) = bce1074fe6f9987d531a215327b4bc691fd555fb
-SHA1 (patch-ab) = b919f6ab77abaf8765fb5bafa7fef8714502b989
+SHA1 (patch-ab) = 6acd8cb2b7af6c5b57d8c4a0a6a6653ebbcc935a
diff --git a/chat/silc-client/patches/patch-ab b/chat/silc-client/patches/patch-ab
index a738277bbc5..e47aa6517bd 100644
--- a/chat/silc-client/patches/patch-ab
+++ b/chat/silc-client/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2003/01/08 23:53:53 salo Exp $
+$NetBSD: patch-ab,v 1.9 2003/01/26 14:35:08 salo Exp $
 
 --- lib/silccrypt/Makefile.in.orig	Wed Jan  8 17:19:42 2003
 +++ lib/silccrypt/Makefile.in	Wed Jan  8 23:00:18 2003
@@ -6,7 +6,7 @@ $NetBSD: patch-ab,v 1.8 2003/01/08 23:53:53 salo Exp $
  .c.obj:
  	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
  
-+# Workaround a bug in GCC which causes momory exhaustion
++# Workaround a bug in GCC which causes memory exhaustion
 +# when compiling sha1 with optimizations on UltraSPARC.
 +#
 +ifeq (sparc64, $(host_cpu))