Date: Sun, 6 Jan 2013 02:34:59 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/175036: net-im/icb: Fix build with clang Message-ID: <20130106023459.551db12bee1b12926f0dd9d2@yahoo.com> Resent-Message-ID: <201301051810.r05IAAGQ001676@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175036
>Category: ports
>Synopsis: net-im/icb: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 05 18:10:09 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Support USE_READLINE
New file:
files/patch-icb__c_time.c
files/patch-icb__c_usage.c
files/patch-icb__main.c
files/patch-icb__oset.c
files/patch-icb__parse.c
files/patch-icb__protos.h
files/patch-icb__s_admin.c
files/patch-icb__s_group.c
files/patch-icb__s_user.c
files/patch-icb__s_who.c
files/patch-icb__serverlist.c
files/patch-icb__tcl.c
files/patch-murgil__getrname.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net-im/icb/Makefile net-im/icb/Makefile
--- /usr/ports/net-im/icb/Makefile 2012-11-08 06:32:29.000000000 +0900
+++ net-im/icb/Makefile 2013-01-02 03:44:22.000000000 +0900
@@ -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: head/net-im/icb/Makefile 300897 2012-07-14 14:29:18Z beat $
-#
PORTNAME= icb
PORTVERSION= 5.1.0
@@ -18,6 +13,7 @@
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 @@
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 -urN /usr/ports/net-im/icb/files/patch-icb::c_log.c net-im/icb/files/patch-icb::c_log.c
--- /usr/ports/net-im/icb/files/patch-icb::c_log.c 2012-11-08 06:32:29.000000000 +0900
+++ net-im/icb/files/patch-icb::c_log.c 2012-10-25 18:24:29.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__c_time.c net-im/icb/files/patch-icb__c_time.c
--- /usr/ports/net-im/icb/files/patch-icb__c_time.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__c_time.c 2012-10-25 18:28:54.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__c_usage.c net-im/icb/files/patch-icb__c_usage.c
--- /usr/ports/net-im/icb/files/patch-icb__c_usage.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__c_usage.c 2012-10-25 18:30:05.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__main.c net-im/icb/files/patch-icb__main.c
--- /usr/ports/net-im/icb/files/patch-icb__main.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__main.c 2012-10-25 18:20:42.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__oset.c net-im/icb/files/patch-icb__oset.c
--- /usr/ports/net-im/icb/files/patch-icb__oset.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__oset.c 2012-10-25 18:20:55.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__parse.c net-im/icb/files/patch-icb__parse.c
--- /usr/ports/net-im/icb/files/patch-icb__parse.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__parse.c 2012-10-25 18:30:55.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__protos.h net-im/icb/files/patch-icb__protos.h
--- /usr/ports/net-im/icb/files/patch-icb__protos.h 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__protos.h 2012-10-25 18:21:05.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__s_admin.c net-im/icb/files/patch-icb__s_admin.c
--- /usr/ports/net-im/icb/files/patch-icb__s_admin.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__s_admin.c 2012-10-25 18:32:18.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__s_group.c net-im/icb/files/patch-icb__s_group.c
--- /usr/ports/net-im/icb/files/patch-icb__s_group.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__s_group.c 2012-10-25 18:33:14.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__s_user.c net-im/icb/files/patch-icb__s_user.c
--- /usr/ports/net-im/icb/files/patch-icb__s_user.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__s_user.c 2012-10-25 18:34:02.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__s_who.c net-im/icb/files/patch-icb__s_who.c
--- /usr/ports/net-im/icb/files/patch-icb__s_who.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__s_who.c 2012-10-25 18:34:50.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__serverlist.c net-im/icb/files/patch-icb__serverlist.c
--- /usr/ports/net-im/icb/files/patch-icb__serverlist.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__serverlist.c 2012-10-25 18:39:49.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-icb__tcl.c net-im/icb/files/patch-icb__tcl.c
--- /usr/ports/net-im/icb/files/patch-icb__tcl.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-icb__tcl.c 2012-10-25 18:22:53.000000000 +0900
@@ -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 -urN /usr/ports/net-im/icb/files/patch-murgil__getrname.c net-im/icb/files/patch-murgil__getrname.c
--- /usr/ports/net-im/icb/files/patch-murgil__getrname.c 1970-01-01 09:00:00.000000000 +0900
+++ net-im/icb/files/patch-murgil__getrname.c 2012-10-25 18:26:26.000000000 +0900
@@ -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();
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130106023459.551db12bee1b12926f0dd9d2>