Ticket #12950: perl5.8_1.diff

File perl5.8_1.diff, 8.5 KB (added by nox@…, 17 years ago)

  • lang/perl5.8/files/patch-perl.c

     
     1Revert the order of @INC from PRIV SITE VENDOR to SITE VENDOR PRIV.
     2
     3--- perl.c.orig 2007-10-20 19:21:12.000000000 +0200
     4+++ perl.c      2007-10-20 19:40:47.000000000 +0200
     5@@ -4770,45 +4770,12 @@
     6     }
     7 
     8 /* Use the ~-expanded versions of APPLLIB (undocumented),
     9-    ARCHLIB PRIVLIB SITEARCH SITELIB VENDORARCH and VENDORLIB
     10+    SITEARCH SITELIB VENDORARCH VENDORLIB ARCHLIB and PRIVLIB
     11 */
     12 #ifdef APPLLIB_EXP
     13     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
     14 #endif
     15 
     16-#ifdef ARCHLIB_EXP
     17-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
     18-#endif
     19-#ifdef MACOS_TRADITIONAL
     20-    {
     21-       Stat_t tmpstatbuf;
     22-       SV * privdir = NEWSV(55, 0);
     23-       char * macperl = PerlEnv_getenv("MACPERL");
     24-       
     25-       if (!macperl)
     26-           macperl = "";
     27-       
     28-       Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
     29-       if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
     30-           incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
     31-       Perl_sv_setpvf(aTHX_ privdir, "%ssite_perl:", macperl);
     32-       if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
     33-           incpush(SvPVX(privdir), TRUE, FALSE, TRUE);
     34-       
     35-       SvREFCNT_dec(privdir);
     36-    }
     37-    if (!PL_tainting)
     38-       incpush(":", FALSE, FALSE, TRUE);
     39-#else
     40-#ifndef PRIVLIB_EXP
     41-#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
     42-#endif
     43-#if defined(WIN32)
     44-    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
     45-#else
     46-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
     47-#endif
     48-
     49 #ifdef SITEARCH_EXP
     50     /* sitearch is always relative to sitelib on Windows for
     51      * DLL-based path intuition to work correctly */
     52@@ -4854,9 +4821,20 @@
     53     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
     54 #endif
     55 
     56+#ifdef ARCHLIB_EXP
     57+    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
     58+#endif
     59+#ifndef PRIVLIB_EXP
     60+#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
     61+#endif
     62+#if defined(WIN32)
     63+    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
     64+#else
     65+    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
     66+#endif
     67+
     68     if (!PL_tainting)
     69        incpush(".", FALSE, FALSE, TRUE);
     70-#endif /* MACOS_TRADITIONAL */
     71 }
     72 
     73 #if defined(DOSISH) || defined(EPOC) || defined(SYMBIAN)

  • lang/perl5.8/Portfile

     
    44
    55name            perl5.8
    66version         5.8.8
     7revision        1
    78categories      lang
    8 platforms               darwin freebsd linux
    9 maintainers     nomaintainer
     9platforms       darwin freebsd linux
     10maintainers     nox
    1011description     Perl 5.8.x - Practical Extraction and Report Language
    1112
    1213long_description \
    … …  
    2425                sha1 4aab490040727ca4419098720eca2ba4367df539 \
    2526                rmd160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b
    2627
     28patchfiles      patch-perl.c
     29
    2730platform darwin {
    2831    patchfiles-append   patch-hints_darwin.sh
    2932
    3033    pre-configure {
    31         reinplace "s|ld=\"MACOSX_DEPLOYMENT_TARGET=10.3|ld=\"env MACOSX_DEPLOYMENT_TARGET=10.3|g" "${worksrcpath}/hints/darwin.sh"
     34        reinplace -E "s|ld=\"(MACOSX_DEPLOYMENT_TARGET)|ld=\"env \\1|" ${worksrcpath}/hints/darwin.sh
    3235    }
    3336}
    3437
    35 configure.env       LC_ALL=C
    36 configure.cmd       sh Configure
    37 configure.pre_args 
    38 configure.post_args -des -Dprefix='${prefix}' -Dccflags="-I'${prefix}/include'"\
    39                     -Dldflags=-L'${prefix}/lib' \
    40                     -Dvendorprefix='${prefix}'
     38configure.env-append    LC_ALL=C
     39configure.cmd           ./configure.gnu
     40configure.args          -Dvendorprefix=${prefix} \
     41                        -Dusethreads \
     42                        -Duseshrplib
    4143
    4244test.run            yes
    4345
    4446post-destroot {
    4547    foreach man3File [glob ${destroot}/${prefix}/share/man/man3/*] {
    46         file rename ${man3File} ${man3File}pm
     48        move ${man3File} ${man3File}pm
    4749    }
    4850}
    4951
    50 variant threads {
    51     configure.args-append   -Dusethreads
    52 }
     52platform darwin 8 {
     53    configure.compiler  gcc-4.0
    5354
    54 variant shared {
    55     configure.args-append   -Duseshrplib
     55    post-patch {
     56        reinplace -E "/MACOSX_DEPLOYMENT_TARGET/s/10\\.3/10.4/" ${worksrcpath}/hints/darwin.sh
     57    }
    5658}
    5759
    58 platform darwin 8 {
    59     configure.post_args-append  -Dcc=/usr/bin/gcc-4.0
    60 }
    61 
    6260livecheck.check regex
    6361livecheck.url   ${master_sites}
    64 livecheck.regex latest_is_(\\d+(?:\\.\\d+)*)
     62livecheck.regex {latest_is_(\d+(?:\.\d+)*)}
    6563

  • perl/p5-getopt-long/Portfile

     
    44PortGroup       perl5 1.0
    55
    66perl5.setup     Getopt-Long 2.37
     7revision        1
    78maintainers     nox openmaintainer
    89categories-append   devel
    910platforms       darwin
    … …  
    2425
    2526depends_lib-append     port:p5-pathtools
    2627
    27 # Perl searches vendor location last, so this won't
    28 # override the older version included with perl
    29 # if we install it in the vendor location
    30 set perl5.lib   ${prefix}/lib/perl5/${perl5.version}
    31 
    32 configure.args 
    33 
    34 post-destroot {
    35     ui_msg "You must install or activate this package with '-f' (force) as it needs to overwrite files installed by the perl5.8 port"
    36 }
    37 

  • perl/p5-pathtools/Portfile

     
    44PortGroup       perl5 1.0
    55
    66perl5.setup     PathTools 3.25 ../../authors/id/K/KW/KWILLIAMS/
     7revision        1
    78platforms       darwin
    89maintainers             geeklair.net:dluke openmaintainer
    910description             PathTools contains path building and modification classes.
    … …  
    1112long_description        $description
    1213
    1314homepage        http://search.cpan.org/dist/${perl5.module}/
    14 #master_sites    http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/
    1515
    1616checksums       md5 242b8a6355927625f57048f6c59577ca \
    1717                sha1 cbaf1a5aab6f7d50adbd00046010ae7e51e033ba \
    1818                rmd160 d14b9bb83b361a91a22560141b4b2753cf5804d0
    1919
    20 # Perl searches vendor location last, so this won't
    21 # override the older version included with perl
    22 # if we install it in the vendor location
    23 set perl5.lib   ${prefix}/lib/perl5/${perl5.version}
    24 
    25 configure.args 
    26 
    27 post-destroot {
    28     ui_msg "You must install or activate this package with '-f' (force) as it needs to overwrite files installed by the perl5.8 port"
    29 }
    30 

  • perl/p5-test-harness/Portfile

     
    44PortGroup       perl5 1.0
    55
    66perl5.setup     Test-Harness 2.64
    7 revision        1
    8 platforms               darwin
     7revision        2
     8platforms       darwin
    99maintainers     nomaintainer
    1010description     Run perl standard test scripts with statistics.
    1111
    … …  
    1818                sha1 65a5442500926f9ef00f9aadbacc2e30377074d8 \
    1919                rmd160 2ce9ed32114b545344ca517f3ba1dfeb0293d82d
    2020
    21 # Perl searches vendor location last, so this won't
    22 # override the older version included with perl
    23 # if we install it in the vendor location
    24 set perl5.lib   ${prefix}/lib/perl5/${perl5.version}
    25 
    26 configure.args 
    27 
    28 post-destroot {
    29     ui_msg "You must install or activate this package with '-f' (force) as it needs to overwrite files installed by the perl5.8 port"
    30 }
    31 
    3221universal_variant   no
    3322
    3423livecheck.check regexm

  • perl/p5-test-simple/Portfile

     
    44PortGroup           perl5 1.0
    55
    66perl5.setup         Test-Simple 0.72
     7revision            1
    78maintainers                     sal@email.arc.nasa.gov
    89description                     Basic utilities for writing perl tests
    910long_description        ${description}
    … …  
    1516
    1617depends_lib-append      port:p5-test-harness
    1718
    18 # Perl searches vendor location last, so this won't
    19 # override the older version included with perl
    20 # if we install it in the vendor location
    21 set perl5.lib   ${prefix}/lib/perl5/${perl5.version}
    22 
    23 configure.args 
    24 
    25 post-destroot {
    26     ui_msg "You must install or activate this package with '-f' (force) as it needs to overwrite files installed by the perl5.8 port"
    27 }
    28 
    2919universal_variant   no
    3020