4 files changed, 29 insertions, 27 deletions

diff --git a/irc/ircservices/Makefile b/irc/ircservices/Makefile
index 61df4cdbd2be..53c52ace9d8f 100644
--- a/irc/ircservices/Makefile
+++ b/irc/ircservices/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.esper.net/ircservices/ \
 DISTNAME=	${PORTNAME}-5.0.0
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHLEVEL=	57
+PATCHLEVEL=	58
 PATCHFILES!=	/usr/bin/jot -s " " -w ${DISTNAME:C/[0-9]*$//}%d.diff.gz  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 PATCH_DIST_STRIP=	-p1
@@ -27,12 +27,12 @@ COMMENT=	A system of IRC services for IRC networks
 USE_PERL5_BUILD=yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_RC_SUBR=	ircservices.sh
+USE_RC_SUBR=	ircservices
 USE_GCC=	3.2+
-NOT_FOR_ARCHS=	sparc64
 
 DIST_SUBDIR=	${PORTNAME}
-CONFIGURE_ARGS=	-prefix ${PREFIX} -cflags "${CFLAGS} -fPIC" -cc "${CC}"
+CFLAGS+=	-fPIC
+CONFIGURE_ARGS=	-prefix ${PREFIX} -cflags "${CFLAGS}" -cc "${CC}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/irc/ircservices/distinfo b/irc/ircservices/distinfo
index e3d1b5fbc683..0dcfe743fcbd 100644
--- a/irc/ircservices/distinfo
+++ b/irc/ircservices/distinfo
@@ -172,3 +172,6 @@ SIZE (ircservices/ircservices-5.0.56.diff.gz) = 5907
 MD5 (ircservices/ircservices-5.0.57.diff.gz) = 669ceedc6996438ccf7f9fb079f2d9b1
 SHA256 (ircservices/ircservices-5.0.57.diff.gz) = f6c0d6379fe500004a1948491e368d75798a5893285b996338c28616ab382d7e
 SIZE (ircservices/ircservices-5.0.57.diff.gz) = 15023
+MD5 (ircservices/ircservices-5.0.58.diff.gz) = 7447b41d55027fea2f9e898699f99231
+SHA256 (ircservices/ircservices-5.0.58.diff.gz) = d39a429fa92ff622a5615892847b78e7cab5ea86b1be5980d5d59a8dd8a4fbc2
+SIZE (ircservices/ircservices-5.0.58.diff.gz) = 6890
diff --git a/irc/ircservices/files/ircservices.in b/irc/ircservices/files/ircservices.in
new file mode 100644
index 000000000000..7264bd6b3e5a
--- /dev/null
+++ b/irc/ircservices/files/ircservices.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+# $FreeBSD$
+#
+# PROVIDE: ircservices
+# REQUIRE: LOGIN
+# KEYWORDS: nojail shutdown
+
+. %%RC_SUBR%%
+
+name=ircservices
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/${name}"
+pidfile="%%PREFIX%%/lib/services/${name}.pid"
+required_files="%%PREFIX%%/lib/services/ircservices.conf \
+		%%PREFIX%%/lib/services/modules.conf"
+
+load_rc_config ${name}
+
+: ${ircservices_enable="NO"}
+
+run_rc_command "$1"
diff --git a/irc/ircservices/files/ircservices.sh.in b/irc/ircservices/files/ircservices.sh.in
deleted file mode 100644
index e82a2eae3e3b..000000000000
--- a/irc/ircservices/files/ircservices.sh.in
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# PROVIDE: ircservices
-# REQUIRE: NETWORKING
-#
-# Add the following line to /etc/rc.conf to enable ircservices:
-#
-# ircservices_enable="YES"
-#
-
-ircservices_enable="${ircservices_enable-NO}"
-
-. %%RC_SUBR%%
-
-name=ircservices
-rcvar=`set_rcvar`
-
-prefix=%%PREFIX%%
-command="${prefix}/sbin/ircservices"
-ircservices_pidfile="${prefix}/lib/services/ircservices.pid"
-
-load_rc_config ${name}
-run_rc_command "$1"