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

[mojca at macports.org]

Revision: 144219
          https://trac.macports.org/changeset/144219
Author:   mojca at macports.org
Date:     2016-01-04 15:53:50 -0800 (Mon, 04 Jan 2016)
Log Message:
-----------
globus-core: fixes for perl (r144216, #48365), still broken (#50215)

Revision Links:
--------------
    https://trac.macports.org/changeset/144216

Modified Paths:
--------------
    trunk/dports/devel/globus-core/Portfile
    trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff
    trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff

Modified: trunk/dports/devel/globus-core/Portfile
===================================================================
--- trunk/dports/devel/globus-core/Portfile	2016-01-04 23:48:57 UTC (rev 144218)
+++ trunk/dports/devel/globus-core/Portfile	2016-01-04 23:53:50 UTC (rev 144219)
@@ -45,8 +45,18 @@
 patchfiles              patch-globus-core-automake-obsolete-macro.diff \
                         patch-globus-core-perldir.diff
 
-patch.pre_args          -p1
+post-patch {
+    reinplace "s|@@PERLLIB@@|${perl5.lib}|" ${worksrcpath}/configure.in
+    reinplace "s|libtoolize|glibtoolize|g"  ${worksrcpath}/bootstrap
+}
 
+# this should probably be an "autoconf" step
+pre-configure {
+    file delete -force ${worksrcpath}/autom4te.cache
+    system "cd ${worksrcpath} && \
+        GLOBUS_LOCATION=${prefix} GPT_LOCATION=${prefix} ./bootstrap"
+}
+
 depends_build           port:grid-packaging-tools \
                         port:libtool \
                         port:autoconf \
@@ -76,13 +86,6 @@
 build.env-append        GPT_LOCATION=${prefix} \
                         GLOBUS_LOCATION=${prefix}
 
-pre-configure {
-    file delete -force ${worksrcpath}/autom4te.cache
-    reinplace "s/libtoolize/glibtoolize/g" ${worksrcpath}/bootstrap
-    system "cd ${worksrcpath} && \
-        GLOBUS_LOCATION=${prefix} GPT_LOCATION=${prefix} ./bootstrap"
-}
-
 post-destroot {
     # These scripts are intended to be sourced, not executed
     system "chmod 644 ${destroot}${prefix}/share/globus/globus-build-env-*.sh"

Modified: trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff
===================================================================
--- trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff	2016-01-04 23:48:57 UTC (rev 144218)
+++ trunk/dports/devel/globus-core/files/patch-globus-core-automake-obsolete-macro.diff	2016-01-04 23:53:50 UTC (rev 144219)
@@ -1,5 +1,5 @@
---- globus_core-8.9.orig/configure.in	2011-12-05 21:27:20.000000000 +0100
-+++ globus_core-8.9/configure.in	2013-01-18 11:50:18.742812017 +0100
+--- configure.in.orig
++++ configure.in
 @@ -21,7 +21,7 @@
  GPT_INIT
  AM_INIT_AUTOMAKE($GPT_NAME, $GPT_VERSION,0)

Modified: trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff
===================================================================
--- trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff	2016-01-04 23:48:57 UTC (rev 144218)
+++ trunk/dports/devel/globus-core/files/patch-globus-core-perldir.diff	2016-01-04 23:53:50 UTC (rev 144219)
@@ -1,15 +1,11 @@
---- 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 @@
+--- configure.in.orig
++++ configure.in
+@@ -89,7 +89,7 @@
      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
++    perlmoduledir=@@PERLLIB@@
  ])
  AC_SUBST(perlmoduledir)
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160104/cd64f8b0/attachment.html>