[131310] trunk/dports/lang

larryv at macports.org larryv at macports.org
Thu Jan 8 18:12:52 PST 2015


Revision: 131310
          https://trac.macports.org/changeset/131310
Author:   larryv at macports.org
Date:     2015-01-08 18:12:52 -0800 (Thu, 08 Jan 2015)
Log Message:
-----------
perl5.{8,10,12,14,16,18,20}: Rearrange and reformat

Mainly aesthetic changes, quoting improvements, use of a ternary
expression where appropriate, and use of `ne` for string inequality
testing.

Modified Paths:
--------------
    trunk/dports/lang/perl5.10/Portfile
    trunk/dports/lang/perl5.12/Portfile
    trunk/dports/lang/perl5.14/Portfile
    trunk/dports/lang/perl5.16/Portfile
    trunk/dports/lang/perl5.18/Portfile
    trunk/dports/lang/perl5.20/Portfile
    trunk/dports/lang/perl5.8/Portfile

Modified: trunk/dports/lang/perl5.10/Portfile
===================================================================
--- trunk/dports/lang/perl5.10/Portfile	2015-01-09 00:46:30 UTC (rev 131309)
+++ trunk/dports/lang/perl5.10/Portfile	2015-01-09 02:12:52 UTC (rev 131310)
@@ -5,29 +5,30 @@
 
 name                perl5.10
 version             5.10.1
-revision            7
 set branch          [join [lrange [split ${version} .] 0 1] .]
+revision            7
 categories          lang
-license             {Artistic-1 GPL}
 platforms           darwin freebsd linux
+license             {Artistic-1 GPL}
 maintainers         nomaintainer
+
 description         Perl 5.10.x - Practical Extraction and Report Language
+long_description    Perl is a general-purpose programming language \
+                    originally developed for text manipulation and now \
+                    used for a wide range of tasks including system \
+                    administration, web development, network \
+                    programming, GUI development, and more.
+homepage            http://www.perl.org/
 
-long_description    Perl is a general-purpose programming language originally developed \
-                    for text manipulation and now used for a wide range of tasks including \
-                    system administration, web development, network programming, GUI \
-                    development, and more.
+depends_lib-append  port:gdbm
 
+master_sites        http://www.cpan.org/src/5.0/
 distname            perl-${version}
 use_bzip2           yes
-homepage            http://www.perl.org/
-master_sites        http://www.cpan.org/src/5.0/
 
 checksums           rmd160  840b3a5ac3d7f517770ce789676ebd9154d9ee5a \
                     sha256  9385f2c8c2ca8b1dc4a7c31903f1f8dc8f2ba867dc2a9e5c93012ed6b564e826
 
-depends_lib-append  port:gdbm
-
 patchfiles          patch-Configure.diff
 
 platform darwin {
@@ -35,8 +36,8 @@
                         patch-perl.c.diff
 
     if {${os.major} >= 11} {
-    # bypass stupid check that assumes fprintf must be in libc.dylib
-    patchfiles-append   patch-hints_darwin.sh-usenm.diff
+        # bypass stupid check that assumes fprintf must be in libc.dylib
+        patchfiles-append   patch-hints_darwin.sh-usenm.diff
     }
 
     # Prevent miniperl build from finding libstdcxx (#36438).
@@ -60,35 +61,32 @@
 configure.post_args -des \
                     -Dprefix='${prefix}' \
                     -Dscriptdir='${prefix}/bin' \
-                    -Dcppflags="\${CPPFLAGS}" \
-                    -Dccflags="\${CFLAGS}" \
-                    -Dldflags="\${LDFLAGS}" \
+                   {-Dcppflags="$CPPFLAGS"} \
+                   {-Dccflags="$CFLAGS"} \
+                   {-Dldflags="$LDFLAGS"} \
                     -Dvendorprefix='${prefix}' \
                     -Dusemultiplicity=y \
                     -Dusethreads \
                     -Duseshrplib \
-                    -D cc=\${CC} \
-                    -D ld=\${CC} \
-                    -D man1ext='1pm' \
-                    -D man3ext='3pm' \
-                    -D man1dir='${prefix}/share/man/man1p' \
-                    -D man3dir='${prefix}/share/man/man3p' \
-                    -D sitebin='${prefix}/libexec/perl${branch}/sitebin' \
-                    -D siteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
-                    -D siteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
-                    -D vendorbin='${prefix}/libexec/perl${branch}' \
-                    -D vendorman1dir='${prefix}/share/perl${branch}/man/man1' \
-                    -D vendorman3dir='${prefix}/share/perl${branch}/man/man3' \
-                    -D pager="/usr/bin/less -sR" \
-                    -D perlpath="${prefix}/bin/perl${branch}" \
-                    -D startperl="#!${prefix}/bin/perl${branch}"
+                   {-Dcc="$CC"} \
+                   {-Dld="$CC"} \
+                    -Dman1ext=1pm \
+                    -Dman3ext=3pm \
+                    -Dman1dir='${prefix}/share/man/man1p' \
+                    -Dman3dir='${prefix}/share/man/man3p' \
+                    -Dsitebin='${prefix}/libexec/perl${branch}/sitebin' \
+                    -Dsiteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
+                    -Dsiteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
+                    -Dvendorbin='${prefix}/libexec/perl${branch}' \
+                    -Dvendorman1dir='${prefix}/share/perl${branch}/man/man1' \
+                    -Dvendorman3dir='${prefix}/share/perl${branch}/man/man3' \
+                    -Dpager='/usr/bin/less -sR' \
+                    -Dperlpath="${prefix}/bin/perl${branch}" \
+                    -Dstartperl="#!${prefix}/bin/perl${branch}"
 
 # Allow perl to find p5-* ports installed by previous (minor) versions
-set platsuffix ""
-if {${os.platform} eq "darwin"} {
-    set platsuffix "-2level"
-}
-configure.args-append "-D inc_version_list=\"5.10.0/${os.platform}-thread-multi${platsuffix} 5.10.0\""
+set platsuffix [expr {${os.platform} eq "darwin" ? "-2level" : ""}]
+configure.args-append -Dinc_version_list='5.10.0/${os.platform}-thread-multi${platsuffix} 5.10.0'
 
 if {[variant_isset universal]} {
     post-configure {
@@ -97,7 +95,7 @@
 }
 
 post-build {
-    reinplace -E {s|-arch [a-z0-9_]+||g} \
+    reinplace -E {s/-arch [a-z0-9_]+//g} \
         ${worksrcpath}/lib/Config_heavy.pl
 }
 
@@ -112,7 +110,7 @@
     # perl5 creates unversioned symlinks
     delete ${destroot}${prefix}/bin/perl
     foreach binFile [glob -directory "${destroot}${prefix}/bin" *] {
-        if {$binFile != "${destroot}${prefix}/bin/perl${version}"} {
+        if {$binFile ne "${destroot}${prefix}/bin/perl${version}"} {
             move ${binFile} ${binFile}-${branch}
         }
     }

Modified: trunk/dports/lang/perl5.12/Portfile
===================================================================
--- trunk/dports/lang/perl5.12/Portfile	2015-01-09 00:46:30 UTC (rev 131309)
+++ trunk/dports/lang/perl5.12/Portfile	2015-01-09 02:12:52 UTC (rev 131310)
@@ -7,26 +7,27 @@
 version             5.12.5
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
-license             {Artistic-1 GPL}
 platforms           darwin freebsd linux
+license             {Artistic-1 GPL}
 maintainers         nomaintainer
+
 description         Perl 5.12.x - Practical Extraction and Report Language
+long_description    Perl is a general-purpose programming language \
+                    originally developed for text manipulation and now \
+                    used for a wide range of tasks including system \
+                    administration, web development, network \
+                    programming, GUI development, and more.
+homepage            http://www.perl.org/
 
-long_description    Perl is a general-purpose programming language originally developed \
-                    for text manipulation and now used for a wide range of tasks including \
-                    system administration, web development, network programming, GUI \
-                    development, and more.
+depends_lib-append  port:gdbm
 
+master_sites        http://www.cpan.org/src/5.0/
 distname            perl-${version}
 use_bzip2           yes
-homepage            http://www.perl.org/
-master_sites        http://www.cpan.org/src/5.0/
 
 checksums           rmd160  5a88d99650edc6697418ac81d4bd392250cf0e0e \
                     sha256  10749417fd3010aae320a34181ad4cd6a4855c1fc63403b87fa4d630b18e966c
 
-depends_lib-append  port:gdbm
-
 patchfiles          patch-Configure.diff \
                     patch-handy.h.stdbool.diff
 
@@ -54,35 +55,32 @@
 configure.post_args -des \
                     -Dprefix='${prefix}' \
                     -Dscriptdir='${prefix}/bin' \
-                    -Dcppflags="\${CPPFLAGS}" \
-                    -Dccflags="\${CFLAGS}" \
-                    -Dldflags="\${LDFLAGS}" \
+                   {-Dcppflags="$CPPFLAGS"} \
+                   {-Dccflags="$CFLAGS"} \
+                   {-Dldflags="$LDFLAGS"} \
                     -Dvendorprefix='${prefix}' \
                     -Dusemultiplicity=y \
                     -Dusethreads \
                     -Duseshrplib \
-                    -D cc=\${CC} \
-                    -D ld=\${CC} \
-                    -D man1ext='1pm' \
-                    -D man3ext='3pm' \
-                    -D man1dir='${prefix}/share/man/man1p' \
-                    -D man3dir='${prefix}/share/man/man3p' \
-                    -D sitebin='${prefix}/libexec/perl${branch}/sitebin' \
-                    -D siteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
-                    -D siteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
-                    -D vendorbin='${prefix}/libexec/perl${branch}' \
-                    -D vendorman1dir='${prefix}/share/perl${branch}/man/man1' \
-                    -D vendorman3dir='${prefix}/share/perl${branch}/man/man3' \
-                    -D pager="/usr/bin/less -sR" \
-                    -D perlpath="${prefix}/bin/perl${branch}" \
-                    -D startperl="#!${prefix}/bin/perl${branch}"
+                   {-Dcc="$CC"} \
+                   {-Dld="$CC"} \
+                    -Dman1ext=1pm \
+                    -Dman3ext=3pm \
+                    -Dman1dir='${prefix}/share/man/man1p' \
+                    -Dman3dir='${prefix}/share/man/man3p' \
+                    -Dsitebin='${prefix}/libexec/perl${branch}/sitebin' \
+                    -Dsiteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
+                    -Dsiteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
+                    -Dvendorbin='${prefix}/libexec/perl${branch}' \
+                    -Dvendorman1dir='${prefix}/share/perl${branch}/man/man1' \
+                    -Dvendorman3dir='${prefix}/share/perl${branch}/man/man3' \
+                    -Dpager='/usr/bin/less -sR' \
+                    -Dperlpath="${prefix}/bin/perl${branch}" \
+                    -Dstartperl="#!${prefix}/bin/perl${branch}"
 
 # Allow perl to find p5-* ports installed by previous (minor) versions
-set platsuffix ""
-if {${os.platform} eq "darwin"} {
-    set platsuffix "-2level"
-}
-configure.args-append "-D inc_version_list=\"5.12.4/${os.platform}-thread-multi${platsuffix} 5.12.4 5.12.3/${os.platform}-thread-multi${platsuffix} 5.12.3 5.12.2/${os.platform}-thread-multi${platsuffix} 5.12.2 5.12.1/${os.platform}-thread-multi${platsuffix} 5.12.1 5.12.0/${os.platform}-thread-multi${platsuffix} 5.12.0\""
+set platsuffix [expr {${os.platform} eq "darwin" ? "-2level" : ""}]
+configure.args-append -Dinc_version_list='5.12.4/${os.platform}-thread-multi${platsuffix} 5.12.4 5.12.3/${os.platform}-thread-multi${platsuffix} 5.12.3 5.12.2/${os.platform}-thread-multi${platsuffix} 5.12.2 5.12.1/${os.platform}-thread-multi${platsuffix} 5.12.1 5.12.0/${os.platform}-thread-multi${platsuffix} 5.12.0'
 
 if {[variant_isset universal]} {
     post-configure {
@@ -91,7 +89,7 @@
 }
 
 post-build {
-    reinplace -E {s|-arch [a-z0-9_]+||g} \
+    reinplace -E {s/-arch [a-z0-9_]+//g} \
         ${worksrcpath}/lib/Config_heavy.pl
 }
 
@@ -106,7 +104,7 @@
     # perl5 creates unversioned symlinks
     delete ${destroot}${prefix}/bin/perl
     foreach binFile [glob -directory "${destroot}${prefix}/bin" *] {
-        if {$binFile != "${destroot}${prefix}/bin/perl${version}"} {
+        if {$binFile ne "${destroot}${prefix}/bin/perl${version}"} {
             move ${binFile} ${binFile}-${branch}
         }
     }

Modified: trunk/dports/lang/perl5.14/Portfile
===================================================================
--- trunk/dports/lang/perl5.14/Portfile	2015-01-09 00:46:30 UTC (rev 131309)
+++ trunk/dports/lang/perl5.14/Portfile	2015-01-09 02:12:52 UTC (rev 131310)
@@ -7,26 +7,27 @@
 version             5.14.4
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
-license             {Artistic-1 GPL}
 platforms           darwin freebsd linux
+license             {Artistic-1 GPL}
 maintainers         nomaintainer
+
 description         Perl 5.14.x - Practical Extraction and Report Language
+long_description    Perl is a general-purpose programming language \
+                    originally developed for text manipulation and now \
+                    used for a wide range of tasks including system \
+                    administration, web development, network \
+                    programming, GUI development, and more.
+homepage            http://www.perl.org/
 
-long_description    Perl is a general-purpose programming language originally developed \
-                    for text manipulation and now used for a wide range of tasks including \
-                    system administration, web development, network programming, GUI \
-                    development, and more.
+depends_lib-append  port:gdbm
 
+master_sites        http://www.cpan.org/src/5.0/
 distname            perl-${version}
 use_bzip2           yes
-homepage            http://www.perl.org/
-master_sites        http://www.cpan.org/src/5.0/
 
 checksums           rmd160  b06a822864f2c8e4e77a1ebef74d37c00cba54d6 \
                     sha256  eece8c2b0d491bf6f746bd1f4f1bb7ce26f6b98e91c54690c617d7af38964745
 
-depends_lib-append  port:gdbm
-
 patchfiles          patch-Configure.diff \
                     patch-handy.h.stdbool.diff
 
@@ -54,35 +55,32 @@
 configure.post_args -des \
                     -Dprefix='${prefix}' \
                     -Dscriptdir='${prefix}/bin' \
-                    -Dcppflags="\${CPPFLAGS}" \
-                    -Dccflags="\${CFLAGS}" \
-                    -Dldflags="\${LDFLAGS}" \
+                   {-Dcppflags="$CPPFLAGS"} \
+                   {-Dccflags="$CFLAGS"} \
+                   {-Dldflags="$LDFLAGS"} \
                     -Dvendorprefix='${prefix}' \
                     -Dusemultiplicity=y \
                     -Dusethreads \
                     -Duseshrplib \
-                    -D cc=\${CC} \
-                    -D ld=\${CC} \
-                    -D man1ext='1pm' \
-                    -D man3ext='3pm' \
-                    -D man1dir='${prefix}/share/man/man1p' \
-                    -D man3dir='${prefix}/share/man/man3p' \
-                    -D sitebin='${prefix}/libexec/perl${branch}/sitebin' \
-                    -D siteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
-                    -D siteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
-                    -D vendorbin='${prefix}/libexec/perl${branch}' \
-                    -D vendorman1dir='${prefix}/share/perl${branch}/man/man1' \
-                    -D vendorman3dir='${prefix}/share/perl${branch}/man/man3' \
-                    -D pager="/usr/bin/less -sR" \
-                    -D perlpath="${prefix}/bin/perl${branch}" \
-                    -D startperl="#!${prefix}/bin/perl${branch}"
+                   {-Dcc="$CC"} \
+                   {-Dld="$CC"} \
+                    -Dman1ext=1pm \
+                    -Dman3ext=3pm \
+                    -Dman1dir='${prefix}/share/man/man1p' \
+                    -Dman3dir='${prefix}/share/man/man3p' \
+                    -Dsitebin='${prefix}/libexec/perl${branch}/sitebin' \
+                    -Dsiteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
+                    -Dsiteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
+                    -Dvendorbin='${prefix}/libexec/perl${branch}' \
+                    -Dvendorman1dir='${prefix}/share/perl${branch}/man/man1' \
+                    -Dvendorman3dir='${prefix}/share/perl${branch}/man/man3' \
+                    -Dpager='/usr/bin/less -sR' \
+                    -Dperlpath="${prefix}/bin/perl${branch}" \
+                    -Dstartperl="#!${prefix}/bin/perl${branch}"
 
 # Allow perl to find p5-* ports installed by previous (minor) versions
-set platsuffix ""
-if {${os.platform} eq "darwin"} {
-    set platsuffix "-2level"
-}
-configure.args-append "-D inc_version_list=\"5.14.2/${os.platform}-thread-multi${platsuffix} 5.14.2 5.14.1/${os.platform}-thread-multi${platsuffix} 5.14.1 5.14.0/${os.platform}-thread-multi${platsuffix} 5.14.0\""
+set platsuffix [expr {${os.platform} eq "darwin" ? "-2level" : ""}]
+configure.args-append -Dinc_version_list='5.14.2/${os.platform}-thread-multi${platsuffix} 5.14.2 5.14.1/${os.platform}-thread-multi${platsuffix} 5.14.1 5.14.0/${os.platform}-thread-multi${platsuffix} 5.14.0'
 
 
 if {[variant_isset universal]} {
@@ -92,7 +90,7 @@
 }
 
 post-build {
-    reinplace -E {s|-arch [a-z0-9_]+||g} \
+    reinplace -E {s/-arch [a-z0-9_]+//g} \
         ${worksrcpath}/lib/Config_heavy.pl
 }
 
@@ -107,7 +105,7 @@
     # perl5 creates unversioned symlinks
     delete ${destroot}${prefix}/bin/perl
     foreach binFile [glob -directory "${destroot}${prefix}/bin" *] {
-        if {$binFile != "${destroot}${prefix}/bin/perl${version}"} {
+        if {$binFile ne "${destroot}${prefix}/bin/perl${version}"} {
             move ${binFile} ${binFile}-${branch}
         }
     }

Modified: trunk/dports/lang/perl5.16/Portfile
===================================================================
--- trunk/dports/lang/perl5.16/Portfile	2015-01-09 00:46:30 UTC (rev 131309)
+++ trunk/dports/lang/perl5.16/Portfile	2015-01-09 02:12:52 UTC (rev 131310)
@@ -95,7 +95,7 @@
 }
 
 post-build {
-    reinplace -E {s|-arch [a-z0-9_]+||g} \
+    reinplace -E {s/-arch [a-z0-9_]+//g} \
         ${worksrcpath}/lib/Config_heavy.pl
 }
 

Modified: trunk/dports/lang/perl5.18/Portfile
===================================================================
--- trunk/dports/lang/perl5.18/Portfile	2015-01-09 00:46:30 UTC (rev 131309)
+++ trunk/dports/lang/perl5.18/Portfile	2015-01-09 02:12:52 UTC (rev 131310)
@@ -7,26 +7,27 @@
 version             5.18.4
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
+platforms           darwin freebsd linux
 license             {Artistic-1 GPL}
-platforms           darwin freebsd linux
 maintainers         emer.net:emer openmaintainer
+
 description         Perl 5.18.x - Practical Extraction and Report Language
+long_description    Perl is a general-purpose programming language \
+                    originally developed for text manipulation and now \
+                    used for a wide range of tasks including system \
+                    administration, web development, network \
+                    programming, GUI development, and more.
+homepage            http://www.perl.org/
 
-long_description    Perl is a general-purpose programming language originally developed \
-                    for text manipulation and now used for a wide range of tasks including \
-                    system administration, web development, network programming, GUI \
-                    development, and more.
+depends_lib-append  port:gdbm
 
+master_sites        http://www.cpan.org/src/5.0/
 distname            perl-${version}
 use_bzip2           yes
-homepage            http://www.perl.org/
-master_sites        http://www.cpan.org/src/5.0/
 
 checksums           rmd160  d97181a98f7acc80125b0d2a182a6a2cd7542ceb \
                     sha256  1fb4d27b75cd244e849f253320260efe1750641aaff4a18ce0d67556ff1b96a5
 
-depends_lib-append  port:gdbm
-
 patchfiles          patch-Configure.diff
 
 pre-configure {
@@ -43,28 +44,28 @@
 configure.post_args -des \
                     -Dprefix='${prefix}' \
                     -Dscriptdir='${prefix}/bin' \
-                    -Dcppflags="\${CPPFLAGS}" \
-                    -Dccflags="\${CFLAGS}" \
-                    -Dldflags="\${LDFLAGS}" \
+                   {-Dcppflags="$CPPFLAGS"} \
+                   {-Dccflags="$CFLAGS"} \
+                   {-Dldflags="$LDFLAGS"} \
                     -Dvendorprefix='${prefix}' \
                     -Dusemultiplicity=y \
                     -Dusethreads \
                     -Duseshrplib \
-                    -D cc=\${CC} \
-                    -D ld=\${CC} \
-                    -D man1ext='1pm' \
-                    -D man3ext='3pm' \
-                    -D man1dir='${prefix}/share/man/man1p' \
-                    -D man3dir='${prefix}/share/man/man3p' \
-                    -D sitebin='${prefix}/libexec/perl${branch}/sitebin' \
-                    -D siteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
-                    -D siteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
-                    -D vendorbin='${prefix}/libexec/perl${branch}' \
-                    -D vendorman1dir='${prefix}/share/perl${branch}/man/man1' \
-                    -D vendorman3dir='${prefix}/share/perl${branch}/man/man3' \
-                    -D pager="/usr/bin/less -sR" \
-                    -D perlpath="${prefix}/bin/perl${branch}" \
-                    -D startperl="#!${prefix}/bin/perl${branch}"
+                   {-Dcc="$CC"} \
+                   {-Dld="$CC"} \
+                    -Dman1ext=1pm \
+                    -Dman3ext=3pm \
+                    -Dman1dir='${prefix}/share/man/man1p' \
+                    -Dman3dir='${prefix}/share/man/man3p' \
+                    -Dsitebin='${prefix}/libexec/perl${branch}/sitebin' \
+                    -Dsiteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
+                    -Dsiteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
+                    -Dvendorbin='${prefix}/libexec/perl${branch}' \
+                    -Dvendorman1dir='${prefix}/share/perl${branch}/man/man1' \
+                    -Dvendorman3dir='${prefix}/share/perl${branch}/man/man3' \
+                    -Dpager='/usr/bin/less -sR' \
+                    -Dperlpath="${prefix}/bin/perl${branch}" \
+                    -Dstartperl="#!${prefix}/bin/perl${branch}"
 
 if {[variant_isset universal]} {
     post-configure {
@@ -88,7 +89,7 @@
     # perl5 creates unversioned symlinks
     delete ${destroot}${prefix}/bin/perl
     foreach binFile [glob -directory "${destroot}${prefix}/bin" *] {
-        if {$binFile != "${destroot}${prefix}/bin/perl${version}"} {
+        if {$binFile ne "${destroot}${prefix}/bin/perl${version}"} {
             move ${binFile} ${binFile}-${branch}
         }
     }

Modified: trunk/dports/lang/perl5.20/Portfile
===================================================================
--- trunk/dports/lang/perl5.20/Portfile	2015-01-09 00:46:30 UTC (rev 131309)
+++ trunk/dports/lang/perl5.20/Portfile	2015-01-09 02:12:52 UTC (rev 131310)
@@ -7,26 +7,27 @@
 version             5.20.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
+platforms           darwin freebsd linux
 license             {Artistic-1 GPL}
-platforms           darwin freebsd linux
 maintainers         nomaintainer
+
 description         Perl 5.20.x - Practical Extraction and Report Language
+long_description    Perl is a general-purpose programming language \
+                    originally developed for text manipulation and now \
+                    used for a wide range of tasks including system \
+                    administration, web development, network \
+                    programming, GUI development, and more.
+homepage            http://www.perl.org/
 
-long_description    Perl is a general-purpose programming language originally developed \
-                    for text manipulation and now used for a wide range of tasks including \
-                    system administration, web development, network programming, GUI \
-                    development, and more.
+depends_lib-append  port:gdbm
 
+master_sites        http://www.cpan.org/src/5.0/
 distname            perl-${version}
 use_bzip2           yes
-homepage            http://www.perl.org/
-master_sites        http://www.cpan.org/src/5.0/
 
 checksums           rmd160  8a33e7ef2cbe4b11c83187176656454794f6d26d \
                     sha256  ede5ded37e7fb6139b04728cfca826f17076f9888dbfd100a56834dbeb04657c
 
-depends_lib-append  port:gdbm
-
 patchfiles          patch-Configure.diff
 
 pre-configure {
@@ -43,28 +44,28 @@
 configure.post_args -des \
                     -Dprefix='${prefix}' \
                     -Dscriptdir='${prefix}/bin' \
-                    -Dcppflags="\${CPPFLAGS}" \
-                    -Dccflags="\${CFLAGS}" \
-                    -Dldflags="\${LDFLAGS}" \
+                   {-Dcppflags="$CPPFLAGS"} \
+                   {-Dccflags="$CFLAGS"} \
+                   {-Dldflags="$LDFLAGS"} \
                     -Dvendorprefix='${prefix}' \
                     -Dusemultiplicity=y \
                     -Dusethreads \
                     -Duseshrplib \
-                    -D cc=\${CC} \
-                    -D ld=\${CC} \
-                    -D man1ext='1pm' \
-                    -D man3ext='3pm' \
-                    -D man1dir='${prefix}/share/man/man1p' \
-                    -D man3dir='${prefix}/share/man/man3p' \
-                    -D sitebin='${prefix}/libexec/perl${branch}/sitebin' \
-                    -D siteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
-                    -D siteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
-                    -D vendorbin='${prefix}/libexec/perl${branch}' \
-                    -D vendorman1dir='${prefix}/share/perl${branch}/man/man1' \
-                    -D vendorman3dir='${prefix}/share/perl${branch}/man/man3' \
-                    -D pager="/usr/bin/less -sR" \
-                    -D perlpath="${prefix}/bin/perl${branch}" \
-                    -D startperl="#!${prefix}/bin/perl${branch}"
+                   {-Dcc="$CC"} \
+                   {-Dld="$CC"} \
+                    -Dman1ext=1pm \
+                    -Dman3ext=3pm \
+                    -Dman1dir='${prefix}/share/man/man1p' \
+                    -Dman3dir='${prefix}/share/man/man3p' \
+                    -Dsitebin='${prefix}/libexec/perl${branch}/sitebin' \
+                    -Dsiteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
+                    -Dsiteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
+                    -Dvendorbin='${prefix}/libexec/perl${branch}' \
+                    -Dvendorman1dir='${prefix}/share/perl${branch}/man/man1' \
+                    -Dvendorman3dir='${prefix}/share/perl${branch}/man/man3' \
+                    -Dpager='/usr/bin/less -sR' \
+                    -Dperlpath="${prefix}/bin/perl${branch}" \
+                    -Dstartperl="#!${prefix}/bin/perl${branch}"
 
 if {[variant_isset universal]} {
     post-configure {
@@ -73,7 +74,7 @@
 }
 
 post-build {
-    reinplace -E {s|-arch [a-z0-9_]+||g} \
+    reinplace -E {s/-arch [a-z0-9_]+//g} \
         ${worksrcpath}/lib/Config_heavy.pl
 }
 
@@ -88,7 +89,7 @@
     # perl5 creates unversioned symlinks
     delete ${destroot}${prefix}/bin/perl
     foreach binFile [glob -directory "${destroot}${prefix}/bin" *] {
-        if {$binFile != "${destroot}${prefix}/bin/perl${version}"} {
+        if {$binFile ne "${destroot}${prefix}/bin/perl${version}"} {
             move ${binFile} ${binFile}-${branch}
         }
     }

Modified: trunk/dports/lang/perl5.8/Portfile
===================================================================
--- trunk/dports/lang/perl5.8/Portfile	2015-01-09 00:46:30 UTC (rev 131309)
+++ trunk/dports/lang/perl5.8/Portfile	2015-01-09 02:12:52 UTC (rev 131310)
@@ -5,23 +5,24 @@
 
 name                perl5.8
 version             5.8.9
+set branch          [join [lrange [split ${version} .] 0 1] .]
 revision            9
-set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
+platforms           darwin freebsd linux
 license             {Artistic-1 GPL}
-platforms           darwin freebsd linux
 maintainers         nomaintainer
+
 description         Perl 5.8.x - Practical Extraction and Report Language
+long_description    Perl is a general-purpose programming language \
+                    originally developed for text manipulation and now \
+                    used for a wide range of tasks including system \
+                    administration, web development, network \
+                    programming, GUI development, and more.
+homepage            http://www.perl.org/
 
-long_description    Perl is a general-purpose programming language originally developed \
-                    for text manipulation and now used for a wide range of tasks including \
-                    system administration, web development, network programming, GUI \
-                    development, and more.
-
+master_sites        http://www.cpan.org/src/5.0/
 distname            perl-${version}
 use_bzip2           yes
-homepage            http://www.perl.org/
-master_sites        http://www.cpan.org/src/5.0/
 
 checksums           rmd160  680004238d626ec985075e1b4519b7f0b34f57e5 \
                     sha256  1097fbcd48ceccb2bc735d119c9db399a02a8ab9f7dc53e29e47e6a8d0d72e79
@@ -53,31 +54,31 @@
 configure.post_args -des \
                     -Dprefix='${prefix}' \
                     -Dscriptdir='${prefix}/bin' \
-                    -Dcppflags="\${CPPFLAGS}" \
-                    -Dccflags="\${CFLAGS}" \
-                    -Dldflags="\${LDFLAGS}" \
+                   {-Dcppflags="$CPPFLAGS"} \
+                   {-Dccflags="$CFLAGS"} \
+                   {-Dldflags="$LDFLAGS"} \
                     -Dvendorprefix='${prefix}' \
                     -Dusemultiplicity=y \
                     -Dusethreads \
                     -Duseshrplib \
-                    -D cc=\${CC} \
-                    -D ld=\${CC} \
-                    -D man1ext='1pm' \
-                    -D man3ext='3pm' \
-                    -D man1dir='${prefix}/share/man/man1p' \
-                    -D man3dir='${prefix}/share/man/man3p' \
-                    -D sitebin='${prefix}/libexec/perl${branch}/sitebin' \
-                    -D siteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
-                    -D siteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
-                    -D vendorbin='${prefix}/libexec/perl${branch}' \
-                    -D vendorman1dir='${prefix}/share/perl${branch}/man/man1' \
-                    -D vendorman3dir='${prefix}/share/perl${branch}/man/man3' \
-                    -D pager="/usr/bin/less -sR" \
-                    -D perlpath="${prefix}/bin/perl${branch}" \
-                    -D startperl="#!${prefix}/bin/perl${branch}"
+                   {-Dcc="$CC"} \
+                   {-Dld="$CC"} \
+                    -Dman1ext=1pm \
+                    -Dman3ext=3pm \
+                    -Dman1dir='${prefix}/share/man/man1p' \
+                    -Dman3dir='${prefix}/share/man/man3p' \
+                    -Dsitebin='${prefix}/libexec/perl${branch}/sitebin' \
+                    -Dsiteman1dir='${prefix}/share/perl${branch}/siteman/man1' \
+                    -Dsiteman3dir='${prefix}/share/perl${branch}/siteman/man3' \
+                    -Dvendorbin='${prefix}/libexec/perl${branch}' \
+                    -Dvendorman1dir='${prefix}/share/perl${branch}/man/man1' \
+                    -Dvendorman3dir='${prefix}/share/perl${branch}/man/man3' \
+                    -Dpager='/usr/bin/less -sR' \
+                    -Dperlpath="${prefix}/bin/perl${branch}" \
+                    -Dstartperl="#!${prefix}/bin/perl${branch}"
 
 # Allow perl to find p5-* ports installed by previous (minor) versions
-configure.args-append "-D inc_version_list=\"5.8.8 5.8.8/${os.platform}-thread-multi-2level\""
+configure.args-append -Dinc_version_list='5.8.8 5.8.8/${os.platform}-thread-multi-2level'
 
 set exclude_libs {bind gdbm db}
 
@@ -95,7 +96,7 @@
 }
 
 post-build {
-    reinplace -E {s|-arch [a-z0-9_]+||g} \
+    reinplace -E {s/-arch [a-z0-9_]+//g} \
         ${worksrcpath}/lib/Config_heavy.pl
 }
 
@@ -106,7 +107,7 @@
     # perl5 creates unversioned symlinks
     delete ${destroot}${prefix}/bin/perl
     foreach binFile [glob -directory "${destroot}${prefix}/bin" *] {
-        if {$binFile != "${destroot}${prefix}/bin/perl${version}"} {
+        if {$binFile ne "${destroot}${prefix}/bin/perl${version}"} {
             move ${binFile} ${binFile}-${branch}
         }
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150108/be3d4379/attachment-0001.html>


More information about the macports-changes mailing list