5 files changed, 13 insertions, 47 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index a7c000d79e19..1539cdd9078e 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.9.12.1
-PORTREVISION=	3
+PORTVERSION=	0.9.13
 CATEGORIES=	net ipv6 security
 MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		http://ftp.silcnet.org/%SUBDIR%/ \
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
index 46f2c657d1f8..f3f8948d58bc 100644
--- a/net/silc-client/distinfo
+++ b/net/silc-client/distinfo
@@ -1 +1 @@
-MD5 (silc-client-0.9.12.1.tar.bz2) = 0ea94745b3036e4dcc18f6e8e54bbaa5
+MD5 (silc-client-0.9.13.tar.bz2) = e26b21ffbe318ef9d2d6c3c4bc48c9dd
diff --git a/net/silc-client/files/patch-Makefile.in b/net/silc-client/files/patch-Makefile.in
index 60b26a65e0aa..fa4542ef8663 100644
--- a/net/silc-client/files/patch-Makefile.in
+++ b/net/silc-client/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Mar 18 15:40:51 2003
-+++ Makefile.in	Wed Sep 24 20:17:07 2003
-@@ -233,7 +233,7 @@
+--- Makefile.in.orig	Thu Oct 16 00:31:17 2003
++++ Makefile.in	Thu Oct 16 15:39:51 2003
+@@ -234,7 +234,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -9,16 +9,16 @@
  
  # Sub directories defined by "distributions" file, and can be overridden
  # with ./configure, which substitutes these variables.
-@@ -706,17 +706,13 @@
+@@ -707,17 +707,13 @@
  
  install-dirs-client: install-dirs
  	-mkdir -p $(helpdir)
--	-mkdir -p $(mansdir)/man1
+-	-mkdir -p $(mandir)/man1
  
  install-dirs-server: install-dirs
  	-mkdir -p $(logsdir)
--	-mkdir -p $(mansdir)/man5
--	-mkdir -p $(mansdir)/man8
+-	-mkdir -p $(mandir)/man5
+-	-mkdir -p $(mandir)/man8
  
  doc-install:
  	-$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/
@@ -27,7 +27,7 @@
  	-$(INSTALL_DATA) $(srcdir)/COPYING $(docdir)/
  	-$(INSTALL_DATA) $(srcdir)/CHANGES $(docdir)/
  	-$(INSTALL_DATA) $(srcdir)/CREDITS $(docdir)/
-@@ -740,12 +736,8 @@
+@@ -741,12 +737,8 @@
  	fi
  
  etc-install-client:
@@ -37,7 +37,7 @@
 -	    	$(etcdir)/silc.conf; \
 -	  fi; \
 -	fi
-+	    	$(etcdir)/silc.conf.sample
++		$(etcdir)/silc.conf.sample
  
  etc-install-server:
  	-@if test '!' -f $(etcdir)/silcd.conf ; then \
diff --git a/net/silc-client/files/patch-irssi-src-silc-core-client_ops.c b/net/silc-client/files/patch-irssi-src-silc-core-client_ops.c
deleted file mode 100644
index 94da3d68796d..000000000000
--- a/net/silc-client/files/patch-irssi-src-silc-core-client_ops.c
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --unified --recursive silc-client-0.9.10.1/irssi/src/silc/core/client_ops.c silc-client-0.9.10.1.db/irssi/src/silc/core/client_ops.c
---- irssi/src/silc/core/client_ops.c.orig	Thu Dec  5 15:37:49 2002
-+++ irssi/src/silc/core/client_ops.c	Tue Sep  9 18:41:57 2003
-@@ -312,9 +312,26 @@
-   /* FIXME: replace those printformat calls with signals and add signature
-             information to them (if present) */
-   if (flags & SILC_MESSAGE_FLAG_ACTION)
--    printformat_module("fe-common/silc", server, channel->channel_name,
--		       MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_ACTION, 
--                       nick == NULL ? "[<unknown>]" : nick->nick, message);
-+    if(flags & SILC_MESSAGE_FLAG_UTF8 && !silc_term_utf8()) {
-+      char tmp[256], *cp, *dm = NULL;
-+      memset(tmp, 0, sizeof(tmp));
-+      cp = tmp;
-+      if(message_len > sizeof(tmp) - 1) {
-+        dm = silc_calloc(message_len + 1, sizeof(*dm));
-+        cp = dm;
-+      }
-+      silc_utf8_decode(message, message_len, SILC_STRING_LANGUAGE,
-+                       cp, message_len);
-+      printformat_module("fe-common/silc", server, channel->channel_name,
-+                         MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_ACTION,
-+                         nick == NULL ? "[<unknown>]" : nick->nick, cp);
-+      silc_free(dm);
-+    } else {
-+      printformat_module("fe-common/silc", server, channel->channel_name,
-+                         MSGLEVEL_ACTIONS, SILCTXT_CHANNEL_ACTION,
-+                         nick == NULL ? "[<unknown>]" : nick->nick,
-+                         message);
-+    }
-   else if (flags & SILC_MESSAGE_FLAG_NOTICE)
-     printformat_module("fe-common/silc", server, channel->channel_name,
- 		       MSGLEVEL_NOTICES, SILCTXT_CHANNEL_NOTICE, 
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
index cda38f18ee57..e37587700462 100644
--- a/net/silc-client/pkg-plist
+++ b/net/silc-client/pkg-plist
@@ -1,9 +1,9 @@
 bin/silc
 etc/silc/silc.conf.sample
-lib/libsilc-1.0.so.1
+lib/libsilc-1.0.so.2
 lib/libsilc.la
 lib/libsilc.so
-lib/libsilcclient-1.0.so.1
+lib/libsilcclient-1.0.so.2
 lib/libsilcclient.la
 lib/libsilcclient.so
 lib/silcsim/client/aes.sim.so