Update to 0.9.4

5 files changed, 36 insertions, 27 deletions

diff --git a/net/silc-doc/Makefile b/net/silc-doc/Makefile
index c486dbe0dabb..4634e50f7b20 100644
--- a/net/silc-doc/Makefile
+++ b/net/silc-doc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.7.5
+PORTVERSION=	0.9.4
 CATEGORIES=	net security
 MASTER_SITES=	http://www.silcnet.org/download/server/sources/ \
 		ftp://ftp.silcnet.org/silc/server/sources/ \
diff --git a/net/silc-doc/distinfo b/net/silc-doc/distinfo
index 12eba70adfd1..5dd308c78fef 100644
--- a/net/silc-doc/distinfo
+++ b/net/silc-doc/distinfo
@@ -1 +1 @@
-MD5 (silc-server-0.7.5.tar.bz2) = cc0d706a1806f1e5756139faa77cb835
+MD5 (silc-server-0.9.4.tar.bz2) = 2ae957a0b631d88f799e6251e7aab51e
diff --git a/net/silc-doc/files/patch-Makefile.in b/net/silc-doc/files/patch-Makefile.in
index a0e4d784d40f..7b74bc182c79 100644
--- a/net/silc-doc/files/patch-Makefile.in
+++ b/net/silc-doc/files/patch-Makefile.in
@@ -1,19 +1,15 @@
---- Makefile.in.orig	Mon Jan 21 16:58:41 2002
-+++ Makefile.in	Mon Jan 21 16:59:16 2002
-@@ -151,9 +151,9 @@
+--- Makefile.in.orig	Wed Jul 17 18:55:04 2002
++++ Makefile.in	Wed Jul 17 18:56:13 2002
+@@ -151,7 +151,7 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
 -COMMONDIRS = lib irssi silc silcd doc includes
--SUBDIRS = lib silcd doc includes
--DIST_SUBDIRS = lib silcd doc includes
 +COMMONDIRS = doc
-+SUBDIRS = doc
-+DIST_SUBDIRS = doc
  
- #
- # INCLUDE defines
-@@ -528,11 +528,7 @@
+ # Sub directories defined by "distributions" file, and can be overridden
+ # with ./configure, which substitutes these variables.
+@@ -530,11 +530,7 @@
  	-rm -rf $(distdir)
  
  install-dirs:
@@ -25,14 +21,16 @@
  
  generate-server-key:
  	-@if test '!' -f $(etcdir)/silcd.pub ; then \
-@@ -571,8 +567,8 @@
+@@ -580,9 +576,9 @@
  	  $(etcdir)/silc.conf; \
  	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 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
 +@SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs doc-install
-+@SILC_DIST_CLIENT_FALSE@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_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.
  .NOEXPORT:
diff --git a/net/silc-doc/files/patch-configure b/net/silc-doc/files/patch-configure
new file mode 100644
index 000000000000..1f7861102335
--- /dev/null
+++ b/net/silc-doc/files/patch-configure
@@ -0,0 +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
+ # value. Do not edit!
+ silc_dist=silc-server
+-SILC_DIST_SUBDIRS="lib silcd doc includes"
++SILC_DIST_SUBDIRS="doc"
+ cat >>confdefs.h <<\EOF
+ #define SILC_DIST_SERVER 1
+ EOF
diff --git a/net/silc-doc/pkg-plist b/net/silc-doc/pkg-plist
index 669b96734cfa..5b79743de047 100644
--- a/net/silc-doc/pkg-plist
+++ b/net/silc-doc/pkg-plist
@@ -1,17 +1,17 @@
-share/doc/silc/CodingStyle
-share/doc/silc/FAQ
-share/doc/silc/example_silc.conf
-share/doc/silc/example_silc.conf.in
-share/doc/silc/example_silcd.conf
-share/doc/silc/example_silcd.conf.in
-share/doc/silc/draft-riikonen-silc-commands-02.txt
-share/doc/silc/draft-riikonen-silc-ke-auth-04.txt
-share/doc/silc/draft-riikonen-silc-pp-04.txt
-share/doc/silc/draft-riikonen-silc-spec-04.txt
-share/doc/silc/COPYING
 share/doc/silc/CHANGES
+share/doc/silc/COPYING
 share/doc/silc/CREDITS
-share/doc/silc/README
+share/doc/silc/CodingStyle
+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