[110696] trunk/dports/devel/globus-core

ram at macports.org ram at macports.org
Tue Sep 3 19:17:50 PDT 2013


Revision: 110696
          https://trac.macports.org/changeset/110696
Author:   ram at macports.org
Date:     2013-09-03 19:17:50 -0700 (Tue, 03 Sep 2013)
Log Message:
-----------
devel/globus-core: correct location for perl modules (#40205)

Modified Paths:
--------------
    trunk/dports/devel/globus-core/Portfile

Added Paths:
-----------
    trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff

Modified: trunk/dports/devel/globus-core/Portfile
===================================================================
--- trunk/dports/devel/globus-core/Portfile	2013-09-04 02:11:31 UTC (rev 110695)
+++ trunk/dports/devel/globus-core/Portfile	2013-09-04 02:17:50 UTC (rev 110696)
@@ -1,8 +1,6 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # $Id$
 
-set perl_vendor_lib [ exec sh -c "eval \"\`perl -V:installvendorlib\`\" ; echo \$installvendorlib" ]
-
 if {$build_arch == "x86_64" || $build_arch == "ppc64"} {
     set flavor gcc64pthr
     set enable64 yes
@@ -18,7 +16,7 @@
 version                 8.9
 set globus_version      5.2.4
 set globus_branch       [join [lrange [split ${globus_version} .] 0 1] .]
-revision                0
+revision                1
 platforms               darwin
 categories              devel
 license                 Apache-2
@@ -43,16 +41,16 @@
 checksums               sha256 75d58415fdcf344ef3c6a4c1214b29a83035bfc014f43b980607b0929998c9c0 \
                         rmp160 2ca5cdaa7e77c4467409a01cdb0d379bd15a5c7f
 
-patchfiles              patch-globus-core-automake-obsolete-macro.diff
+patchfiles              patch-globus-core-automake-obsolete-macro.diff \
+                        patch-globus-core-perldir.diff
 
 patch.pre_args          -p1
 
-depends_run             port:p5-xml-dom \
-                        port:p5-xml-parser
+depends_lib             port:p5.12-xml-dom \
+                        port:p5.12-xml-parser \
+                        port:perl5.12
 
 depends_build           port:grid-packaging-tools \
-                        port:p5-xml-dom \
-                        port:p5-xml-parser \
                         port:libtool \
                         port:autoconf \
                         port:automake
@@ -69,7 +67,6 @@
                         --with-setupdir='\${datadir}/globus/setup' \
                         --with-testdir='\${datadir}/globus/test' \
                         --with-flavorincludedir='\${libdir}/globus/include' \
-                        --with-perlmoduledir=${perl_vendor_lib} \
                         --with-doxygendir='\${datadir}/globus/doxygen' \
                         --with-docdir='\${datadir}/doc/${name}'
 

Added: trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff
===================================================================
--- trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff	                        (rev 0)
+++ trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff	2013-09-04 02:17:50 UTC (rev 110696)
@@ -0,0 +1,15 @@
+--- globus_core-8.9-orig/configure.in	2011-12-05 21:27:20.000000000 +0100
++++ globus_core-8.9/configure.in	2013-06-21 16:28:42.471409885 +0200
+@@ -89,7 +89,11 @@
+     perlmoduledir=$withval
+ ],
+ [
+-    perlmoduledir='${prefix}/lib/perl'
++    if test -x ${prefix}/bin/perl ; then
++        perlmoduledir=`${prefix}/bin/perl -V:installvendorlib | cut -d\' -f 2`
++    else
++        perlmoduledir='${prefix}/lib/perl'
++    fi
+ ])
+ AC_SUBST(perlmoduledir)
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130903/6ca42e76/attachment.html>


More information about the macports-changes mailing list