Emergency update to 0.9.10.1: previous port version is incompatible

with current SILC protocol

Prompted by:	many
Approved by:	portmgr (self)

4 files changed, 77 insertions, 42 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 344066512a76..e7faaf9feb8d 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -6,14 +6,23 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.9.5.1
+PORTVERSION=	0.9.10.1
 CATEGORIES=	net ipv6 security
-MASTER_SITES=	http://www.silcnet.org/download/client/sources/ \
-		ftp://ftp.silcnet.org/silc/client/sources/ \
-		ftp://ftp.au.silcnet.org/pub/silcnet/client/sources/ \
-		http://www.mirrors.wiretapped.net/security/network-security/silc/client/sources/ \
-		ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/silc/client/sources/ \
-		ftp://ftp.no.silcnet.org/pub/silc/client/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=	client/sources
 PKGNAMESUFFIX=	-client
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
@@ -28,8 +37,11 @@ USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc/${PORTNAME} \
+		--with-simdir=${PREFIX}/lib/silcsim/client \
 		--with-helpdir=${PREFIX}/share/${PORTNAME}/help
+INSTALLS_SHLIB=	yes
 PLIST_SUB=	INSTALL_DIR="${INSTALL_DIR}"
 PKGDEINSTALL=	${PKGINSTALL}
 
@@ -70,9 +82,11 @@ post-patch:
 		${WRKSRC}/irssi/docs/Makefile.in
 	@${PERL} -pi -e 's/^(install-data-am:) install-moduleLTLIBRARIES$$/\1/' \
 		${WRKSRC}/irssi/src/perl/Makefile.in
-	@${PERL} -pi -e 's/^(install-data-am: )install-confDATA /\1/' \
-		${WRKSRC}/irssi/Makefile.in
-	@${PERL} -pi -e 's/silcsim//' ${WRKSRC}/lib/Makefile.in
+	@${PERL} -pi -e 's/--libtool-enable-shared//' \
+		${WRKSRC}/lib/silccrypt/Makefile.in
+
+post-configure:
+	@${CP} ${LOCALBASE}/bin/libtool ${WRKSRC}
 
 post-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
index f0f996dbf362..4cb471a142c2 100644
--- a/net/silc-client/distinfo
+++ b/net/silc-client/distinfo
@@ -1 +1 @@
-MD5 (silc-client-0.9.5.1.tar.bz2) = 5d12658655f9eb681fe769b0e2bd0d89
+MD5 (silc-client-0.9.10.1.tar.bz2) = 6c6c5e0826b70dc99d7fe9710728b27e
diff --git a/net/silc-client/files/patch-Makefile.in b/net/silc-client/files/patch-Makefile.in
index 0564425d3162..4f4d4f1e6914 100644
--- a/net/silc-client/files/patch-Makefile.in
+++ b/net/silc-client/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Wed Jul 10 16:54:28 2002
-+++ Makefile.in	Wed Jul 10 18:02:37 2002
-@@ -151,7 +151,7 @@
+--- Makefile.in.orig	Thu Dec  5 19:38:34 2002
++++ Makefile.in	Sun Dec 29 15:27:21 2002
+@@ -231,7 +231,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -9,36 +9,38 @@
  
  # Sub directories defined by "distributions" file, and can be overridden
  # with ./configure, which substitutes these variables.
-@@ -531,10 +531,7 @@
- 
+@@ -700,11 +700,9 @@
  install-dirs:
  	-mkdir -p $(etcdir)
--	-mkdir -p $(modulesdir)
- 	-mkdir -p $(helpdir)
+ 	-mkdir -p $(modulesdir)
 -	-mkdir -p $(docdir)
--	-mkdir -p $(logsdir)
- 
- generate-server-key:
- 	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -568,19 +565,12 @@
- 	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
- 
- etc-install:
--	-@if test '!' -f $(etcdir)/silcd.conf ; then \
--	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
--		$(etcdir)/silcd.conf; \
--	  $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
--		$(etcdir)/silcalgs.conf; \
--          chmod go= $(etcdir)/silcd.conf; \
+ 
+ install-dirs-client: install-dirs
+ 	-mkdir -p $(helpdir)
+-	-mkdir -p $(mandir)/man1
+ 
+ install-dirs-server: install-dirs
+ 	-mkdir -p $(logsdir)
+@@ -738,12 +736,8 @@
+ 	fi
+ 
+ etc-install-client:
+-	-@if test '!' -d $(srcdir)/irssi ; then \
+-	  if test '!' -f $(etcdir)/silc.conf ; then \
+ 	    $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
+-	    	$(etcdir)/silc.conf; \
+-	  fi; \
 -	fi
- 	-@if test '!' -f $(etcdir)/silc.conf ; then \
- 	  $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
--	  $(etcdir)/silc.conf; \
-+	  $(etcdir)/silc.conf.sample; \
++	    	$(etcdir)/silc.conf.sample
+ 
+ etc-install-server:
+ 	-@if test '!' -f $(etcdir)/silcd.conf ; then \
+@@ -773,7 +767,7 @@
+ 	  $(sbindir)/silcd -C $(etcdir); \
  	fi
  
--@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
-+@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs 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-client sim-install doc-install-client etc-install-client
++@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install 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
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/silc-client/pkg-plist b/net/silc-client/pkg-plist
index d517c19a459f..7e723964964a 100644
--- a/net/silc-client/pkg-plist
+++ b/net/silc-client/pkg-plist
@@ -1,8 +1,25 @@
 bin/silc
 etc/silc/silc.conf.sample
+lib/libsilc-1.0.so.1
+lib/libsilc.la
+lib/libsilc.so
+lib/libsilcclient-1.0.so.1
+lib/libsilcclient.la
+lib/libsilcclient.so
+lib/silcsim/client/aes.sim.so
+lib/silcsim/client/blowfish.sim.so
+lib/silcsim/client/cast.sim.so
+lib/silcsim/client/md5.sim.so
+lib/silcsim/client/none.sim.so
+lib/silcsim/client/rc5.sim.so
+lib/silcsim/client/rc6.sim.so
+lib/silcsim/client/rsa.sim.so
+lib/silcsim/client/sha1.sim.so
+lib/silcsim/client/twofish.sim.so
 share/silc/help/action
 share/silc/help/admin
 share/silc/help/alias
+share/silc/help/attr
 share/silc/help/away
 share/silc/help/ban
 share/silc/help/beep
@@ -49,7 +66,6 @@ share/silc/help/motd
 share/silc/help/msg
 share/silc/help/names
 share/silc/help/nick
-share/silc/help/note
 share/silc/help/notice
 share/silc/help/oper
 share/silc/help/part
@@ -69,6 +85,8 @@ 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
 share/silc/help/topic
@@ -77,7 +95,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
@@ -96,4 +113,6 @@ share/silc/themes/default.theme
 @dirrm share/silc/scripts
 @dirrm share/silc/help
 @dirrm share/silc
+@dirrm lib/silcsim/client
+@unexec rmdir %D/lib/silcsim 2>/dev/null || true
 @unexec rmdir %D/etc/silc 2>/dev/null || true