Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12071/10.4/unstable/main/finkinfo/net
Modified Files:
cicb.info cicb.patch
Log Message:
gcc4 fixes, install-location fixes.
Index: cicb.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/cicb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cicb.patch 4 Apr 2006 22:02:16 -0000 1.2
+++ cicb.patch 4 Apr 2006 22:14:41 -0000 1.3
@@ -188,8 +188,8 @@
elif test -f "$j/lib$undottedtcllibroot.a" ;
then
icb_ac_cv_tcllib=`(cd $j;
pwd)`/lib$undottedtcllibroot.a
diff -Nur cicb-5.1.0/icb/Makefile.in cicb-5.1.0-patched/icb/Makefile.in
---- cicb-5.1.0/icb/Makefile.in Sun Oct 15 04:49:50 2000
-+++ cicb-5.1.0-patched/icb/Makefile.in Wed Sep 18 13:31:25 2002
+--- cicb-5.1.0/icb/Makefile.in 2000-10-14 23:49:50.000000000 -0400
++++ cicb-5.1.0-patched/icb/Makefile.in 2006-04-04 17:05:39.000000000 -0400
@@ -87,7 +87,7 @@
default all: icb
@@ -199,10 +199,33 @@
funcs.h: protos.h
sed -e 's/(.*)/()/' protos.h > tmp
+@@ -97,12 +97,12 @@
+
+ $(DATADIR)/icbserverdb: ../icbserverdb
+ -mkdir $(DATADIR)
+- ../support/install-sh -c -o 0 -g 0 -m 0644 ../icbserverdb
$(DATADIR)/icbserverdb
++ ../support/install-sh -c -m 0644 ../icbserverdb $(DATADIR)/icbserverdb
+
+ $(BINDIR)/icb: icb
+ -mkdir $(BINDIR)
+ -rm -f $(BINDIR)/icb
+- ../support/install-sh -c -o 0 -g 0 -m 0755 -s icb $(BINDIR)
++ ../support/install-sh -c -m 0755 -s icb $(BINDIR)
+
+ clean:
+ rm -f *.o icb core
diff -Nur cicb-5.1.0/icb/c_log.c cicb-5.1.0-patched/icb/c_log.c
---- cicb-5.1.0/icb/c_log.c Fri Dec 15 04:29:17 2000
-+++ cicb-5.1.0-patched/icb/c_log.c Wed Sep 18 13:31:50 2002
-@@ -30,7 +30,7 @@
+--- cicb-5.1.0/icb/c_log.c 2000-12-14 23:29:17.000000000 -0500
++++ cicb-5.1.0-patched/icb/c_log.c 2006-04-04 16:49:26.000000000 -0400
+@@ -16,6 +16,7 @@
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
++#include <string.h>
+
+ FILE *logfp = NULL;
+
+@@ -30,7 +31,7 @@
time_t time();
struct tm *t, *localtime();
time_t clock;
@@ -211,6 +234,48 @@
/* determine pathname to use */
if (path == NULL || *path == '\0') {
+diff -Nur cicb-5.1.0/icb/c_time.c cicb-5.1.0-patched/icb/c_time.c
+--- cicb-5.1.0/icb/c_time.c 2000-12-14 22:21:02.000000000 -0500
++++ cicb-5.1.0-patched/icb/c_time.c 2006-04-04 16:49:38.000000000 -0400
+@@ -10,6 +10,7 @@
+ #ifdef HAVE_TIME_H
+ #include <time.h>
+ #endif
++#include <string.h>
+
+ #include "icb.h"
+ #include "externs.h"
+diff -Nur cicb-5.1.0/icb/icb.h cicb-5.1.0-patched/icb/icb.h
+--- cicb-5.1.0/icb/icb.h 2000-12-14 23:29:18.000000000 -0500
++++ cicb-5.1.0-patched/icb/icb.h 2006-04-04 16:49:08.000000000 -0400
+@@ -128,6 +128,13 @@
+ # define Tcl_GetStringResult(interp) ((interp)->result)
+ #endif
+
++#define COLORSIZE 12 /* how many chars can make an ansi sequence */
++
++
++struct COLORTABLE {
++ char color[COLORSIZE]; /* this color's ansi sequence */
++ int defined; /* has color been set? */
++};
+
+ /* include function prototypes if ANSI compiler */
+ /* otherwise, include file that shows return type for each function */
+@@ -149,13 +156,6 @@
+ int port;
+ };
+
+-#define COLORSIZE 12 /* how many chars can make an ansi sequence */
+-
+-
+-struct COLORTABLE {
+- char color[COLORSIZE]; /* this color's ansi sequence */
+- int defined; /* has color been set? */
+-};
+
+ enum { ColSANE,
+ ColNORMAL,
diff -Nur cicb-5.1.0/icb/main.c cicb-5.1.0-patched/icb/main.c
--- cicb-5.1.0/icb/main.c Tue Dec 12 07:02:07 2000
+++ cicb-5.1.0-patched/icb/main.c Wed Sep 18 14:05:26 2002
@@ -236,9 +301,17 @@
/* c_replay.c */
diff -Nur cicb-5.1.0/icb/serverlist.c cicb-5.1.0-patched/icb/serverlist.c
---- cicb-5.1.0/icb/serverlist.c Mon Oct 2 19:38:45 2000
-+++ cicb-5.1.0-patched/icb/serverlist.c Wed Sep 18 14:05:38 2002
-@@ -138,7 +138,7 @@
+--- cicb-5.1.0/icb/serverlist.c 2000-10-02 14:38:45.000000000 -0400
++++ cicb-5.1.0-patched/icb/serverlist.c 2006-04-04 16:51:36.000000000
-0400
+@@ -18,6 +18,7 @@
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
++#include <string.h>
+
+ #include "icb.h"
+
+@@ -138,7 +139,7 @@
return &serverbuf;
}
@@ -247,6 +320,41 @@
char *name;
{
if (!serverfile) {
+diff -Nur cicb-5.1.0/icb/strccmp.c cicb-5.1.0-patched/icb/strccmp.c
+--- cicb-5.1.0/icb/strccmp.c 2000-12-19 01:46:02.000000000 -0500
++++ cicb-5.1.0-patched/icb/strccmp.c 2006-04-04 16:56:43.000000000 -0400
+@@ -237,7 +237,7 @@
+ if (a == '\0')
+ return 0;
+
+-shloop: }
++shloop: ; }
+ while (cm[a] != cm[b]);
+
+
+diff -Nur cicb-5.1.0/icb/tcl.c cicb-5.1.0-patched/icb/tcl.c
+--- cicb-5.1.0/icb/tcl.c 2000-10-02 07:25:55.000000000 -0400
++++ cicb-5.1.0-patched/icb/tcl.c 2006-04-04 16:59:34.000000000 -0400
+@@ -15,6 +15,7 @@
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
+ #endif
++#include <string.h>
+
+ #include "icb.h"
+ #include "externs.h"
+diff -Nur cicb-5.1.0/murgil/Makefile.in cicb-5.1.0-patched/murgil/Makefile.in
+--- cicb-5.1.0/murgil/Makefile.in 2000-10-02 08:04:45.000000000 -0400
++++ cicb-5.1.0-patched/murgil/Makefile.in 2006-04-04 16:49:08.000000000
-0400
+@@ -7,7 +7,7 @@
+
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+-CPPFLAGS = [EMAIL PROTECTED]@ [EMAIL PROTECTED]@
++CPPFLAGS = @CPPFLAGS@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@
+
+ MAKEDEPEND = @MAKEDEPEND@
+ MDFLAGS = $(CPPFLAGS)
diff -Nur cicb-5.1.0/murgil/globals.c cicb-5.1.0-patched/murgil/globals.c
--- cicb-5.1.0/murgil/globals.c Mon Oct 2 12:25:59 2000
+++ cicb-5.1.0-patched/murgil/globals.c Wed Sep 18 14:08:36 2002
Index: cicb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/net/cicb.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cicb.info 4 Apr 2006 22:03:36 -0000 1.3
+++ cicb.info 4 Apr 2006 22:14:41 -0000 1.4
@@ -1,17 +1,17 @@
Package: cicb
Version: 5.1.0
-Revision: 1004
+Revision: 1005
Maintainer: William Dell Wisner <[EMAIL PROTECTED]>
Source: http://www.obfuscation.org/ftp/pub/icb/%n-%v.tar.gz
Source-MD5: 7ffe712d2606ee2295aee2b3f1f3aec7
Depends: readline-shlibs (>= 4.3-1028), tcltk-shlibs
BuildDepends: readline (>= 4.3-1028), tcltk-dev
Patch: %n.patch
-PatchScript: <<
- perl -pi -e 's/shloop:/shloop: ;/' icb/strccmp.c
- perl -pi -e 's/-o 0 -g 0//' icb/Makefile.in
+CompileScript: <<
+ ./configure %c
+ perl -pi -e 's|(#define SERVERLIST ).*|\1 "%p/share/icbserverdb"|' config.h
+ make
<<
-ConfigureParams: --with-readlineinclude=%p/include --with-readlinelib=%p/lib
--with-tclinclude=%p/include --with-tcllib=%p/lib
DocFiles: COPYING CUTE_MESSAGES README README.COLOR TRIGGERS
Description: ICB chat client
DescDetail: <<
@@ -24,6 +24,19 @@
Rename local function to avoid collision with global getservbyname().
Fix dangling label.
+
+ Remember to pass CPPFLAGS to cpp
+
+ Move typedef to before the #include of a .h that uses that type
+
+ Add some .h so we don't have implicit prototypes
+
+ It's impossible to avoid mixing fink vs system headers by trying
+ to force system tcl, so use fink's
+
+ Move compiling into the compile phase
+
+ Look for servser database where it is
<<
License: GPL
Homepage: http://www.obfuscation.org/icb/
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
