From samy@kerneled.com  Tue Oct 28 18:58:38 2003
Return-Path: <samy@kerneled.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 13B1D16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Oct 2003 18:58:38 -0800 (PST)
Received: from essence.sdodson.com (67-50-89-87.br2.tbr.ga.frontiernet.net [67.50.89.87])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9EAC243F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Oct 2003 18:58:33 -0800 (PST)
	(envelope-from samy@kerneled.com)
Received: from beastie.freebsd.local (dial36-102.sbm.net.sa [212.46.36.102])
	by essence.sdodson.com (8.12.10/8.12.10) with ESMTP id h9SCQLOk003779
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 28 Oct 2003 12:26:41 GMT
	(envelope-from samy@kerneled.com)
Message-Id: 1067343961@beastie.freebsd.local
Date: Tue, 28 Oct 2003 15:26:43 +0300
From: "Samy Al Bahra" <samy@kerneled.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Fix irc/darkbot build on 5.X
X-Send-Pr-Version: gtk-send-pr 0.1 
X-GNATS-Notify:

>Number:         58670
>Category:       ports
>Synopsis:       Fix irc/darkbot build on 5.X
>Confidential:   no
>Severity:       critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 28 19:00:27 PST 2003
>Closed-Date:    Sun Nov 16 11:58:42 PST 2003
>Last-Modified:  Sun Nov 16 11:58:42 PST 2003
>Originator:     Samy Al Bahra
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
Kerneled 
>Environment:


System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003     samy@beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386  


>Description:


irc/darkbot does not build on 5.X
systems due to multiline unterminated
string literals. The patch that follows
fixes this.


>How-To-Repeat:


Build on a 5.X system.


>Fix:


diff -ruN darkbot/Makefile /tmp/darkbot/Makefile
--- darkbot/Makefile	Tue Oct 28 15:24:05 2003
+++ /tmp/darkbot/Makefile	Tue Oct 28 15:23:18 2003
@@ -24,13 +24,7 @@
 GNU_CONFIGURE=	yes
 IS_INTERACTIVE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 pre-install:
 	${CAT} ${MASTERDIR}/pkg-plist | ${SED} -e "s,/usr/local,${LOCALBASE},g" > ${PLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN darkbot/files/patch-darkbot.c /tmp/darkbot/files/patch-darkbot.c
--- darkbot/files/patch-darkbot.c	Thu Jan  1 03:00:00 1970
+++ /tmp/darkbot/files/patch-darkbot.c	Tue Oct 28 15:22:56 2003
@@ -0,0 +1,29 @@
+--- darkbot.c.orig	Tue Oct 28 15:22:21 2003
++++ darkbot.c	Tue Oct 28 15:22:21 2003
+@@ -3476,8 +3476,7 @@
+           strlwr (s2);
+           if (*s2 == '~') {
+             S
+-              ("PRIVMSG %s :%s, rdb files can only be called from the data of a topic, they cannot be used in the
+- topic itself.\n",
++              ("PRIVMSG %s :%s, rdb files can only be called from the data of a topic, they cannot be used in the topic itself.\n",
+                target, source);
+             R;
+           }
+@@ -5026,14 +5025,12 @@
+ #else
+   if (pre_CLIENTS == 0 || pre_CLIENTS == L_CLIENTS) {
+     S
+-      ("PRIVMSG %s :\1ACTION \37(\37%2d servers\37)\37: %2d opers + \2%4d\2 users \37(\37%s%% %5d global \2!\2 %3
+-ld avg\37)\37\1\n",
++      ("PRIVMSG %s :\1ACTION \37(\37%2d servers\37)\37: %2d opers + \2%4d\2 users \37(\37%s%% %5d global \2!\2 %3ld avg\37)\37\1\n",
+        CHAN, NUM_SERV, IRCOPS, L_CLIENTS, tmp,
+        G_USERS, G_USERS / NUM_SERV);}
+   else
+     S
+-      ("PRIVMSG %s :\1ACTION \37(\37%2d servers\37)\37: %2d opers + \2%4d\2 users [\37%c%2d\37] \37(\37%s%% %5d g
+-lobal \2!\2 %3ld avg\37)\37\1\n",
++      ("PRIVMSG %s :\1ACTION \37(\37%2d servers\37)\37: %2d opers + \2%4d\2 users [\37%c%2d\37] \37(\37%s%% %5d global \2!\2 %3ld avg\37)\37\1\n",
+        CHAN, NUM_SERV, IRCOPS, L_CLIENTS,
+        Stat[0], pre_CLIENTS, tmp, G_USERS, G_USERS / NUM_SERV);
+ #endif



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sun Nov 16 11:16:02 PST 2003 
Responsible-Changed-Why:  
I'll take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58670 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sun Nov 16 11:58:29 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=58670 
>Unformatted:
