Changeset 39000


Ignore:
Timestamp:
Aug 5, 2008, 8:25:51 PM (12 years ago)
Author:
pmagrath@…
Message:

Merged revisions 38683-38684,38753,38756,38765,38835,38883,38940-38942,38960-38961,38973 via svnmerge from
https://svn.macosforge.org/repository/macports/trunk/base

........

r38683 | febeling@… | 2008-07-28 22:21:33 +0100 (Mon, 28 Jul 2008) | 9 lines


Support for ruby19 ports in the ruby port group.


The command ruby.setup accepts an new optional
parameter "implementation", which is ruby18 by
default, and can also be ruby19. (As more ruby
implementations appear these may be added as
well.) Unit tests are in the new sub-directory
tests/.

........

r38684 | febeling@… | 2008-07-28 22:32:47 +0100 (Mon, 28 Jul 2008) | 2 lines


ChangeLog for ruby group change, #15912.

........

r38753 | afb@… | 2008-07-30 08:30:39 +0100 (Wed, 30 Jul 2008) | 2 lines


update changelog for r38577

........

r38756 | afb@… | 2008-07-30 11:13:23 +0100 (Wed, 30 Jul 2008) | 2 lines


unbreak test case when ruby19 is not installed or not running leopard

........

r38765 | toby@… | 2008-07-30 20:59:14 +0100 (Wed, 30 Jul 2008) | 2 lines


fix distclean

........

r38835 | febeling@… | 2008-08-01 09:47:58 +0100 (Fri, 01 Aug 2008) | 2 lines


remove hard-coded mp prefix in test case setup

........

r38883 | wsiegrist@… | 2008-08-02 00:53:41 +0100 (Sat, 02 Aug 2008) | 2 lines


Make the guide chunkier at <http://guide.macports.org/chunked/>

........

r38940 | raimue@… | 2008-08-03 09:05:42 +0100 (Sun, 03 Aug 2008) | 4 lines


pextlib1.0:
Add a wrapper for isatty(3). Add term_get_size to find the size of a connected
terminal for a channel using ioctl(2).

........

r38941 | raimue@… | 2008-08-03 09:10:26 +0100 (Sun, 03 Aug 2008) | 4 lines


port/port.tcl:
Use isatty and term_get_size from pextlib to determine the size of the
connected terminal. This requires the Pextlib package.

........

r38942 | raimue@… | 2008-08-03 09:19:05 +0100 (Sun, 03 Aug 2008) | 3 lines


pextlib1.0/tty.c:
Tabs to spaces

........

r38960 | afb@… | 2008-08-04 10:23:00 +0100 (Mon, 04 Aug 2008) | 2 lines


add use_lzma for .tar.lzma support

........

r38961 | afb@… | 2008-08-04 10:29:00 +0100 (Mon, 04 Aug 2008) | 2 lines


fix typo

........

r38973 | jmr@… | 2008-08-04 17:11:28 +0100 (Mon, 04 Aug 2008) | 2 lines


mirror sites: order sourceforge mirrors more or less geographically

........

Location:
branches/gsoc08-privileges/base
Files:
15 edited
4 copied

Legend:

Unmodified
Added
Removed
  • branches/gsoc08-privileges/base

  • branches/gsoc08-privileges/base/ChangeLog

    r38641 r39000  
    66
    77Unreleased:
     8    - Ruby port group now accepts a new (optional) last parameter for the
     9      ruby.setup command, "implementation". It is "ruby" by default, and
     10      can be set to "ruby19". It names the ruby-implementing port, and can
     11      possibly support still other rubys in the future. (#15912, febeling
     12      in 38683)
     13       
     14    - Don't use build.nice for complex build.cmd commands (#16091)
     15
    816    - The buildmakejobs setting now also affects ports using the scons build
    917      system, so now scons-based ports can be built in parallel too. Previously
  • branches/gsoc08-privileges/base/Makefile.in

    r38641 r39000  
    5858        rm -f Makefile Mk/macports.autoconf.mk portmgr/fedora/macports.spec portmgr/freebsd/Makefile
    5959        rm -f Doxyfile
     60        rm -f setupenv.bash
    6061
    6162_gettag:
  • branches/gsoc08-privileges/base/configure

    r38145 r39000  
    1238712387if false && test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
    1238812388        PATHCONF=pathconf
     12389        ac_config_files="$ac_config_files src/pathconf/Makefile src/pathconf/paths src/pathconf/manpaths"
     12390
    1238912391        { echo "$as_me:$LINENO: result: yes" >&5
    1239012392echo "${ECHO_T}yes" >&6; }
     
    1247512477
    1247612478# Output
    12477 ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/pathconf/Makefile src/pathconf/paths src/pathconf/manpaths src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
     12479ac_config_files="$ac_config_files Doxyfile Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf portmgr/freebsd/Makefile portmgr/fedora/macports.spec src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl setupenv.bash"
    1247812480
    1247912481
     
    1303313035    "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;;
    1303413036    "src/programs/daemondo/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/daemondo/Makefile" ;;
     13037    "src/pathconf/Makefile") CONFIG_FILES="$CONFIG_FILES src/pathconf/Makefile" ;;
     13038    "src/pathconf/paths") CONFIG_FILES="$CONFIG_FILES src/pathconf/paths" ;;
     13039    "src/pathconf/manpaths") CONFIG_FILES="$CONFIG_FILES src/pathconf/manpaths" ;;
    1303513040    "Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
    1303613041    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     
    1304413049    "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
    1304513050    "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
    13046     "src/pathconf/Makefile") CONFIG_FILES="$CONFIG_FILES src/pathconf/Makefile" ;;
    13047     "src/pathconf/paths") CONFIG_FILES="$CONFIG_FILES src/pathconf/paths" ;;
    13048     "src/pathconf/manpaths") CONFIG_FILES="$CONFIG_FILES src/pathconf/manpaths" ;;
    1304913051    "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
    1305013052    "src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
  • branches/gsoc08-privileges/base/configure.ac

    r38145 r39000  
    342342if false && test -d /etc/paths.d -a -d /etc/manpaths.d -a "$mpprefix" = "$ac_default_prefix"; then
    343343        PATHCONF=pathconf
     344        AC_CONFIG_FILES([src/pathconf/Makefile src/pathconf/paths src/pathconf/manpaths])
    344345        AC_MSG_RESULT([yes])
    345346else
     
    411412        src/macports1.0/macports_autoconf.tcl
    412413        src/tclobjc1.0/Makefile
    413         src/pathconf/Makefile
    414         src/pathconf/paths
    415         src/pathconf/manpaths
    416414        src/port1.0/port_autoconf.tcl
    417415        src/registry1.0/registry_autoconf.tcl
  • branches/gsoc08-privileges/base/doc/portfile.7

    r36914 r39000  
    613613Use bzip2.
    614614.br
    615 Sets extract.suffix to: .bzip2
     615Sets extract.suffix to: .bz2
    616616.br
    617617Sets extract.cmd to: bzip2
     
    622622.Sy Example:
    623623.Dl use_bzip2 yes
     624.It Ic use_lzma
     625Use lzma.
     626.br
     627Sets extract.suffix to: .lzma
     628.br
     629Sets extract.cmd to: lzma
     630.br
     631.Sy Type:
     632.Em optional
     633.br
     634.Sy Example:
     635.Dl use_lzma yes
    624636.It Ic dist_subdir
    625637Create a sub-directory in
  • branches/gsoc08-privileges/base/portmgr/jobs/GuideRegen.sh

    r38641 r39000  
    6262fi
    6363
    64 # (re)build
     64# build single html version
    6565{ cd ${SRCTREE}/doc-new && $MAKE guide > $FAILURE_LOG 2>&1 ; } \
     66    || { echo "make failed." >> $FAILURE_LOG ; bail ; }
     67
     68# build chunked version
     69{ cd ${SRCTREE}/doc-new && $MAKE guide-chunked > $FAILURE_LOG 2>&1 ; } \
    6670    || { echo "make failed." >> $FAILURE_LOG ; bail ; }
    6771
  • branches/gsoc08-privileges/base/src/pextlib1.0/Makefile

    r27297 r39000  
    22                fs-traverse.o strcasecmp.o vercomp.o filemap.o \
    33                sha1cmd.o compat.o curl.o rmd160cmd.o readline.o uid.o\
    4                 tracelib.o
     4                tracelib.o tty.o
    55SHLIB_NAME=     Pextlib${SHLIB_SUFFIX}
    66INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0
  • branches/gsoc08-privileges/base/src/pextlib1.0/Pextlib.c

    r37922 r39000  
    115115#include "uid.h"
    116116#include "tracelib.h"
     117#include "tty.h"
    117118
    118119#if HAVE_CRT_EXTERNS_H
     
    12151216       
    12161217        Tcl_CreateObjCommand(interp, "tracelib", TracelibCmd, NULL, NULL);
     1218        Tcl_CreateObjCommand(interp, "isatty", IsattyCmd, NULL, NULL);
     1219        Tcl_CreateObjCommand(interp, "term_get_size", TermGetSizeCmd, NULL, NULL);
    12171220
    12181221        if (Tcl_PkgProvide(interp, "Pextlib", "1.0") != TCL_OK)
  • branches/gsoc08-privileges/base/src/port/port.tcl

    r38999 r39000  
    4242    [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
    4343package require macports
     44package require Pextlib 1.0
    4445
    4546
     
    405406##
    406407# Makes sure we get the current terminal size
    407 proc set_term_size {} {
     408proc term_init_size {} {
    408409    global env
    409410
    410411    if {![info exists env(COLUMNS)] || ![info exists env(LINES)]} {
    411         if {![catch {exec stty size} err]} {
    412             regexp {(\d+) (\d+)} $err -> rows cols
    413             set env(COLUMNS) $cols
    414             set env(LINES) $rows
     412        if {[isatty stdout]} {
     413            set size [term_get_size stdout]
     414
     415            if {![info exists env(LINES)]} {
     416                set env(LINES) [lindex $size 0]
     417            }
     418
     419            if {![info exists env(COLUMNS)]} {
     420                set env(COLUMNS) [lindex $size 1]
     421            }
    415422        }
    416423    }
     
    31623169# Make sure we get the size of the terminal
    31633170# We do this here to save it in the boot_env, in case we determined it manually
    3164 set_term_size
     3171term_init_size
    31653172
    31663173# Save off a copy of the environment before mportinit monkeys with it
  • branches/gsoc08-privileges/base/src/port1.0/portextract.tcl

    r38800 r39000  
    5959
    6060proc extract_init {args} {
    61     global extract.only extract.dir extract.cmd extract.pre_args extract.post_args extract.mkdir distfiles use_bzip2 use_zip use_dmg workpath
     61    global extract.only extract.dir extract.cmd extract.pre_args extract.post_args extract.mkdir distfiles use_bzip2 use_lzma use_zip use_dmg workpath
    6262
    6363    # should the distfiles be extracted to worksrcpath instead?
     
    7171    if {[tbool use_bzip2]} {
    7272        option extract.cmd [binaryInPath "bzip2"]
     73    } elseif {[tbool use_lzma]} {
     74        option extract.cmd [binaryInPath "lzma"]
    7375    } elseif {[tbool use_zip]} {
    7476        option extract.cmd [binaryInPath "unzip"]
  • branches/gsoc08-privileges/base/src/port1.0/portfetch.tcl

    r38277 r39000  
    101101# Option-executed procedures
    102102option_proc use_bzip2 fix_extract_suffix
     103option_proc use_lzma fix_extract_suffix
    103104option_proc use_zip fix_extract_suffix
    104105option_proc use_dmg fix_extract_suffix
     
    110111            use_bzip2 {
    111112                set extract.suffix .tar.bz2
     113            }
     114            use_lzma {
     115                set extract.suffix .tar.lzma
    112116            }
    113117            use_zip {
  • branches/gsoc08-privileges/base/src/port1.0/resources/fetch/mirror_sites.tcl

    r38277 r39000  
    259259set portfetch::mirror_sites::sites(sourceforge) {
    260260    http://downloads.sourceforge.net/
    261     http://internode.dl.sourceforge.net/
    262261    http://easynews.dl.sourceforge.net/
    263     http://ufpr.dl.sourceforge.net/
    264     http://kent.dl.sourceforge.net/
    265     http://jaist.dl.sourceforge.net/
    266     http://optusnet.dl.sourceforge.net/
    267     http://nchc.dl.sourceforge.net/
    268     http://switch.dl.sourceforge.net/
    269     http://puzzle.dl.sourceforge.net/
    270     http://garr.dl.sourceforge.net/
    271     http://surfnet.dl.sourceforge.net/
    272262    http://internap.dl.sourceforge.net/
    273263    http://superb-east.dl.sourceforge.net/
    274264    http://superb-west.dl.sourceforge.net/
     265    http://voxel.dl.sourceforge.net/
     266    http://ufpr.dl.sourceforge.net/
     267    http://dfn.dl.sourceforge.net/
     268    http://garr.dl.sourceforge.net/
     269    http://heanet.dl.sourceforge.net/
     270    http://kent.dl.sourceforge.net/
     271    http://mesh.dl.sourceforge.net/
     272    http://puzzle.dl.sourceforge.net/
     273    http://surfnet.dl.sourceforge.net/
     274    http://switch.dl.sourceforge.net/
     275    http://nchc.dl.sourceforge.net/
     276    http://jaist.dl.sourceforge.net/
     277    http://internode.dl.sourceforge.net/
    275278    http://transact.dl.sourceforge.net/
     279    http://optusnet.dl.sourceforge.net/
    276280}
    277281
  • branches/gsoc08-privileges/base/src/port1.0/resources/group/Makefile

    r28463 r39000  
    1313
    1414test:
     15        ${TCLSH} tests/ruby-1.0.tcl
    1516
    1617install:
  • branches/gsoc08-privileges/base/src/port1.0/resources/group/ruby-1.0.tcl

    r36656 r39000  
    3232# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    3333# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    34 #
    35 # Set some variables.
    36 set ruby.bin    ${prefix}/bin/ruby
    37 set ruby.rdoc   ${prefix}/bin/rdoc
     34
     35# Define these variables assuming ruby1.8 to make them accessible in
     36# the portfile after port group declaration. They can be modified by
     37# ruby.setup, e.g. to use another ruby than 1.8.
     38set ruby.bin            ${prefix}/bin/ruby
     39set ruby.rdoc           ${prefix}/bin/rdoc
     40set ruby.gem            ${prefix}/bin/gem
    3841
    3942proc ruby.extract_config {var {default ""}} {
     
    5255set ruby.archlib        [ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}]
    5356
    54 # define these empty initially, they are set by ruby.setup arguments
    5557set ruby.module         ""
    5658set ruby.filename       ""
     
    5961set ruby.srcdir         ""
    6062
    61 # ruby group setup procedure
    62 proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"}} {
    63         global destroot prefix worksrcpath
    64         global ruby.bin ruby.lib
    65         global ruby.module ruby.project ruby.filename ruby.docs ruby.srcdir
     63# ruby group setup procedure; optional for ruby 1.8 if you want only
     64# basic variables, like ruby.lib and ruby.archlib.
     65proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {implementation "ruby"}} {
     66        global destroot prefix worksrcpath os.platform
     67        global ruby.bin ruby.rdoc ruby.gem
     68        global ruby.version
     69        global ruby.lib ruby.archlib
     70        global ruby.module ruby.filename ruby.project ruby.docs ruby.srcdir
     71
     72        if {${implementation} eq "ruby19"} {
     73                set ruby.bin    ${prefix}/bin/ruby1.9
     74                set ruby.rdoc   ${prefix}/bin/rdoc1.9
     75                set ruby.gem    ${prefix}/bin/gem1.9
     76                set ruby.port_prefix rb19
     77        } elseif {${implementation} eq "ruby"} {
     78                # ruby.bin, ruby.rdoc, and ruby.gem set to 1.8 by default
     79                set ruby.port_prefix rb
     80        } else {
     81                ui_error "ruby.setup: unknown implementation '${implementation}' specified (ruby, ruby19 possible)"
     82                return -code error "ruby.setup failed"
     83        }
     84
     85        # re-define variables to pick up possible implemantation change
     86        set ruby.version        [ruby.extract_config ruby_version]
     87        set ruby.arch           [ruby.extract_config arch ${os.platform}]
     88        set ruby.lib            [ruby.extract_config vendorlibdir ${prefix}/lib/ruby/vendor_ruby/${ruby.version}]
     89        set ruby.archlib        [ruby.extract_config vendorarchdir ${ruby.lib}/${ruby.arch}]
    6690
    6791        # define ruby global names and lists
     
    81105        set ruby.docs   ${docs}
    82106
    83         name                    rb-[string tolower ${ruby.module}]
     107        name                    ${ruby.port_prefix}-[string tolower ${ruby.module}]
    84108        version                 ${vers}
    85109        categories              ruby
     
    132156        dist_subdir             ruby
    133157
    134         depends_lib             path:${ruby.bin}:ruby
     158        depends_lib             port:${implementation}
    135159
    136160        post-extract {
     
    276300                       
    277301                        destroot {
    278                           system "cd ${worksrcpath} && ${prefix}/bin/gem install --local --force --install-dir ${destroot}${prefix}/lib/ruby/gems/${ruby.version} ${distpath}/${distname}"
     302                          system "cd ${worksrcpath} && ${ruby.gem} install --local --force --install-dir ${destroot}${prefix}/lib/ruby/gems/${ruby.version} ${distpath}/${distname}"
    279303                       
    280304                                set binDir ${destroot}${prefix}/lib/ruby/gems/${ruby.version}/bin
Note: See TracChangeset for help on using the changeset viewer.