summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authortron <tron>2006-04-28 13:23:25 +0000
committertron <tron>2006-04-28 13:23:25 +0000
commit13452fe835e9554b53f59b9be7848997a78f129a (patch)
tree0d12b99e493c5cda6259816241e6333aeca685d4 /chat
parent7543a6acf528fd66940665bdfe9d076fb5a743c5 (diff)
downloadpkgsrc-13452fe835e9554b53f59b9be7848997a78f129a.tar.gz
Don't insert "[] " into every stored message if "log_timestamp" is
set "no". Bump package revision because of this fix.
Diffstat (limited to 'chat')
-rw-r--r--chat/dircproxy-devel/Makefile4
-rw-r--r--chat/dircproxy-devel/distinfo3
-rw-r--r--chat/dircproxy-devel/patches/patch-ad51
3 files changed, 55 insertions, 3 deletions
diff --git a/chat/dircproxy-devel/Makefile b/chat/dircproxy-devel/Makefile
index 3efea7a44e8..04c13f09cec 100644
--- a/chat/dircproxy-devel/Makefile
+++ b/chat/dircproxy-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/04/27 16:36:17 tron Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/28 13:23:25 tron Exp $
DISTNAME= dircproxy-1.2.0-beta
PKGNAME= ${DISTNAME:S/-beta//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= chat
MASTER_SITES= http://dircproxy.securiweb.net/pub/1.2/
EXTRACT_SUFX= .tar.bz
diff --git a/chat/dircproxy-devel/distinfo b/chat/dircproxy-devel/distinfo
index 0b90385ca93..8326db04e12 100644
--- a/chat/dircproxy-devel/distinfo
+++ b/chat/dircproxy-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/04/27 16:36:17 tron Exp $
+$NetBSD: distinfo,v 1.5 2006/04/28 13:23:25 tron Exp $
SHA1 (dircproxy-1.2.0-beta.tar.bz) = d0979ad3711184fa581fe413c9e3ea156660ac56
RMD160 (dircproxy-1.2.0-beta.tar.bz) = 08016210b245872f7c071e25d067f7ef1e97f17d
@@ -6,3 +6,4 @@ Size (dircproxy-1.2.0-beta.tar.bz) = 312912 bytes
SHA1 (patch-aa) = 59870074b86f1150f904e10269c654719b506f29
SHA1 (patch-ab) = c0e8706c0f1bb7a2c981d1140d1b1deb105c601b
SHA1 (patch-ac) = c07df4e100c82e935c48b722da702e562def135b
+SHA1 (patch-ad) = 818d7f0ca0590f40dc2e46926236ba033cadbf0d
diff --git a/chat/dircproxy-devel/patches/patch-ad b/chat/dircproxy-devel/patches/patch-ad
new file mode 100644
index 00000000000..202baa450b9
--- /dev/null
+++ b/chat/dircproxy-devel/patches/patch-ad
@@ -0,0 +1,51 @@
+$NetBSD: patch-ad,v 1.1 2006/04/28 13:23:25 tron Exp $
+
+--- src/irc_log.c.orig 2006-02-18 22:39:32.000000000 +0000
++++ src/irc_log.c 2006-04-28 14:06:01.000000000 +0100
+@@ -58,7 +58,7 @@
+
+
+ /* Log time format for strftime(3) */
+-#define LOG_TIME_FORMAT "%H:%M"
++#define LOG_TIME_FORMAT "[%H:%M] "
+
+ /* User log time format */
+ #define LOG_USER_TIME_FORMAT "[%d %b %H:%M] "
+@@ -952,13 +952,13 @@
+ diff = now - when;
+
+ if (diff < 82800L) { /* Within 23 hours [hh:mm] */
+- strftime(tbuf, sizeof(tbuf), "%H:%M", localtime(&when));
++ strftime(tbuf, sizeof(tbuf), "[%H:%M] ", localtime(&when));
+ } else if (diff < 518400L) { /* Within 6 days [day hh:mm] */
+- strftime(tbuf, sizeof(tbuf), "%a %H:%M", localtime(&when));
++ strftime(tbuf, sizeof(tbuf), "[%a %H:%M] ", localtime(&when));
+ } else if (diff < 25920000L) { /* Within 300 days [d mon] */
+- strftime(tbuf, sizeof(tbuf), "%d %b", localtime(&when));
++ strftime(tbuf, sizeof(tbuf), "[%d %b] ", localtime(&when));
+ } else { /* Otherwise [d mon yyyy] */
+- strftime(tbuf, sizeof(tbuf), "%d %b %Y", localtime(&when));
++ strftime(tbuf, sizeof(tbuf), "[%d %b %Y] ", localtime(&when));
+ }
+ } else {
+ strftime(tbuf, sizeof(tbuf), LOG_TIME_FORMAT, localtime(&when));
+@@ -988,15 +988,15 @@
+
+ /* Send the line */
+ if (event == IRC_LOG_MSG) {
+- net_send(p->client_sock, ":%s PRIVMSG %s :[%s] %s\r\n", frm, to, tbuf, msg);
++ net_send(p->client_sock, ":%s PRIVMSG %s :%s%s\r\n", frm, to, tbuf, msg);
+ } else if (event == IRC_LOG_ACTION) {
+- net_send(p->client_sock, ":%s PRIVMSG %s :\001ACTION [%s] %s\001\r\n", frm, to, tbuf, msg);
++ net_send(p->client_sock, ":%s PRIVMSG %s :\001ACTION %s%s\001\r\n", frm, to, tbuf, msg);
+ } else if (event == IRC_LOG_CTCP) {
+- net_send(p->client_sock, ":%s PRIVMSG %s :\001%s [%s]%s%s\001\r\n", src, to, eventtext, tbuf, (strlen(msg) ? " " : ""), msg);
++ net_send(p->client_sock, ":%s PRIVMSG %s :\001%s %s%s%s\001\r\n", src, to, eventtext, tbuf, (strlen(msg) ? " " : ""), msg);
+ } else if (event == IRC_LOG_NOTICE) {
+ ircclient_send_notice(p, "%s", msg);
+ } else {
+- net_send(p->client_sock, ":%s PRIVMSG %s :[%s] %s\r\n", src, to, tbuf, msg);
++ net_send(p->client_sock, ":%s PRIVMSG %s :%s%s\r\n", src, to, tbuf, msg);
+ }
+
+ free(ll);