Attachment #131015 for bug #175036

View | Details | Raw Unified | Return to bug 175036
Collapse All | Expand All

Lines 1-10 Link Here

(-)net-im/icb/Makefile (-7 / +5 lines)
1	# ex:ts=8	1	# Created by: David O'Brien (obrien@NUXI.ucdavis.edu)
2	# Ports collection makefile for: icb
3	# Date created: Tue Feb 03, 1998
4	# Whom: David O'Brien (obrien@NUXI.ucdavis.edu)
5	#
6	# $FreeBSD: head/net-im/icb/Makefile 300897 2012-07-14 14:29:18Z beat $	2	# $FreeBSD: head/net-im/icb/Makefile 300897 2012-07-14 14:29:18Z beat $
7	#
8		3
9	PORTNAME= icb	4	PORTNAME= icb
10	PORTVERSION= 5.1.0	5	PORTVERSION= 5.1.0
Lines 18-23 Link Here
18		13
19	USE_TK_BUILD= yes	14	USE_TK_BUILD= yes
20	USE_TK= yes	15	USE_TK= yes
		16	USE_READLINE= yes
21	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
22	CONFIGURE_ARGS= --with-tclinclude=${TCL_INCLUDEDIR} \	18	CONFIGURE_ARGS= --with-tclinclude=${TCL_INCLUDEDIR} \
23	--with-tcllib=${LOCALBASE}/lib	19	--with-tcllib=${LOCALBASE}/lib
Lines 27-37 Link Here
27	PLIST_FILES= bin/icb %%DATADIR%%/icbserverdb	23	PLIST_FILES= bin/icb %%DATADIR%%/icbserverdb
28	PLIST_DIRS= %%DATADIR%%	24	PLIST_DIRS= %%DATADIR%%
29		25
		26	.include <bsd.port.options.mk>
		27
30	do-install:	28	do-install:
31	${INSTALL_PROGRAM} ${WRKSRC}/icb/icb ${PREFIX}/bin	29	${INSTALL_PROGRAM} ${WRKSRC}/icb/icb ${PREFIX}/bin
32	@${MKDIR} ${DATADIR}	30	@${MKDIR} ${DATADIR}
33	${INSTALL_DATA} ${WRKSRC}/icbserverdb ${DATADIR}	31	${INSTALL_DATA} ${WRKSRC}/icbserverdb ${DATADIR}
34	.if !defined(NOPORTEXAMPLES)	32	.if ${PORT_OPTIONS:MEXAMPLES}
35	@${MKDIR} ${EXAMPLESDIR}	33	@${MKDIR} ${EXAMPLESDIR}
36	.for f in ${PORTEXAMPLES}	34	.for f in ${PORTEXAMPLES}
37	${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${EXAMPLESDIR}	35	${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${EXAMPLESDIR}




--- icb/c_log.c.orig	Sat May 11 23:59:42 2002
+++ icb/c_log.c	Sun May 12 00:00:20 2002
@@ -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;

Line 0 Link Here

(-)net-im/icb/files/patch-icb__c_time.c (+11 lines)
	1	--- icb/c_time.c.orig 2000-12-15 12:21:02.000000000 +0900
	2	+++ icb/c_time.c 2012-10-25 18:28:19.000000000 +0900
	3	@@ -4,7 +4,7 @@
	4	#ifdef HAVE_UNISTD_H
	5	#include <unistd.h>
	6	#endif
	7	-#ifdef STRING_H
	8	+#ifdef HAVE_STRING_H
	9	#include <string.h>
	10	#endif
	11	#ifdef HAVE_TIME_H

Line 0 Link Here

(-)net-im/icb/files/patch-icb__c_usage.c (+13 lines)
	1	--- icb/c_usage.c.orig 2000-10-02 20:25:42.000000000 +0900
	2	+++ icb/c_usage.c 2012-10-25 18:29:43.000000000 +0900
	3	@@ -6,6 +6,10 @@
	4	#include "icb.h"
	5	#include "externs.h"
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	+
	11	int
	12	c_usage (ARGV_TCL)
	13	{

Line 0 Link Here

(-)net-im/icb/files/patch-icb__main.c (+11 lines)
	1	--- icb/main.c.orig 2000-12-12 16:02:07.000000000 +0900
	2	+++ icb/main.c 2012-10-25 18:18:39.000000000 +0900
	3	@@ -279,7 +279,7 @@
	4	#endif
	5	readlineinit();
	6	if (restrictflg && !gv.restricted)
	7	- restrict();
	8	+ icb_restrict();
	9	}
	10
	11	/* try to connect to port - if it fails, start server if we are on */




--- 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);
 		}
 	}

Line 0 Link Here

(-)net-im/icb/files/patch-icb__parse.c (+13 lines)
	1	--- icb/parse.c.orig 2000-12-15 13:29:18.000000000 +0900
	2	+++ icb/parse.c 2012-10-25 18:30:39.000000000 +0900
	3	@@ -6,6 +6,10 @@
	4	#include "icb.h"
	5	#include "externs.h"
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	+
	11	extern Tcl_Interp *interp;
	12	char *nextword();
	13

Line 0 Link Here

(-)net-im/icb/files/patch-icb__protos.h (+11 lines)
	1	--- icb/protos.h.orig 2000-12-15 12:21:04.000000000 +0900
	2	+++ icb/protos.h 2012-10-25 18:14:24.000000000 +0900
	3	@@ -171,7 +171,7 @@
	4	void readlineinit (void);
	5
	6	/* oset.c */
	7	-void restrict (void);
	8	+void icb_restrict (void);
	9
	10	/* send.c */
	11	void send_command (char* cmd, char* arg);

Line 0 Link Here

(-)net-im/icb/files/patch-icb__s_admin.c (+13 lines)
	1	--- icb/s_admin.c.orig 2000-10-02 20:25:49.000000000 +0900
	2	+++ icb/s_admin.c 2012-10-25 18:31:57.000000000 +0900
	3	@@ -6,6 +6,10 @@
	4	#include "icb.h"
	5	#include "externs.h"
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	+
	11	int
	12	s_admin (ARGV_TCL)
	13	{

Line 0 Link Here

(-)net-im/icb/files/patch-icb__s_group.c (+13 lines)
	1	--- icb/s_group.c.orig 2000-10-02 20:25:51.000000000 +0900
	2	+++ icb/s_group.c 2012-10-25 18:32:57.000000000 +0900
	3	@@ -6,6 +6,10 @@
	4	#include "icb.h"
	5	#include "externs.h"
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	+
	11	int
	12	s_group (ARGV_TCL)
	13	{

Line 0 Link Here

(-)net-im/icb/files/patch-icb__s_user.c (+13 lines)
	1	--- icb/s_user.c.orig 2000-10-02 20:25:52.000000000 +0900
	2	+++ icb/s_user.c 2012-10-25 18:33:46.000000000 +0900
	3	@@ -6,6 +6,10 @@
	4	#include "icb.h"
	5	#include "externs.h"
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	+
	11	int
	12	s_user (ARGV_TCL)
	13	{

Line 0 Link Here

(-)net-im/icb/files/patch-icb__s_who.c (+13 lines)
	1	--- icb/s_who.c.orig 2000-10-02 20:25:53.000000000 +0900
	2	+++ icb/s_who.c 2012-10-25 18:34:37.000000000 +0900
	3	@@ -6,6 +6,10 @@
	4	#include "icb.h"
	5	#include "externs.h"
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	+
	11	int
	12	s_who (ARGV_TCL)
	13	{




--- 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

Line 0 Link Here

(-)net-im/icb/files/patch-icb__tcl.c (+12 lines)
	1	--- icb/tcl.c.orig 2000-10-02 20:25:55.000000000 +0900
	2	+++ icb/tcl.c 2012-10-25 18:22:17.000000000 +0900
	3	@@ -3,6 +3,9 @@
	4	/* TCL interface */
	5	#include "config.h"
	6
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	#ifdef HAVE_UNISTD_H
	11	#include <unistd.h>
	12	#endif

Line 0 Link Here

(-)net-im/icb/files/patch-murgil__getrname.c (+11 lines)
	1	--- murgil/getrname.c.orig 2000-10-02 20:25:59.000000000 +0900
	2	+++ murgil/getrname.c 2012-10-25 18:25:58.000000000 +0900
	3	@@ -27,7 +27,7 @@
	4	{
	5	struct hostent *host;
	6	struct sockaddr_in rs;
	7	- int rs_size = sizeof(rs);
	8	+ socklen_t rs_size = sizeof(rs);
	9	/* temporary hack */
	10	char *debug_c;
	11	long debug_l, inet_addr();

Return to bug 175036

Lines 1-6 Link Here

(-)net-im/icb/files/patch-icb::c_log.c (-1 / +11 lines)
1	--- icb/c_log.c.orig Sat May 11 23:59:42 2002	1	--- icb/c_log.c.orig Sat May 11 23:59:42 2002
2	+++ icb/c_log.c Sun May 12 00:00:20 2002	2	+++ icb/c_log.c Sun May 12 00:00:20 2002
3	@@ -30,7 +30,8 @@	3	@@ -7,6 +7,9 @@
		4	#include "icb.h"
		5	#include "externs.h"
		6
		7	+#ifdef HAVE_STRING_H
		8	+#include <string.h>
		9	+#endif
		10	#ifdef HAVE_TIME_H
		11	#include <time.h>
		12	#endif
		13	@@ -30,7 +33,8 @@
4	time_t time();	14	time_t time();
5	struct tm t, localtime();	15	struct tm t, localtime();
6	time_t clock;	16	time_t clock;

Line 0 Link Here

(-)net-im/icb/files/patch-icb__oset.c (+20 lines)
	1	--- icb/oset.c.orig 2000-12-15 12:21:03.000000000 +0900
	2	+++ icb/oset.c 2012-10-25 18:15:16.000000000 +0900
	3	@@ -61,7 +61,7 @@
	4
	5
	6	void
	7	-restrict(void)
	8	+icb_restrict(void)
	9	{
	10	gv.restricted = 1;
	11	tclrestrict();
	12	@@ -91,7 +91,7 @@
	13	if (gv.restricted)
	14	TRETURNERR("oset: restricted mode can't be reset")
	15	else {
	16	- restrict();
	17	+ icb_restrict();
	18	return(TCL_OK);
	19	}
	20	}

Line 0 Link Here

(-)net-im/icb/files/patch-icb__serverlist.c (+12 lines)
	1	--- icb/serverlist.c.orig 2000-10-03 03:38:45.000000000 +0900
	2	+++ icb/serverlist.c 2012-10-25 18:39:06.000000000 +0900
	3	@@ -6,6 +6,9 @@
	4	#ifdef HAVE_UNISTD_H
	5	#include <unistd.h>
	6	#endif
	7	+#ifdef HAVE_STRING_H
	8	+#include <string.h>
	9	+#endif
	10	#ifdef HAVE_CTYPE_H
	11	#include <ctype.h>
	12	#endif