[81222] trunk/dports/science/arb
ryandesign at macports.org
ryandesign at macports.org
Tue Jul 26 23:11:59 PDT 2011
Revision: 81222
http://trac.macports.org/changeset/81222
Author: ryandesign at macports.org
Date: 2011-07-26 23:11:58 -0700 (Tue, 26 Jul 2011)
Log Message:
-----------
arb: fix build for Lion / clang; see #30342
Modified Paths:
--------------
trunk/dports/science/arb/Portfile
trunk/dports/science/arb/files/patch-ARB-makefile.diff
Added Paths:
-----------
trunk/dports/science/arb/files/patch-ARB-Flatio.diff
trunk/dports/science/arb/files/patch-ARB-Zuk_to_gen.c.diff
trunk/dports/science/arb/files/patch-ARB-count.c.diff
trunk/dports/science/arb/files/patch-ARB-interface.c.diff
trunk/dports/science/arb/files/patch-ARB-lsadt.c.diff
Modified: trunk/dports/science/arb/Portfile
===================================================================
--- trunk/dports/science/arb/Portfile 2011-07-27 06:00:17 UTC (rev 81221)
+++ trunk/dports/science/arb/Portfile 2011-07-27 06:11:58 UTC (rev 81222)
@@ -6,7 +6,7 @@
name arb
epoch 1
version 5.2
-revision 1
+revision 2
categories science
maintainers me.com:matt.cottrell
platforms darwin
@@ -54,7 +54,12 @@
patch-ARB-RNA3D_GlobalHeader.hxx.diff \
patch-ARB-DARWIN.pl.diff \
patch-ARB-glpng.diff \
- arb_intro.fig.diff
+ arb_intro.fig.diff \
+ patch-ARB-Flatio.diff \
+ patch-ARB-Zuk_to_gen.c.diff \
+ patch-ARB-count.c.diff \
+ patch-ARB-lsadt.c.diff \
+ patch-ARB-interface.c.diff
configure {
reinplace "s| sed | gsed |g" ${worksrcpath}/GDEHELP/MENUS/align.menu \
@@ -76,8 +81,6 @@
reinplace "s|@@LIBPERLDIR@@|[exec ${prefix}/bin/perl -e "use Config; print \$Config{archlib};"]/CORE|g" ${worksrcpath}/PERL2ARB/DARWIN.PL
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/bin/arb_macsetup
- reinplace "s|OSX_SDK:=/Developer/SDKs/MacOSX10.5.sdk|OSX_SDK:=${configure.sdkroot}|g" ${worksrcpath}/Makefile
-
if {${build_arch} == "ppc" || ${build_arch} == "i386"} {
set is64bit 0
} else {
@@ -90,6 +93,10 @@
ARBHOME=${worksrcpath} \
PATH=${worksrcpath}/bin:$env(PATH)
+if {${configure.compiler} == "llvm-gcc-4.2"} {
+ configure.compiler clang
+}
+
build.args GCC=${configure.cc} \
GPP=${configure.cxx} \
CPPreal=${configure.cpp}
Added: trunk/dports/science/arb/files/patch-ARB-Flatio.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-Flatio.diff (rev 0)
+++ trunk/dports/science/arb/files/patch-ARB-Flatio.diff 2011-07-27 06:11:58 UTC (rev 81222)
@@ -0,0 +1,20 @@
+--- GDE/SUPPORT/Flatio.c.orig 2008-07-22 05:11:25.000000000 -0400
++++ GDE/SUPPORT/Flatio.c 2011-07-25 22:52:15.000000000 -0400
+@@ -24,7 +24,7 @@
+ fprintf(stderr,"Error:%s\n",string);
+ exit(1);
+ }
+- return;
++ return 0;
+ }
+
+ char *Calloc2(count,size)
+@@ -163,7 +163,7 @@
+ fputc(data[j].nuc[i],file);
+ }
+ }
+- return;
++ return 0;
+ }
+
+
Added: trunk/dports/science/arb/files/patch-ARB-Zuk_to_gen.c.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-Zuk_to_gen.c.diff (rev 0)
+++ trunk/dports/science/arb/files/patch-ARB-Zuk_to_gen.c.diff 2011-07-27 06:11:58 UTC (rev 81222)
@@ -0,0 +1,10 @@
+--- GDE/SUPPORT/Zuk_to_gen.c.orig 2008-07-22 05:11:25.000000000 -0400
++++ GDE/SUPPORT/Zuk_to_gen.c 2011-07-25 23:14:06.000000000 -0400
+@@ -99,6 +99,6 @@
+ }
+ fprintf(file,"\n//\n");
+ }
+- return;
++ return 0;
+ }
+
Added: trunk/dports/science/arb/files/patch-ARB-count.c.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-count.c.diff (rev 0)
+++ trunk/dports/science/arb/files/patch-ARB-count.c.diff 2011-07-27 06:11:58 UTC (rev 81222)
@@ -0,0 +1,38 @@
+--- GDE/SUPPORT/count.c.orig 2008-07-22 05:11:25.000000000 -0400
++++ GDE/SUPPORT/count.c 2011-07-25 23:24:50.000000000 -0400
+@@ -255,7 +255,7 @@
+ }
+ if(special)
+ (*num) = *denom - (int)fnum;
+- return;
++ return 0;
+ }
+
+
+@@ -317,7 +317,7 @@
+ aval[i] = c;
+ aval[i] = '\0';
+ }
+- return;
++ return 0;
+ }
+
+ SetPart()
+@@ -369,7 +369,7 @@
+ partg[j] = (float)g / (float)tot;
+ partu[j] = (float)u / (float)tot;
+ }
+- return;
++ return 0;
+ }
+
+
+@@ -394,7 +394,7 @@
+ printf("\n");
+ jj++;
+ }
+- return;
++ return 0;
+ }
+
+
Added: trunk/dports/science/arb/files/patch-ARB-interface.c.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-interface.c.diff (rev 0)
+++ trunk/dports/science/arb/files/patch-ARB-interface.c.diff 2011-07-27 06:11:58 UTC (rev 81222)
@@ -0,0 +1,11 @@
+--- GDE/CLUSTALW/interface.c.orig 2008-07-22 05:11:26.000000000 -0400
++++ GDE/CLUSTALW/interface.c 2011-07-25 23:48:32.000000000 -0400
+@@ -210,7 +210,7 @@
+ Boolean name1 = FALSE;
+ sint ajb;
+
+- if(args[0]==NULL) return;
++ if(args[0]==NULL) return 0;
+
+
+
Added: trunk/dports/science/arb/files/patch-ARB-lsadt.c.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-lsadt.c.diff (rev 0)
+++ trunk/dports/science/arb/files/patch-ARB-lsadt.c.diff 2011-07-27 06:11:58 UTC (rev 81222)
@@ -0,0 +1,53 @@
+--- GDE/SUPPORT/lsadt.c.orig 2008-07-22 05:11:25.000000000 -0400
++++ GDE/SUPPORT/lsadt.c 2011-07-25 23:34:23.000000000 -0400
+@@ -522,7 +522,7 @@
+ for(i=2; i<=n; i++)
+ for(j=1; j<i; j++)
+ d[i][j] = runif();
+- return;
++ return 0;
+ }
+ if(nempty == 0 && start == 2)
+ {
+@@ -530,12 +530,12 @@
+ for(i=2; i<=n; i++)
+ for(j=1; j<i; j++)
+ d[i][j] = delta[i][j] + rnorm()*estd;
+- return;
++ return 0;
+ }
+ for(i=2; i<=n; i++)
+ for(j=1; j<i; j++)
+ d[i][j] = delta[i][j];
+- if(start==3 && nempty==0) return;
++ if(start==3 && nempty==0) return 0;
+ emp=nempty;
+ nemp=0;
+ while(nemp<emp)
+@@ -576,7 +576,7 @@
+ for(j=1; j<i; j++)
+ d[i][j]+= rnorm()*estd;
+ }
+- return;
++ return 0;
+ }
+
+ static int nm0, nm1, nm2, nm3;
+@@ -735,7 +735,7 @@
+ {
+ prc = 0;
+ print_iter(maxfnc, f);
+- return;
++ return 0;
+ }
+ if(itcrs>m)
+ {
+@@ -813,7 +813,7 @@
+ {
+ prc = 0;
+ print_iter(maxfnc, f);
+- return;
++ return 0;
+ }
+ }
+ if(maxfnc==maxfn)
Modified: trunk/dports/science/arb/files/patch-ARB-makefile.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-makefile.diff 2011-07-27 06:00:17 UTC (rev 81221)
+++ trunk/dports/science/arb/files/patch-ARB-makefile.diff 2011-07-27 06:11:58 UTC (rev 81222)
@@ -1,8 +1,6 @@
-Index: Makefile
-===================================================================
---- Makefile (revision 6215)
-+++ Makefile (working copy)
-@@ -31,11 +31,12 @@
+--- Makefile.orig 2010-09-05 12:00:58.000000000 -0400
++++ Makefile 2011-07-26 00:35:21.000000000 -0400
+@@ -31,22 +31,21 @@
# configurable in config.makefile
#
# -----------------------------------------------------
@@ -16,8 +14,39 @@
endif
FORCEMASK = umask 002
-@@ -198,15 +197,15 @@
+ # ---------------------- [unconditionally used options]
+
+-GCC:=gcc
+-GPP:=g++
+-CPPreal:=cpp
+-
+-
++#GCC:=gcc <Now set in the Portfile>
++#GPP:=g++ <Now set in the Portfile>
++#CPPreal:=cpp <Now set in the Portfile>
+
+ # ---------------------- compiler version detection
+
+@@ -71,7 +70,7 @@
+ #---------------------- define special directories for non standard builds
+
+ ifdef DARWIN
+-OSX_SDK:=/Developer/SDKs/MacOSX10.5.sdk
++OSX_SDK:=
+ OSX_FW:=/System/Library/Frameworks
+ OSX_FW_OPENGL:=$(OSX_FW)/OpenGL.framework/Versions/A/Libraries
+ OSX_FW_IMAGEIO:=$(OSX_FW)/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources
+@@ -186,7 +185,6 @@
+ dflags += -D$(MACH) # define machine
+
+ ifdef DARWIN
+- cflags += -no-cpp-precomp
+ shared_cflags += -fno-common
+ else
+ dflags += $(shell getconf LFS_CFLAGS)
+@@ -199,15 +197,15 @@
+
#---------------------- X11 location
-XHOME:=/usr/X11R6
@@ -35,7 +64,7 @@
XLIBS += -lGLU -lGL -Wl,-dylib_file,$(OSX_FW_OPENGL)/libGL.dylib:$(OSX_FW_OPENGL)/libGL.dylib
else
XLIBS:=-L$(XHOME)/$(CROSS_LIB) -lXm -lXpm -lXp -lXt -lXext -lX11
-@@ -225,14 +224,9 @@
+@@ -226,14 +224,9 @@
GL_PNGLIBS := -L$(ARBHOME)/GL/glpng -lglpng_arb -lpng
@@ -53,7 +82,7 @@
GL_LIBS := $(GL_LIB) $(GLEWLIB) $(GLUTLIB) $(GL_PNGLIBS)
#XLIBS += $(GL_LIB)
-@@ -247,11 +241,7 @@
+@@ -248,11 +241,7 @@
#---------------------- tiff lib:
@@ -66,7 +95,7 @@
#---------------------- basic libs:
-@@ -317,11 +307,7 @@
+@@ -318,11 +307,7 @@
# other used tools
CTAGS := etags
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110726/f3064752/attachment.html>
More information about the macports-changes
mailing list