[76563] trunk/dports/science/arb

[ryandesign at macports.org]

Revision: 76563
          http://trac.macports.org/changeset/76563
Author:   ryandesign at macports.org
Date:     2011-02-28 03:09:01 -0800 (Mon, 28 Feb 2011)
Log Message:
-----------
arb: find the path to libperl at compile time instead of hardcoding it; see #28276

Modified Paths:
--------------
    trunk/dports/science/arb/Portfile
    trunk/dports/science/arb/files/patch-ARB-DARWIN.pl.diff

Modified: trunk/dports/science/arb/Portfile
===================================================================
--- trunk/dports/science/arb/Portfile	2011-02-28 09:47:06 UTC (rev 76562)
+++ trunk/dports/science/arb/Portfile	2011-02-28 11:09:01 UTC (rev 76563)
@@ -72,8 +72,8 @@
                                                      ${worksrcpath}/GDEHELP/Makefile.helpfiles
                         file copy ${worksrcpath}/config.makefile.template ${worksrcpath}/config.makefile
                         file copy ${filespath}/arb_macsetup ${worksrcpath}/bin
-                        reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/PERL2ARB/DARWIN.PL \
-                                                             ${worksrcpath}/bin/arb_macsetup
+                        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
 

Modified: trunk/dports/science/arb/files/patch-ARB-DARWIN.pl.diff
===================================================================
--- trunk/dports/science/arb/files/patch-ARB-DARWIN.pl.diff	2011-02-28 09:47:06 UTC (rev 76562)
+++ trunk/dports/science/arb/files/patch-ARB-DARWIN.pl.diff	2011-02-28 11:09:01 UTC (rev 76563)
@@ -6,7 +6,7 @@
      'VERSION_FROM' => 'ARB.pm',               # finds $VERSION
 -   #'LIBS'         => '-L../ARBDB2 -lARBDB -L/usr/local/lib/perl5/5.10.0/darwin-2level/CORE/ -lperl',  # e.g., '-lm' 
 -    'LIBS'         => '-L../ARBDB2 -lARBDB -L/System/Library/Perl/lib/5.10/ -lperl', #System provides 64-bit Perl with Snow Leopard
-+    'LIBS'         => '-L../ARBDB2 -lARBDB -L@@PREFIX@@/lib/perl5/5.8.9/darwin-2level/CORE/ -lperl', #MacPorts installs 64-bit perl5.8.9
++    'LIBS'         => '-L../ARBDB2 -lARBDB -L@@LIBPERLDIR@@ -lperl',
      'DEFINE'       => '',                     # e.g., '-DHAVE_SOMETHING' 
      'INC'          => '-I../INCLUDE',         # e.g., '-I/usr/include/other' 
      'CCFLAGS'      => '-arch x86_64',
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110228/242f23c0/attachment.html>