9 files changed, 120 insertions, 116 deletions

diff --git a/net/silc-server/Makefile b/net/silc-server/Makefile
index 222c8a64b675..dfb44c3ed787 100644
--- a/net/silc-server/Makefile
+++ b/net/silc-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	silc
-PORTVERSION=	0.9.18
+PORTVERSION=	1.0.2
 CATEGORIES=	net ipv6 security
 MASTER_SITES=	http://www.silcnet.org/download/%SUBDIR%/ \
 		http://ftp.silcnet.org/%SUBDIR%/ \
diff --git a/net/silc-server/distinfo b/net/silc-server/distinfo
index 42d64366e27f..2cfcc228ee56 100644
--- a/net/silc-server/distinfo
+++ b/net/silc-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (silc-server-0.9.18.tar.bz2) = c74b2ba088a81b670a64d350239cde62
-SHA256 (silc-server-0.9.18.tar.bz2) = d294a5d09be764bfd8feb79851eab69a83a11fe8ed9c8c1496e5d6e9c668915b
-SIZE (silc-server-0.9.18.tar.bz2) = 1169331
+MD5 (silc-server-1.0.2.tar.bz2) = a55b86783cc6b502e80fcbe73e698329
+SHA256 (silc-server-1.0.2.tar.bz2) = 37812c18a7221fe4ff87ef31a28ba9de97a3b722d7507c14ed0552cee20559b3
+SIZE (silc-server-1.0.2.tar.bz2) = 890357
diff --git a/net/silc-server/files/patch-Makefile.in b/net/silc-server/files/patch-Makefile.in
deleted file mode 100644
index e7d219d33bb0..000000000000
--- a/net/silc-server/files/patch-Makefile.in
+++ /dev/null
@@ -1,59 +0,0 @@
---- Makefile.in.orig	Fri Oct 31 17:15:11 2003
-+++ Makefile.in	Fri Oct 31 18:14:57 2003
-@@ -702,8 +702,6 @@
- 
- install-dirs:
- 	-mkdir -p $(etcdir)
--	-mkdir -p $(modulesdir)
--	-mkdir -p $(docdir)
- 
- install-dirs-client: install-dirs
- 	-mkdir -p $(helpdir)
-@@ -731,8 +729,7 @@
- 	 $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
- 	fi
- 
--doc-install-server: doc-install
--	-$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/
-+doc-install-server:
- 	-@if test -f $(srcdir)/doc/silcd.8 ; then \
- 	 $(INSTALL_DATA) $(srcdir)/doc/silcd.8 $(mandir)/man8; \
- 	fi
-@@ -749,16 +746,13 @@
- 	fi
- 
- etc-install-server:
--	-@if test '!' -f $(etcdir)/silcd.conf ; then \
- 	  $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \
--		$(etcdir)/silcd.conf; \
-+		$(etcdir)/silcd.conf.sample; \
- 	  $(INSTALL_DATA) $(srcdir)/doc/silcalgs.conf \
--		$(etcdir)/silcalgs.conf; \
--          chmod go= $(etcdir)/silcd.conf; \
--	fi
-+		$(etcdir)/silcalgs.conf.sample; \
-+          chmod go= $(etcdir)/silcd.conf.sample; \
- 
- sim-install:
--	-$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/
- 
- toolkit-install:
- 	-mkdir -p $(docdir)/toolkit/
-@@ -767,13 +761,14 @@
- 	-cp -R $(srcdir)/tutorial $(prefix)
- 
- examples-install:
--	-mkdir -p $(docdir)/examples/
--	-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/
--	-$(INSTALL_DATA) $(srcdir)/doc/examples/silc* $(docdir)/examples/
-+	-mkdir -p $(prefix)/share/examples/silc
-+	-$(INSTALL_DATA) $(srcdir)/doc/examples/README $(prefix)/share/examples/silc
-+	-$(INSTALL_DATA) $(srcdir)/doc/examples/cell* $(prefix)/share/examples/silc
- 
- generate-server-key:
- 	-@if test '!' -f $(etcdir)/silcd.pub ; then \
- 	  $(sbindir)/silcd -C $(etcdir); \
-+	    chmod 600 $(etcdir)/silcd.p*; \
- 	fi
- 
- @SILC_DIST_CLIENT_TRUE@install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client
diff --git a/net/silc-server/files/patch-apps:silcd:Makefile.in b/net/silc-server/files/patch-apps:silcd:Makefile.in
new file mode 100644
index 000000000000..64286065a883
--- /dev/null
+++ b/net/silc-server/files/patch-apps:silcd:Makefile.in
@@ -0,0 +1,55 @@
+--- apps/silcd/Makefile.in.orig	Wed Dec 14 15:47:35 2005
++++ apps/silcd/Makefile.in	Mon Aug 21 21:53:39 2006
+@@ -358,8 +358,8 @@
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$p'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$p" || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -579,14 +579,11 @@
+ 
+ 
+ install-dirs-server:
+-	-mkdir -p $(docdir)
+ 	-mkdir -p $(etcdir)
+-	-mkdir -p $(logsdir)
+ 	-mkdir -p $(mandir)/man5
+ 	-mkdir -p $(mandir)/man8
+ 
+ doc-install-server:
+-	-$(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf $(docdir)/
+ 	-@if test -f $(top_srcdir)/doc/silcd.8 ; then \
+ 	 $(INSTALL_DATA) $(top_srcdir)/doc/silcd.8 $(mandir)/man8; \
+ 	fi
+@@ -597,20 +594,18 @@
+ etc-install-server:
+ 	-@if test '!' -f $(etcdir)/silcd.conf ; then \
+ 	  $(INSTALL_DATA) $(top_srcdir)/doc/example_silcd.conf \
+-		$(etcdir)/silcd.conf; \
++		$(etcdir)/silcd.conf.sample; \
+ 	  $(INSTALL_DATA) $(top_srcdir)/doc/silcalgs.conf \
+-		$(etcdir)/silcalgs.conf; \
+-          chmod go= $(etcdir)/silcd.conf; \
++		$(etcdir)/silcalgs.conf.sample; \
++          chmod go= $(etcdir)/silcd.conf.sample; \
+ 	fi
+ 
+ examples-install:
+-	-mkdir -p $(docdir)/examples/
+-	-$(INSTALL_DATA) $(top_srcdir)/doc/examples/* $(docdir)/examples/
++	-mkdir -p $(prefix)/share/examples/silc
++	-$(INSTALL_DATA) $(top_srcdir)/doc/examples/README $(prefix)/share/examples/silc
++	-$(INSTALL_DATA) $(top_srcdir)/doc/examples/cell* $(prefix)/share/examples/silc
+ 
+ generate-server-key:
+-	-@if test '!' -f $(etcdir)/silcd.pub ; then \
+-	  $(sbindir)/silcd -C $(etcdir); \
+-	fi
+ 
+ install-data-hook: 		\
+ 	install-dirs-server 	\
diff --git a/net/silc-server/files/patch-doc:Makefile.in b/net/silc-server/files/patch-doc:Makefile.in
new file mode 100644
index 000000000000..eb6314e98244
--- /dev/null
+++ b/net/silc-server/files/patch-doc:Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Wed Dec 14 15:47:35 2005
++++ doc/Makefile.in	Thu Aug 10 13:38:49 2006
+@@ -477,7 +477,7 @@
+ 	-$(INSTALL_DATA) $(top_srcdir)/INSTALL $(docdir)/
+ 	-$(INSTALL_DATA) $(top_srcdir)/TODO $(docdir)/
+ 
+-install-data-hook:	doc-install
++install-data-hook:
+ 
+ @INCLUDE_DEFINES_INT@
+ 
diff --git a/net/silc-server/files/patch-lib:Makefile.in b/net/silc-server/files/patch-lib:Makefile.in
deleted file mode 100644
index 3b98a0d8fcb8..000000000000
--- a/net/silc-server/files/patch-lib:Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- lib/Makefile.in.orig	Mon Oct 27 11:28:00 2003
-+++ lib/Makefile.in	Mon Oct 27 11:29:06 2003
-@@ -541,15 +541,7 @@
- 	-rm -rf libsilcclient.a
- 
- @SILC_DIST_TOOLKIT_TRUE@install-exec-hook:
--@SILC_DIST_TOOLKIT_TRUE@	-mkdir -p $(DESTDIR)$(libdir)
--@SILC_DIST_TOOLKIT_TRUE@	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
--@SILC_DIST_TOOLKIT_TRUE@	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
- @SILC_DIST_TOOLKIT_FALSE@install-exec-hook:
--@SILC_DIST_TOOLKIT_FALSE@	-mkdir -p $(libdir)
--@SILC_DIST_TOOLKIT_FALSE@	-$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
--@SILC_DIST_TOOLKIT_FALSE@	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
--@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@	-$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
--@SILC_DIST_CLIENT_TRUE@@SILC_DIST_TOOLKIT_FALSE@	-rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
- 
- # WIN32 DLL generation
- @SILC_DIST_WIN32DLL_TRUE@silc.dll: libsilc.a
diff --git a/net/silc-server/files/patch-lib:silcsim:Makefile.in b/net/silc-server/files/patch-lib:silcsim:Makefile.in
new file mode 100644
index 000000000000..945b162dc16b
--- /dev/null
+++ b/net/silc-server/files/patch-lib:silcsim:Makefile.in
@@ -0,0 +1,11 @@
+--- lib/silcsim/Makefile.in.orig	Wed Dec 14 15:47:35 2005
++++ lib/silcsim/Makefile.in	Thu Aug 10 13:30:43 2006
+@@ -563,8 +563,6 @@
+ # Installation
+ #
+ install-data-hook:
+-	-mkdir -p $(modulesdir)
+-	-$(INSTALL_DATA) $(top_srcdir)/lib/silcsim/*.so $(modulesdir)/
+ 
+ @INCLUDE_DEFINES_INT@
+ 
diff --git a/net/silc-server/files/patch-silcd:Makefile.in b/net/silc-server/files/patch-silcd:Makefile.in
deleted file mode 100644
index 69da8eacb44f..000000000000
--- a/net/silc-server/files/patch-silcd:Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- silcd/Makefile.in.orig	Tue Feb 24 20:39:37 2004
-+++ silcd/Makefile.in	Thu Feb 26 10:15:39 2004
-@@ -179,7 +179,7 @@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = $(SILC_COMMON_LIBS) -lsilc
-+LIBS = -L$(top_srcdir)/lib $(SILC_COMMON_LIBS) -lsilc
- LIBSILCCLIENT_AGE = @LIBSILCCLIENT_AGE@
- LIBSILCCLIENT_CURRENT = @LIBSILCCLIENT_CURRENT@
- LIBSILCCLIENT_REVISION = @LIBSILCCLIENT_REVISION@
-@@ -370,8 +370,8 @@
- 	     || test -f $$p1 \
- 	  ; then \
- 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$p"; \
-+	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$p || exit 1; \
- 	  else :; fi; \
- 	done
- 
diff --git a/net/silc-server/files/silcd.sh b/net/silc-server/files/silcd.sh
index 0155e5498210..16988485fb2c 100644
--- a/net/silc-server/files/silcd.sh
+++ b/net/silc-server/files/silcd.sh
@@ -1,15 +1,41 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: silcd
+# REQUIRE: NETWORKING
+#
+# Add the following line to /etc/rc.conf[.local] to enable silcd:
+#
+# silcd_enable="YES"
+#
 
-case "$1" in
-start)
-	[ -x %%PREFIX%%/sbin/silcd ] && %%PREFIX%%/sbin/silcd > /dev/null && echo -n ' silcd'
-	;;
-stop)
-	[ -r /var/run/silcd.pid ] && /bin/kill `cat /var/run/silcd.pid` > /dev/null && echo -n ' silcd'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
+silcd_enable=${silcd_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name=silcd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/${name}
+pidfile=/var/run/${name}.pid
+
+extra_commands="keygen"
+keygen_cmd="silcd_keygen"
+start_precmd="silcd_precmd"
+
+silcd_keygen()
+{
+	umask 077
+	${command} -C %%PREFIX%%/etc/silc
+}
+
+silcd_precmd()
+{
+	if [ ! -f %%PREFIX%%/etc/silc/silcd.prv -a ! -f %%PREFIX%%/etc/silc/silcd.pub ]; then
+		run_rc_command keygen
+	fi
+}
+
+load_rc_config ${name}
+run_rc_command "$1"