Emergency update to 0.9.10.1: previous port version is incompatible

with current SILC protocol

Prompted by:	many
Approved by:	portmgr (self)

5 files changed, 39 insertions, 40 deletions

diff --git a/net/silc-doc/Makefile b/net/silc-doc/Makefile
index 7e9cb493c4f..409002e8330 100644
--- a/net/silc-doc/Makefile
+++ b/net/silc-doc/Makefile
@@ -6,15 +6,23 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.10.1
 CATEGORIES=	net security
-MASTER_SITES=	http://www.silcnet.org/download/server/sources/ \
-		ftp://ftp.silcnet.org/silc/server/sources/ \
-		http://public.www.planetmirror.com/pub/silcnet/server/sources/ \
-		ftp://ftp.au.silcnet.org/pub/silcnet/server/sources/ \
-		http://www.mirrors.wiretapped.net/security/network-security/silc/server/sources/ \
-		ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/silc/server/sources/ \
-		ftp://ftp.no.silcnet.org/pub/silc/server/sources/
+MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
+		http://ftp.silcnet.org/%SUBDIR%/ \
+		http://www.planetmirror.com/pub/silcnet/%SUBDIR%/ \
+		http://www.nic.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
+		http://www.fi.silcnet.org/download/%SUBDIR%/ \
+		http://munitions.vipul.net/software/mirrors/silc/%SUBDIR%/ \
+		http://www.pl.silcnet.org/download/%SUBDIR%/ \
+		http://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
+		ftp://ftp.silcnet.org/silc/%SUBDIR%/ \
+		ftp://ftp.au.silcnet.org/pub/silcnet/%SUBDIR%/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.silcnet.org/silc/%SUBDIR%/ \
+		ftp://ftp.pl.silcnet.org/pub/silc/%SUBDIR%/ \
+		ftp://ftp.sunet.se/pub/network/silc/%SUBDIR%/ \
+		ftp://ftp.uk.silcnet.org/pub/silc/%SUBDIR%/
+MASTER_SITE_SUBDIR=	server/sources
 PKGNAMESUFFIX=	-doc
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
 
diff --git a/net/silc-doc/distinfo b/net/silc-doc/distinfo
index e63e40b238f..70694ef241b 100644
--- a/net/silc-doc/distinfo
+++ b/net/silc-doc/distinfo
@@ -1 +1 @@
-MD5 (silc-server-0.9.5.tar.bz2) = 031796371828a92debcec9e33bab42e1
+MD5 (silc-server-0.9.10.1.tar.bz2) = 47f687c8261f31befd16b8ae2fad2716
diff --git a/net/silc-doc/files/patch-Makefile.in b/net/silc-doc/files/patch-Makefile.in
index 7b74bc182c7..47f644170b8 100644
--- a/net/silc-doc/files/patch-Makefile.in
+++ b/net/silc-doc/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Jul 17 18:55:04 2002
-+++ Makefile.in	Wed Jul 17 18:56:13 2002
-@@ -151,7 +151,7 @@
+--- Makefile.in.orig	Tue Dec 31 17:07:00 2002
++++ Makefile.in	Tue Dec 31 17:10:23 2002
+@@ -231,7 +231,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -9,27 +9,20 @@
  
  # Sub directories defined by "distributions" file, and can be overridden
  # with ./configure, which substitutes these variables.
-@@ -530,11 +530,7 @@
+@@ -698,8 +698,6 @@
  	-rm -rf $(distdir)
  
  install-dirs:
 -	-mkdir -p $(etcdir)
 -	-mkdir -p $(modulesdir)
--	-mkdir -p $(helpdir)
  	-mkdir -p $(docdir)
--	-mkdir -p $(logsdir)
  
- generate-server-key:
- 	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -580,9 +576,9 @@
- 	  $(etcdir)/silc.conf; \
- 	fi
+ install-dirs-client: install-dirs
+@@ -775,7 +773,7 @@
  
--@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-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
-+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs doc-install
-+@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs doc-install
+ @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
+ @SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server generate-server-key
+-@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key
 +@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs doc-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.
diff --git a/net/silc-doc/files/patch-configure b/net/silc-doc/files/patch-configure
index 1f786110233..9868d898ff1 100644
--- a/net/silc-doc/files/patch-configure
+++ b/net/silc-doc/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Wed Jul 17 18:56:57 2002
-+++ configure	Wed Jul 17 18:57:09 2002
-@@ -2623,7 +2623,7 @@
- # Distribution definition. ./prepare will automatically add here a correct
+--- configure.orig	Tue Dec 31 17:10:45 2002
++++ configure	Tue Dec 31 17:10:58 2002
+@@ -3052,7 +3052,7 @@
  # value. Do not edit!
+ #
  silc_dist=silc-server
 -SILC_DIST_SUBDIRS="lib silcd doc includes"
 +SILC_DIST_SUBDIRS="doc"
- cat >>confdefs.h <<\EOF
+ cat >>confdefs.h <<\_ACEOF
  #define SILC_DIST_SERVER 1
- EOF
+ _ACEOF
diff --git a/net/silc-doc/pkg-plist b/net/silc-doc/pkg-plist
index 5b79743de04..4ffabd6069f 100644
--- a/net/silc-doc/pkg-plist
+++ b/net/silc-doc/pkg-plist
@@ -6,12 +6,10 @@ share/doc/silc/FAQ
 share/doc/silc/INSTALL
 share/doc/silc/README
 share/doc/silc/TODO
-share/doc/silc/draft-riikonen-presence-attrs-00.txt
-share/doc/silc/draft-riikonen-silc-commands-03.txt
-share/doc/silc/draft-riikonen-silc-flags-payloads-00.txt
-share/doc/silc/draft-riikonen-silc-ke-auth-05.txt
-share/doc/silc/draft-riikonen-silc-pp-05.txt
-share/doc/silc/draft-riikonen-silc-spec-05.txt
-share/doc/silc/example_silcd.conf
-share/doc/silc/example_silcd.conf.in
-@dirrm share/doc/silc
+share/doc/silc/draft-riikonen-presence-attrs-01.txt
+share/doc/silc/draft-riikonen-silc-commands-04.txt
+share/doc/silc/draft-riikonen-silc-flags-payloads-02.txt
+share/doc/silc/draft-riikonen-silc-ke-auth-06.txt
+share/doc/silc/draft-riikonen-silc-pp-06.txt
+share/doc/silc/draft-riikonen-silc-spec-06.txt
+@unexec %D/share/doc/silc 2>/dev/null || true