- Updated mirrors.

- Changed distname.
- Removed patch for include/ircsprintf.h. It seems not needed today.
- Added patch for src/s_serv.c (it needed for custom compilation with syslog disabled)
- Removed several includes utmp.h. They are not used.

PR:		ports/143008
Submitted by:	"Andrey V. Elsukov" <bu7cher@yandex.ru> (maintainer)

5 files changed, 79 insertions, 20 deletions

diff --git a/irc/ircd-ru/Makefile b/irc/ircd-ru/Makefile
index b90032b7b7f5..bad944a1f334 100644
--- a/irc/ircd-ru/Makefile
+++ b/irc/ircd-ru/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	ircd-ru
 PORTVERSION=	1.0.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	irc russian
-MASTER_SITES=	http://muhnet.org.ru/ \
-		ftp://repoman.wenet.ru/pub/ircd-RU/
-DISTNAME=	ircd-RU-${PORTVERSION}-03-rc
+MASTER_SITES=	http://link.wenet.su/
+DISTNAME=	ircd-RU-${PORTVERSION}-03-rc-20090810
 
 MAINTAINER=	bu7cher@yandex.ru
 COMMENT=	An irc daemon with translation schemes and other useful features
@@ -20,6 +19,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	ircd
+WRKSRC=		${WRKDIR}/ircd-RU-${PORTVERSION}-03-rc
 
 VARDIR=		/var
 PLIST_SUB=	VARDIR=${VARDIR}
diff --git a/irc/ircd-ru/distinfo b/irc/ircd-ru/distinfo
index 2ece393d4675..4bb7112cbbc6 100644
--- a/irc/ircd-ru/distinfo
+++ b/irc/ircd-ru/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (ircd-RU-1.0.7-03-rc-20090810.tar.bz2) = 24263805be10213db5b2d276076f0de0
+SHA256 (ircd-RU-1.0.7-03-rc-20090810.tar.bz2) = c67a6628125cf44eaf7198491016809ad121d58dd0204b87fe81bb51cdb33fba
+SIZE (ircd-RU-1.0.7-03-rc-20090810.tar.bz2) = 409009
diff --git a/irc/ircd-ru/files/patch-ircsprintf.h b/irc/ircd-ru/files/patch-ircsprintf.h
deleted file mode 100644
index 763500318270..000000000000
--- a/irc/ircd-ru/files/patch-ircsprintf.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/ircsprintf.h.orig	Wed Dec 27 21:28:44 2006
-+++ include/ircsprintf.h	Wed Dec 27 21:29:34 2006
-@@ -3,6 +3,10 @@
- #include <stdarg.h>
- #include <stdio.h>
- 
-+#ifndef va_copy
-+#define va_copy(a1, a2)	(a1) = (a2)
-+#endif
-+
- /* define this if you intend to use ircsnprintf or ircvsnprintf */
- /* It's not used, and sNprintf functions are not in all libraries */
- #define WANT_SNPRINTF
diff --git a/irc/ircd-ru/files/patch-src_s_serv.c b/irc/ircd-ru/files/patch-src_s_serv.c
new file mode 100644
index 000000000000..1088fb95a3cc
--- /dev/null
+++ b/irc/ircd-ru/files/patch-src_s_serv.c
@@ -0,0 +1,12 @@
+--- src/s_serv.c	2006-07-14 18:11:33.000000000 +0400
++++ src/s_serv.c	2007-01-11 02:54:40.000000000 +0300
+@@ -290,8 +290,8 @@ int m_squit(aClient *cptr, aClient *sptr
+ #ifdef USE_SYSLOG
+ 	    syslog(LOG_NOTICE, "Failed SQUIT U-lined server %s attempt by "
+ 		"server %s", acptr->name, parv[0]);
+-	}
+ #endif
++	}
+ 	else
+ 	{
+ 	    sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
diff --git a/irc/ircd-ru/files/patch-utmpx b/irc/ircd-ru/files/patch-utmpx
new file mode 100644
index 000000000000..5f8e5b46f2d3
--- /dev/null
+++ b/irc/ircd-ru/files/patch-utmpx
@@ -0,0 +1,60 @@
+--- src/m_nick.c.orig	2006-07-14 17:53:58.000000000 +0400
++++ src/m_nick.c	2010-01-20 09:30:51.342752644 +0300
+@@ -29,7 +29,6 @@
+ #include "msg.h"
+ #include "channel.h"
+ #include <sys/stat.h>
+-#include <utmp.h>
+ #include <fcntl.h>
+ #include "h.h"
+ 
+--- src/m_services.c.orig	2006-07-14 17:53:58.000000000 +0400
++++ src/m_services.c	2010-01-20 09:31:39.523130876 +0300
+@@ -29,7 +29,6 @@
+ #include "msg.h"
+ #include "channel.h"
+ #include <sys/stat.h>
+-#include <utmp.h>
+ #include <fcntl.h>
+ #include "h.h"
+ 
+--- src/m_who.c.orig	2010-01-20 09:24:57.060156113 +0300
++++ src/m_who.c	2010-01-20 09:32:12.763365040 +0300
+@@ -29,7 +29,6 @@
+ #include "msg.h"
+ #include "channel.h"
+ #include <sys/stat.h>
+-#include <utmp.h>
+ #include <fcntl.h>
+ #include "h.h"
+ 
+--- src/s_bsd.c.orig	2006-07-14 18:11:33.000000000 +0400
++++ src/s_bsd.c	2010-01-20 09:32:50.543598561 +0300
+@@ -42,7 +42,6 @@
+ #include <arpa/inet.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+-#include <utmp.h>
+ #include <sys/resource.h>
+ 
+ /* Stuff for poll() */
+--- src/s_serv.c.orig	2010-01-20 09:24:57.340153990 +0300
++++ src/s_serv.c	2010-01-20 09:33:38.093895317 +0300
+@@ -41,7 +41,6 @@
+ #endif
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-#include <utmp.h>
+ #include "h.h"
+ #if defined( HAVE_STRING_H )
+ #include <string.h>
+--- src/s_user.c.orig	2006-07-14 18:11:33.000000000 +0400
++++ src/s_user.c	2010-01-20 09:33:57.834018154 +0300
+@@ -34,7 +34,6 @@
+ #include <arpa/inet.h>
+ #endif
+ #include <sys/stat.h>
+-#include <utmp.h>
+ #include <fcntl.h>
+ #include "h.h"
+ #ifdef FLUD