7 files changed, 55 insertions, 56 deletions

diff --git a/irc/ircd-ru/Makefile b/irc/ircd-ru/Makefile
index ec2e6e589f4a..5c9d088d6367 100644
--- a/irc/ircd-ru/Makefile
+++ b/irc/ircd-ru/Makefile
@@ -7,18 +7,19 @@
 
 PORTNAME=	ircd-ru
 PORTVERSION=	1.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	irc russian
-MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
-DISTNAME=	ircd-RU-${PORTVERSION}-02-stable
+MASTER_SITES=	http://muhnet.org.ru/ \
+		ftp://repoman.wenet.ru/pub/ircd-RU/
+DISTNAME=	ircd-RU-${PORTVERSION}-03-rc
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bu7cher@yandex.ru
 COMMENT=	An irc daemon with translation schemes and other useful features
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message
-USE_RC_SUBR=	ircd.sh
+USE_RC_SUBR=	ircd
 
 VARDIR=		/var
 PLIST_SUB=	VARDIR=${VARDIR}
@@ -75,10 +76,6 @@ CONFIGURE_ARGS+=--enable-dnsbl
 CONFIGURE_ARGS+=--enable-select
 .endif
 
-.if ${ARCH} == "amd64"
-BROKEN=		Does not compile on amd64
-.endif
-
 post-patch:
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -Ee '/(dir_HPATH)|opers.txt/d' ${WRKSRC}/tools/install_ircd.in
@@ -97,4 +94,8 @@ post-install:
 	@${CHOWN} -R ircd:ircd ${VARDIR}/log/ircd-ru
 	@${CAT} ${PKGMESSAGE}
 
+.if ${OSVERSION} < 500000
+BROKEN=		Does not compile on 4.x
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/irc/ircd-ru/distinfo b/irc/ircd-ru/distinfo
index 800b6e43d812..2ece393d4675 100644
--- a/irc/ircd-ru/distinfo
+++ b/irc/ircd-ru/distinfo
@@ -1,3 +1,3 @@
-MD5 (ircd-RU-1.0.7-02-stable.tar.bz2) = 7fe6336ca79fd29b5c2f088f250591a8
-SHA256 (ircd-RU-1.0.7-02-stable.tar.bz2) = e53df45b838ffded8418f07990962c8c7892a563e20f7d6b39fbe4376835782a
-SIZE (ircd-RU-1.0.7-02-stable.tar.bz2) = 403996
+MD5 (ircd-RU-1.0.7-03-rc.tar.bz2) = 5ee68f6277e540365cdc0d12c3b9592b
+SHA256 (ircd-RU-1.0.7-03-rc.tar.bz2) = b8f57c8d1acdeb6fbb32506afcc6cc1c410387e9be244d7613686d89b531a285
+SIZE (ircd-RU-1.0.7-03-rc.tar.bz2) = 409535
diff --git a/irc/ircd-ru/files/ircd.in b/irc/ircd-ru/files/ircd.in
new file mode 100644
index 000000000000..88fafa601507
--- /dev/null
+++ b/irc/ircd-ru/files/ircd.in
@@ -0,0 +1,30 @@
+#! /bin/sh
+# $FreeBSD$
+#
+# PROVIDE: ircd
+# REQUIRE: LOGIN syslogd
+# KEYWORD: shutdown
+
+. "%%RC_SUBR%%"
+
+name="ircd"
+rcvar=${name}_enable
+
+command="%%PREFIX%%/sbin/$name"
+required_files="%%PREFIX%%/etc/ircd-ru/ircd.conf %%PREFIX%%/etc/ircd-ru/ircd.motd %%PREFIX%%/etc/ircd-ru/ircd.smotd"
+piddir="/var/run/ircd-ru"
+pidfile="$piddir/$name.pid"
+start_precmd=${name}_precmd
+
+ircd_precmd () {
+	/usr/bin/install -d -o $ircd_user -g $ircd_group $piddir
+        eval `/usr/bin/limits -U $ircd_user -e`
+}
+
+load_rc_config $name
+
+: ${ircd_enable="NO"}
+: ${ircd_user="ircd"}
+: ${ircd_group="ircd"}
+
+run_rc_command "$1"
diff --git a/irc/ircd-ru/files/ircd.sh.in b/irc/ircd-ru/files/ircd.sh.in
deleted file mode 100644
index 0b9baab1f854..000000000000
--- a/irc/ircd-ru/files/ircd.sh.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-
-#
-# PROVIDE: ircd
-#
-# Add the fellowing line to /etc/rc.conf to enable ircd:
-#
-# ircd_enable="YES"
-#
-
-. "%%RC_SUBR%%"
-
-name=ircd
-rcvar=`set_rcvar`
-
-command=/usr/local/sbin/ircd
-
-ircd_pidfile="/var/run/ircd-ru/ircd.pid"
-ircd_required_files="/usr/local/etc/ircd-ru/ircd.conf /usr/local/etc/ircd-ru/ircd.motd /usr/local/etc/ircd-ru/ircd.smotd"
-ircd_user="ircd"
-
-pidfile=${ircd_pidfile}
-required_files=${ircd_required_files}
-
-ircd_precmd () {
-	/usr/bin/install -d -o ircd -g ircd /var/run/ircd-ru
-        eval `/usr/bin/limits -U ${ircd_user} -e`
-}
-start_precmd="ircd_precmd"
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/irc/ircd-ru/files/patch-rc4.c b/irc/ircd-ru/files/patch-rc4.c
new file mode 100644
index 000000000000..a604a026f631
--- /dev/null
+++ b/irc/ircd-ru/files/patch-rc4.c
@@ -0,0 +1,10 @@
+--- src/rc4.c.orig	Sun Dec 24 01:17:00 2006
++++ src/rc4.c	Sun Dec 24 01:17:25 2006
+@@ -21,6 +21,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ /*
+  * Transparent rc4 implementation
diff --git a/irc/ircd-ru/files/patch-res.c b/irc/ircd-ru/files/patch-res.c
deleted file mode 100644
index 57238525644b..000000000000
--- a/irc/ircd-ru/files/patch-res.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/res.c.orig	Fri Jan 21 02:00:34 2005
-+++ src/res.c	Fri Jan 21 02:00:46 2005
-@@ -50,7 +50,7 @@
- 				 * don't do DNS on this ip. */
- 
- #undef	DEBUG			/* because theres alot of debug code in here */
--extern void debug();
-+/* extern void debug(); */
- 
- struct in_addr reslocaladdr;
- 
diff --git a/irc/ircd-ru/pkg-plist b/irc/ircd-ru/pkg-plist
index 89e1b9c55949..50d7a2ff6bbc 100644
--- a/irc/ircd-ru/pkg-plist
+++ b/irc/ircd-ru/pkg-plist
@@ -26,5 +26,6 @@ etc/ircd-ru/ru_RU.KOI8-R/ircd.conf-dist
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec mkdir -m 755 %%VARDIR%%/log/ircd-ru
 @exec chown ircd:ircd %%VARDIR%%/log/ircd-ru
-@unexec rm -R %%VARDIR%%/log/ircd-ru 2>&1 >/dev/null || true
+@unexec rmdir %%VARDIR%%/log/ircd-ru
+@unexec rmdir %%VARDIR%%/run/ircd-ru
 @unexec (rmdir %D/etc/ircd-ru && pw user del ircd) || echo 'To completely remove this port delete user ircd, group ircd and remove etc/ircd-ru'