Index: head/irc/icbirc/Makefile
===================================================================
--- head/irc/icbirc/Makefile	(revision 527916)
+++ head/irc/icbirc/Makefile	(revision 527917)
@@ -1,25 +1,20 @@
 # Created by: hrs
 # $FreeBSD$
 
 PORTNAME=	icbirc
 PORTVERSION=	2.1
 CATEGORIES=	irc
-MASTER_SITES=	http://www.benzedrine.cx/
+MASTER_SITES=	http://www.benzedrine.ch/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Proxy IRC client and ICB server
 
-BROKEN=		unfetchable
-
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${FILESDIR}/COPYING
 
 USES=		uidfix
 MAKE_ENV=	BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man"
 PLIST_FILES=	bin/icbirc \
 		man/man8/icbirc.8.gz
-
-post-patch:
-	${REINPLACE_CMD} -e '/^static const char rcsid/d' ${WRKSRC}/*.c
 
 .include <bsd.port.mk>
Index: head/irc/icbirc/files/patch-icb.c
===================================================================
--- head/irc/icbirc/files/patch-icb.c	(revision 527916)
+++ head/irc/icbirc/files/patch-icb.c	(revision 527917)
@@ -1,113 +1,115 @@
 --- icb.c.orig	2015-08-21 19:01:12 UTC
 +++ icb.c
-@@ -30,7 +30,6 @@
+@@ -30,7 +30,9 @@
   *
   */
  
--static const char rcsid[] = "$Id: icb.c,v 1.3 2015/08/21 19:01:12 dhartmei Exp $";
++#if 0
+ static const char rcsid[] = "$Id: icb.c,v 1.3 2015/08/21 19:01:12 dhartmei Exp $";
++#endif
  
  #include <stdio.h>
  #include <stdlib.h>
-@@ -40,8 +39,8 @@ static const char rcsid[] = "$Id: icb.c,
+@@ -40,8 +42,8 @@ static const char rcsid[] = "$Id: icb.c,v 1.3 2015/08/
  
  extern int	 sync_write(int, const char *, int);
  
 -static unsigned char	 icb_args(const char *, unsigned char, char [255][255]);
 -static void		 icb_cmd(const char *, unsigned char, int, int);
 +static unsigned char	 icb_args(const unsigned char *, unsigned char, char [255][255]);
 +static void		 icb_cmd(const unsigned char *, unsigned char, int, int);
  static void		 icb_ico(int, const char *);
  static void		 icb_iwl(int, const char *, const char *, long,
  			    long, const char *, const char *);
-@@ -109,7 +108,7 @@ static unsigned off;
+@@ -109,7 +111,7 @@ static unsigned off;
   */
  
  void
 -scan(const char **s, char *d, size_t siz, const char *skip, const char *term)
 +scan(const unsigned char **s, char *d, size_t siz, const char *skip, const char *term)
  {
  	while (**s && strchr(skip, **s) != NULL)
  		(*s)++;
-@@ -164,7 +163,7 @@ icb_recv(const char *buf, unsigned len, 
+@@ -164,7 +166,7 @@ icb_recv(const char *buf, unsigned len, int fd, int se
  }
  
  static unsigned char
 -icb_args(const char *data, unsigned char len, char args[255][255])
 +icb_args(const unsigned char *data, unsigned char len, char args[255][255])
  {
  	unsigned char i = 0, j = 0, k = 0;
  
-@@ -190,10 +189,10 @@ icb_args(const char *data, unsigned char
+@@ -190,10 +192,10 @@ icb_args(const char *data, unsigned char len, char arg
  }
  
  static void
 -icb_cmd(const char *cmd, unsigned char len, int fd, int server_fd)
 +icb_cmd(const unsigned char *cmd, unsigned char len, int fd, int server_fd)
  {
  	char args[255][255];
 -	const char *a = args[1];
 +	const unsigned char *a = (unsigned char *)args[1];
  	unsigned char i, j;
  	char s[8192];
  
-@@ -269,7 +268,7 @@ icb_cmd(const char *cmd, unsigned char l
+@@ -269,7 +271,7 @@ icb_cmd(const char *cmd, unsigned char len, int fd, in
  			char old_nick[256], new_nick[256];
  
  			scan(&a, old_nick, sizeof(old_nick), " ", " ");
 -			if (strncmp(a, " changed nickname to ", 21))
 +			if (strncmp((const char *)a, " changed nickname to ", 21))
  				return;
  			a += 21;
  			scan(&a, new_nick, sizeof(new_nick), " ", " ");
-@@ -283,7 +282,7 @@ icb_cmd(const char *cmd, unsigned char l
+@@ -283,7 +285,7 @@ icb_cmd(const char *cmd, unsigned char len, int fd, in
  			char nick[256], topic[256];
  
  			scan(&a, nick, sizeof(nick), " ", " ");
 -			if (strncmp(a, " changed the topic to \"", 23))
 +			if (strncmp((const char *)a, " changed the topic to \"", 23))
  				return;
  			a += 23;
  			scan(&a, topic, sizeof(topic), "", "\"");
-@@ -294,13 +293,13 @@ icb_cmd(const char *cmd, unsigned char l
+@@ -294,13 +296,13 @@ icb_cmd(const char *cmd, unsigned char len, int fd, in
  			char old_mod[256], new_mod[256];
  
  			scan(&a, old_mod, sizeof(old_mod), " ", " ");
 -			if (!strncmp(a, " has passed moderation to ", 26)) {
 +			if (!strncmp((const char *)a, " has passed moderation to ", 26)) {
  				a += 26;
  				scan(&a, new_mod, sizeof(new_mod), " ", " ");
  				snprintf(s, sizeof(s),
  				    ":%s MODE %s -o+o %s %s\r\n",
  				    old_mod, irc_channel, old_mod, new_mod);
 -			} else if (!strcmp(a, " is now mod.")) {
 +			} else if (!strcmp((const char *)a, " is now mod.")) {
  				snprintf(s, sizeof(s),
  				    ":%s MODE %s +o %s\r\n",
  				    icb_hostid, irc_channel, old_mod);
-@@ -312,7 +311,7 @@ icb_cmd(const char *cmd, unsigned char l
+@@ -312,7 +314,7 @@ icb_cmd(const char *cmd, unsigned char len, int fd, in
  			char nick[256];
  
  			scan(&a, nick, sizeof(nick), " ", " ");
 -			if (strcmp(a, " was booted."))
 +			if (strcmp((const char *)a, " was booted."))
  				return;
  			snprintf(s, sizeof(s), ":%s KICK %s %s :booted\r\n",
  			    icb_moderator, irc_channel, nick);
-@@ -523,7 +522,7 @@ icb_send_openmsg(int fd, const char *msg
+@@ -523,7 +525,7 @@ icb_send_openmsg(int fd, const char *msg)
  		cmd[off++] = 0;
  		cmd[0] = off - 1;
  		/* cmd[0] <= MAX_MSG_SIZE */
 -		sync_write(fd, cmd, off);
 +		sync_write(fd, (const char *)cmd, off);
  	}
  }
  
-@@ -548,7 +547,7 @@ icb_send_privmsg(int fd, const char *nic
+@@ -548,7 +550,7 @@ icb_send_privmsg(int fd, const char *nick, const char 
  		cmd[off++] = 0;
  		cmd[0] = off - 1;
  		/* cmd[0] <= MAX_MSG_SIZE */
 -		sync_write(fd, cmd, off);
 +		sync_write(fd, (const char *)cmd, off);
  	}
  }
  
Index: head/irc/icbirc/files/patch-icbirc.c
===================================================================
--- head/irc/icbirc/files/patch-icbirc.c	(nonexistent)
+++ head/irc/icbirc/files/patch-icbirc.c	(revision 527917)
@@ -0,0 +1,12 @@
+--- icbirc.c.orig	2016-04-25 08:17:01 UTC
++++ icbirc.c
+@@ -30,7 +30,9 @@
+  *
+  */
+ 
++#if 0
+ static const char rcsid[] = "$Id: icbirc.c,v 1.3 2016/04/25 08:17:01 dhartmei Exp $";
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>

Property changes on: head/irc/icbirc/files/patch-icbirc.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/irc/icbirc/files/patch-irc.c
===================================================================
--- head/irc/icbirc/files/patch-irc.c	(nonexistent)
+++ head/irc/icbirc/files/patch-irc.c	(revision 527917)
@@ -0,0 +1,12 @@
+--- irc.c.orig	2015-08-20 17:29:16 UTC
++++ irc.c
+@@ -30,7 +30,9 @@
+  *
+  */
+ 
++#if 0
+ static const char rcsid[] = "$Id: irc.c,v 1.2 2015/08/20 17:29:16 dhartmei Exp $";
++#endif
+ 
+ #include <stdarg.h>
+ #include <stdio.h>

Property changes on: head/irc/icbirc/files/patch-irc.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/irc/icbirc/pkg-descr
===================================================================
--- head/irc/icbirc/pkg-descr	(revision 527916)
+++ head/irc/icbirc/pkg-descr	(revision 527917)
@@ -1,9 +1,9 @@
 icbirc is a proxy that allows to connect an IRC client to an ICB server.
 The proxy accepts client connections, connects to the server, and for-
 wards data between those two connections.
 
 Commands from the IRC client are translated to ICB commands and forwarded
 to the ICB server. Messages from the ICB server are translated to IRC
 messages and forwarded to the IRC client.
 
-WWW: http://www.benzedrine.cx/icbirc.html
+WWW: http://www.benzedrine.ch/icbirc.html