Update to 1.0.35, unbreak for 5.x and USE_RC_SUBR.

9 files changed, 421 insertions, 66 deletions

diff --git a/irc/dancer-ircd/Makefile b/irc/dancer-ircd/Makefile
index 72fa01bab800..6802ee8a8020 100644
--- a/irc/dancer-ircd/Makefile
+++ b/irc/dancer-ircd/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	dancer-ircd
-PORTVERSION=	1.0.32
-PORTREVISION=	1
+PORTVERSION=	1.0.35
 CATEGORIES=	irc ipv6
-MASTER_SITES=	http://freenode.net/ \
-		http://source.freenode.net/~asuffield/dancer/dancer-oper-guide/:doc1 \
-		http://source.freenode.net/~asuffield/dancer/dancer-user-guide/:doc2
-MASTER_SITE_SUBDIR=	${PORTNAME}/stable/releases
-DISTNAME=	${PORTNAME}-${PORTVERSION}+6p4
+MASTER_SITES=	http://source.freenode.net/~asuffield/dancer/%SUBDIR%/ \
+		http://source.freenode.net/~asuffield/dancer/%SUBDIR%/:doc1 \
+		http://source.freenode.net/~asuffield/dancer/%SUBDIR%/:doc2
+MASTER_SITE_SUBDIR=	${PORTNAME}/stable/releases \
+			dancer-oper-guide:doc1 \
+			dancer-user-guide:doc2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		dancer-oper-guide.txt:doc1 \
 		dancer-user-guide.txt:doc2
@@ -25,6 +25,10 @@ COMMENT=	An irc daemon based on hybrid ircd
 IGNOREFILES=	dancer-oper-guide.txt \
 		dancer-user-guide.txt
 
+USE_RC_SUBR=	yes
+SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%RC_SUBR%%,${RC_SUBR},g'
+
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -35,13 +39,13 @@ IS_INTERACTIVE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502000
-BROKEN=		"Does not compile"
-.endif
-
 post-patch:
 	${REINPLACE_CMD} 's:@@prefix@@:${PREFIX}:g' ${WRKSRC}/src/paths.c
 
+post-build:
+	${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%RC_SUBR%%,${RC_SUBR},g' \
+		${FILESDIR}/dancer-ircd.sh > ${WRKDIR}/dancer-ircd.sh
+
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
@@ -64,8 +68,6 @@ post-install:
 	${FIND} ${PREFIX}/etc/dancer-ircd -type f -print0 | \
 		${XARGS} -0 ${CHMOD} 600
 	${CHOWN} -R ircd:ircd ${PREFIX}/etc/dancer-ircd
-	${SED} -e "s,%PREFIX%,${PREFIX},g" ${FILESDIR}/dancer-ircd.sh \
-		> ${WRKDIR}/dancer-ircd.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/dancer-ircd.sh ${PREFIX}/etc/rc.d/
 	${SED} -e "s,/usr/local/,${PREFIX}/,g" ${PKGMESSAGE}
 .if !defined(NOPORTDOCS)
diff --git a/irc/dancer-ircd/distinfo b/irc/dancer-ircd/distinfo
index 88448358a0cb..0f871768ea4e 100644
--- a/irc/dancer-ircd/distinfo
+++ b/irc/dancer-ircd/distinfo
@@ -1,4 +1,4 @@
-MD5 (dancer-ircd-1.0.32+6p4.tar.gz) = e7d6ab16ceeb1d5c20f1d6f9ddbaaacb
-SIZE (dancer-ircd-1.0.32+6p4.tar.gz) = 653481
+MD5 (dancer-ircd-1.0.35.tar.gz) = da7f212ef5e1e9cca72002114727aaab
+SIZE (dancer-ircd-1.0.35.tar.gz) = 604367
 MD5 (dancer-oper-guide.txt) = IGNORE
 MD5 (dancer-user-guide.txt) = IGNORE
diff --git a/irc/dancer-ircd/files/dancer-ircd.sh b/irc/dancer-ircd/files/dancer-ircd.sh
index 7727bd928822..b9b3e895c097 100644
--- a/irc/dancer-ircd/files/dancer-ircd.sh
+++ b/irc/dancer-ircd/files/dancer-ircd.sh
@@ -1,25 +1,23 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#
+
+# PROVIDE: dancer-ircd
+# KEYWORD: FreeBSD
+
+. %%RC_SUBR%%
+
+name=dancer_ircd
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/dancer-ircd
+pidfile=/var/run/dancer-ircd/dancer-ircd.pid
+required_files=%%PREFIX%%/etc/dancer-ircd/ircd.conf
 
-case "$1" in
-start)
-  if [ -x %PREFIX%/bin/dancer-ircd ]; then
-    su -fm ircd -c %PREFIX%/bin/dancer-ircd && echo ' dancer-ircd'
-  fi
-  ;;
+[ -z "$dancer_ircd_enable" ] && dancer_ircd_enable=NO
+[ -z "$dancer_ircd_user" ] && dancer_ircd_user=ircd
 
-stop)
-  if [ -f /var/run/dancer-ircd.pid ]; then
-    kill `cat /var/run/dancer-ircd.pid`
-  else
-    # oh well
-    killall dancer-ircd
-  fi
-  ;;
+load_rc_config $name
 
-*)
-  echo "usage: $0 {start|stop}" >&2
-  exit 64
-  ;;
-esac
+run_rc_command "$1"
diff --git a/irc/dancer-ircd/files/patch-Werror b/irc/dancer-ircd/files/patch-Werror
new file mode 100644
index 000000000000..ea53855b11f0
--- /dev/null
+++ b/irc/dancer-ircd/files/patch-Werror
@@ -0,0 +1,358 @@
+--- src/channel.c.orig	Fri Feb  6 14:33:55 2004
++++ src/channel.c	Tue Apr 20 00:38:54 2004
+@@ -3894,23 +3894,23 @@
+             {
+               sendto_match_servs(chptr, cptr,
+                                  ":%s SJOIN %lu %s + :@%s", me.name,
+-                                 chptr->channelts, name, sptr->name);
++				(unsigned long)chptr->channelts, name, sptr->name);
+             }                                
+           else
+             sendto_match_servs(chptr, cptr,
+                                ":%s SJOIN %lu %s + :%s", me.name,
+-                               chptr->channelts, name, sptr->name);
++                               (unsigned long)chptr->channelts, name, sptr->name);
+ #else
+           sendto_match_servs(chptr, cptr,
+                              ":%s SJOIN %lu %s + :@%s", me.name,
+-                             chptr->channelts, name, sptr->name);
++                             (unsigned long)chptr->channelts, name, sptr->name);
+ #endif
+         }
+       else if (MyClient(sptr))
+         {
+           sendto_match_servs(chptr, cptr,
+                              ":%s SJOIN %lu %s + :%s", me.name,
+-                             chptr->channelts, name, sptr->name);
++                             (unsigned long)chptr->channelts, name, sptr->name);
+         }
+       else
+         sendto_match_servs(chptr, cptr, ":%s JOIN :%s", sptr->name,
+@@ -4652,7 +4652,7 @@
+       sendto_one(sptr,":%s NOTICE %s :*** Notice -- Wait %.1ld seconds before another knock",
+                  me.name,
+                  sptr->name,
+-                 KNOCK_DELAY - (CurrentTime - sptr->last_knock));
++                 KNOCK_DELAY - ((unsigned long)CurrentTime - sptr->last_knock));
+       return 0;
+     }
+ 
+@@ -4766,9 +4766,9 @@
+               strncpy_irc(chptr->topic_nick, sptr->name, NICKLEN + 1);
+               chptr->topic_time = CurrentTime;
+ #endif
+-              sendto_match_servs(chptr, cptr, ":%s STOPIC %s %s %.1ld %.1ld :%s",
++              sendto_match_servs(chptr, cptr, ":%s STOPIC %s %s %.1lu %.1lu :%s",
+ 				 sptr->name, chptr->chname, sptr->name,
+-				 chptr->topic_time, chptr->channelts,
++				 (unsigned long)chptr->topic_time, (unsigned long)chptr->channelts,
+ 				 chptr->topic);
+               sendto_channel_butserv(chptr, sptr, ":%s TOPIC %s :%s",
+ 				     IsServer(sptr) ? NETWORK_NAME : sptr->name, chptr->chname,
+@@ -5433,9 +5433,9 @@
+     {
+       sendto_channel_butserv(chptr, &me,
+ 			     ":%s NOTICE %s :*** Notice -- TS for %s changed from %lu to 0",
+-			     me.name, chptr->chname, chptr->chname, oldts);
++			     me.name, chptr->chname, chptr->chname, (unsigned long)oldts);
+       sendto_ops_flag(UMODE_SERVNOTICE, "Server %s changing TS on %s from %lu to 0",
+-		      sptr->name,parv[2],oldts);
++		      sptr->name,parv[2],(unsigned long)oldts);
+     }
+ 
+   doesop = (parv[4+args][0] == '@' || parv[4+args][1] == '@');
+@@ -5970,7 +5970,7 @@
+         }
+         sendto_channel_butserv(chptr, &me,
+             ":%s NOTICE %s :*** Notice -- TS for %s changed from %lu to %lu",
+-            me.name, chptr->chname, chptr->chname, oldts, newts);
++            me.name, chptr->chname, chptr->chname, (unsigned long)oldts, (unsigned long)newts);
+     }
+   if (mbuf != modebuf)
+     {
+--- src/client.c.orig	Tue Jul  8 14:41:54 2003
++++ src/client.c	Tue Apr 20 00:40:14 2004
+@@ -604,7 +604,8 @@
+ 		      currenttime - cptr->lasttime);
+ 	  if (IsServer(cptr))
+ 	    logprintf(L_NOTICE, "Ping timeout: %.1lu seconds for %s",
+-		currenttime - cptr->lasttime, cptr->name);
++		(unsigned long)currenttime - (unsigned long)cptr->lasttime,
++		cptr->name);
+ 
+           /* ugh. this is horrible.
+            * but I can get away with this hack because of the
+@@ -1659,10 +1660,11 @@
+       if (sptr->servptr == &me)
+         {
+           sendto_ops_flag(UMODE_SEEROUTING, "%s was connected to %s for %.1ld seconds.  %d/%d sendK/recvK. (%s)",
+-			  sptr->name, (char*) &me.name, CurrentTime - sptr->firsttime,
++			  sptr->name, (char*) &me.name,
++			  (unsigned long)CurrentTime - (unsigned long)sptr->firsttime,
+ 			  sptr->sendK, sptr->receiveK, comment);
+-          logprintf(L_NOTICE, "%s was connected for %.1ld seconds.  %d/%d sendK/recvK. (%s)",
+-              sptr->name, CurrentTime - sptr->firsttime, 
++          logprintf(L_NOTICE, "%s was connected for %.1lu seconds.  %d/%d sendK/recvK. (%s)",
++              sptr->name, (unsigned long)CurrentTime - (unsigned long)sptr->firsttime, 
+               sptr->sendK, sptr->receiveK, comment);
+ 
+               /* Just for paranoia... this shouldn't be necessary if the
+--- src/m_kline.c.orig	Wed Aug 20 04:45:53 2003
++++ src/m_kline.c	Tue Apr 20 01:03:29 2004
+@@ -818,12 +818,12 @@
+ 
+ #ifdef FULL_TIMEOUT_KLINES
+   if(temporary_kline_time)
+-    sendto_local_ops_flag(UMODE_SERVNOTICE, "%s added K-Line for [%s@%s] [%s], expiring at %.1ld (%d minutes)",
++    sendto_local_ops_flag(UMODE_SERVNOTICE, "%s added K-Line for [%s@%s] [%s], expiring at %.1lu (%d minutes)",
+ 			  rcptr ? rcptr->name : sptr->name,
+ 			  user,
+ 			  host,
+ 			  reason ? reason : "No reason",
+-			  aconf->hold, temporary_kline_time);
++			  (unsigned long)aconf->hold, temporary_kline_time);
+   else
+ #endif
+     sendto_local_ops_flag(UMODE_SERVNOTICE, "%s added K-Line for [%s@%s] [%s]",
+--- src/m_pong.c.orig	Tue Jul  8 14:41:55 2003
++++ src/m_pong.c	Tue Apr 20 00:42:21 2004
+@@ -128,7 +128,7 @@
+ 	  time_t ping;
+           sendto_ops_flag_butone(cptr, UMODE_SEEROUTING,
+ 				 "%s acknowledged end of %s burst (%.1lu sec). %u messages in %u kB",
+-				 sptr->name, me.name, CurrentTime - sptr->firsttime,
++				 sptr->name, me.name, (unsigned long)CurrentTime - (unsigned long)sptr->firsttime,
+ 				 sptr->sendM, sptr->sendK);
+ 	  sendto_ops_flag_butflag_butone_hidefrom(cptr, UMODE_SERVNOTICE, UMODE_SEEROUTING,
+ 						  "Burst complete, %s has linked", sptr->name);
+@@ -168,8 +168,8 @@
+ #if 0
+ 	  if (MyConnect(sptr)) /* This should never fail, with all dancer servers */
+ 	    {
+-	      sendto_serv_butone(cptr, ":%s SPINGTIME %s %.1ld", me.name, sptr->name, 
+-				 (sptr->ping_time.tv_sec * 1000000) + sptr->ping_time.tv_usec);
++	      sendto_serv_butone(cptr, ":%s SPINGTIME %s %.1lu", me.name, sptr->name, 
++				 (unsigned long)(sptr->ping_time.tv_sec * 1000000) + (unsigned long)sptr->ping_time.tv_usec);
+ 	    }
+ #endif
+ 	}
+--- src/m_set.c.orig	Tue Jul  8 14:41:55 2003
++++ src/m_set.c	Tue Apr 20 00:42:48 2004
+@@ -466,10 +466,10 @@
+                 }
+               else
+                 {
+-                  sendto_one(sptr, ":%s NOTICE %s :SPLITDELAY is currently %.1li",
++                  sendto_one(sptr, ":%s NOTICE %s :SPLITDELAY is currently %.1lu",
+                              me.name,
+                              parv[0],
+-                             SPLITDELAY/60);
++                             (unsigned long)SPLITDELAY/60);
+                 }
+           return 0;
+           break;
+--- src/m_snick.c.orig	Sun Sep  7 13:49:46 2003
++++ src/m_snick.c	Tue Apr 20 00:43:21 2004
+@@ -93,8 +93,9 @@
+   if (parc > 4)
+     acptr->firsttime = atol(parv[4]);
+ 
+-  sendto_serv_butone(cptr, "SNICK %s %s %s %.1ld", acptr->name,
+-		     acptr->origname, acptr->spoofhost, acptr->firsttime);
++  sendto_serv_butone(cptr, "SNICK %s %s %s %.1lu", acptr->name,
++		     acptr->origname, acptr->spoofhost,
++		     (unsigned long)acptr->firsttime);
+ 
+   return 0;
+ }
+--- src/m_svinfo.c.orig	Tue Jul  8 14:41:55 2003
++++ src/m_svinfo.c	Tue Apr 20 00:45:05 2004
+@@ -133,16 +133,22 @@
+   if (deltat > TS_MAX_DELTA)
+     {
+       sendto_ops_flag(UMODE_SERVNOTICE, 
+-		      "Link %s dropped, excessive TS delta (my TS=%.1ld, their TS=%.1ld, delta=%.1ld)",
+-		      get_client_name(sptr, MASK_IP), CurrentTime, theirtime,deltat);
++		      "Link %s dropped, excessive TS delta (my TS=%.1lu, their TS=%.1lu, delta=%.1lu)",
++		      get_client_name(sptr, MASK_IP),
++		      (unsigned long)CurrentTime,
++		      (unsigned long)theirtime,
++		      (unsigned long)deltat);
+       return exit_client(sptr, sptr, sptr, "Excessive TS delta");
+     }
+ 
+   if (deltat > TS_WARN_DELTA)
+     { 
+       sendto_ops_flag(UMODE_SERVNOTICE, 
+-		      "Link %s notable TS delta (my TS=%.1ld, their TS=%.1ld, delta=%.1ld)",
+-		      get_client_name(sptr, MASK_IP), CurrentTime, theirtime, deltat);
++		      "Link %s notable TS delta (my TS=%.1lu, their TS=%.1lu, delta=%.1lu)",
++		      get_client_name(sptr, MASK_IP),
++		      (unsigned long)CurrentTime,
++		      (unsigned long)theirtime,
++		      (unsigned long)deltat);
+     }
+ 
+   return 0;
+--- src/res.c.orig	Tue Jul  8 14:41:55 2003
++++ src/res.c	Tue Apr 20 00:51:00 2004
+@@ -265,8 +265,8 @@
+  * From bind 8.3, these aren't in earlier versions of bind
+  *
+  */
+-extern u_short  _getshort(const u_char *);
+-extern u_int    _getlong(const u_char *);
++/*extern u_short  _getshort(const u_char *);*/
++/*extern u_int    _getlong(const u_char *);*/
+ /*
+  * int
+  * res_isourserver(ina)
+@@ -503,7 +503,7 @@
+       else {
+         request->sentat = now;
+         request->timeout += request->timeout / 2;
+-        logprintf(L_WARN, "DNS lookup timed out, new timeout %lu, retries %d", request->timeout, request->retries);
++        logprintf(L_WARN, "DNS lookup timed out, new timeout %lu, retries %d", (unsigned long)request->timeout, request->retries);
+         resend_query(request);
+ #ifdef DEBUG
+         Debug((DEBUG_INFO,"r %x now %d retry %d c %x",
+@@ -1715,8 +1715,8 @@
+   if (parv[1] && *parv[1] == 'l') {
+     for(cp = cacheTop; cp; cp = cp->list_next) {
+       hp = &cp->he.h;
+-      sendto_one(sptr, "NOTICE %s :Ex %.1ld ttl %.1ld host %s(%s)",
+-                 parv[0], cp->expireat - CurrentTime, cp->ttl,
++      sendto_one(sptr, "NOTICE %s :Ex %.1lu ttl %.1lu host %s(%s)",
++		 parv[0], (unsigned long)(cp->expireat - CurrentTime), (unsigned long)cp->ttl,
+                  hp->h_name, inetntoa(hp->h_addr));
+       for (i = 0; hp->h_aliases[i]; i++)
+         sendto_one(sptr,"NOTICE %s : %s = %s (CN)",
+--- src/s_debug.c.orig	Tue Jul  8 14:41:56 2003
++++ src/s_debug.c	Tue Apr 20 00:53:00 2004
+@@ -155,10 +155,10 @@
+ 
+ 
+   sendto_one(cptr,
+-	     ":%s %d %s :CPU Secs %ld:%ld User %ld:%ld System %ld:%ld",
+-	     me.name, RPL_STATSDEBUG, nick, secs / 60, secs % 60,
+-	     rus.ru_utime.tv_sec / 60, rus.ru_utime.tv_sec % 60,
+-	     rus.ru_stime.tv_sec / 60, rus.ru_stime.tv_sec % 60);
++	     ":%s %d %s :CPU Secs %lu:%lu User %lu:%lu System %lu:%lu",
++	     me.name, RPL_STATSDEBUG, nick, (unsigned long)secs / 60, (unsigned long)secs % 60,
++	     (unsigned long)rus.ru_utime.tv_sec / 60, (unsigned long)rus.ru_utime.tv_sec % 60,
++	     (unsigned long)rus.ru_stime.tv_sec / 60, (unsigned long)rus.ru_stime.tv_sec % 60);
+   sendto_one(cptr, ":%s %d %s :RSS %ld ShMem %ld Data %ld Stack %ld",
+ 	     me.name, RPL_STATSDEBUG, nick, rus.ru_maxrss,
+ 	     rus.ru_ixrss / rup, rus.ru_idrss / rup, rus.ru_isrss / rup);
+--- src/s_serv.c.orig	Thu Dec  4 04:19:47 2003
++++ src/s_serv.c	Tue Apr 20 00:57:25 2004
+@@ -485,7 +485,7 @@
+   if (IsPerson(acptr))
+     {
+       sendto_one(cptr, "NICK %s %d %lu +%s %s %s %s %s :%s", acptr->name, 
+-                 acptr->hopcount + 1, acptr->tsinfo, umodes_as_string(&acptr->umodes),
++                 acptr->hopcount + 1, (unsigned long)acptr->tsinfo, umodes_as_string(&acptr->umodes),
+                  acptr->username, acptr->host,
+                  acptr->user->server, inetntoa((char *)&acptr->ip.s_addr), acptr->info);
+       {
+@@ -495,8 +495,8 @@
+           sendto_one(cptr, ":%s OPER %s +%s", me.name, acptr->name,
+                      umodes_as_string(&privs));
+       }
+-      sendto_one(cptr, ":%s SNICK %s %s %s %.1ld", me.name, acptr->name,
+-                 acptr->origname, acptr->spoofhost, acptr->firsttime);
++      sendto_one(cptr, ":%s SNICK %s %s %s %.1lu", me.name, acptr->name,
++                 acptr->origname, acptr->spoofhost, (unsigned long)acptr->firsttime);
+       /* Let's propogate AWAY status in the burst as well */
+       if (acptr->user->away)
+         sendto_one(cptr, ":%s AWAY :%s", acptr->name, acptr->user->away);
+@@ -728,7 +728,7 @@
+     ClearCap(cptr, CAP_ZIP);
+ #endif /* ZIP_LINKS */
+ 
+-  sendto_one(cptr,"SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN, CurrentTime);
++  sendto_one(cptr,"SVINFO %d %d 0 :%lu", TS_CURRENT, TS_MIN, (unsigned long)CurrentTime);
+   
+   det_confs_butmask(cptr, CONF_LEAF|CONF_HUB|CONF_NOCONNECT_SERVER);
+   release_client_dns_reply(cptr);
+@@ -872,7 +872,7 @@
+           }
+         else
+           {
+-            sendto_one(cptr, ":%s UNKLINE %s %.1ld", me.name, ukr2->mask, ukr2->placed);
++            sendto_one(cptr, ":%s UNKLINE %s %.1lu", me.name, ukr2->mask, (unsigned long)ukr2->placed);
+             sent_unkline = 1;
+           }
+       }
+@@ -919,9 +919,9 @@
+         send_channel_modes(cptr, chptr);
+ #ifdef TOPIC_INFO
+         if (chptr->topic_time)
+-          sendto_one(cptr,":%s STOPIC %s %s %.1ld %.1ld :%s",
++          sendto_one(cptr,":%s STOPIC %s %s %.1lu %.1lu :%s",
+                      me.name, chptr->chname, chptr->topic_nick,
+-                     chptr->topic_time, chptr->channelts,
++                     (unsigned long)chptr->topic_time, (unsigned long)chptr->channelts,
+                      chptr->topic);
+ #endif
+       }
+@@ -1022,7 +1022,7 @@
+       sendto_one(cptr, ":%s %d %s :%s (%s!%s@%s) Idle: %.1ld",
+                  me.name, RPL_STATSDEBUG, cptr->name, cptr2->name,
+                  (cptr2->serv->by[0] ? cptr2->serv->by : "Remote."), 
+-                 "*", "*", CurrentTime - cptr2->lasttime);
++                 "*", "*", (unsigned long)(CurrentTime - cptr2->lasttime));
+ 
+       /*
+        * NOTE: moving the username and host to the client struct
+--- src/s_stats.c.orig	Tue Jul  8 14:41:56 2003
++++ src/s_stats.c	Tue Apr 20 00:57:41 2004
+@@ -125,7 +125,7 @@
+              me.name, RPL_STATSDEBUG, name,
+              sp->is_ckr, sp->is_cbr, sp->is_skr, sp->is_sbr);
+   sendto_one(cptr, ":%s %d %s :time connected %.1lu %.1lu",
+-             me.name, RPL_STATSDEBUG, name, sp->is_cti, sp->is_sti);
++             me.name, RPL_STATSDEBUG, name, (unsigned long)sp->is_cti, (unsigned long)sp->is_sti);
+ #ifdef FLUD
+   sendto_one(cptr, ":%s %d %s :CTCP Floods Blocked %u",
+              me.name, RPL_STATSDEBUG, name, sp->is_flud);
+--- src/s_user.c.orig	Thu Aug  7 03:36:13 2003
++++ src/s_user.c	Tue Apr 20 00:58:27 2004
+@@ -920,7 +920,7 @@
+   if (!IsHoneypot(sptr))
+     {
+       sendto_serv_butone(cptr, "NICK %s %d %lu +%s %s %s %s %s :%s",
+-                         nick, sptr->hopcount+1, sptr->tsinfo,
++                         nick, sptr->hopcount+1, (unsigned long)sptr->tsinfo,
+                          umodes_as_string(&sptr->umodes),
+                          sptr->username, sptr->host, user->server,
+                          inetntoa((char *)&sptr->ip.s_addr),
+@@ -931,8 +931,8 @@
+        * correct value
+        */
+       if (MyConnect(sptr) && strcmp(sptr->spoofhost, SPOOF_LIMIT_HOST) != 0)
+-        sendto_serv_butone(NULL, "SNICK %s %s %s %.1ld", sptr->name,
+-                           sptr->origname, sptr->spoofhost, sptr->firsttime);
++        sendto_serv_butone(NULL, "SNICK %s %s %s %.1lu", sptr->name,
++                           sptr->origname, sptr->spoofhost, (unsigned long)sptr->firsttime);
+     }
+ 
+   if (sptr->user)
+@@ -1250,7 +1250,7 @@
+                   add_history(sptr,1);
+               
+                   sendto_serv_butone(cptr, ":%s NICK %s :%lu",
+-                                     parv[0], nick, sptr->tsinfo);
++                                     parv[0], nick, (unsigned long)sptr->tsinfo);
+ 		  /* This global message will reset the idle time everywhere, so
+ 		   *  reset the last_sent counter as well
+ 		   */
+@@ -1281,7 +1281,7 @@
+             {
+               add_history(sptr,1);
+               sendto_serv_butone(cptr, ":%s NICK %s :%lu",
+-                                 parv[0], nick, sptr->tsinfo);
++                                 parv[0], nick, (unsigned long)sptr->tsinfo);
+ 	      sptr->user->last_sent = CurrentTime;
+ 
+               sendto_local_ops_flag(UMODE_NCHANGE,
diff --git a/irc/dancer-ircd/files/patch-config.h b/irc/dancer-ircd/files/patch-config.h
index 1d4f0c98c85b..66c33048ffe6 100644
--- a/irc/dancer-ircd/files/patch-config.h
+++ b/irc/dancer-ircd/files/patch-config.h
@@ -1,11 +1,11 @@
---- include/config.h.orig	Wed Sep  3 03:11:17 2003
-+++ include/config.h	Fri Nov 14 06:16:38 2003
-@@ -36,8 +36,8 @@
+--- include/config.h.orig	Sun Feb 15 02:11:26 2004
++++ include/config.h	Tue Apr 20 00:29:14 2004
+@@ -66,8 +66,8 @@
   * system limits. If you know what you are doing, increase them now
   */
  
--#define HARD_FDLIMIT_   4096 /* was 256 */
--#define INIT_MAXCLIENTS 4000 /* was 200 */
+-#define HARD_FDLIMIT_   256 /* was 256 */
+-#define INIT_MAXCLIENTS 200 /* was 200 */
 +#define HARD_FDLIMIT_   512 /* was 256 */
 +#define INIT_MAXCLIENTS 400 /* was 200 */
  
diff --git a/irc/dancer-ircd/files/patch-irc_string.c b/irc/dancer-ircd/files/patch-irc_string.c
index 54c0cf5e44f6..bb43889317b4 100644
--- a/irc/dancer-ircd/files/patch-irc_string.c
+++ b/irc/dancer-ircd/files/patch-irc_string.c
@@ -1,17 +1,14 @@
-This patch prevents ircd from stripping topics etc. of escape
-characters, which is commonly used by Asian languages.
-
---- src/irc_string.c.orig	Sun Apr  7 08:16:04 2002
-+++ src/irc_string.c	Tue Apr 15 23:52:28 2003
-@@ -131,6 +131,7 @@
+--- src/irc_string.c.orig	Tue Jul  8 14:41:54 2003
++++ src/irc_string.c	Tue Apr 20 00:33:19 2004
+@@ -139,6 +139,7 @@
  
  char* strip_colour(char* string)
  {
 +#if 0
    char *c = string;
    char *c2 = string;
-   char *last_non_space = c2;
-@@ -165,6 +166,7 @@
+   char *last_non_space = NULL;
+@@ -173,6 +174,7 @@
    *c2 = '\0';
    if (last_non_space)
      *last_non_space = '\0';
diff --git a/irc/dancer-ircd/files/patch-paths.c b/irc/dancer-ircd/files/patch-paths.c
index 3cef30d4a72c..aa6de659a542 100644
--- a/irc/dancer-ircd/files/patch-paths.c
+++ b/irc/dancer-ircd/files/patch-paths.c
@@ -1,6 +1,6 @@
---- src/paths.c.orig	Tue Jul  8 14:41:55 2003
-+++ src/paths.c	Fri Nov 14 05:26:16 2003
-@@ -64,20 +64,21 @@
+--- src/paths.c.orig	Sat Nov  8 01:28:44 2003
++++ src/paths.c	Tue Apr 20 00:33:19 2004
+@@ -64,20 +64,20 @@
   */
  
  #define DPATH    PREFIX "/"
@@ -13,26 +13,25 @@
 -#define HLBASE   "var/log/dancer-ircd/hash"
 -#define USERLOG  "var/log/dancer-ircd/user.log"
 -#define OPERLOG  "var/log/dancer-ircd/oper.log"
--#define PPATH    "var/run/dancer-ircd.pid"
+-#define PPATH    "var/run/dancer-ircd/dancer-ircd.pid"
 -#define KPATH    "var/lib/dancer-ircd/kline.conf"
 -#define DLPATH   "var/lib/dancer-ircd/dline.conf"
 -#define MXPATH   "var/lib/dancer-ircd/ircd.max"
 -#define DUMPPATH "var/lib/dancer-ircd/dump"
-+
-+#define SPATH    "@@prefix@@/bin/dancer-ircd"
-+#define CPATH    "@@prefix@@/etc/dancer-ircd/ircd.conf"
-+#define MPATH    "@@prefix@@/etc/dancer-ircd/motd"
-+#define HPATH    "@@prefix@@/etc/dancer-ircd/ohelp"
-+#define OPATH    "@@prefix@@/etc/dancer-ircd/omotd"
++#define SPATH    "/usr/local/sbin/dancer-ircd"
++#define CPATH    "/usr/local/etc/dancer-ircd/ircd.conf"
++#define MPATH    "/usr/local/etc/dancer-ircd/motd"
++#define HPATH    "/usr/local/etc/dancer-ircd/ohelp"
++#define OPATH    "/usr/local/etc/dancer-ircd/omotd"
 +#define LPATH    "/var/log/dancer-ircd/ircd.log"
 +#define HLBASE   "/var/log/dancer-ircd/hash"
 +#define USERLOG  "/var/log/dancer-ircd/user.log"
 +#define OPERLOG  "/var/log/dancer-ircd/oper.log"
 +#define PPATH    "/var/run/dancer-ircd/dancer-ircd.pid"
-+#define KPATH    "@@prefix@@/etc/dancer-ircd/kline.conf"
-+#define DLPATH   "@@prefix@@/etc/dancer-ircd/dline.conf"
-+#define MXPATH   "@@prefix@@/etc/dancer-ircd/ircd.max"
-+#define DUMPPATH "@@prefix@@/etc/dancer-ircd/dump"
++#define KPATH    "/usr/local/etc/dancer-ircd/kline.conf"
++#define DLPATH   "/usr/local/etc/dancer-ircd/dline.conf"
++#define MXPATH   "/usr/local/etc/dancer-ircd/ircd.max"
++#define DUMPPATH "/usr/local/etc/dancer-ircd/dump"
  
  const char *work_dir = DPATH;
  const char *config_file = CPATH;
diff --git a/irc/dancer-ircd/pkg-message b/irc/dancer-ircd/pkg-message
index 3e7efeb9052d..3b14e79a5dc1 100644
--- a/irc/dancer-ircd/pkg-message
+++ b/irc/dancer-ircd/pkg-message
@@ -1,8 +1,9 @@
 dancer-ircd has now been installed.
 
-You should now edit /usr/local/etc/dancer-ircd/ircd.conf
-to suit your needs.
-
-You may then start the server by running:
+Please configure /usr/local/etc/dancer-ircd/ircd.conf to suit your
+needs, and you may then start the server by running:
 
 	/usr/local/etc/rc.d/dancer-ircd.sh start
+
+To make it automatically run on (the next) startup, you must add
+``dancer_ircd_enable=YES'' to /etc/rc.conf.
diff --git a/irc/dancer-ircd/pkg-plist b/irc/dancer-ircd/pkg-plist
index 517ce87497d0..5baf7b760250 100644
--- a/irc/dancer-ircd/pkg-plist
+++ b/irc/dancer-ircd/pkg-plist
@@ -1,4 +1,4 @@
-bin/dancer-ircd
+sbin/dancer-ircd
 @unexec if cmp -s %D/etc/dancer-ircd/ircd.conf %D/etc/dancer-ircd/ircd.conf.sample; then rm -f %D/etc/dancer-ircd/ircd.conf; fi
 etc/dancer-ircd/ircd.conf.sample
 @exec if [ ! -f %B/ircd.conf ]; then cp %B/%f %B/ircd.conf; fi