4 files changed, 19 insertions, 16 deletions
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 48bbccfafec..45d1b4579ec 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2002/05/03 22:02:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2002/05/24 22:15:36 hubertf Exp $
 
-DISTNAME=		silc-server-0.8.4
+DISTNAME=		silc-server-0.9.1
 CATEGORIES=		chat
 MASTER_SITES=		http://www.silcnet.org/download/server/sources/ \
 			ftp://ftp.silcnet.org/silc/server/sources/ \
@@ -46,14 +46,13 @@ RCD_SCRIPTS_MODE=	0555
 
 OWN_DIRS_PERMS+=	/var/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700
 
-INSTALL_EXTRA_TMPL=	${PKGDIR}/INSTALL
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/silcd
 CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf
 CONFIGURE_ARGS+=	--with-logsdir=/var/log/silcd
-CONFIGURE_ARGS+=	--with-silcd-pid-file=/var/log/silcd/silcd.pid
+CONFIGURE_ARGS+=	--with-silcd-pid-file=/var/run/silcd.pid
 CONFIGURE_ARGS+=	--without-ncurses
 
 # list it into IPv6-ready packages
@@ -75,7 +74,7 @@ post-install:
 .else
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/silcd.generic \
 		> ${PREFIX}/share/doc/silcd/silcd.default
-.endif	
+.endif
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/motd.txt \
 		> ${PREFIX}/share/doc/silcd/motd.txt.default
 
diff --git a/chat/silc-server/distinfo b/chat/silc-server/distinfo
index dc75aec118b..80805ee7182 100644
--- a/chat/silc-server/distinfo
+++ b/chat/silc-server/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2002/05/03 22:02:49 hubertf Exp $
+$NetBSD: distinfo,v 1.11 2002/05/24 22:15:36 hubertf Exp $
 
-SHA1 (silc-server-0.8.4.tar.bz2) = 1549594faa6f21b760f4240ae167bc501efa3101
-Size (silc-server-0.8.4.tar.bz2) = 940368 bytes
+SHA1 (silc-server-0.9.1.tar.bz2) = b925d8102efe90cdced7415fb9be501d3ef3c3c5
+Size (silc-server-0.9.1.tar.bz2) = 960514 bytes
 SHA1 (patch-aa) = 97ccff02e5d2d1bd3ff64a1a1942525e5a4522bd
 SHA1 (patch-ab) = 482b7580cb95a0833c85f64a3d94c16b2b1c984f
diff --git a/chat/silc-server/files/silcd.generic b/chat/silc-server/files/silcd.generic
index c8280e49670..6fceb7dd7d9 100644
--- a/chat/silc-server/files/silcd.generic
+++ b/chat/silc-server/files/silcd.generic
@@ -1,4 +1,4 @@
-# $NetBSD: silcd.generic,v 1.1 2002/05/03 22:02:49 hubertf Exp $
+# $NetBSD: silcd.generic,v 1.2 2002/05/24 22:15:36 hubertf Exp $
 #
 
 KILL="/bin/kill"
@@ -9,7 +9,7 @@ name="silcd"
 confdir="@PKG_SYSCONFDIR@"
 required_files="$confdir/silcd.conf"
 required_dirs="/var/log/silcd"
-pidfile="/var/log/silcd/${name}.pid"
+pidfile="/var/run/${name}.pid"
 command="@PREFIX@/sbin/silcd"
 start_precmd="silcd_precmd"
 
diff --git a/chat/silc-server/files/silcd.sh b/chat/silc-server/files/silcd.sh
index 60c255c95b9..774b79fb015 100644
--- a/chat/silc-server/files/silcd.sh
+++ b/chat/silc-server/files/silcd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: silcd.sh,v 1.4 2002/05/03 22:02:49 hubertf Exp $
+# $NetBSD: silcd.sh,v 1.5 2002/05/24 22:15:36 hubertf Exp $
 #
 # PROVIDE: silcd
 # REQUIRE: DAEMON
@@ -15,7 +15,7 @@ rcvar=$name
 confdir="@PKG_SYSCONFDIR@"
 required_files="$confdir/silcd.conf"
 required_dirs="/var/log/silcd"
-pidfile="/var/log/silcd/${name}.pid"
+pidfile="/var/run/${name}.pid"
 command="@PREFIX@/sbin/silcd"
 start_precmd="silcd_precmd"
 stop_cmd="silcd_stop"
@@ -29,7 +29,11 @@ silcd_precmd()
 
 silcd_stop()
 {
-	if [ -z "$_pid" ]; then
+	# Backward compat with NetBSD <1.6:
+	[ -z "$rc_pid" ] && rc_pid=$_pid
+	[ -z "$rc_pidcmd" ] && rc_pidcmd=$_pidcmd
+
+	if [ -z "$rc_pid" ]; then
 		if [ -n "$pidfile" ]; then
 			echo "${name} not running? (check $pidfile)."
 		else
@@ -40,11 +44,11 @@ silcd_stop()
 
 	echo "Stopping ${name}."
 	_doit=\
-"${_user:+su -m $_user -c '}kill -${sig_stop:-TERM} $_pid${_user:+'}"
+"${_user:+su -m $_user -c '}kill -${sig_stop:-TERM} $rc_pid${_user:+'}"
 	eval $_doit
 
-	eval $_pidcmd
-	if [ ! $_pid ]; then
+	eval $rc_pidcmd
+	if [ ! $rc_pid ]; then
 		rm -f $pidfile
 	fi
 }