From owner-svn-ports-head@freebsd.org Sun Nov 6 21:08:30 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B27AC34AB0; Sun, 6 Nov 2016 21:08:30 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 480F319E; Sun, 6 Nov 2016 21:08:30 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA6L8TO6063536; Sun, 6 Nov 2016 21:08:29 GMT (envelope-from hrs@FreeBSD.org) Received: (from hrs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA6L8TPj063533; Sun, 6 Nov 2016 21:08:29 GMT (envelope-from hrs@FreeBSD.org) Message-Id: <201611062108.uA6L8TPj063533@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hrs set sender to hrs@FreeBSD.org using -f From: Hiroki Sato Date: Sun, 6 Nov 2016 21:08:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425582 - in head/irc/icbirc: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Nov 2016 21:08:30 -0000 Author: hrs Date: Sun Nov 6 21:08:29 2016 New Revision: 425582 URL: https://svnweb.freebsd.org/changeset/ports/425582 Log: Update to 2.1. PR: 214262 Submitted by: Dmitrij D. Czarkoff Deleted: head/irc/icbirc/files/patch-icbirc.c head/irc/icbirc/files/patch-irc.c Modified: head/irc/icbirc/Makefile head/irc/icbirc/distinfo head/irc/icbirc/files/patch-icb.c Modified: head/irc/icbirc/Makefile ============================================================================== --- head/irc/icbirc/Makefile Sun Nov 6 20:58:30 2016 (r425581) +++ head/irc/icbirc/Makefile Sun Nov 6 21:08:29 2016 (r425582) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= icbirc -PORTVERSION= 1.8 -PORTREVISION= 1 +PORTVERSION= 2.1 CATEGORIES= irc MASTER_SITES= http://www.benzedrine.cx/ @@ -15,9 +14,10 @@ LICENSE_FILE= ${FILESDIR}/COPYING USES= uidfix MAKE_ENV= BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man" -WRKSRC= ${WRKDIR}/${PORTNAME} - PLIST_FILES= bin/icbirc \ man/man8/icbirc.8.gz +post-patch: + ${REINPLACE_CMD} -e '/^static const char rcsid/d' ${WRKSRC}/*.c + .include Modified: head/irc/icbirc/distinfo ============================================================================== --- head/irc/icbirc/distinfo Sun Nov 6 20:58:30 2016 (r425581) +++ head/irc/icbirc/distinfo Sun Nov 6 21:08:29 2016 (r425582) @@ -1,2 +1,3 @@ -SHA256 (icbirc-1.8.tar.gz) = ebc4c2482ac531149874ee77c188f6adcf509862ca2b600e9fe5057f555ecd92 -SIZE (icbirc-1.8.tar.gz) = 11061 +TIMESTAMP = 1478423682 +SHA256 (icbirc-2.1.tar.gz) = 6839344d93c004da97ec6bb5d805a1db7e0a79efc3870445788043627162bbb1 +SIZE (icbirc-2.1.tar.gz) = 11257 Modified: head/irc/icbirc/files/patch-icb.c ============================================================================== --- head/irc/icbirc/files/patch-icb.c Sun Nov 6 20:58:30 2016 (r425581) +++ head/irc/icbirc/files/patch-icb.c Sun Nov 6 21:08:29 2016 (r425582) @@ -1,16 +1,14 @@ ---- icb.c.orig 2004-11-19 06:14:28.000000000 +0900 -+++ icb.c 2014-05-17 02:34:25.000000000 +0900 -@@ -30,7 +30,9 @@ +--- icb.c.orig 2015-08-21 19:01:12 UTC ++++ icb.c +@@ -30,7 +30,6 @@ * */ -+#if 0 - static const char rcsid[] = "$Id: icb.c,v 1.15 2004/11/18 21:14:28 dhartmei Exp $"; -+#endif +-static const char rcsid[] = "$Id: icb.c,v 1.3 2015/08/21 19:01:12 dhartmei Exp $"; #include #include -@@ -40,8 +42,8 @@ +@@ -40,8 +39,8 @@ static const char rcsid[] = "$Id: icb.c, extern int sync_write(int, const char *, int); @@ -21,7 +19,7 @@ static void icb_ico(int, const char *); static void icb_iwl(int, const char *, const char *, long, long, const char *, const char *); -@@ -108,7 +110,7 @@ +@@ -109,7 +108,7 @@ static unsigned off; */ void @@ -30,7 +28,7 @@ { while (**s && strchr(skip, **s) != NULL) (*s)++; -@@ -149,7 +151,7 @@ +@@ -164,7 +163,7 @@ icb_recv(const char *buf, unsigned len, } static unsigned char @@ -39,7 +37,7 @@ { unsigned char i = 0, j = 0, k = 0; -@@ -175,10 +177,10 @@ +@@ -190,10 +189,10 @@ icb_args(const char *data, unsigned char } static void @@ -52,7 +50,7 @@ unsigned char i, j; char s[8192]; -@@ -254,7 +256,7 @@ +@@ -269,7 +268,7 @@ icb_cmd(const char *cmd, unsigned char l char old_nick[256], new_nick[256]; scan(&a, old_nick, sizeof(old_nick), " ", " "); @@ -61,7 +59,7 @@ return; a += 21; scan(&a, new_nick, sizeof(new_nick), " ", " "); -@@ -268,7 +270,7 @@ +@@ -283,7 +282,7 @@ icb_cmd(const char *cmd, unsigned char l char nick[256], topic[256]; scan(&a, nick, sizeof(nick), " ", " "); @@ -70,7 +68,7 @@ return; a += 23; scan(&a, topic, sizeof(topic), "", "\""); -@@ -279,13 +281,13 @@ +@@ -294,13 +293,13 @@ icb_cmd(const char *cmd, unsigned char l char old_mod[256], new_mod[256]; scan(&a, old_mod, sizeof(old_mod), " ", " "); @@ -86,7 +84,7 @@ snprintf(s, sizeof(s), ":%s MODE %s +o %s\r\n", icb_hostid, irc_channel, old_mod); -@@ -297,7 +299,7 @@ +@@ -312,7 +311,7 @@ icb_cmd(const char *cmd, unsigned char l char nick[256]; scan(&a, nick, sizeof(nick), " ", " "); @@ -95,7 +93,7 @@ return; snprintf(s, sizeof(s), ":%s KICK %s %s :booted\r\n", icb_moderator, irc_channel, nick); -@@ -508,7 +510,7 @@ +@@ -523,7 +522,7 @@ icb_send_openmsg(int fd, const char *msg cmd[off++] = 0; cmd[0] = off - 1; /* cmd[0] <= MAX_MSG_SIZE */ @@ -104,7 +102,7 @@ } } -@@ -533,7 +535,7 @@ +@@ -548,7 +547,7 @@ icb_send_privmsg(int fd, const char *nic cmd[off++] = 0; cmd[0] = off - 1; /* cmd[0] <= MAX_MSG_SIZE */