8 files changed, 34 insertions, 64 deletions

diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index 0040391543f4..8d576e1d17ba 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -6,20 +6,16 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.6.4
+PORTVERSION=	0.7.2
 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/server/sources/ \
+		ftp://ftp.silcnet.org/silc/server/sources/ \
+		http://www.planetmirror.com/pub/silcnet/server/sources/ \
+		ftp://ftp.au.silcnet.org/pub/silcnet/server/sources/ \
+		http://the.wiretapped.net/security/network-security/silc/server/sources/ \
+		ftp://ftp.wiretapped.net/pub/security/network-security/silc/server/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/server/sources/
 PKGNAMESUFFIX=	-server
 DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 
diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo
index bbb8963d92b1..bde424d52c7c 100644
--- a/net/silc-server/distinfo
+++ b/net/silc-server/distinfo
@@ -1 +1 @@
-MD5 (silc-server-0.6.4.tar.bz2) = de6efa6582b6fa679ee84c7be948775a
+MD5 (silc-server-0.7.2.tar.bz2) = 3f0902384a3b8a2c898a238419b980f2
diff --git a/net/silc-server/files/patch-Makefile.in b/net/silc-server/files/patch-Makefile.in
index 922283827b73..99f9b027c4bd 100644
--- a/net/silc-server/files/patch-Makefile.in
+++ b/net/silc-server/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Nov 11 15:02:16 2001
-+++ Makefile.in	Mon Nov 12 22:15:00 2001
-@@ -145,9 +145,9 @@
+--- Makefile.in.orig	Fri Dec 21 02:09:25 2001
++++ Makefile.in	Fri Dec 21 02:11:22 2001
+@@ -151,9 +151,9 @@
  
  AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
  
@@ -13,7 +13,7 @@
  
  #
  # INCLUDE defines
-@@ -512,9 +512,6 @@
+@@ -529,9 +529,6 @@
  
  install-dirs:
  	-mkdir -p $(etcdir)
@@ -23,8 +23,8 @@
  	-mkdir -p $(logsdir)
  
  generate-server-key:
-@@ -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 etc-install
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/silc-server/files/patch-configure b/net/silc-server/files/patch-configure
index 0a9dcb4a76dd..b6b8427dc170 100644
--- a/net/silc-server/files/patch-configure
+++ b/net/silc-server/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Thu Nov  8 14:44:02 2001
-+++ configure	Thu Nov  8 14:45:48 2001
-@@ -8499,7 +8499,7 @@
+--- configure.orig	Fri Dec 21 02:11:37 2001
++++ configure	Fri Dec 21 02:11:55 2001
+@@ -12572,7 +12572,7 @@
        fi
        ;;
      *-freebsd2.2*)
diff --git a/net/silc-server/files/patch-lib:Makefile.in b/net/silc-server/files/patch-lib:Makefile.in
index 77bac513fd33..218ce536936b 100644
--- a/net/silc-server/files/patch-lib:Makefile.in
+++ b/net/silc-server/files/patch-lib:Makefile.in
@@ -1,6 +1,6 @@
---- lib/Makefile.in.orig	Fri Nov  9 00:36:48 2001
-+++ lib/Makefile.in	Fri Nov  9 00:37:05 2001
-@@ -116,13 +116,12 @@
+--- lib/Makefile.in.orig	Fri Dec 21 02:12:11 2001
++++ lib/Makefile.in	Fri Dec 21 02:13:06 2001
+@@ -123,13 +123,12 @@
  	silcutil \
  	silcclient \
  	silcsftp \
@@ -16,7 +16,7 @@
  
  # SILC Library dirs
  SILCLIB_DIRS = \
-@@ -134,8 +133,7 @@
+@@ -141,8 +140,7 @@
  	silcske \
  	silcutil \
  	silcsftp \
diff --git a/net/silc-server/files/patch-lib:dotconf:src:Makefile.in b/net/silc-server/files/patch-lib:dotconf:src:Makefile.in
index 2353fa102336..42ac3712a304 100644
--- a/net/silc-server/files/patch-lib:dotconf:src:Makefile.in
+++ b/net/silc-server/files/patch-lib:dotconf:src:Makefile.in
@@ -1,11 +1,11 @@
---- lib/dotconf/src/Makefile.in.orig	Thu Nov  8 23:46:47 2001
-+++ lib/dotconf/src/Makefile.in	Thu Nov  8 23:47:31 2001
+--- lib/dotconf/src/Makefile.in.orig	Fri Dec 21 02:13:30 2001
++++ lib/dotconf/src/Makefile.in	Fri Dec 21 02:14:08 2001
 @@ -91,7 +91,7 @@
  noinst_HEADERS = readdir.h
  lib_LTLIBRARIES = libdotconf.la
  libdotconf_la_SOURCES = dotconf.c readdir.c
 -libdotconf_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE) 	-export-dynamic
-+libdotconf_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-dynamic
++libdotconf_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -export-dynamic
  
  
  EXTRA_DIST = dotconf.dsp
diff --git a/net/silc-server/files/patch-lib:silccrypt:silcrng.c b/net/silc-server/files/patch-lib:silccrypt:silcrng.c
deleted file mode 100644
index 0af7d4318609..000000000000
--- a/net/silc-server/files/patch-lib:silccrypt:silcrng.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- lib/silccrypt/silcrng.c.orig	Wed Nov 14 12:44:05 2001
-+++ lib/silccrypt/silcrng.c	Wed Nov 14 22:19:57 2001
-@@ -28,12 +28,23 @@
- 
- #include "silcincludes.h"
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(BSD) && (BSD >= 199103))
-+# if defined(HAVE_GETSID) || defined(HAVE_GETPGID)
-+#  include <unistd.h>
-+# endif
-+#else
-+
- #ifdef HAVE_GETSID
- extern pid_t getsid (pid_t __pid);
- #endif
- 
- #ifdef HAVE_GETPGID
- extern pid_t getpgid (pid_t __pid);
-+#endif
- #endif
- 
- #undef SILC_RNG_DEBUG
diff --git a/net/silc-server/files/patch-silcd:Makefile.in b/net/silc-server/files/patch-silcd:Makefile.in
index da6e3eca52f6..07be6ee2f466 100644
--- a/net/silc-server/files/patch-silcd:Makefile.in
+++ b/net/silc-server/files/patch-silcd:Makefile.in
@@ -1,13 +1,13 @@
---- silcd/Makefile.in.orig	Fri Nov  9 13:26:07 2001
-+++ silcd/Makefile.in	Fri Nov  9 13:28:59 2001
-@@ -240,8 +240,8 @@
- 	  if test -f $$p \
+--- silcd/Makefile.in.orig	Fri Dec 21 02:15:06 2001
++++ silcd/Makefile.in	Fri Dec 21 02:16:08 2001
+@@ -260,8 +260,8 @@
+ 	     || test -f $$p1 \
  	  ; then \
  	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p"; \
-+	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$f; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/$$p; \
  	  else :; fi; \
  	done