Changeset 37817


Ignore:
Timestamp:
Jun 24, 2008, 9:58:07 PM (12 years ago)
Author:
raimue@…
Message:

Merged revisions 34807,36461-36462,36654,37059,37481,37485,37529,37810-37812 via svnmerge from
https://svn.macosforge.org/repository/macports/branches/python-frameworks/dports/lang/python25

........

r34807 | raimue@… | 2008-03-06 18:20:38 +0100 (Thu, 06 Mar 2008) | 3 lines


lang/python25:
Committing what we got so far from #11267

........

r36461 | raimue@… | 2008-05-03 02:27:21 +0200 (Sat, 03 May 2008) | 3 lines


lang/python25:
Tabs to spaces

........

r36462 | raimue@… | 2008-05-03 05:01:09 +0200 (Sat, 03 May 2008) | 6 lines


lang/python24, lang/python25:
Major changes to make the ports more similar. I hope I didn't miss some
changes.
This still does not contain any hook to make the transition easier, but these
ports are now very similar which makes them easier to maintain.

........

r36654 | raimue@… | 2008-05-09 16:29:30 +0200 (Fri, 09 May 2008) | 3 lines


lang/python{24,25}:
Remove unnecessary links to libpython.dylib, should be handled by python_select

........

r37059 | raimue@… | 2008-05-25 04:45:36 +0200 (Sun, 25 May 2008) | 3 lines


lang/python25:
Different framework approach

........

r37481 | raimue@… | 2008-06-09 19:36:10 +0200 (Mon, 09 Jun 2008) | 5 lines


lang/python{24,25,30}:
Make the ports more similar.
These ports install fine for me now and also work with py-* and py25-* ports
providing modules, but need testing by others.

........

r37485 | raimue@… | 2008-06-09 21:00:33 +0200 (Mon, 09 Jun 2008) | 3 lines


lang/python25:
Correct checksums

........

r37529 | raimue@… | 2008-06-11 17:32:11 +0200 (Wed, 11 Jun 2008) | 3 lines


lang/python{24,25,30}:
Correct a symlink inside the framework directory pointing into the destroot

........

r37810 | raimue@… | 2008-06-24 21:51:31 +0200 (Tue, 24 Jun 2008) | 3 lines


lang/python25:
Restore maintainer

........

r37811 | raimue@… | 2008-06-24 22:36:46 +0200 (Tue, 24 Jun 2008) | 3 lines


lang/python{24,25,30}:
Add better post-activate message

........

r37812 | raimue@… | 2008-06-24 22:38:25 +0200 (Tue, 24 Jun 2008) | 3 lines


lang/python{24,25,30}:
Bump revisions

........

Location:
trunk/dports/lang/python25
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/python25

  • trunk/dports/lang/python25/Portfile

    r36179 r37817  
    33PortSystem 1.0
    44
    5 name                    python25
    6 version                 2.5.2
    7 revision                2
    8 categories              lang
    9 platforms               darwin
    10 maintainers             mww
     5name                    python25
     6version                 2.5.2
     7revision                3
     8set major               2
     9set branch              2.5
     10categories              lang
     11platforms               darwin
     12maintainers             mww
    1113
    12 description             An interpreted, object-oriented programming language
    13 long_description        Python is an interpreted, interactive, object-oriented \
    14                         programming language.
     14description             An interpreted, object-oriented programming language
     15long_description        Python is an interpreted, interactive, object-oriented \
     16                        programming language.
    1517
    16 homepage                http://www.python.org/
    17 master_sites    ${homepage}/ftp/python/${version}/ \
    18                         ftp://ftp.python.org/pub/python/${version}/ \
    19                         ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
    20                         ftp://ftp.python.jp/pub/python/${version}/
     18homepage                http://www.python.org/
     19master_sites            ${homepage}/ftp/python/${version}/ \
     20                        ftp://ftp.python.org/pub/python/${version}/ \
     21                        ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
     22                        ftp://ftp.python.jp/pub/python/${version}/
    2123
    22 distname                Python-${version}
    23 use_bzip2               yes
     24distname                Python-${version}
     25extract.suffix          .tgz
    2426
    25 checksums       md5 afb5451049eda91fbde10bd5a4b7fadc \
    26                 sha1 4755d212f50af704c20224a6966e23acc5aea60f \
    27                 rmd160 b23b02739833e6730799c5866e2b77aae884b63f
     27checksums               md5     3f7ca8aa86c6bd275426d63b46e07992 \
     28                        sha1    7a835c93a904ae4ecb2d23b5183e94d3b92f8305 \
     29                        rmd160  a6e2e81910639a362f265af2e3814e7b47e2110a
    2830
    29 depends_lib     port:gettext
     31patchfiles              patch-Makefile.pre.in.diff \
     32                        patch-setup.py.diff \
     33                        patch-Lib-cgi.py.diff
    3034
    31 patchfiles      patch-configure.diff \
    32                 patch-Makefile.pre.in.diff \
    33                 patch-Misc-setuid-prog.c.diff \
    34                 patch-Modules-posixmodule.c.diff \
    35                 patch-setup.py.diff \
    36                 patch-Lib-cgi.py.diff
     35depends_lib             port:gettext
    3736
    38 configure.args  --enable-shared \
    39                         --mandir=${prefix}/share/man \
    40                         --disable-framework
     37configure.args          --enable-shared \
     38                        --enable-framework=${prefix}/Library/Frameworks \
     39                        --mandir=${prefix}/share/man \
     40                        --without-readline \
     41                        --disable-tk \
     42                        --enable-ipv6
     43
     44use_parallel_build      no
    4145
    4246post-patch {
    43     reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
     47        reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py
     48        reinplace "s|/Applications/MacPython|/Applications/MacPorts/MacPython|g" \
     49                Mac/Makefile.in Mac/IDLE/Makefile.in \
     50                Mac/IDLE/Makefile.in Mac/Tools/Doc/setup.py \
     51                Mac/PythonLauncher/Makefile.in \
     52                Mac/BuildScript/build-installer.py
    4453}
    4554
    46 test.run           yes
    47 test.target        test
     55build.target            all libpython${branch}.dylib
    4856
    49 destroot.target altinstall \
    50                 maninstall
     57# TODO: From python24, do we still need this?
     58# Workaround for case-sensitive file systems
     59post-build {
     60    if { ![file exists ${worksrcpath}/python.exe] } {
     61        ln -s python ${worksrcpath}/python.exe
     62    }
     63}
     64
     65test.run                yes
     66test.target             test
     67
     68destroot.target         frameworkinstall maninstall
    5169
    5270post-destroot {
    53     set branche [join [lrange [split ${version} .] 0 1] .]
     71        set framewpath ${prefix}/Library/Frameworks/Python.framework
     72        set framewdir  ${framewpath}/Versions/${branch}
    5473
    55     foreach bin {idle pydoc smtpd.py} {
    56         move ${destroot}${prefix}/bin/${bin} \
    57             ${destroot}${prefix}/bin/${bin}${branche}
    58     }
    59     move ${destroot}${prefix}/share/man/man1/python.1 \
    60         ${destroot}${prefix}/share/man/man1/python${branche}.1
     74        foreach dir { lib include } {
     75            file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir}
     76            ln -s ${destroot}${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
     77        }
    6178
    62     # install select file for python_select
    63     xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
    64     xinstall -m 644 ${filespath}/python25 ${destroot}${prefix}/etc/select/python/
     79        file rename ${destroot}${framewdir}/lib/libpython${branch}.dylib ${destroot}${prefix}/lib
     80        ln -s ${destroot}${prefix}/lib/libpython${branch}.dylib ${destroot}${framewdir}/lib/libpython${branch}.dylib
     81
     82        file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
     83
     84        # delete symlinks without version suffix, use python_select instead to choose version
     85        foreach bin { python pythonw idle pydoc smtpd.py python-config } {
     86            file delete ${destroot}${prefix}/bin/${bin}
     87        }
     88        foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py python${branch}-config] {
     89            file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin
     90            ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin}
     91        }
     92
     93        foreach dir { Headers Resources Python Versions/Current } {
     94            file delete ${destroot}${framewpath}/${dir}
     95        }
     96
     97        # install select file for python_select
     98        xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
     99        xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
     100}
     101
     102post-activate {
     103    ui_msg "\nTo fully complete your installation and make python $branch the default, please run
     104\n\tsudo port install python_select \
     105\n\tsudo python_select $name\n"
    65106}
    66107
    67108platform darwin 7 {
    68         # there is no SystemStubs on 10.3
    69         post-patch { reinplace "s|-lSystemStubs||g" ${worksrcpath}/Makefile.pre.in }
    70         # To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth@gmail.com, ticket #13322)
    71         configure.ldflags-append "-lcc_dynamic"
     109        # there is no SystemStubs on 10.3
     110        post-patch {
     111                reinplace "s|-lSystemStubs||g" \
     112                        configure configure.in
     113        }
     114        post-configure {
     115                reinplace "s|-lSystemStubs||g" \
     116                        Makefile.pre.in Makefile.pre Makefile
     117        }
     118        # To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth@gmail.com, ticket #13322)
     119        configure.ldflags-append "-lcc_dynamic"
    72120}
    73121
    74122platform darwin 8 {
    75         configure.args-append   --with-cxx=/usr/bin/g++-4.0
     123        # TODO: would configure.compiler be more appropriate?
     124        configure.args-append           --with-cxx=/usr/bin/g++-4.0
    76125}
    77126
    78127platform darwin 9 {
    79         configure.cppflags-append       -D__DARWIN_UNIX03
    80         configure.args-append   --with-cxx=/usr/bin/g++-4.0
     128        configure.cppflags-append       -D__DARWIN_UNIX03
    81129}
    82130
    83131variant universal {
    84     configure.args-append   --enable-universalsdk
     132        configure.args-append           --enable-universalsdk
    85133}
    86134
    87 # for w/o quicktime sdk, etc. (be prepared for framework build, though)
    88 platform puredarwin {
    89 #       configure.args-delete   --enable-framework=${prefix}/Library/Frameworks
    90         configure.args-append   --disable-toolbox-glue --disable-framework
    91 }
    92 
    93 livecheck.check regex
    94 livecheck.url   ${homepage}download/releases/
    95 livecheck.regex {Python (2\.5(?:\.\d+)*)}
    96 
     135livecheck.check         regex
     136livecheck.url           ${homepage}download/releases/
     137livecheck.regex         Python (${branch}.\[0-9\]+)
  • trunk/dports/lang/python25/files/python25

    r36179 r37817  
    11bin/python2.5
    2 -
     2bin/pythonw2.5
    33bin/python2.5-config
    44bin/idle2.5
     
    77-
    88share/man/man1/python2.5.1.gz
    9 -
    10 -
    11 -
    12 -
     9Library/Frameworks/Python.framework/Versions/2.5
     10Library/Frameworks/Python.framework/Versions/Versions/2.5/Headers
     11Library/Frameworks/Python.framework/Versions/Versions/2.5/Resources
     12Library/Frameworks/Python.framework/Versions/Versions/2.5/Python
Note: See TracChangeset for help on using the changeset viewer.