[109785] branches/larryv-subversion-subports/dports/devel/subversion/ Portfile

[larryv at macports.org]

Revision: 109785
          https://trac.macports.org/changeset/109785
Author:   larryv at macports.org
Date:     2013-08-19 18:48:22 -0700 (Mon, 19 Aug 2013)
Log Message:
-----------
Rename variables to match those in perl5 PortGroup.

Modified Paths:
--------------
    branches/larryv-subversion-subports/dports/devel/subversion/Portfile

Modified: branches/larryv-subversion-subports/dports/devel/subversion/Portfile
===================================================================
--- branches/larryv-subversion-subports/dports/devel/subversion/Portfile	2013-08-20 01:18:28 UTC (rev 109784)
+++ branches/larryv-subversion-subports/dports/devel/subversion/Portfile	2013-08-20 01:48:22 UTC (rev 109785)
@@ -12,7 +12,8 @@
     set p_idx [lsearch ${perl5.branches} ${branch}]
     set other_perls [lreplace ${perl5.branches} $p_idx $p_idx]
     subport subversion-perlbindings-${branch} {
-        set perl5.branch ${branch}
+        set perl5.major ${branch}
+        set perl5.bin ${prefix}/bin/perl${perl5.major}
         foreach c_perl ${other_perls} {
             conflicts-append    subversion-perlbindings-${c_perl}
         }
@@ -35,10 +36,10 @@
 switch -regexp ${subport} {
     perl {
         categories-append       perl
-        description             Perl ${perl5.branch} bindings for the \
+        description             Perl ${perl5.major} bindings for the \
                                 Subversion version control system
         long_description-append These bindings provide access to the \
-                                Subversion API from Perl ${perl5.branch}.
+                                Subversion API from Perl ${perl5.major}.
     }
     default {
         description             A version control system designed to \
@@ -61,7 +62,7 @@
             port:sqlite3 \
             port:zlib
 switch -regexp ${subport} {
-    perl    {depends_lib-append port:${name} port:perl${perl5.branch}}
+    perl    {depends_lib-append port:${name} port:perl${perl5.major}}
     default {depends_run        port:curl-ca-bundle}
 }
 
@@ -99,7 +100,7 @@
                 --without-apxs \
                 --without-gnome-keyring
 switch -regexp ${subport} {
-    perl    {configure.args-append  PERL=${prefix}/bin/perl${perl5.branch}}
+    perl    {configure.args-append  PERL=${perl5.bin}}
 }
 pre-configure {
     reinplace "s|hardcode_direct=yes|hardcode_direct=no|g" \
@@ -130,8 +131,8 @@
                 "${build.cmd} pure_install INSTALLDIRS=vendor ${destroot.post_args}"
             fs-traverse pl ${destroot} {
                 if {[file tail ${pl}] eq {.packlist}} {
-                    ui_info "Fixing packlist ${pl}"
                     reinplace "s|${destroot}||" ${pl}
+                    ui_info "Fixing packlist '${pl}'"
                 }
             }
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130819/8d18614b/attachment.html>