Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6525/10.4-transitional/unstable/main/finkinfo/sci
Modified Files:
afni.info afni.patch
Log Message:
Fix building on modern gcc
Index: afni.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/afni.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- afni.patch 27 Apr 2005 03:26:20 -0000 1.1
+++ afni.patch 13 Dec 2005 19:56:00 -0000 1.2
@@ -1,5 +1,6 @@
---- afni_src/Makefile.macosx_10.2 2002-10-16 11:22:25.000000000 -0700
-+++ afni_src/Makefile.macosx_10.2 2002-10-17 11:28:41.000000000 -0700
+diff -Nurd afni_src.orig/Makefile.macosx_10.2 afni_src/Makefile.macosx_10.2
+--- afni_src.orig/Makefile.macosx_10.2 2002-11-21 11:41:35.000000000 -0500
++++ afni_src/Makefile.macosx_10.2 2005-12-13 13:22:57.000000000 -0500
@@ -1,19 +1,19 @@
# This Makefile is for Mac OSX 10.0 (Darwin)
@@ -25,7 +26,7 @@
AR = /usr/bin/ar
RANLIB = /usr/bin/ranlib
@@ -31,7 +31,7 @@
- INSTALLDIR = ./macosx_10.1
+ INSTALLDIR = ./macosx_10.2
LIBDIR = $(INSTALLDIR)
-LIBDL = libdl.a
@@ -33,8 +34,102 @@
# for dynamic linking
---- afni_src/plug_maskcalc.c 2002-10-16 11:22:23.000000000 -0700
-+++ afni_src/plug_maskcalc.c 2002-10-17 11:41:40.000000000 -0700
+diff -Nurd afni_src.orig/afni_setup.c afni_src/afni_setup.c
+--- afni_src.orig/afni_setup.c 2002-11-21 11:41:32.000000000 -0500
++++ afni_src/afni_setup.c 2005-12-13 14:24:52.000000000 -0500
+@@ -176,7 +176,7 @@
+
+ if(PRINT_TRACING)
+ { char str[256] ;
+- sprintf(str,"found palette label=%s. [len=%d label[0]=%d]",
++ sprintf(str,"found palette label=%s. [len=%lu label[0]=%d]",
+ label,strlen(label),(int)label[0]); STATUS(str);
+ sprintf(str,"nbuf=%d fptr-fbuf=%d",nbuf,fptr-fbuf); STATUS(str);}
+
+diff -Nurd afni_src.orig/f2cdir/f2c.h afni_src/f2cdir/f2c.h
+--- afni_src.orig/f2cdir/f2c.h 2002-11-21 11:41:37.000000000 -0500
++++ afni_src/f2cdir/f2c.h 2005-12-13 13:22:57.000000000 -0500
+@@ -8,7 +8,7 @@
+ #define F2C_INCLUDE
+
+ #define NON_UNIX_STDIO /* RWCox */
+-#define complex complexxx /* RWCox */
++//#define complex complexxx /* RWCox */
+
+ typedef long int integer;
+ typedef unsigned long uinteger;
+diff -Nurd afni_src.orig/mcw_malloc.c afni_src/mcw_malloc.c
+--- afni_src.orig/mcw_malloc.c 2002-11-21 11:41:33.000000000 -0500
++++ afni_src/mcw_malloc.c 2005-12-13 13:28:34.000000000 -0500
+@@ -215,7 +215,7 @@
+ for( ii=0 ; ii < NEXTRA ; ii++ )
+ if( fred[ii] != MAGIC ){
+ fprintf(stderr,"*** malloc pre-corruption! "
+- "serial=%u size=%d source=%s line#=%d\n",
++ "serial=%u size=%zd source=%s line#=%d\n",
+ ip->pss,ip->psz,ip->pfn,ip->pln ) ;
+ break ;
+ }
+@@ -223,7 +223,7 @@
+ for( ii=0 ; ii < NEXTRA ; ii++ )
+ if( fred[n+NEXTRA+ii] != MAGIC ){
+ fprintf(stderr,"*** malloc post-corruption! "
+- "serial=%u size=%d source=%s line#=%d\n",
++ "serial=%u size=%zd source=%s line#=%d\n",
+ ip->pss,ip->psz,ip->pfn,ip->pln ) ;
+ break ;
+ }
+@@ -416,7 +416,7 @@
+ jj = jk[ii] / JBASE ; /* retrieve jj and kk */
+ kk = jk[ii] % JBASE ;
+ if( htab[jj][kk].pmt != NULL ){
+- fprintf(fp,"%7u %10d %-20.30s %5d %10p %5d %3d",
++ fprintf(fp,"%7u %10zd %-20.30s %5d %10p %5d %3d",
+ htab[jj][kk].pss , htab[jj][kk].psz ,
+ htab[jj][kk].pfn , htab[jj][kk].pln , htab[jj][kk].pmt ,
+ jj,kk ) ;
+diff -Nurd afni_src.orig/niml.c afni_src/niml.c
+--- afni_src.orig/niml.c 2002-11-21 11:41:33.000000000 -0500
++++ afni_src/niml.c 2005-12-13 13:44:16.000000000 -0500
+@@ -1435,7 +1435,7 @@
+ }
+ nbuf = strlen(buf); sprintf(buf+nbuf,"%02x",(int)urr[nurr]);
+ nurr = (nurr+1) % NURR ;
+-URR_DONE:
++URR_DONE: ;
+ }
+ #endif /* NURR */
+
+@@ -8950,7 +8950,7 @@
+ for( ii=0 ; ii < NEXTRA ; ii++ )
+ if( fred[ii] != MAGIC ){
+ fprintf(stderr,"*** malloc pre-corruption! "
+- "serial=%u size=%d source=%s line#=%d\n",
++ "serial=%u size=%zd source=%s line#=%d\n",
+ ip->pss,ip->psz,ip->pfn,ip->pln ) ;
+ break ;
+ }
+@@ -8958,7 +8958,7 @@
+ for( ii=0 ; ii < NEXTRA ; ii++ )
+ if( fred[n+NEXTRA+ii] != MAGIC ){
+ fprintf(stderr,"*** malloc post-corruption! "
+- "serial=%u size=%d source=%s line#=%d\n",
++ "serial=%u size=%zd source=%s line#=%d\n",
+ ip->pss,ip->psz,ip->pfn,ip->pln ) ;
+ break ;
+ }
+@@ -9148,7 +9148,7 @@
+ jj = jk[ii] / JBASE ; /* retrieve jj and kk */
+ kk = jk[ii] % JBASE ;
+ if( htab[jj][kk].pmt != NULL ){
+- fprintf(fp,"%7u %10d %-20.30s %5d %10p %5d %3d",
++ fprintf(fp,"%7u %10zd %-20.30s %5d %10p %5d %3d",
+ htab[jj][kk].pss , htab[jj][kk].psz ,
+ htab[jj][kk].pfn , htab[jj][kk].pln , htab[jj][kk].pmt ,
+ jj,kk ) ;
+diff -Nurd afni_src.orig/plug_maskcalc.c afni_src/plug_maskcalc.c
+--- afni_src.orig/plug_maskcalc.c 2002-11-21 11:41:33.000000000 -0500
++++ afni_src/plug_maskcalc.c 2005-12-13 13:22:57.000000000 -0500
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <math.h>
@@ -43,8 +138,9 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
---- afni_src/plug_threshold.c 2002-10-16 11:22:24.000000000 -0700
-+++ afni_src/plug_threshold.c 2002-10-17 11:43:58.000000000 -0700
+diff -Nurd afni_src.orig/plug_threshold.c afni_src/plug_threshold.c
+--- afni_src.orig/plug_threshold.c 2002-11-21 11:41:34.000000000 -0500
++++ afni_src/plug_threshold.c 2005-12-13 13:22:57.000000000 -0500
@@ -36,13 +36,13 @@
#include <sys/types.h>
#include <stdio.h>
@@ -60,8 +156,9 @@
#endif
#ifndef MAXINT
---- afni_src/volpack/vp_global.h 2002-10-16 11:22:26.000000000 -0700
-+++ afni_src/volpack/vp_global.h 2002-10-17 10:55:38.000000000 -0700
+diff -Nurd afni_src.orig/volpack/vp_global.h afni_src/volpack/vp_global.h
+--- afni_src.orig/volpack/vp_global.h 2002-11-21 11:41:36.000000000 -0500
++++ afni_src/volpack/vp_global.h 2005-12-13 13:22:57.000000000 -0500
@@ -36,7 +36,6 @@
#include "volpack.h"
@@ -70,14 +167,3 @@
#include <math.h>
extern double rint ANSI_ARGS((double x)); /* missing from Ultrix math.h */
---- afni_src/f2cdir/f2c.h.orig Sun Dec 14 14:35:54 2003
-+++ afni_src/f2cdir/f2c.h Sun Dec 14 14:35:57 2003
-@@ -8,7 +8,7 @@
- #define F2C_INCLUDE
-
- #define NON_UNIX_STDIO /* RWCox */
--#define complex complexxx /* RWCox */
-+//#define complex complexxx /* RWCox */
-
- typedef long int integer;
- typedef unsigned long uinteger;
Index: afni.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/afni.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- afni.info 27 Apr 2005 03:26:20 -0000 1.1
+++ afni.info 13 Dec 2005 19:56:00 -0000 1.2
@@ -2,7 +2,7 @@
Version: 2.51e
Revision: 13
BuildDependsOnly: true
-BuildDepends: openmotif3
+BuildDepends: openmotif3, x11-dev
Depends: openmotif3-shlibs
Conflicts: arb
#Source: http://afni.nimh.nih.gov/%n/AFNI98/%n_src.tgz
@@ -14,7 +14,6 @@
Source2-MD5: d581c817eaa64f51580d321203fed41b
PatchScript: <<
sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
- perl -pi -e 's|cc|gcc-3.3|g' Makefile.macosx_10.2
<<
CompileScript: echo "Nothing to do"
InstallScript: <<
@@ -39,7 +38,7 @@
some precompiled binaries) for research purposes.
<<
DescUsage: <<
-For usage notes, see the manuals installed into /sw/share/doc/afni.
+For usage notes, see the manuals installed into %p/share/doc/afni.
Plugins are installed into /sw/lib/afni.
Type "dpkg -L afni" to see a list of files installed.
<<
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
