6 files changed, 36 insertions, 24 deletions

diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index dd840c862b04..c7f086612c04 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.7.9
+PORTVERSION=	0.9.4
 CATEGORIES=	net ipv6 security
 MASTER_SITES=   http://www.silcnet.org/download/server/sources/ \
 		ftp://ftp.silcnet.org/silc/server/sources/ \
diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo
index fe578ed19387..5dd308c78fef 100644
--- a/net/silc-server/distinfo
+++ b/net/silc-server/distinfo
@@ -1 +1 @@
-MD5 (silc-server-0.7.9.tar.bz2) = 9e04b3f5de0a62892e4720e774bd3094
+MD5 (silc-server-0.9.4.tar.bz2) = 2ae957a0b631d88f799e6251e7aab51e
diff --git a/net/silc-server/files/patch-Makefile.in b/net/silc-server/files/patch-Makefile.in
index e37dfe06a529..c672907a128d 100644
--- a/net/silc-server/files/patch-Makefile.in
+++ b/net/silc-server/files/patch-Makefile.in
@@ -1,19 +1,15 @@
---- Makefile.in.orig	Mon Jan 21 17:08:04 2002
-+++ Makefile.in	Mon Jan 21 17:09:44 2002
-@@ -151,9 +151,9 @@
+--- Makefile.in.orig	Mon Jul  1 13:55:06 2002
++++ Makefile.in	Wed Jul 17 18:43: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 = lib irssi silcd includes
-+SUBDIRS = lib silcd includes
-+DIST_SUBDIRS = lib silcd includes
  
- #
- # INCLUDE defines
-@@ -529,9 +529,6 @@
+ # Sub directories defined by "distributions" file, and can be overridden
+ # with ./configure, which substitutes these variables.
+@@ -531,9 +531,6 @@
  
  install-dirs:
  	-mkdir -p $(etcdir)
@@ -23,26 +19,32 @@
  	-mkdir -p $(logsdir)
  
  generate-server-key:
-@@ -561,18 +558,13 @@
+@@ -568,21 +565,17 @@
  	$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(docdir)/examples/
  
  etc-install:
 -	-@if test '!' -f $(etcdir)/silcd.conf ; then \
 +	-@if test '!' -f $(etcdir)/silcd.conf.sample ; then \
  	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
--	  $(etcdir)/silcd.conf; \
+-		$(etcdir)/silcd.conf; \
++		$(etcdir)/silcd.conf.sample; \
+ 	  $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
+-		$(etcdir)/silcalgs.conf; \
 -          chmod go= $(etcdir)/silcd.conf; \
 -	fi
 -	-@if test '!' -f $(etcdir)/silc.conf ; then \
--	  $(INSTALL_DATA) $(srcdir)/doc/example_silc.conf \
+-	  $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \
 -	  $(etcdir)/silc.conf; \
-+	  $(etcdir)/silcd.conf.sample; \
++		$(etcdir)/silcalgs.conf.sample; \
++          chmod go= $(etcdir)/silcd.conf.sample; \
  	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 etc-install
-+@SILC_DIST_CLIENT_FALSE@install-data-hook: install-dirs etc-install
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_TRUE@install-data-hook: install-dirs etc-install
++@SILC_DIST_CLIENT_FALSE@@SILC_DIST_TOOLKIT_FALSE@install-data-hook: install-dirs etc-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-server/files/patch-configure b/net/silc-server/files/patch-configure
index ab9b1d781dbc..6a0af32db00d 100644
--- a/net/silc-server/files/patch-configure
+++ b/net/silc-server/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	Mon Jan 21 17:09:59 2002
-+++ configure	Mon Jan 21 17:10:05 2002
-@@ -12567,7 +12567,7 @@
+--- configure.orig	Wed Jul 17 18:17:54 2002
++++ configure	Wed Jul 17 18:19:32 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="lib silcd includes"
+ cat >>confdefs.h <<\EOF
+ #define SILC_DIST_SERVER 1
+ EOF
+@@ -11313,7 +11313,7 @@
        fi
        ;;
      *-freebsd2.2*)
diff --git a/net/silc-server/files/patch-silcd:Makefile.in b/net/silc-server/files/patch-silcd:Makefile.in
index ca92308d5cd5..7fa1d1b338e8 100644
--- a/net/silc-server/files/patch-silcd:Makefile.in
+++ b/net/silc-server/files/patch-silcd:Makefile.in
@@ -1,6 +1,6 @@
---- silcd/Makefile.in.orig	Mon Jan 21 17:11:17 2002
-+++ silcd/Makefile.in	Mon Jan 21 17:12:21 2002
-@@ -260,8 +260,8 @@
+--- silcd/Makefile.in.orig	Wed Jul 17 18:20:09 2002
++++ silcd/Makefile.in	Wed Jul 17 18:20:33 2002
+@@ -259,8 +259,8 @@
  	     || test -f $$p1 \
  	  ; then \
  	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
diff --git a/net/silc-server/pkg-plist b/net/silc-server/pkg-plist
index ca5fc43749ef..cbd32e43a2be 100644
--- a/net/silc-server/pkg-plist
+++ b/net/silc-server/pkg-plist
@@ -1,3 +1,4 @@
+etc/silc/silcalgs.conf.sample
 etc/silc/silcd.conf.sample
 sbin/silcd
 @unexec rmdir %D/etc/silc 2>/dev/null || true