- Fix build with clang

- Trim header

PR:		175036
Submitted by:	Ports Fury

15 files changed, 182 insertions, 8 deletions

diff --git a/net-im/icb/Makefile b/net-im/icb/Makefile
index 28db85bc7a38..06a4bfa8c9e8 100644
--- a/net-im/icb/Makefile
+++ b/net-im/icb/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:  icb
-# Date created:			  Tue Feb 03, 1998
-# Whom:				  David O'Brien (obrien@NUXI.ucdavis.edu)
-#
+# Created by: David O'Brien (obrien@NUXI.ucdavis.edu)
 # $FreeBSD$
-#
 
 PORTNAME=	icb
 PORTVERSION=	5.1.0
@@ -18,6 +13,7 @@ COMMENT=	Internet CB - a mostly-defunct chat client
 
 USE_TK_BUILD=	yes
 USE_TK=		yes
+USE_READLINE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tclinclude=${TCL_INCLUDEDIR} \
 		--with-tcllib=${LOCALBASE}/lib
@@ -27,11 +23,13 @@ PORTEXAMPLES=	bartender confuse echofunctions sample.icbrc
 PLIST_FILES=	bin/icb %%DATADIR%%/icbserverdb
 PLIST_DIRS=	%%DATADIR%%
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icb/icb ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/icbserverdb ${DATADIR}
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${EXAMPLESDIR}
diff --git a/net-im/icb/files/patch-icb::c_log.c b/net-im/icb/files/patch-icb::c_log.c
index c8945448ce85..2e3dcdb5b338 100644
--- a/net-im/icb/files/patch-icb::c_log.c
+++ b/net-im/icb/files/patch-icb::c_log.c
@@ -1,6 +1,16 @@
 --- icb/c_log.c.orig	Sat May 11 23:59:42 2002
 +++ icb/c_log.c	Sun May 12 00:00:20 2002
-@@ -30,7 +30,8 @@
+@@ -7,6 +7,9 @@
+ #include "icb.h"
+ #include "externs.h"
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
+ #ifdef HAVE_TIME_H
+ #include <time.h>
+ #endif
+@@ -30,7 +33,8 @@
  	time_t time();
  	struct tm *t, *localtime();
  	time_t clock;
diff --git a/net-im/icb/files/patch-icb__c_time.c b/net-im/icb/files/patch-icb__c_time.c
new file mode 100644
index 000000000000..1783bd1fcc45
--- /dev/null
+++ b/net-im/icb/files/patch-icb__c_time.c
@@ -0,0 +1,11 @@
+--- icb/c_time.c.orig	2000-12-15 12:21:02.000000000 +0900
++++ icb/c_time.c	2012-10-25 18:28:19.000000000 +0900
+@@ -4,7 +4,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+-#ifdef STRING_H
++#ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
+ #ifdef HAVE_TIME_H
diff --git a/net-im/icb/files/patch-icb__c_usage.c b/net-im/icb/files/patch-icb__c_usage.c
new file mode 100644
index 000000000000..f092b9df5ef3
--- /dev/null
+++ b/net-im/icb/files/patch-icb__c_usage.c
@@ -0,0 +1,13 @@
+--- icb/c_usage.c.orig	2000-10-02 20:25:42.000000000 +0900
++++ icb/c_usage.c	2012-10-25 18:29:43.000000000 +0900
+@@ -6,6 +6,10 @@
+ #include "icb.h"
+ #include "externs.h"
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ int
+ c_usage (ARGV_TCL)
+ {
diff --git a/net-im/icb/files/patch-icb__main.c b/net-im/icb/files/patch-icb__main.c
new file mode 100644
index 000000000000..980a5445fefd
--- /dev/null
+++ b/net-im/icb/files/patch-icb__main.c
@@ -0,0 +1,11 @@
+--- icb/main.c.orig	2000-12-12 16:02:07.000000000 +0900
++++ icb/main.c	2012-10-25 18:18:39.000000000 +0900
+@@ -279,7 +279,7 @@
+ #endif
+ 		readlineinit();
+ 		if (restrictflg && !gv.restricted)
+-			restrict(); 
++			icb_restrict(); 
+ 	}
+ 
+ 	/* try to connect to port - if it fails, start server if we are on */
diff --git a/net-im/icb/files/patch-icb__oset.c b/net-im/icb/files/patch-icb__oset.c
new file mode 100644
index 000000000000..f1f53379b1ea
--- /dev/null
+++ b/net-im/icb/files/patch-icb__oset.c
@@ -0,0 +1,20 @@
+--- icb/oset.c.orig	2000-12-15 12:21:03.000000000 +0900
++++ icb/oset.c	2012-10-25 18:15:16.000000000 +0900
+@@ -61,7 +61,7 @@
+ 
+ 
+ void
+-restrict(void)
++icb_restrict(void)
+ {
+ 	gv.restricted = 1;
+ 	tclrestrict();
+@@ -91,7 +91,7 @@
+ 		if (gv.restricted)
+ 			TRETURNERR("oset: restricted mode can't be reset")
+ 		else {
+-			restrict();
++			icb_restrict();
+ 			return(TCL_OK);
+ 		}
+ 	}
diff --git a/net-im/icb/files/patch-icb__parse.c b/net-im/icb/files/patch-icb__parse.c
new file mode 100644
index 000000000000..1fd2bf03fbe2
--- /dev/null
+++ b/net-im/icb/files/patch-icb__parse.c
@@ -0,0 +1,13 @@
+--- icb/parse.c.orig	2000-12-15 13:29:18.000000000 +0900
++++ icb/parse.c	2012-10-25 18:30:39.000000000 +0900
+@@ -6,6 +6,10 @@
+ #include "icb.h"
+ #include "externs.h"
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ extern Tcl_Interp *interp;
+ char *nextword();
+ 
diff --git a/net-im/icb/files/patch-icb__protos.h b/net-im/icb/files/patch-icb__protos.h
new file mode 100644
index 000000000000..d7f2b84d17b4
--- /dev/null
+++ b/net-im/icb/files/patch-icb__protos.h
@@ -0,0 +1,11 @@
+--- icb/protos.h.orig	2000-12-15 12:21:04.000000000 +0900
++++ icb/protos.h	2012-10-25 18:14:24.000000000 +0900
+@@ -171,7 +171,7 @@
+ void readlineinit (void);
+ 
+ /* oset.c */
+-void restrict (void);
++void icb_restrict (void);
+ 
+ /* send.c */
+ void send_command (char* cmd, char* arg);
diff --git a/net-im/icb/files/patch-icb__s_admin.c b/net-im/icb/files/patch-icb__s_admin.c
new file mode 100644
index 000000000000..b341134d141e
--- /dev/null
+++ b/net-im/icb/files/patch-icb__s_admin.c
@@ -0,0 +1,13 @@
+--- icb/s_admin.c.orig	2000-10-02 20:25:49.000000000 +0900
++++ icb/s_admin.c	2012-10-25 18:31:57.000000000 +0900
+@@ -6,6 +6,10 @@
+ #include "icb.h"
+ #include "externs.h"
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ int
+ s_admin (ARGV_TCL)
+ {
diff --git a/net-im/icb/files/patch-icb__s_group.c b/net-im/icb/files/patch-icb__s_group.c
new file mode 100644
index 000000000000..ba94353ac2ec
--- /dev/null
+++ b/net-im/icb/files/patch-icb__s_group.c
@@ -0,0 +1,13 @@
+--- icb/s_group.c.orig	2000-10-02 20:25:51.000000000 +0900
++++ icb/s_group.c	2012-10-25 18:32:57.000000000 +0900
+@@ -6,6 +6,10 @@
+ #include "icb.h"
+ #include "externs.h"
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ int
+ s_group (ARGV_TCL)
+ {
diff --git a/net-im/icb/files/patch-icb__s_user.c b/net-im/icb/files/patch-icb__s_user.c
new file mode 100644
index 000000000000..4959da30bed0
--- /dev/null
+++ b/net-im/icb/files/patch-icb__s_user.c
@@ -0,0 +1,13 @@
+--- icb/s_user.c.orig	2000-10-02 20:25:52.000000000 +0900
++++ icb/s_user.c	2012-10-25 18:33:46.000000000 +0900
+@@ -6,6 +6,10 @@
+ #include "icb.h"
+ #include "externs.h"
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ int
+ s_user (ARGV_TCL)
+ {
diff --git a/net-im/icb/files/patch-icb__s_who.c b/net-im/icb/files/patch-icb__s_who.c
new file mode 100644
index 000000000000..7d8c3523edcf
--- /dev/null
+++ b/net-im/icb/files/patch-icb__s_who.c
@@ -0,0 +1,13 @@
+--- icb/s_who.c.orig	2000-10-02 20:25:53.000000000 +0900
++++ icb/s_who.c	2012-10-25 18:34:37.000000000 +0900
+@@ -6,6 +6,10 @@
+ #include "icb.h"
+ #include "externs.h"
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ int
+ s_who (ARGV_TCL)
+ {
diff --git a/net-im/icb/files/patch-icb__serverlist.c b/net-im/icb/files/patch-icb__serverlist.c
new file mode 100644
index 000000000000..37522c790682
--- /dev/null
+++ b/net-im/icb/files/patch-icb__serverlist.c
@@ -0,0 +1,12 @@
+--- icb/serverlist.c.orig	2000-10-03 03:38:45.000000000 +0900
++++ icb/serverlist.c	2012-10-25 18:39:06.000000000 +0900
+@@ -6,6 +6,9 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
+ #ifdef HAVE_CTYPE_H
+ #include <ctype.h>
+ #endif
diff --git a/net-im/icb/files/patch-icb__tcl.c b/net-im/icb/files/patch-icb__tcl.c
new file mode 100644
index 000000000000..56b1d2d9346a
--- /dev/null
+++ b/net-im/icb/files/patch-icb__tcl.c
@@ -0,0 +1,12 @@
+--- icb/tcl.c.orig	2000-10-02 20:25:55.000000000 +0900
++++ icb/tcl.c	2012-10-25 18:22:17.000000000 +0900
+@@ -3,6 +3,9 @@
+ /* TCL interface */
+ #include "config.h"
+ 
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
diff --git a/net-im/icb/files/patch-murgil__getrname.c b/net-im/icb/files/patch-murgil__getrname.c
new file mode 100644
index 000000000000..b43e53734f7b
--- /dev/null
+++ b/net-im/icb/files/patch-murgil__getrname.c
@@ -0,0 +1,11 @@
+--- murgil/getrname.c.orig	2000-10-02 20:25:59.000000000 +0900
++++ murgil/getrname.c	2012-10-25 18:25:58.000000000 +0900
+@@ -27,7 +27,7 @@
+ {
+ 	struct hostent *host;
+ 	struct sockaddr_in rs;
+-	int rs_size = sizeof(rs);
++	socklen_t rs_size = sizeof(rs);
+ /* temporary hack */
+ char *debug_c;
+ long debug_l, inet_addr();