diff options
| -rw-r--r-- | chat/silc-client/Makefile | 8 | ||||
| -rw-r--r-- | chat/silc-client/PLIST | 12 | ||||
| -rw-r--r-- | chat/silc-client/distinfo | 9 | ||||
| -rw-r--r-- | chat/silc-client/patches/patch-ab | 40 | ||||
| -rw-r--r-- | chat/silc-client/patches/patch-ac | 13 |
5 files changed, 50 insertions, 32 deletions
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index ffb571942d3..45a813059ea 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2002/12/04 17:26:48 salo Exp $ +# $NetBSD: Makefile,v 1.19 2002/12/06 19:51:25 salo Exp $ -DISTNAME= silc-client-0.9.9.1 +DISTNAME= silc-client-0.9.10 CATEGORIES= chat security MASTER_SITES= http://www.silcnet.org/download/client/sources/ \ ftp://ftp.silcnet.org/silc/client/sources/ \ @@ -20,6 +20,8 @@ USE_GMAKE= # defined USE_GNU_ICONV= # defined USE_BUILDLINK2= # defined USE_LIBTOOL= # defined +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \ + ${WRKSRC}/lib/silcmath/mpi/libtool BUILDLINK_DEPENDS.iconv= libiconv>=1.7 @@ -77,7 +79,7 @@ CONFIGURE_ARGS+= --disable-asm PLIST_SRC+= ${PKGDIR}/PLIST -# Temporary hack which prevents installation of static libraries +# Ugly hack which prevents installation of static libraries. # post-build: for f in \ diff --git a/chat/silc-client/PLIST b/chat/silc-client/PLIST index 3a539653107..19bd603022c 100644 --- a/chat/silc-client/PLIST +++ b/chat/silc-client/PLIST @@ -1,13 +1,13 @@ -@comment $NetBSD: PLIST,v 1.9 2002/12/04 17:26:48 salo Exp $ +@comment $NetBSD: PLIST,v 1.10 2002/12/06 19:51:25 salo Exp $ bin/silc lib/silc/libsilc-1.0.so -lib/silc/libsilc-1.0.so.0 -lib/silc/libsilc-1.0.so.0.0 +lib/silc/libsilc-1.0.so.1 +lib/silc/libsilc-1.0.so.1.0 lib/silc/libsilc.la lib/silc/libsilc.so lib/silc/libsilcclient-1.0.so -lib/silc/libsilcclient-1.0.so.0 -lib/silc/libsilcclient-1.0.so.0.0 +lib/silc/libsilcclient-1.0.so.1 +lib/silc/libsilcclient-1.0.so.1.1 lib/silc/libsilcclient.la lib/silc/libsilcclient.so lib/silc/modules/aes.sim.so @@ -104,6 +104,7 @@ share/silc/help/server share/silc/help/set share/silc/help/shutdown share/silc/help/silcoper +share/silc/help/smsg share/silc/help/stats share/silc/help/statusbar share/silc/help/toggle @@ -113,7 +114,6 @@ share/silc/help/unalias share/silc/help/unignore share/silc/help/unload share/silc/help/unquery -share/silc/help/upgrade share/silc/help/users share/silc/help/version share/silc/help/watch diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo index 60bc30b826e..5382eca7f12 100644 --- a/chat/silc-client/distinfo +++ b/chat/silc-client/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.15 2002/12/04 17:26:48 salo Exp $ +$NetBSD: distinfo,v 1.16 2002/12/06 19:51:25 salo Exp $ -SHA1 (silc-client-0.9.9.1.tar.bz2) = a49debb3fca372776ab33ff17d6d44c72510af5c -Size (silc-client-0.9.9.1.tar.bz2) = 1436578 bytes +SHA1 (silc-client-0.9.10.tar.bz2) = 0baa9f0a9000e6b55f33ee90e026f842969aa507 +Size (silc-client-0.9.10.tar.bz2) = 1495547 bytes SHA1 (patch-aa) = bce1074fe6f9987d531a215327b4bc691fd555fb -SHA1 (patch-ab) = 9c02f3ab2d6502075a71f4ac777704c9d0797370 +SHA1 (patch-ab) = 8d1edd3e2112ec33186b70a65ec99ee44d9d88ad +SHA1 (patch-ac) = 796663dd1008997b08b6a627e9c0537cf518cf8f diff --git a/chat/silc-client/patches/patch-ab b/chat/silc-client/patches/patch-ab index 4b3386adbdf..b24a2cd64e4 100644 --- a/chat/silc-client/patches/patch-ab +++ b/chat/silc-client/patches/patch-ab @@ -1,20 +1,22 @@ -$NetBSD: patch-ab,v 1.6 2002/12/04 17:26:49 salo Exp $ +$NetBSD: patch-ab,v 1.7 2002/12/06 19:51:26 salo Exp $ ---- irssi/Makefile.in.orig Fri Nov 29 08:50:58 2002 -+++ irssi/Makefile.in Wed Dec 4 16:20:05 2002 -@@ -332,15 +332,6 @@ - -rm -f libtool - uninstall-info-am: - confDATA_INSTALL = $(INSTALL_DATA) --install-confDATA: $(conf_DATA) -- @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(confdir) -- @list='$(conf_DATA)'; for p in $$list; do \ -- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ -- f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(confDATA_INSTALL) $$d$$p $(DESTDIR)$(confdir)/$$f"; \ -- $(confDATA_INSTALL) $$d$$p $(DESTDIR)$(confdir)/$$f; \ -- done - - uninstall-confDATA: - @$(NORMAL_UNINSTALL) +--- lib/silcsim/Makefile.in.orig Thu Dec 5 22:39:00 2002 ++++ lib/silcsim/Makefile.in Fri Dec 6 17:48:33 2002 +@@ -561,7 +561,7 @@ + $(SIM_CIPHER_OBJS): + @if test '!' -f lib$*.la ; then \ + $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \ +- ../silccrypt/$*.lo -o lib$*.la --libtool-enable-shared; \ ++ ../silccrypt/$*.lo -o lib$*.la ; \ + cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \ + $(srcdir)/$*.sim.so; \ + fi +@@ -569,7 +569,7 @@ + $(SIM_HASH_OBJS): + @if test '!' -f lib$*.la ; then \ + $(LIBTOOL) --mode=link $(CCLD) -rpath $(silc_modulesdir) \ +- ../silccrypt/$*.lo -o lib$*.la --libtool-enable-shared; \ ++ ../silccrypt/$*.lo -o lib$*.la ; \ + cd $(srcdir) && $(LN_S) -f $(srcdir)/.libs/lib$*.so \ + $(srcdir)/$*.sim.so; \ + fi diff --git a/chat/silc-client/patches/patch-ac b/chat/silc-client/patches/patch-ac new file mode 100644 index 00000000000..858b8ebf33b --- /dev/null +++ b/chat/silc-client/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.5 2002/12/06 19:51:26 salo Exp $ + +--- lib/silccrypt/Makefile.in.orig Thu Dec 5 22:38:58 2002 ++++ lib/silccrypt/Makefile.in Fri Dec 6 17:49:59 2002 +@@ -106,7 +106,7 @@ + CCDEPMODE = @CCDEPMODE@ + + # Tell libtool to compile silccrypt as shared since silcsim will need it. +-CFLAGS = --libtool-enable-shared ++#CFLAGS = --libtool-enable-shared + CPP = @CPP@ + CPPFLAGS = @CPPFLAGS@ + CYGPATH_W = @CYGPATH_W@ |