6 files changed, 24 insertions, 28 deletions

diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 3a40b15ab1b6..a166aa1c7974 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -6,20 +6,16 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.6.6
+PORTVERSION=	0.7.1
 CATEGORIES=	net security
-MASTER_SITES=	http://www.silcnet.org/download/ \
-		ftp://ftp.silcnet.org/pub/silc/ \
-		http://ftp.silcnet.org/ \
+MASTER_SITES=	http://www.silcnet.org/download/client/sources/ \
+		ftp://ftp.silcnet.org/silc/client/sources/ \
+		http://www.planetmirror.com/pub/silcnet/client/sources/ \
+		ftp://ftp.au.silcnet.org/pub/silcnet/client/sources/ \
+		http://the.wiretapped.net/security/network-security/silc/client/sources/ \
+		ftp://ftp.wiretapped.net/pub/security/network-security/silc/client/sources/ \
 		http://munitions.vipul.net/software/mirrors/silc/ \
-		ftp://ftp.wiretapped.net/pub/security/network-security/silc/ \
-		http://www.au.silcnet.org/download/ \
-		ftp://ftp.au.silcnet.org/pub/silcnet/ \
-		http://www.planetmirror.com/pub/silcnet/ \
-		http://the.wiretapped.net/security/network-security/silc/ \
-		ftp://ftp.wiretapped.net/pub/security/network-security/silc/ \
-		http://www.no.silcnet.org/download/ \
-		ftp://ftp.no.silcnet.org/pub/silc/
+		ftp://ftp.no.silcnet.org/pub/silc/client/sources/
 PKGNAMESUFFIX=	-client
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
diff --git a/net/silc-client/distinfo b/net/silc-client/distinfo
index 87283167ec76..e3dc731d1c2a 100644
--- a/net/silc-client/distinfo
+++ b/net/silc-client/distinfo
@@ -1 +1 @@
-MD5 (silc-client-0.6.6.tar.bz2) = 60f42d1a218a8153e3bf84b2d28636c1
+MD5 (silc-client-0.7.1.tar.bz2) = 3a2be3017717824573bc2ec7f6628dd2
diff --git a/net/silc-client/files/patch-Makefile.in b/net/silc-client/files/patch-Makefile.in
index 89bac09247e3..f947c27a26b8 100644
--- a/net/silc-client/files/patch-Makefile.in
+++ b/net/silc-client/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Nov  2 22:58:36 2001
-+++ Makefile.in	Mon Nov 12 23:14:54 2001
-@@ -145,9 +145,9 @@
+--- Makefile.in.orig	Fri Dec 21 01:34:43 2001
++++ Makefile.in	Fri Dec 21 01:37:48 2001
+@@ -151,9 +151,9 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -13,7 +13,7 @@
  
  #
  # INCLUDE defines
-@@ -512,10 +512,7 @@
+@@ -529,10 +529,7 @@
  
  install-dirs:
  	-mkdir -p $(etcdir)
@@ -24,8 +24,8 @@
  
  generate-server-key:
  	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -538,18 +535,13 @@
- 	$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/
+@@ -561,18 +558,13 @@
+ 	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
  
  etc-install:
 -	-@if test '!' -f $(etcdir)/silcd.conf ; then \
@@ -40,7 +40,7 @@
  	fi
  
 -@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs sim-install doc-install etc-install
--@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key sim-install 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_TRUE@install-data-hook: install-dirs etc-install
 +@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs generate-server-key etc-install
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/silc-client/files/patch-configure b/net/silc-client/files/patch-configure
index fe7627008c78..ef3ea3c683ff 100644
--- a/net/silc-client/files/patch-configure
+++ b/net/silc-client/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Nov  8 22:59:50 2001
-+++ configure	Thu Nov  8 23:01:39 2001
-@@ -8472,7 +8472,7 @@
+--- configure.orig	Fri Dec 21 01:38:03 2001
++++ configure	Fri Dec 21 01:38:18 2001
+@@ -12572,7 +12572,7 @@
        fi
        ;;
      *-freebsd2.2*)
diff --git a/net/silc-client/files/patch-doc:Makefile.in b/net/silc-client/files/patch-doc:Makefile.in
index 29538ba8a2b5..05f2a9e14a9f 100644
--- a/net/silc-client/files/patch-doc:Makefile.in
+++ b/net/silc-client/files/patch-doc:Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	Fri Nov  9 02:17:35 2001
-+++ doc/Makefile.in	Fri Nov  9 02:17:43 2001
-@@ -118,7 +118,6 @@
+--- doc/Makefile.in.orig	Fri Dec 21 01:38:31 2001
++++ doc/Makefile.in	Fri Dec 21 01:38:52 2001
+@@ -125,7 +125,6 @@
  EXTRA_DIST = \
  	CodingStyle \
  	FAQ \
diff --git a/net/silc-client/files/patch-irssi:docs:Makefile.in b/net/silc-client/files/patch-irssi:docs:Makefile.in
index 68cba29c7bf3..da3acac415e0 100644
--- a/net/silc-client/files/patch-irssi:docs:Makefile.in
+++ b/net/silc-client/files/patch-irssi:docs:Makefile.in
@@ -1,5 +1,5 @@
---- irssi/docs/Makefile.in.orig	Fri Nov  2 22:58:58 2001
-+++ irssi/docs/Makefile.in	Mon Nov 12 23:56:17 2001
+--- irssi/docs/Makefile.in.orig	Fri Dec 21 01:39:14 2001
++++ irssi/docs/Makefile.in	Fri Dec 21 01:40:15 2001
 @@ -385,7 +385,7 @@
  
  info-am: