diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile index cfbdbb3f397..91e6bd02b6a 100644 --- a/net/silc-client/Makefile +++ b/net/silc-client/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2002/02/02 00:14:59 naddy Exp $ +# $OpenBSD: Makefile,v 1.4 2002/02/05 23:51:30 naddy Exp $ COMMENT= "Secure Live Internet Conferencing (SILC) client" -DISTNAME= silc-client-0.7.5 +DISTNAME= silc-client-0.7.6 CATEGORIES= net NEED_VERSION= 1.504 HOMEPAGE= http://www.silcnet.org/ diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo index df611aa64a6..bfed8e120c9 100644 --- a/net/silc-client/distinfo +++ b/net/silc-client/distinfo @@ -1,3 +1,3 @@ -MD5 (silc-client-0.7.5.tar.gz) = 124fe91ffa48ce769457a74b4e80e0ac -RMD160 (silc-client-0.7.5.tar.gz) = c08892f25093a2364112f310eac0acdee299abf9 -SHA1 (silc-client-0.7.5.tar.gz) = 078dfa57b7f6283f0f30ba6c14c1db90cc86cdce +MD5 (silc-client-0.7.6.tar.gz) = 1c0414a5479509949bf5e844cbdc8661 +RMD160 (silc-client-0.7.6.tar.gz) = 6f58b975cd9daba0910cc9c508b413dab22ae394 +SHA1 (silc-client-0.7.6.tar.gz) = 5f61ec25b59f9e10d8f2dcd8d78d042eaa24a2d7 diff --git a/net/silc-client/patches/patch-configure b/net/silc-client/patches/patch-configure index fb1feb84aae..a968e3abe6a 100644 --- a/net/silc-client/patches/patch-configure +++ b/net/silc-client/patches/patch-configure @@ -1,6 +1,7 @@ ---- configure.orig Thu Jan 31 22:33:39 2002 -+++ configure Fri Feb 1 21:15:34 2002 -@@ -2660,12 +2660,6 @@ +$OpenBSD: patch-configure,v 1.3 2002/02/05 23:51:30 naddy Exp $ +--- configure.orig Sun Feb 3 18:27:11 2002 ++++ configure Tue Feb 5 16:34:42 2002 +@@ -2660,12 +2660,6 @@ else SILC_DIST_WIN32DLL_FALSE= fi @@ -13,7 +14,7 @@ # Program checking # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or -@@ -12326,16 +12320,14 @@ +@@ -12326,16 +12320,14 @@ echo "${ECHO_T}yes" >&6 #define SILC_DEBUG 1 EOF diff --git a/net/silc-client/patches/patch-irssi_src_silc_core_silc-channels_c b/net/silc-client/patches/patch-irssi_src_silc_core_silc-channels_c new file mode 100644 index 00000000000..f632d2e6dc0 --- /dev/null +++ b/net/silc-client/patches/patch-irssi_src_silc_core_silc-channels_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-irssi_src_silc_core_silc-channels_c,v 1.1 2002/02/05 23:51:30 naddy Exp $ +--- irssi/src/silc/core/silc-channels.c.orig Wed Feb 6 00:34:25 2002 ++++ irssi/src/silc/core/silc-channels.c Wed Feb 6 00:34:37 2002 +@@ -245,7 +245,7 @@ static void event_topic(SILC_SERVER_REC + char userhost[256]; + SilcIdType idtype; + +- idtype = va_arg(va, SilcIdType); ++ idtype = va_arg(va, int); + entry = va_arg(va, void *); + topic = va_arg(va, char *); + channel = va_arg(va, SilcChannelEntry); diff --git a/net/silc-client/patches/patch-lib_makefilein b/net/silc-client/patches/patch-lib_makefilein new file mode 100644 index 00000000000..18693e732bd --- /dev/null +++ b/net/silc-client/patches/patch-lib_makefilein @@ -0,0 +1,11 @@ +$OpenBSD: patch-lib_makefilein,v 1.1 2002/02/05 23:51:30 naddy Exp $ +--- lib/Makefile.in.orig Sun Feb 3 18:27:16 2002 ++++ lib/Makefile.in Tue Feb 5 16:34:42 2002 +@@ -359,7 +359,6 @@ install-data-am: + + install-exec-am: + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + + install-info: install-info-recursive + diff --git a/net/silc-client/patches/patch-makefilein b/net/silc-client/patches/patch-makefilein index da775dc1cbf..ec465de828c 100644 --- a/net/silc-client/patches/patch-makefilein +++ b/net/silc-client/patches/patch-makefilein @@ -1,6 +1,7 @@ ---- Makefile.in.orig Thu Jan 31 22:33:44 2002 -+++ Makefile.in Fri Feb 1 21:06:00 2002 -@@ -533,19 +533,10 @@ +$OpenBSD: patch-makefilein,v 1.3 2002/02/05 23:51:30 naddy Exp $ +--- Makefile.in.orig Sun Feb 3 18:27:16 2002 ++++ Makefile.in Tue Feb 5 16:34:42 2002 +@@ -533,19 +533,10 @@ install-dirs: -mkdir -p $(docdir) -mkdir -p $(logsdir) @@ -21,9 +22,9 @@ $(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/ $(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/ $(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/ -@@ -553,24 +544,13 @@ - $(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/ - $(INSTALL_DATA) $(srcdir)/TODO $(docdir)/ +@@ -558,24 +549,13 @@ toolkit-install: + -$(INSTALL_DATA) $(srcdir)/doc/toolkit/silc* $(docdir)/toolkit + -$(INSTALL_DATA) $(srcdir)/doc/toolkit/index* $(docdir)/toolkit -examples-install: - -mkdir -p $(docdir)/examples/ @@ -44,6 +45,6 @@ -@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install +@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs doc-install etc-install - @SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install + @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs generate-server-key sim-install doc-install toolkit-install examples-install etc-install + @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs generate-server-key sim-install doc-install examples-install etc-install # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded.