Index: head/irc/ircd-hybrid/Makefile
===================================================================
--- head/irc/ircd-hybrid/Makefile	(revision 458680)
+++ head/irc/ircd-hybrid/Makefile	(revision 458681)
@@ -1,50 +1,50 @@
 # Created by: David Taylor <davidt@yadt.co.uk>
 # $FreeBSD$
 
 PORTNAME=	ircd-hybrid
-PORTVERSION=	8.2.21
+PORTVERSION=	8.2.22
 CATEGORIES=	irc ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Fast irc daemon with a number of new features
 
 LICENSE=	GPLv2
 
 INSTALL_IGNORES=	ircu-* ircd-rat* charby*
 
 # :keepla because port uses lt_dlopen
 USES=		cpe gmake libtool:keepla tar:tgz
 GNU_CONFIGURE=	yes
 
 USERS=		ircd
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	ircd-hybrid
 SUB_FILES=	pkg-message
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	OPENSSL HALFOPS ASSERT
 OPTIONS_DEFAULT=OPENSSL
 
 ASSERT_CONFIGURE_ENABLE=	assert
 ASSERT_DESC=	Enable parts of the debugging code
 
 HALFOPS_CONFIGURE_ENABLE=	halfops
 HALFOPS_DESC=	Enable halfops on the server
 
 OPENSSL_DESC=	Enable openssl - allows use of CHALLENGE and encrypted links
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES	+=	ssl
 CONFIGURE_ARGS+=	--enable-openssl=${OPENSSLBASE}
 .endif
 
 CONFIGURE_ARGS+=	\
 	--sysconfdir=${PREFIX}/etc/ircd-hybrid \
 	--datarootdir=${PREFIX}/share/${PORTNAME}-${PORTVERSION} \
 	--localstatedir=/var
 
 .include <bsd.port.mk>
Index: head/irc/ircd-hybrid/distinfo
===================================================================
--- head/irc/ircd-hybrid/distinfo	(revision 458680)
+++ head/irc/ircd-hybrid/distinfo	(revision 458681)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482502869
-SHA256 (ircd-hybrid-8.2.21.tgz) = c37f67ff087bb471e6a4fbdd172e4b92d4c9924ba3ddfe481787855febcb8fa5
-SIZE (ircd-hybrid-8.2.21.tgz) = 1219746
+TIMESTAMP = 1515612001
+SHA256 (ircd-hybrid-8.2.22.tgz) = d7d8df4524d088132e928d3685f2f65bb7b1bf6c1f855fc9e16a3dc460d9b1c4
+SIZE (ircd-hybrid-8.2.22.tgz) = 1223395
Index: head/irc/ircd-hybrid/files/ircd-hybrid.in
===================================================================
--- head/irc/ircd-hybrid/files/ircd-hybrid.in	(revision 458680)
+++ head/irc/ircd-hybrid/files/ircd-hybrid.in	(revision 458681)
@@ -1,44 +1,44 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: ircd-hybrid
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 # To get ircd-hybrid enabled at boot, add the following lines to /etc/rc.conf :
 # ircd_hybrid_enable (bool):    Set to "NO" by default.
 #                               Set it to "YES" to enable ircd-hybrid.
 
 . /etc/rc.subr
 
 name="ircd_hybrid"
 rcvar=ircd_hybrid_enable
 
 command=/usr/local/bin/ircd
 
 start_precmd=pid_touch
 stop_postcmd=pid_rm
 
 load_rc_config ${name}
 
 pidfile=${ircd_hybrid_pidfile-"/var/run/ircd/ircd.pid"}
 : ${ircd_hybrid_enable:="NO"}
 : ${ircd_hybrid_user:="ircd"}
 : ${ircd_hybrid_config:="%%PREFIX%%/etc/ircd-hybrid/ircd.conf"}
 : ${ircd_hybrid_flags=" -pidfile ${pidfile}"}
 
 pid_touch ()
 {
     install -d -o ${ircd_hybrid_user} ${pidfile%/*} /var/log/ircd
     touch $pidfile
     chown $ircd_hybrid_user $pidfile
 }
 
 pid_rm ()
 {
-    rm $pidfile
+    rm -f $pidfile
 }
 
 run_rc_command "$1"