[60758] trunk/dports/science/pvm
ryandesign at macports.org
ryandesign at macports.org
Sun Nov 22 07:23:10 PST 2009
Revision: 60758
http://trac.macports.org/changeset/60758
Author: ryandesign at macports.org
Date: 2009-11-22 07:23:07 -0800 (Sun, 22 Nov 2009)
Log Message:
-----------
pvm: update to 3.4.6, simply DARWIN.def patch, make sure we're always UsingTheRightCompiler; see #22541 (maintainer timeout)
Modified Paths:
--------------
trunk/dports/science/pvm/Portfile
trunk/dports/science/pvm/files/patch-console-cons.c
Added Paths:
-----------
trunk/dports/science/pvm/files/patch-DARWIN.def
Removed Paths:
-------------
trunk/dports/science/pvm/files/DARWIN8.def
trunk/dports/science/pvm/files/DARWIN9.def
Modified: trunk/dports/science/pvm/Portfile
===================================================================
--- trunk/dports/science/pvm/Portfile 2009-11-22 10:54:10 UTC (rev 60757)
+++ trunk/dports/science/pvm/Portfile 2009-11-22 15:23:07 UTC (rev 60758)
@@ -3,8 +3,7 @@
PortSystem 1.0
name pvm
-version 3.4.5
-revision 1
+version 3.4.6
categories science parallel net
platforms darwin
maintainers mww
@@ -21,9 +20,12 @@
ftp://ftp.netlib.org/pvm3/ \
ftp://ftp.chg.ru/pub/prog/parallel/pvm3/
distfiles ${name}${version}.tgz
-checksums md5 086e6d707b40adba04bddba8e5b6b17d
+checksums md5 7b5f0c80ea50b6b4b10b6128e197747b \
+ sha1 dc22bb3a592bb37ab86f0de8d867f67949d12e91 \
+ rmd160 fa38e35d1d7a8e31b9c2baeb486a7371d6162378
patchfiles patch-console-cons.c patch-src-global.h patch-src-lpvmgen.c \
- patch-src-pvmcruft.c patch-src-pvmd.c patch-tracer-trcutil.c
+ patch-src-pvmcruft.c patch-src-pvmd.c patch-tracer-trcutil.c \
+ patch-DARWIN.def
set pvm_root ${prefix}/lib/pvm
set pvm_droot ${destroot}${pvm_root}
@@ -33,22 +35,10 @@
use_configure no
-build.env PVM_ROOT=${worksrcpath}
+build.env PVM_ROOT=${worksrcpath} \
+ CC=${configure.cc} \
+ CPP=${configure.cpp}
-platform darwin 8 {
- pre-patch {
- file copy -force ${filespath}/DARWIN8.def ${worksrcpath}/conf/DARWIN.def
- }
- build.env-append CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0
-}
-
-platform darwin 9 {
- pre-patch {
- file copy -force ${filespath}/DARWIN9.def ${worksrcpath}/conf/DARWIN.def
- }
- build.env-append CC=/usr/bin/gcc-4.0 CPP=/usr/bin/cpp-4.0
-}
-
destroot {
xinstall -m 755 -d ${pvm_droot}/lib/${pvm_arch}/ ${pvm_droot}/conf
file copy ${worksrcpath}/bin ${pvm_droot}
Deleted: trunk/dports/science/pvm/files/DARWIN8.def
===================================================================
--- trunk/dports/science/pvm/files/DARWIN8.def 2009-11-22 10:54:10 UTC (rev 60757)
+++ trunk/dports/science/pvm/files/DARWIN8.def 2009-11-22 15:23:07 UTC (rev 60758)
@@ -1,14 +0,0 @@
-ARCHCFLAGS = -DSOCKADHASLEN -DNOREXEC \
- -DRSHCOMMAND=\"/usr/bin/rsh\" \
- -DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
- -DSYSERRISCONST \
- -I/usr/include/malloc \
- -I/System/Library/Frameworks/System.framework/Headers/bsd/sys
- # this last -I flag needed for tracer build...
-ARCHDLIB =
-ARCHDOBJ =
-ARCHLIB =
-HASRANLIB = t
-AR = ar
-PVM_ARCH = DARWIN
-MAKE = make
Deleted: trunk/dports/science/pvm/files/DARWIN9.def
===================================================================
--- trunk/dports/science/pvm/files/DARWIN9.def 2009-11-22 10:54:10 UTC (rev 60757)
+++ trunk/dports/science/pvm/files/DARWIN9.def 2009-11-22 15:23:07 UTC (rev 60758)
@@ -1,14 +0,0 @@
-ARCHCFLAGS = -DSOCKADHASLEN -DNOREXEC \
- -DRSHCOMMAND=\"/usr/bin/rsh\" \
- -DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
- -DSYSERRISCONST \
- -I/usr/include/malloc \
- -I/System/Library/Frameworks/System.framework/Headers/bsd/sys
- # this last -I flag needed for tracer build...
-ARCHDLIB =
-ARCHDOBJ =
-ARCHLIB =
-HASRANLIB = t
-AR = ar
-PVM_ARCH = DARWIN
-MAKE = make
Added: trunk/dports/science/pvm/files/patch-DARWIN.def
===================================================================
--- trunk/dports/science/pvm/files/patch-DARWIN.def (rev 0)
+++ trunk/dports/science/pvm/files/patch-DARWIN.def 2009-11-22 15:23:07 UTC (rev 60758)
@@ -0,0 +1,11 @@
+--- conf/DARWIN.def 2004-08-11 07:56:14.000000000 -0500
++++ conf/DARWIN.def 2008-07-02 13:53:25.000000000 -0500
+@@ -1,7 +1,7 @@
+ ARCHCFLAGS = -DSOCKADHASLEN -DNOREXEC \
+ -DRSHCOMMAND=\"/usr/bin/rsh\" \
+ -DHASSTDLIB -DNEEDMENDIAN -DHASERRORVARS \
+- -DFAKEXDRFLOAT -DSYSERRISCONST \
++ -DSYSERRISCONST \
+ -I/usr/include/malloc \
+ -I/System/Library/Frameworks/System.framework/Headers/bsd/sys
+ # this last -I flag needed for tracer build...
Modified: trunk/dports/science/pvm/files/patch-console-cons.c
===================================================================
--- trunk/dports/science/pvm/files/patch-console-cons.c 2009-11-22 10:54:10 UTC (rev 60757)
+++ trunk/dports/science/pvm/files/patch-console-cons.c 2009-11-22 15:23:07 UTC (rev 60758)
@@ -1,20 +1,20 @@
---- console/cons.c 2001-02-08 00:10:09.000000000 +0100
-+++ console/cons.c 2006-08-18 10:28:46.000000000 +0200
-@@ -788,7 +788,7 @@
+--- console/cons.c.orig 2007-04-19 18:14:46.000000000 -0500
++++ console/cons.c 2009-11-15 02:07:52.000000000 -0600
+@@ -792,7 +792,7 @@
last_line = (char *) NULL;
}
-- matches = completion_matches( text, command_generator );
-+ matches = rl_completion_matches( text, command_generator );
+- matches = (char **) completion_matches( text, command_generator );
++ matches = (char **) rl_completion_matches( text, command_generator );
}
-@@ -797,7 +797,7 @@
+@@ -801,7 +801,7 @@
if ( !last_line || strcmp( last_line, rl_line_buffer ) ) {
-- matches = completion_matches( text,
-+ matches = rl_completion_matches( text,
+- matches = (char **) completion_matches( text,
++ matches = (char **) rl_completion_matches( text,
command_help_generator );
if ( last_line ) free( last_line );
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091122/b7ff208a/attachment.html>
More information about the macports-changes
mailing list