5 files changed, 38 insertions, 35 deletions

diff --git a/irc/ircservices/Makefile b/irc/ircservices/Makefile
index 6bd2cde5bf9e..ef75ea448971 100644
--- a/irc/ircservices/Makefile
+++ b/irc/ircservices/Makefile
@@ -8,11 +8,17 @@
 PORTNAME=	ircservices
 PORTVERSION=	5.0.${PATCHLEVEL}
 CATEGORIES=	irc
-MASTER_SITES=	ftp://ftp.esper.net/ircservices/
+MASTER_SITES= ftp://ftp.esper.net/ircservices/ \
+	http://www.ircservices.esper.net/download/ \
+	ftp://ftp.freenet.de/pub/ftp.ircservices.za.net/pub/ircservices/ \
+	ftp://ftp.ircd.com.br/ircservices/ \
+	http://www.irc.gr/ircservices/ \
+	http://ircservices.swissirc.ch/
+
 DISTNAME=	${PORTNAME}-5.0.0
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHLEVEL=	50
+PATCHLEVEL= 51
 PATCHFILES!=	/usr/bin/jot -s " " -w ${DISTNAME:C/[0-9]*$//}%d.diff.gz  \
 			${PATCHLEVEL} 1 ${PATCHLEVEL}
 PATCH_DIST_STRIP=	-p1
@@ -23,24 +29,16 @@ 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_GCC=	3.2+
+NOT_FOR_ARCHS=	sparc64
 
 DIST_SUBDIR=	${PORTNAME}
-CONFIGURE_ARGS=	-prefix ${PREFIX} -cflags "${CFLAGS}" -cc "${CC}"
+CONFIGURE_ARGS= -prefix ${PREFIX} -cflags "${CFLAGS} -fPIC" -cc "${CC}"
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"Does not build on !i386"
-.endif
-
-.if ${OSVERSION} < 500039
-USE_GCC=	3.2+
-.endif
-
 post-install:
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/ircservices.sh.sample startup file."
-	@${INSTALL_SCRIPT} ${FILESDIR}/ircservices.sh \
-		${PREFIX}/etc/rc.d/ircservices.sh.sample
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/docs/*.html ${DOCSDIR}
diff --git a/irc/ircservices/distinfo b/irc/ircservices/distinfo
index 6e21bb377242..6422303d1994 100644
--- a/irc/ircservices/distinfo
+++ b/irc/ircservices/distinfo
@@ -100,3 +100,5 @@ MD5 (ircservices/ircservices-5.0.49.diff.gz) = 1645eb889074dd8d2d37fa5d957235d2
 SIZE (ircservices/ircservices-5.0.49.diff.gz) = 48004
 MD5 (ircservices/ircservices-5.0.50.diff.gz) = b3137b27b89fa0db99bcc4bab5fd376f
 SIZE (ircservices/ircservices-5.0.50.diff.gz) = 18847
+MD5 (ircservices/ircservices-5.0.51.diff.gz) = 118701b5c92c3fe13447c40ffbec52e0
+SIZE (ircservices/ircservices-5.0.51.diff.gz) = 8368
diff --git a/irc/ircservices/files/ircservices.sh b/irc/ircservices/files/ircservices.sh
deleted file mode 100644
index 0ca8b4f29963..000000000000
--- a/irc/ircservices/files/ircservices.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	[ -x ${PREFIX}/sbin/ircservices ] && ${PREFIX}/sbin/ircservices > /dev/null && echo -n ' ircservices'
-	;;
-stop)
-	killall ircservices && echo -n ' ircservices' 
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
diff --git a/irc/ircservices/files/ircservices.sh.in b/irc/ircservices/files/ircservices.sh.in
new file mode 100644
index 000000000000..184923f71f35
--- /dev/null
+++ b/irc/ircservices/files/ircservices.sh.in
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# PROVIDE: ircservices
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD
+#
+# Add the following line to /etc/rc.conf to enable ircservices:
+#
+# ircservices_enable="YES"
+#
+
+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"
diff --git a/irc/ircservices/pkg-plist b/irc/ircservices/pkg-plist
index 53c34a5e90da..690438bebbf4 100644
--- a/irc/ircservices/pkg-plist
+++ b/irc/ircservices/pkg-plist
@@ -1,4 +1,3 @@
-etc/rc.d/ircservices.sh.sample
 lib/services/convert-db
 lib/services/example-ircservices.conf
 lib/services/example-modules.conf