Ignore:
Timestamp:
Nov 24, 2008, 9:14:55 AM (12 years ago)
Author:
blb@…
Message:

Merged revisions 41015-41016,41030,41056,41068,41097,41123,41157,41166-41167,41170,41174-41175,41249,41379,41388-41389,41396,41404,41478-41479,41511-41512,41522-41527,41541,41573-41575,41595,41603,41637-41639,41650-41651,41655,41701-41702,41742,41841,41850,41854-41855,41907,41978,42055,42061,42134,42484 via svnmerge from
https://svn.macports.org/repository/macports/trunk/base

........

r41015 | afb@… | 2008-10-20 16:56:28 -0600 (Mon, 20 Oct 2008) | 2 lines


make tclobjc package conditional

........

r41016 | afb@… | 2008-10-20 16:57:00 -0600 (Mon, 20 Oct 2008) | 2 lines


regenerate configure

........

r41030 | afb@… | 2008-10-21 01:27:26 -0600 (Tue, 21 Oct 2008) | 2 lines


update changelog for r41015

........

r41056 | raimue@… | 2008-10-21 08:35:03 -0600 (Tue, 21 Oct 2008) | 3 lines


port/port.tcl:
Remove empty TODO tag

........

r41068 | blb@… | 2008-10-21 22:19:29 -0600 (Tue, 21 Oct 2008) | 2 lines


mirror_sites.tcl - clean out a couple more bad mirrors, found via distcheck

........

r41097 | devans@… | 2008-10-22 17:03:00 -0600 (Wed, 22 Oct 2008) | 2 lines


mirror_sites.tcl: add definition for gimp mirror site.

........

r41123 | jmr@… | 2008-10-24 02:48:57 -0600 (Fri, 24 Oct 2008) | 3 lines


Change documentation of uninstall --recursive to --follow-dependents, to match
the change made to the code in r36160.

........

r41157 | jmr@… | 2008-10-26 06:56:11 -0600 (Sun, 26 Oct 2008) | 2 lines


Apply global variants for all targets (#11897)

........

r41166 | blb@… | 2008-10-26 18:01:47 -0600 (Sun, 26 Oct 2008) | 2 lines


ChangeLog - there will be no 1.6.1, so those changes will also be in 1.7.0

........

r41167 | blb@… | 2008-10-26 19:07:22 -0600 (Sun, 26 Oct 2008) | 2 lines


ChangeLog - add closed 1.7.0 milestone tickets not already noted

........

r41170 | ryandesign@… | 2008-10-26 19:32:41 -0600 (Sun, 26 Oct 2008) | 2 lines


portlint.tcl: No longer nitpick whitespace or patchfile names unless the nitpick option is enabled. There is currently no way to enable this option. A future revision should provide a way to do so. See issue #14799.

........

r41174 | ryandesign@… | 2008-10-26 19:48:47 -0600 (Sun, 26 Oct 2008) | 2 lines


Set svn:eol-style to native on tcl files.

........

r41175 | ryandesign@… | 2008-10-26 19:49:23 -0600 (Sun, 26 Oct 2008) | 2 lines


Set svn:keywords to Id on tcl files

........

r41249 | pguyot@… | 2008-10-29 03:17:40 -0600 (Wed, 29 Oct 2008) | 2 lines


Add support for +universal variants with the xcode portgroup

........

r41379 | jmr@… | 2008-10-31 23:49:19 -0600 (Fri, 31 Oct 2008) | 2 lines


Document the new Norwegian mirror in the relevant config files.

........

r41388 | afb@… | 2008-11-01 04:20:52 -0600 (Sat, 01 Nov 2008) | 2 lines


make sure to expand default prefix (from NONE)

........

r41389 | afb@… | 2008-11-01 04:21:17 -0600 (Sat, 01 Nov 2008) | 2 lines


regenerate configure

........

r41396 | raimue@… | 2008-11-01 13:12:44 -0600 (Sat, 01 Nov 2008) | 4 lines


port/port.tcl:
Add proc wraplabel which outputs a wrapped string with a label. Use the new
wrapping code for output of deps, platforms and maintainers.

........

r41404 | raimue@… | 2008-11-01 16:39:42 -0600 (Sat, 01 Nov 2008) | 3 lines


port1.0/portlivecheck.tcl:
Fix livecheck if using https with invalid certificates, passive ftp, or username and password

........

r41478 | toby@… | 2008-11-03 23:37:10 -0700 (Mon, 03 Nov 2008) | 2 lines


set CURLOPT_MAXREDIRS to 50 to avoid infinite redirection

........

r41479 | jmr@… | 2008-11-03 23:49:20 -0700 (Mon, 03 Nov 2008) | 2 lines


Add new Norwegian distfiles mirror.

........

r41511 | blb@… | 2008-11-04 19:50:05 -0700 (Tue, 04 Nov 2008) | 2 lines


lint command - add --nitpick option; ticket #14799

........

r41512 | blb@… | 2008-11-04 20:18:28 -0700 (Tue, 04 Nov 2008) | 2 lines


port.1 - document --nitpick option added in r41511

........

r41522 | pguyot@… | 2008-11-05 06:33:22 -0700 (Wed, 05 Nov 2008) | 2 lines


Fixed expectations in tests to reflect changes in the code (obviously tests are simply not run)

........

r41523 | pguyot@… | 2008-11-05 06:35:27 -0700 (Wed, 05 Nov 2008) | 2 lines


Add a test that was sleeping on my disk, and that illustrates a buggy behaviour with variants

........

r41524 | pguyot@… | 2008-11-05 06:41:54 -0700 (Wed, 05 Nov 2008) | 2 lines


Include the forgotten test

........

r41525 | pguyot@… | 2008-11-05 06:42:13 -0700 (Wed, 05 Nov 2008) | 2 lines


Partial fix for test trace

........

r41526 | pguyot@… | 2008-11-05 06:45:07 -0700 (Wed, 05 Nov 2008) | 2 lines


Handle new syntax for dependencies, to allow work for dependencies to happen on trunk/ where ports lie, while base/ is frozen for most users (cf bug #126)

........

r41527 | pguyot@… | 2008-11-05 07:38:06 -0700 (Wed, 05 Nov 2008) | 2 lines


Fix switch statement (put comment before the statement) and add a test to check for that

........

r41541 | ryandesign@… | 2008-11-05 15:21:41 -0700 (Wed, 05 Nov 2008) | 2 lines


port.1: --nitpick also checks patchfile names

........

r41573 | ryandesign@… | 2008-11-06 03:44:45 -0700 (Thu, 06 Nov 2008) | 2 lines


portutil.tcl: Fix reinplace for filenames containing spaces; fixes #17098

........

r41574 | ryandesign@… | 2008-11-06 03:50:06 -0700 (Thu, 06 Nov 2008) | 2 lines


ChangeLog: Add note for issue #17098

........

r41575 | ryandesign@… | 2008-11-06 03:52:18 -0700 (Thu, 06 Nov 2008) | 2 lines


ChangeLog: Remove trailing whitespace.

........

r41595 | blb@… | 2008-11-06 13:43:18 -0700 (Thu, 06 Nov 2008) | 2 lines


ChangeLog - note port lint improvements from #14799

........

r41603 | blb@… | 2008-11-06 19:48:44 -0700 (Thu, 06 Nov 2008) | 8 lines


base/src/pextlib1.0/Pextlib.c - this should get the edge case issues of
the Tcl environment bug (#13930); basically, looping through environ while
unsetting stuff changes environ, so not all variables are caught.
clearenv() if it becomes a standard would be best for this, but is not
available everywhere (including Mac OS X/Darwin), so instead use a simple
technique that has been found to work on a number of various platforms (see
<http://lists.freebsd.org/pipermail/freebsd-stable/2008-June/043136.html>).

........

r41637 | blb@… | 2008-11-07 14:00:43 -0700 (Fri, 07 Nov 2008) | 2 lines


pextlib1.0/tests/unsetenv.tcl - remove some spaces on empty lines

........

r41638 | blb@… | 2008-11-07 14:06:17 -0700 (Fri, 07 Nov 2008) | 4 lines


pextlib1.0/tests/unsetenv.tcl - add test for verifying 'unsetenv *' does
empty out the environment; use 'error' instead of 'exit' so the cause for
a failure is shown

........

r41639 | blb@… | 2008-11-07 14:09:31 -0700 (Fri, 07 Nov 2008) | 5 lines


pextlib1.0/Pextlib.c - it turns out Tcl gets a little confused when items
in the environment are removed (either via the complete clear or using
unsetenv()), so we need to force Tcl to sync back with the environment
after changing it (follow up to #13930)

........

r41650 | blb@… | 2008-11-08 02:05:33 -0700 (Sat, 08 Nov 2008) | 8 lines


pextlib1.0/Pextlib.c - move away from "environ = calloc(1, sizeof(char *));"
as that appears to tickle some memory bug on Mac OS X 10.4 tclsh which then
causes apparently-random crashes. Instead, create a list of which variables
are set in the environment, storing in a Tcl list (since that's much easier
for a dynamic list like this), then loop through that list and unsetenv()
each one. No crashing on 10.3-10.5 and tests/unsetenv.tcl pass (hopefully
final bit for #13930).

........

r41651 | afb@… | 2008-11-08 02:33:01 -0700 (Sat, 08 Nov 2008) | 2 lines


use clearenv(3) where available

........

r41655 | toby@… | 2008-11-08 03:50:42 -0700 (Sat, 08 Nov 2008) | 5 lines


SystemCmd:

  • fix major leak (circbuf only freed when command exited non-zero)
  • fix fd leak
  • minor refactoring

........

r41701 | ryandesign@… | 2008-11-09 02:25:36 -0700 (Sun, 09 Nov 2008) | 2 lines


portindex.tcl: Generate the port index in a temporary file first, then replace the PortIndex file all at once; fixes #16234

........

r41702 | ryandesign@… | 2008-11-09 02:28:13 -0700 (Sun, 09 Nov 2008) | 2 lines


ChangeLog: update for issue #16234 (atomic PortIndex regeneration)

........

r41742 | raimue@… | 2008-11-09 19:43:42 -0700 (Sun, 09 Nov 2008) | 4 lines


pextlib1.0/tests/curl.tcl:
The old password protected file no longer exists, use another file from the
same server.

........

r41841 | toby@… | 2008-11-10 19:43:25 -0700 (Mon, 10 Nov 2008) | 2 lines


make setrlimit stop complaining

........

r41850 | ryandesign@… | 2008-11-11 01:44:01 -0700 (Tue, 11 Nov 2008) | 2 lines


portimage.tcl: fix typo in comment

........

r41854 | ryandesign@… | 2008-11-11 02:23:45 -0700 (Tue, 11 Nov 2008) | 2 lines


Registry: Properly handle ports whose version evaluates to 0; see #16740

........

r41855 | ryandesign@… | 2008-11-11 02:27:17 -0700 (Tue, 11 Nov 2008) | 2 lines


receipt_flat.tcl: fix typo in error message

........

r41907 | ryandesign@… | 2008-11-11 21:42:24 -0700 (Tue, 11 Nov 2008) | 2 lines


preflight: fix typo in dp2mp-move code introduced in r26518.

........

r41978 | ryandesign@… | 2008-11-12 16:59:39 -0700 (Wed, 12 Nov 2008) | 2 lines


ChangeLog: add note for ticket #16740

........

r42055 | blb@… | 2008-11-14 00:12:06 -0700 (Fri, 14 Nov 2008) | 2 lines


ChangeLog - note change from ticket #12288

........

r42061 | toby@… | 2008-11-14 01:54:14 -0700 (Fri, 14 Nov 2008) | 2 lines


leak fix

........

r42134 | blb@… | 2008-11-15 18:00:02 -0700 (Sat, 15 Nov 2008) | 2 lines


fetch/mirror_sites.tcl - fix path for a CPAN mirror, ticket #17262

........

r42484 | mcalhoun@… | 2008-11-21 19:54:44 -0700 (Fri, 21 Nov 2008) | 3 lines


group/perl5-1.0.tcl: Change perl dependency from path:...:perl5.8 to path:bin/perl:perl5 (see #16830).
bin/perl is used instead of the full path until #17182 is fixed.

........

Location:
branches/variant-descs-14482/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/variant-descs-14482/base

  • branches/variant-descs-14482/base/configure

    r40953 r42567  
    774774TCL_DEFS
    775775TCL_CC
     776CONDITIONAL_PACKAGES
    776777OUR_INCLUDED_PACKAGES
    777778prefix_expanded
     
    44654466
    44664467
     4468# Determine if we want to install conditional packages
     4469CONDITIONAL_PACKAGES=
     4470
    44674471# Foundation checks
    44684472
     
    54965500                        apple)
    54975501                                ;;
     5502                        no)
     5503                                ;;
    54985504                        *)
    54995505                                { { echo "$as_me:$LINENO: error: ${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either \"GNU\" or \"apple\"" >&5
     
    55105516ac_compiler_gnu=$ac_cv_objc_compiler_gnu
    55115517
     5518
     5519        if test x"${with_objc_runtime}" != x"no"; then
    55125520
    55135521        # Check for common header, objc/objc.h
     
    59755983        fi
    59765984
     5985        fi
     5986
    59775987        # Apple runtime is prefered
    59785988        if test x"${mp_cv_objc_runtime_apple}" = x"yes"; then
     
    59966006_ACEOF
    59976007
     6008        elif test x"${with_objc_runtime}" = x"no"; then
     6009                        OBJC_RUNTIME="none"
     6010                        { echo "$as_me:$LINENO: Not using Objective-C runtime" >&5
     6011echo "$as_me: Not using Objective-C runtime" >&6;}
    59986012        else
    59996013                        { { echo "$as_me:$LINENO: error: Could not locate a working Objective-C runtime.
     
    60406054                        apple)
    60416055                                ;;
     6056                        no)
     6057                                ;;
    60426058                        *)
    60436059                                { { echo "$as_me:$LINENO: error: ${with_objc_foundation} is not a valid argument to --with-objc-foundation. Please specify either \"GNU\" or \"apple\"" >&5
     
    60546070ac_compiler_gnu=$ac_cv_objc_compiler_gnu
    60556071
     6072
     6073        if test x"${with_objc_foundation}" != x"no"; then
    60566074
    60576075        if test x"${with_objc_foundation}" == x || test x"${with_objc_foundation}" == x"apple"; then
     
    62526270        fi
    62536271
     6272        fi
     6273
    62546274        # NeXT Foundation is prefered
    62556275        if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
     
    62776297                { echo "$as_me:$LINENO: Using GNUstep Foundation library" >&5
    62786298echo "$as_me: Using GNUstep Foundation library" >&6;}
     6299        elif test x"${with_objc_foundation}" = x"no"; then
     6300                OBJC_FOUNDATION="none"
     6301                { echo "$as_me:$LINENO: Not using Foundation implementation" >&5
     6302echo "$as_me: Not using Foundation implementation" >&6;}
    62796303        else
    62806304                { { echo "$as_me:$LINENO: error: Could not find a working Foundation implementation" >&5
     
    62956319
    62966320
     6321
     6322# tclobjc requires objc (runtime and foundation) support
     6323if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
     6324        CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
     6325fi
    62976326
    62986327
     
    68206849
    68216850
     6851    oldprefix=$prefix
     6852    if test "x$prefix" = "xNONE" ; then
     6853        prefix=$ac_default_prefix
     6854    fi
    68226855    { echo "$as_me:$LINENO: checking for Applications installation directory" >&5
    68236856echo $ECHO_N "checking for Applications installation directory... $ECHO_C" >&6; }
     
    68346867echo "${ECHO_T}$MPAPPLICATIONSDIR" >&6; }
    68356868
     6869    prefix=$oldprefix
    68366870
    68376871
     
    68456879
    68466880
     6881    oldprefix=$prefix
     6882    if test "x$prefix" = "xNONE" ; then
     6883        prefix=$ac_default_prefix
     6884    fi
    68476885    { echo "$as_me:$LINENO: checking for Frameworks installation directory" >&5
    68486886echo $ECHO_N "checking for Frameworks installation directory... $ECHO_C" >&6; }
     
    68556893echo "${ECHO_T}$MPFRAMEWORKSDIR" >&6; }
    68566894
     6895    prefix=$oldprefix
    68576896
    68586897
     
    87928831
    87938832
    8794 for ac_func in bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile
     8833
     8834for ac_func in bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv
    87958835do
    87968836as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
     
    1234012380SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
    1234112381SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
     12382
    1234212383
    1234312384
     
    1321213253TCL_DEFS!$TCL_DEFS$ac_delim
    1321313254TCL_CC!$TCL_CC$ac_delim
     13255CONDITIONAL_PACKAGES!$CONDITIONAL_PACKAGES$ac_delim
    1321413256OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
    1321513257prefix_expanded!$prefix_expanded$ac_delim
     
    1322013262_ACEOF
    1322113263
    13222   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
     13264  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
    1322313265    break
    1322413266  elif $ac_last_try; then
Note: See TracChangeset for help on using the changeset viewer.