<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50752] branches/images-and-archives/base</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/50752">50752</a></dd>
<dt>Author</dt> <dd>blb@macports.org</dd>
<dt>Date</dt> <dd>2009-05-08 13:52:00 -0700 (Fri, 08 May 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge from trunk</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesimagesandarchivesbaseLICENSE">branches/images-and-archives/base/LICENSE</a></li>
<li><a href="#branchesimagesandarchivesbaseaclocalm4">branches/images-and-archives/base/aclocal.m4</a></li>
<li><a href="#branchesimagesandarchivesbaseconfigure">branches/images-and-archives/base/configure</a></li>
<li><a href="#branchesimagesandarchivesbaseconfigureac">branches/images-and-archives/base/configure.ac</a></li>
<li><a href="#branchesimagesandarchivesbasedocmacportsconfin">branches/images-and-archives/base/doc/macports.conf.in</a></li>
<li><a href="#branchesimagesandarchivesbasem4foundationm4">branches/images-and-archives/base/m4/foundation.m4</a></li>
<li><a href="#branchesimagesandarchivesbasem4pthreadm4">branches/images-and-archives/base/m4/pthread.m4</a></li>
<li><a href="#branchesimagesandarchivesbaseregensh">branches/images-and-archives/base/regen.sh</a></li>
<li><a href="#branchesimagesandarchivesbasesrcconfighin">branches/images-and-archives/base/src/config.h.in</a></li>
<li><a href="#branchesimagesandarchivesbasesrcdarwintracelib10darwintracec">branches/images-and-archives/base/src/darwintracelib1.0/darwintrace.c</a></li>
<li><a href="#branchesimagesandarchivesbasesrcmacports10macportstcl">branches/images-and-archives/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#branchesimagesandarchivesbasesrcportportindextcl">branches/images-and-archives/base/src/port/portindex.tcl</a></li>
<li><a href="#branchesimagesandarchivesbasesrcport10portinstalltcl">branches/images-and-archives/base/src/port1.0/portinstall.tcl</a></li>
<li><a href="#branchesimagesandarchivesbasesrcport10portutiltcl">branches/images-and-archives/base/src/port1.0/portutil.tcl</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchesimagesandarchivesbase">branches/images-and-archives/base/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesimagesandarchivesbase"></a>
<div class="propset"><h4>Property changes: branches/images-and-archives/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:50249-50664
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><span class="cx"> + /branches/gsoc08-privileges/base:37343-46937
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:50249-50751
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><a id="branchesimagesandarchivesbaseLICENSE"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/LICENSE (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/LICENSE 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/LICENSE 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> Copyright (c) 2002 - 2003, Apple Computer, Inc.
</span><del>-Copyright (c) 2004 - 2007, The MacPorts Project.
</del><ins>+Copyright (c) 2004 - 2009, The MacPorts Project.
</ins><span class="cx"> All rights reserved.
</span><span class="cx">
</span><span class="cx"> Redistribution and use in source and binary forms, with or without
</span></span></pre></div>
<a id="branchesimagesandarchivesbaseaclocalm4"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/aclocal.m4 (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/aclocal.m4 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/aclocal.m4 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> dnl For ease of reading, run after gcc has been found/configured
</span><span class="cx"> AC_REQUIRE([AC_PROG_CC])
</span><span class="cx">
</span><del>- AC_ARG_WITH(ports-dir, [AC_HELP_STRING([--with-ports-dir=DIR], [Specify alternate ports directory])], [ portsdir="$withval" ] )
</del><ins>+ AC_ARG_WITH(ports-dir, [AS_HELP_STRING([--with-ports-dir=DIR],[Specify alternate ports directory])], [ portsdir="$withval" ] )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([for ports tree])
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> dnl use ~/Library/Tcl as Tcl package directory
</span><span class="cx"> AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</span><span class="cx">
</span><del>- AC_ARG_WITH(no-root-privileges, [AC_HELP_STRING([--with-no-root-privileges], [Specify that MacPorts should be installed in your home directory])], [ROOTPRIVS=$withval] )
</del><ins>+ AC_ARG_WITH(no-root-privileges, [AS_HELP_STRING([--with-no-root-privileges],[Specify that MacPorts should be installed in your home directory])], [ROOTPRIVS=$withval] )
</ins><span class="cx">
</span><span class="cx"> if test "${ROOTPRIVS+set}" = set; then
</span><span class="cx">
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> dnl use it. otherwise default to platform defaults
</span><span class="cx"> AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</span><span class="cx">
</span><del>- AC_ARG_WITH(macports-user, [AC_HELP_STRING([--with-macports-user=USER], [Specify user to drop privileges to, if possible, during compiles etc.])], [ RUNUSR=$withval ] )
</del><ins>+ AC_ARG_WITH(macports-user, [AS_HELP_STRING([--with-macports-user=USER],[Specify user to drop privileges to, if possible, during compiles etc.])], [ RUNUSR=$withval ] )
</ins><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([for macports user])
</span><span class="cx"> if test "x$RUNUSR" = "x" ; then
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> dnl use 0775 permissions for ${prefix} directories
</span><span class="cx"> AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</span><span class="cx">
</span><del>- AC_ARG_WITH(shared-directory, [AC_HELP_STRING([--with-shared-directory], [Use 0775 permissions for installed directories])], [ SHAREDIR=$withval ] )
</del><ins>+ AC_ARG_WITH(shared-directory, [AS_HELP_STRING([--with-shared-directory],[Use 0775 permissions for installed directories])], [ SHAREDIR=$withval ] )
</ins><span class="cx">
</span><span class="cx"> if test "${SHAREDIR+set}" = set; then
</span><span class="cx"> AC_MSG_CHECKING([whether to share the install directory with all members of the install group])
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> dnl use it. otherwise default to platform defaults
</span><span class="cx"> AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</span><span class="cx">
</span><del>- AC_ARG_WITH(install-user, [AC_HELP_STRING([--with-install-user=USER], [Specify user ownership of installed files])], [ DSTUSR=$withval ] )
</del><ins>+ AC_ARG_WITH(install-user, [AS_HELP_STRING([--with-install-user=USER],[Specify user ownership of installed files])], [ DSTUSR=$withval ] )
</ins><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([for install user])
</span><span class="cx"> if test "x$DSTUSR" = "x" ; then
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> dnl use it. otherwise default to platform defaults
</span><span class="cx"> AC_REQUIRE([MP_CHECK_INSTALLUSER])
</span><span class="cx">
</span><del>- AC_ARG_WITH(install-group, [AC_HELP_STRING([--with-install-group=GROUP], [Specify group ownership of installed files])], [ DSTGRP=$withval ] )
</del><ins>+ AC_ARG_WITH(install-group, [AS_HELP_STRING([--with-install-group=GROUP],[Specify group ownership of installed files])], [ DSTGRP=$withval ] )
</ins><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([for install group])
</span><span class="cx"> if test "x$DSTGRP" = "x" ; then
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> dnl otherwise use 0755
</span><span class="cx"> AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</span><span class="cx">
</span><del>- AC_ARG_WITH(directory-mode, [AC_HELP_STRING([--with-directory-mode=MODE], [Specify directory mode of installed directories])], [ DSTMODE=$withval ] )
</del><ins>+ AC_ARG_WITH(directory-mode, [AS_HELP_STRING([--with-directory-mode=MODE],[Specify directory mode of installed directories])], [ DSTMODE=$withval ] )
</ins><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([what permissions to use for installation directories])
</span><span class="cx"> if test "x$DSTMODE" = "x" ; then
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> AC_DEFUN([MP_PATH_APPLICATIONS],[
</span><span class="cx"> AC_REQUIRE([MP_CHECK_INSTALLUSER])
</span><span class="cx">
</span><del>- AC_ARG_WITH(applications-dir,[AC_HELP_STRING([--with-applications-dir], [Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
</del><ins>+ AC_ARG_WITH(applications-dir,[AS_HELP_STRING([--with-applications-dir],[Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
</ins><span class="cx">
</span><span class="cx"> oldprefix=$prefix
</span><span class="cx"> if test "x$prefix" = "xNONE" ; then
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> AC_DEFUN([MP_PATH_FRAMEWORKS],[
</span><span class="cx"> AC_REQUIRE([MP_CHECK_INSTALLUSER])
</span><span class="cx">
</span><del>- AC_ARG_WITH(frameworks-dir,[AC_HELP_STRING([--with-frameworks-dir], [Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
</del><ins>+ AC_ARG_WITH(frameworks-dir,[AS_HELP_STRING([--with-frameworks-dir],[Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
</ins><span class="cx">
</span><span class="cx"> oldprefix=$prefix
</span><span class="cx"> if test "x$prefix" = "xNONE" ; then
</span><span class="lines">@@ -490,9 +490,9 @@
</span><span class="cx"> #---------------------------------------
</span><span class="cx"> AC_DEFUN([MP_UNIVERSAL_OPTIONS],[
</span><span class="cx">
</span><del>- AC_ARG_WITH(universal-target,[AC_HELP_STRING([--with-universal-target=MDT], [Universal MACOSX_DEPLOYMENT_TARGET version])], UNIVERSAL_TARGET=${withval})
- AC_ARG_WITH(universal-sysroot,[AC_HELP_STRING([--with-universal-sysroot=SDK], [Universal SDK sysroot (with complete path)])], UNIVERSAL_SYSROOT=${withval})
- AC_ARG_WITH(universal-archs,[AC_HELP_STRING([--with-universal-archs="CPU"], [Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
</del><ins>+ AC_ARG_WITH(universal-target,[AS_HELP_STRING([--with-universal-target=MDT],[Universal MACOSX_DEPLOYMENT_TARGET version])], UNIVERSAL_TARGET=${withval})
+ AC_ARG_WITH(universal-sysroot,[AS_HELP_STRING([--with-universal-sysroot=SDK],[Universal SDK sysroot (with complete path)])], UNIVERSAL_SYSROOT=${withval})
+ AC_ARG_WITH(universal-archs,[AS_HELP_STRING([--with-universal-archs="CPU"],[Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
</ins><span class="cx">
</span><span class="cx"> MACOSX_MAJOR_VERSION=`$SW_VERS -productVersion | cut -f-2 -d.`
</span><span class="cx">
</span><span class="lines">@@ -572,21 +572,6 @@
</span><span class="cx"> AC_SUBST([MD5_LIBS])
</span><span class="cx"> ])
</span><span class="cx">
</span><del>-# MP_PROG_XAR
-#---------------------------------------
-AC_DEFUN([MP_PROG_XAR],[
-
- AC_PATH_PROG([XAR], [xar], , [/usr/bin:/usr/sbin:/bin:/sbin])
-
- if test "x$XAR" = "x" ; then
- AC_CONFIG_SUBDIRS([src/programs/xar])
- XAR='$(TOPSRCDIR)/src/programs/xar/xar'
- REPLACEMENT_PROGS="$REPLACEMENT_PROGS xar"
- fi
-
- AC_SUBST(XAR)
-])
-
</del><span class="cx"> # MP_PROG_DAEMONDO
</span><span class="cx"> #---------------------------------------
</span><span class="cx"> AC_DEFUN([MP_PROG_DAEMONDO],[
</span><span class="lines">@@ -807,29 +792,6 @@
</span><span class="cx"> AC_SUBST(LDFLAGS_LIBCURL)
</span><span class="cx"> ])
</span><span class="cx">
</span><del>-# MP_LIBCURL_VERSION
-# Determine the version of libcurl.
-#
-# Arguments:
-# None.
-#
-# Requires:
-# CURL must be set (AC_PATH_PROG(CURL, [curl], []))
-#
-# Results:
-# sets libcurl_version to "0" or some number
-#---------------------------------------
-AC_DEFUN([MP_LIBCURL_VERSION],[
- if test "x$CURL" = "x"; then
- libcurl_version="0"
- else
- AC_MSG_CHECKING([libcurl version])
- libcurl_version=`$CURL -V | sed '2,$d' | awk '{print $ 2}' | sed -e 's/\.//g' -e 's/-.*//g'`
- AC_MSG_RESULT([$libcurl_version])
- fi
-])
-
-
</del><span class="cx"> dnl This macro tests if the compiler supports GCC's
</span><span class="cx"> dnl __attribute__ syntax for unused variables/parameters
</span><span class="cx"> AC_DEFUN([MP_COMPILER_ATTRIBUTE_UNUSED], [
</span><span class="lines">@@ -986,7 +948,7 @@
</span><span class="cx"> #------------------------------------------------------------------------
</span><span class="cx"> AC_DEFUN([MP_WERROR],[
</span><span class="cx"> AC_REQUIRE([AC_PROG_CC])
</span><del>- AC_ARG_ENABLE(werror, AC_HELP_STRING([--enable-werror], [Add -Werror to CFLAGS. Used for development.]), [enable_werror=${enableval}], [enable_werror=no])
</del><ins>+ AC_ARG_ENABLE(werror, AS_HELP_STRING([--enable-werror],[Add -Werror to CFLAGS. Used for development.]), [enable_werror=${enableval}], [enable_werror=no])
</ins><span class="cx"> if test x"$enable_werror" != "xno"; then
</span><span class="cx"> CFLAGS_WERROR="-Werror"
</span><span class="cx"> else
</span></span></pre></div>
<a id="branchesimagesandarchivesbaseconfigure"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/configure (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/configure 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/configure 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -744,6 +744,8 @@
</span><span class="cx"> LDFLAGS
</span><span class="cx"> CFLAGS
</span><span class="cx"> CC
</span><ins>+XCODE_SELECT
+DEFAULTS
</ins><span class="cx"> SW_VERS
</span><span class="cx"> MACPORTS_VERSION
</span><span class="cx"> target_os
</span><span class="lines">@@ -1994,6 +1996,7 @@
</span><span class="cx">
</span><span class="cx"> ac_config_headers="$ac_config_headers src/config.h"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> ac_aux_dir=
</span><span class="cx"> for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
</span><span class="cx"> if test -f "$ac_dir/install-sh"; then
</span><span class="lines">@@ -2185,26 +2188,26 @@
</span><span class="cx"> prefix=$oldprefix
</span><span class="cx">
</span><span class="cx">
</span><del>-for ac_prog in sw_vers
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
</del><ins>+# Extract the first word of "sw_vers", so it can be a program name with args.
+set dummy sw_vers; ac_word=$2
</ins><span class="cx"> { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_word... " >&6; }
</span><del>-if test "${ac_cv_prog_SW_VERS+set}" = set; then
</del><ins>+if test "${ac_cv_path_SW_VERS+set}" = set; then
</ins><span class="cx"> $as_echo_n "(cached) " >&6
</span><span class="cx"> else
</span><del>- if test -n "$SW_VERS"; then
- ac_cv_prog_SW_VERS="$SW_VERS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</del><ins>+ case $SW_VERS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_SW_VERS="$SW_VERS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
</ins><span class="cx"> for as_dir in $PATH
</span><span class="cx"> do
</span><span class="cx"> IFS=$as_save_IFS
</span><span class="cx"> test -z "$as_dir" && as_dir=.
</span><span class="cx"> for ac_exec_ext in '' $ac_executable_extensions; do
</span><span class="cx"> if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
</span><del>- ac_cv_prog_SW_VERS="$ac_prog"
</del><ins>+ ac_cv_path_SW_VERS="$as_dir/$ac_word$ac_exec_ext"
</ins><span class="cx"> $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
</span><span class="cx"> break 2
</span><span class="cx"> fi
</span><span class="lines">@@ -2212,9 +2215,10 @@
</span><span class="cx"> done
</span><span class="cx"> IFS=$as_save_IFS
</span><span class="cx">
</span><ins>+ ;;
+esac
</ins><span class="cx"> fi
</span><del>-fi
-SW_VERS=$ac_cv_prog_SW_VERS
</del><ins>+SW_VERS=$ac_cv_path_SW_VERS
</ins><span class="cx"> if test -n "$SW_VERS"; then
</span><span class="cx"> { $as_echo "$as_me:$LINENO: result: $SW_VERS" >&5
</span><span class="cx"> $as_echo "$SW_VERS" >&6; }
</span><span class="lines">@@ -2224,9 +2228,87 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx">
</span><del>- test -n "$SW_VERS" && break
</del><ins>+# Extract the first word of "defaults", so it can be a program name with args.
+set dummy defaults; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_DEFAULTS+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $DEFAULTS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DEFAULTS="$DEFAULTS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_DEFAULTS="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
</ins><span class="cx"> done
</span><ins>+done
+IFS=$as_save_IFS
</ins><span class="cx">
</span><ins>+ ;;
+esac
+fi
+DEFAULTS=$ac_cv_path_DEFAULTS
+if test -n "$DEFAULTS"; then
+ { $as_echo "$as_me:$LINENO: result: $DEFAULTS" >&5
+$as_echo "$DEFAULTS" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "xcode-select", so it can be a program name with args.
+set dummy xcode-select; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XCODE_SELECT+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $XCODE_SELECT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_XCODE_SELECT="$XCODE_SELECT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+XCODE_SELECT=$ac_cv_path_XCODE_SELECT
+if test -n "$XCODE_SELECT"; then
+ { $as_echo "$as_me:$LINENO: result: $XCODE_SELECT" >&5
+$as_echo "$XCODE_SELECT" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
</ins><span class="cx"> if test "x$SW_VERS" != "x"; then
</span><span class="cx"> { $as_echo "$as_me:$LINENO: checking Mac OS X version" >&5
</span><span class="cx"> $as_echo_n "checking Mac OS X version... " >&6; }
</span><span class="lines">@@ -2242,7 +2324,7 @@
</span><span class="cx"> { $as_echo "$as_me:$LINENO: WARNING: Please upgrade at http://store.apple.com/" >&5
</span><span class="cx"> $as_echo "$as_me: WARNING: Please upgrade at http://store.apple.com/" >&2;}
</span><span class="cx"> ;;
</span><del>- 10.1.[0-4]|10.2.[0-7]|10.3.[0-8]|10.4.[0-9]|10.4.10|10.5.[0-4])
</del><ins>+ 10.1.[0-4]|10.2.[0-7]|10.3.[0-8]|10.4.[0-9]|10.4.10|10.5.[0-5])
</ins><span class="cx"> { $as_echo "$as_me:$LINENO: WARNING: This version of Mac OS X is out of date" >&5
</span><span class="cx"> $as_echo "$as_me: WARNING: This version of Mac OS X is out of date" >&2;}
</span><span class="cx"> { $as_echo "$as_me:$LINENO: WARNING: Please run Software Update to update it" >&5
</span><span class="lines">@@ -2254,11 +2336,24 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx">
</span><del>-XCODEPLIST=/Developer/Applications/Xcode.app/Contents/version.plist
</del><ins>+# locate currently selected Xcode path
+if test "x$XCODE_SELECT" != "x"; then
+ { $as_echo "$as_me:$LINENO: checking Xcode location" >&5
+$as_echo_n "checking Xcode location... " >&6; }
+ DEVELOPER_DIR=`$XCODE_SELECT -print-path`
+ { $as_echo "$as_me:$LINENO: result: $DEVELOPER_DIR" >&5
+$as_echo "$DEVELOPER_DIR" >&6; }
+fi
+
+XCODEPLIST=$DEVELOPER_DIR/Applications/Xcode.app/Contents/version.plist
</ins><span class="cx"> if test -r "$XCODEPLIST"; then
</span><span class="cx"> { $as_echo "$as_me:$LINENO: checking Xcode version" >&5
</span><span class="cx"> $as_echo_n "checking Xcode version... " >&6; }
</span><del>- XCODE_VERSION=`tr -d '\r\n' < $XCODEPLIST | sed -e 's/.*<key>CFBundleShortVersionString<\/key>.<string>\([0-9.]*\)<\/string>.*/\1/'`
</del><ins>+ if test "x$DEFAULTS" != "x"; then
+ XCODE_VERSION=`$DEFAULTS read $DEVELOPER_DIR/Applications/Xcode.app/Contents/version CFBundleShortVersionString`
+ else
+ XCODE_VERSION=`tr -d '\r\n' < $XCODEPLIST | sed -e 's/.*<key>CFBundleShortVersionString<\/key>.<string>\([0-9.]*\)<\/string>.*/\1/'`
+ fi
</ins><span class="cx"> { $as_echo "$as_me:$LINENO: result: $XCODE_VERSION" >&5
</span><span class="cx"> $as_echo "$XCODE_VERSION" >&6; }
</span><span class="cx"> fi
</span><span class="lines">@@ -2270,7 +2365,7 @@
</span><span class="cx"> { $as_echo "$as_me:$LINENO: WARNING: Please upgrade at http://connect.apple.com/" >&5
</span><span class="cx"> $as_echo "$as_me: WARNING: Please upgrade at http://connect.apple.com/" >&2;}
</span><span class="cx"> ;;
</span><del>- 1.[2-4]*|2.[2-3]*)
</del><ins>+ 1.[2-4]*|2.[2-3]*|3.[0]*)
</ins><span class="cx"> { $as_echo "$as_me:$LINENO: WARNING: This version of Xcode Tools is out of date" >&5
</span><span class="cx"> $as_echo "$as_me: WARNING: This version of Xcode Tools is out of date" >&2;}
</span><span class="cx"> { $as_echo "$as_me:$LINENO: WARNING: Please consider upgrading as some ports fail compiling" >&5
</span><span class="lines">@@ -4605,7 +4700,6 @@
</span><span class="cx"> # Foundation checks
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> ac_ext=c
</span><span class="cx"> ac_cpp='$CPP $CPPFLAGS'
</span><span class="cx"> ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
</span><span class="lines">@@ -6877,7 +6971,6 @@
</span><span class="cx"> { $as_echo "$as_me:$LINENO: result: ${result}" >&5
</span><span class="cx"> $as_echo "${result}" >&6; }
</span><span class="cx">
</span><del>-#MP_PROG_XAR
</del><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -7962,91 +8055,21 @@
</span><span class="cx">
</span><span class="cx"> fi
</span><span class="cx">
</span><del>-{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
-$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if test "${ac_cv_header_stat_broken+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <sys/types.h>
-#include <sys/stat.h>
</del><span class="cx">
</span><del>-#if defined S_ISBLK && defined S_IFDIR
-extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-#endif
</del><span class="cx">
</span><del>-#if defined S_ISBLK && defined S_IFCHR
-extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-#endif
</del><span class="cx">
</span><del>-#if defined S_ISLNK && defined S_IFREG
-extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-#endif
</del><span class="cx">
</span><del>-#if defined S_ISSOCK && defined S_IFREG
-extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-#endif
</del><span class="cx">
</span><del>-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_stat_broken=no
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</del><span class="cx">
</span><del>- ac_cv_header_stat_broken=yes
-fi
</del><span class="cx">
</span><del>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
-$as_echo "$ac_cv_header_stat_broken" >&6; }
-if test $ac_cv_header_stat_broken = yes; then
</del><span class="cx">
</span><del>-cat >>confdefs.h <<\_ACEOF
-#define STAT_MACROS_BROKEN 1
-_ACEOF
</del><span class="cx">
</span><del>-fi
</del><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
-
-
-
-
-
-
-
-
-
-for ac_header in limits.h paths.h sys/file.h crt_externs.h fcntl.h sys/fcntl.h sys/cdefs.h err.h libgen.h sys/socket.h \
</del><ins>+for ac_header in limits.h paths.h sys/file.h crt_externs.h fcntl.h sys/fcntl.h sys/cdefs.h err.h sys/socket.h \
</ins><span class="cx"> readline/readline.h readline/history.h pwd.h sys/paths.h utime.h
</span><span class="cx"> do
</span><span class="cx"> as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
</span><span class="lines">@@ -8201,340 +8224,19 @@
</span><span class="cx"> INCLUDES="-I.. -I. $INCLUDES"
</span><span class="cx">
</span><span class="cx"> # Checks for library functions.
</span><del>-{ $as_echo "$as_me:$LINENO: checking whether closedir returns void" >&5
-$as_echo_n "checking whether closedir returns void... " >&6; }
-if test "${ac_cv_func_closedir_void+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_closedir_void=yes
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header_dirent>
-#ifndef __cplusplus
-int closedir ();
-#endif
</del><span class="cx">
</span><del>-int
-main ()
-{
-return closedir (opendir (".")) != 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_closedir_void=no
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</del><span class="cx">
</span><del>-( exit $ac_status )
-ac_cv_func_closedir_void=yes
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
</del><span class="cx">
</span><span class="cx">
</span><del>-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
-$as_echo "$ac_cv_func_closedir_void" >&6; }
-if test $ac_cv_func_closedir_void = yes; then
</del><span class="cx">
</span><del>-cat >>confdefs.h <<\_ACEOF
-#define CLOSEDIR_VOID 1
-_ACEOF
</del><span class="cx">
</span><del>-fi
</del><span class="cx">
</span><del>-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
-$as_echo_n "checking for pid_t... " >&6; }
-if test "${ac_cv_type_pid_t+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- ac_cv_type_pid_t=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof (pid_t))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-if (sizeof ((pid_t)))
- return 0;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- :
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</del><span class="cx">
</span><del>- ac_cv_type_pid_t=yes
-fi
</del><span class="cx">
</span><del>-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
</del><span class="cx">
</span><span class="cx">
</span><del>-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-$as_echo "$ac_cv_type_pid_t" >&6; }
-if test "x$ac_cv_type_pid_t" = x""yes; then
- :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define pid_t int
-_ACEOF
-
-fi
-
-
-for ac_header in vfork.h
</del><ins>+for ac_func in bzero memset fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv
</ins><span class="cx"> do
</span><del>-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_header_compiler=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null && {
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
- ac_header_preproc=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
- ( cat <<\_ASBOX
-## ------------------------------------------------ ##
-## Report this to macports-dev@lists.macosforge.org ##
-## ------------------------------------------------ ##
-_ASBOX
- ) | sed "s/^/$as_me: WARNING: /" >&2
- ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_func in fork vfork
-do
</del><span class="cx"> as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
</span><span class="cx"> { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
</span><span class="cx"> $as_echo_n "checking for $ac_func... " >&6; }
</span><span class="lines">@@ -8633,680 +8335,7 @@
</span><span class="cx"> fi
</span><span class="cx"> done
</span><span class="cx">
</span><del>-if test "x$ac_cv_func_fork" = xyes; then
- { $as_echo "$as_me:$LINENO: checking for working fork" >&5
-$as_echo_n "checking for working fork... " >&6; }
-if test "${ac_cv_func_fork_works+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_fork_works=cross
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
</del><span class="cx">
</span><del>- /* By Ruediger Kuhlmann. */
- return fork () < 0;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_fork_works=yes
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_fork_works=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
-$as_echo "$ac_cv_func_fork_works" >&6; }
-
-else
- ac_cv_func_fork_works=$ac_cv_func_fork
-fi
-if test "x$ac_cv_func_fork_works" = xcross; then
- case $host in
- *-*-amigaos* | *-*-msdosdjgpp*)
- # Override, as these systems have only a dummy fork() stub
- ac_cv_func_fork_works=no
- ;;
- *)
- ac_cv_func_fork_works=yes
- ;;
- esac
- { $as_echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
-fi
-ac_cv_func_vfork_works=$ac_cv_func_vfork
-if test "x$ac_cv_func_vfork" = xyes; then
- { $as_echo "$as_me:$LINENO: checking for working vfork" >&5
-$as_echo_n "checking for working vfork... " >&6; }
-if test "${ac_cv_func_vfork_works+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_vfork_works=cross
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Thanks to Paul Eggert for this test. */
-$ac_includes_default
-#include <sys/wait.h>
-#ifdef HAVE_VFORK_H
-# include <vfork.h>
-#endif
-/* On some sparc systems, changes by the child to local and incoming
- argument registers are propagated back to the parent. The compiler
- is told about this with #include <vfork.h>, but some compilers
- (e.g. gcc -O) don't grok <vfork.h>. Test for this by using a
- static variable whose address is put into a register that is
- clobbered by the vfork. */
-static void
-#ifdef __cplusplus
-sparc_address_test (int arg)
-# else
-sparc_address_test (arg) int arg;
-#endif
-{
- static pid_t child;
- if (!child) {
- child = vfork ();
- if (child < 0) {
- perror ("vfork");
- _exit(2);
- }
- if (!child) {
- arg = getpid();
- write(-1, "", 0);
- _exit (arg);
- }
- }
-}
-
-int
-main ()
-{
- pid_t parent = getpid ();
- pid_t child;
-
- sparc_address_test (0);
-
- child = vfork ();
-
- if (child == 0) {
- /* Here is another test for sparc vfork register problems. This
- test uses lots of local variables, at least as many local
- variables as main has allocated so far including compiler
- temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris
- 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should
- reuse the register of parent for one of the local variables,
- since it will think that parent can't possibly be used any more
- in this routine. Assigning to the local variable will thus
- munge parent in the parent process. */
- pid_t
- p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
- p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
- /* Convince the compiler that p..p7 are live; otherwise, it might
- use the same hardware register for all 8 local variables. */
- if (p != p1 || p != p2 || p != p3 || p != p4
- || p != p5 || p != p6 || p != p7)
- _exit(1);
-
- /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
- from child file descriptors. If the child closes a descriptor
- before it execs or exits, this munges the parent's descriptor
- as well. Test for this by closing stdout in the child. */
- _exit(close(fileno(stdout)) != 0);
- } else {
- int status;
- struct stat st;
-
- while (wait(&status) != child)
- ;
- return (
- /* Was there some problem with vforking? */
- child < 0
-
- /* Did the child fail? (This shouldn't happen.) */
- || status
-
- /* Did the vfork/compiler bug occur? */
- || parent != getpid()
-
- /* Did the file descriptor bug occur? */
- || fstat(fileno(stdout), &st) != 0
- );
- }
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_vfork_works=yes
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_vfork_works=no
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
-$as_echo "$ac_cv_func_vfork_works" >&6; }
-
-fi;
-if test "x$ac_cv_func_fork_works" = xcross; then
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- { $as_echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
-fi
-
-if test "x$ac_cv_func_vfork_works" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_VFORK 1
-_ACEOF
-
-else
-
-cat >>confdefs.h <<\_ACEOF
-#define vfork fork
-_ACEOF
-
-fi
-if test "x$ac_cv_func_fork_works" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_FORK 1
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
-$as_echo_n "checking whether strerror_r is declared... " >&6; }
-if test "${ac_cv_have_decl_strerror_r+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-#ifndef strerror_r
- (void) strerror_r;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_strerror_r=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_strerror_r=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
-$as_echo "$ac_cv_have_decl_strerror_r" >&6; }
-if test "x$ac_cv_have_decl_strerror_r" = x""yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR_R 1
-_ACEOF
-
-
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR_R 0
-_ACEOF
-
-
-fi
-
-
-
-for ac_func in strerror_r
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-{ $as_echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
-$as_echo_n "checking whether strerror_r returns char *... " >&6; }
-if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
- $as_echo_n "(cached) " >&6
-else
-
- ac_cv_func_strerror_r_char_p=no
- if test $ac_cv_have_decl_strerror_r = yes; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-
- char buf[100];
- char x = *strerror_r (0, buf, sizeof buf);
- char *p = strerror_r (0, buf, sizeof buf);
- return !p || x;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_func_strerror_r_char_p=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
- # strerror_r is not declared. Choose between
- # systems that have relatively inaccessible declarations for the
- # function. BeOS and DEC UNIX 4.0 fall in this category, but the
- # former has a strerror_r that returns char*, while the latter
- # has a strerror_r that returns `int'.
- # This test should segfault on the DEC system.
- if test "$cross_compiling" = yes; then
- :
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
- extern char *strerror_r ();
-int
-main ()
-{
-char buf[100];
- char x = *strerror_r (0, buf, sizeof buf);
- return ! isalpha (x);
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_strerror_r_char_p=yes
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
- fi
-
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
-$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
-if test $ac_cv_func_strerror_r_char_p = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STRERROR_R_CHAR_P 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- $as_echo_n "(cached) " >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
</del><span class="cx"> { $as_echo "$as_me:$LINENO: checking if readlink conforms to POSIX 1003.1a" >&5
</span><span class="cx"> $as_echo_n "checking if readlink conforms to POSIX 1003.1a... " >&6; }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesimagesandarchivesbaseconfigureac"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/configure.ac (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/configure.ac 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/configure.ac 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -1,12 +1,13 @@
</span><span class="cx"> dnl Process this file with autoconf to produce a configure script.
</span><span class="cx"> dnl $Id$
</span><del>-AC_PREREQ(2.52)
</del><ins>+AC_PREREQ(2.63)
</ins><span class="cx"> AC_DEFUN([MACPORTS_VERSION_MACRO], [esyscmd(cat config/macports_version | tr -d '\n')])
</span><del>-AC_INIT([MacPorts], [MACPORTS_VERSION_MACRO], [macports-dev@lists.macosforge.org], [macports])
</del><ins>+AC_INIT([MacPorts],[MACPORTS_VERSION_MACRO],[macports-dev@lists.macosforge.org],[macports])
</ins><span class="cx"> AC_CONFIG_SRCDIR([src/pextlib1.0/Pextlib.c])
</span><span class="cx"> AC_CONFIG_HEADERS([src/config.h])
</span><del>-AC_CANONICAL_SYSTEM
</del><span class="cx">
</span><ins>+AC_CANONICAL_TARGET
+
</ins><span class="cx"> # Read in the MacPorts version from the base/config/macports_version file
</span><span class="cx"> AC_MSG_CHECKING(MacPorts version)
</span><span class="cx"> MACPORTS_VERSION=MACPORTS_VERSION_MACRO
</span><span class="lines">@@ -16,7 +17,10 @@
</span><span class="cx"> # Check user PATH for MP paths, and remove as necessary.
</span><span class="cx"> MP_PATH_SCAN
</span><span class="cx">
</span><del>-AC_CHECK_PROGS(SW_VERS, sw_vers)
</del><ins>+AC_PATH_PROG(SW_VERS, sw_vers)
+AC_PATH_PROG(DEFAULTS, defaults)
+AC_PATH_PROG(XCODE_SELECT, xcode-select)
+
</ins><span class="cx"> if test "x$SW_VERS" != "x"; then
</span><span class="cx"> AC_MSG_CHECKING(Mac OS X version)
</span><span class="cx"> MACOSX_VERSION=`$SW_VERS -productVersion`
</span><span class="lines">@@ -25,12 +29,12 @@
</span><span class="cx">
</span><span class="cx"> case "$MACOSX_VERSION" in
</span><span class="cx"> 10.0*|10.1*|10.2*)
</span><del>- AC_WARN(This version of Mac OS X is not supported)
- AC_WARN(Please upgrade at http://store.apple.com/)
</del><ins>+ AC_MSG_WARN([This version of Mac OS X is not supported])
+ AC_MSG_WARN([Please upgrade at http://store.apple.com/])
</ins><span class="cx"> ;;
</span><del>- 10.1.[[0-4]]|10.2.[[0-7]]|10.3.[[0-8]]|10.4.[[0-9]]|10.4.10|10.5.[[0-4]])
- AC_WARN(This version of Mac OS X is out of date)
- AC_WARN(Please run Software Update to update it)
</del><ins>+ 10.1.[[0-4]]|10.2.[[0-7]]|10.3.[[0-8]]|10.4.[[0-9]]|10.4.10|10.5.[[0-5]])
+ AC_MSG_WARN([This version of Mac OS X is out of date])
+ AC_MSG_WARN([Please run Software Update to update it])
</ins><span class="cx"> ;;
</span><span class="cx"> 10.3*|10.4*|10.5*)
</span><span class="cx"> dnl Supported version
</span><span class="lines">@@ -39,21 +43,32 @@
</span><span class="cx"> ;;
</span><span class="cx"> esac
</span><span class="cx">
</span><del>-XCODEPLIST=/Developer/Applications/Xcode.app/Contents/version.plist
</del><ins>+# locate currently selected Xcode path
+if test "x$XCODE_SELECT" != "x"; then
+ AC_MSG_CHECKING(Xcode location)
+ DEVELOPER_DIR=`$XCODE_SELECT -print-path`
+ AC_MSG_RESULT([$DEVELOPER_DIR])
+fi
+
+XCODEPLIST=$DEVELOPER_DIR/Applications/Xcode.app/Contents/version.plist
</ins><span class="cx"> if test -r "$XCODEPLIST"; then
</span><span class="cx"> AC_MSG_CHECKING(Xcode version)
</span><del>- XCODE_VERSION=`tr -d '\r\n' < $XCODEPLIST | sed -e 's/.*<key>CFBundleShortVersionString<\/key>.<string>\([[0-9.]]*\)<\/string>.*/\1/'`
</del><ins>+ if test "x$DEFAULTS" != "x"; then
+ XCODE_VERSION=`$DEFAULTS read $DEVELOPER_DIR/Applications/Xcode.app/Contents/version CFBundleShortVersionString`
+ else
+ XCODE_VERSION=`tr -d '\r\n' < $XCODEPLIST | sed -e 's/.*<key>CFBundleShortVersionString<\/key>.<string>\([[0-9.]]*\)<\/string>.*/\1/'`
+ fi
</ins><span class="cx"> AC_MSG_RESULT([$XCODE_VERSION])
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> case "$XCODE_VERSION" in
</span><span class="cx"> 1.[[0-1]]*|2.[[0-1]]*)
</span><del>- AC_WARN(This version of Xcode Tools is not supported)
- AC_WARN(Please upgrade at http://connect.apple.com/)
</del><ins>+ AC_MSG_WARN([This version of Xcode Tools is not supported])
+ AC_MSG_WARN([Please upgrade at http://connect.apple.com/])
</ins><span class="cx"> ;;
</span><del>- 1.[[2-4]]*|2.[[2-3]]*)
- AC_WARN(This version of Xcode Tools is out of date)
- AC_WARN(Please consider upgrading as some ports fail compiling)
</del><ins>+ 1.[[2-4]]*|2.[[2-3]]*|3.[[0]]*)
+ AC_MSG_WARN([This version of Xcode Tools is out of date])
+ AC_MSG_WARN([Please consider upgrading as some ports fail compiling])
</ins><span class="cx"> ;;
</span><span class="cx"> 1.5*|2.4*|3.*)
</span><span class="cx"> dnl Supported version
</span><span class="lines">@@ -126,7 +141,6 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> MP_PROG_DAEMONDO
</span><del>-#MP_PROG_XAR
</del><span class="cx">
</span><span class="cx"> AC_SUBST(REPLACEMENT_PROGS)
</span><span class="cx"> AC_SUBST(EXTRA_PROGS)
</span><span class="lines">@@ -160,24 +174,20 @@
</span><span class="cx"> AC_HEADER_STDC
</span><span class="cx"> AC_HEADER_DIRENT
</span><span class="cx"> AC_HEADER_SYS_WAIT
</span><del>-AC_HEADER_STAT
-AC_CHECK_HEADERS([limits.h paths.h sys/file.h crt_externs.h fcntl.h sys/fcntl.h sys/cdefs.h err.h libgen.h sys/socket.h \
</del><ins>+AC_CHECK_HEADERS([limits.h paths.h sys/file.h crt_externs.h fcntl.h sys/fcntl.h sys/cdefs.h err.h sys/socket.h \
</ins><span class="cx"> readline/readline.h readline/history.h pwd.h sys/paths.h utime.h])
</span><span class="cx">
</span><span class="cx"> INCLUDES="-I.. -I. $INCLUDES"
</span><span class="cx">
</span><span class="cx"> # Checks for library functions.
</span><del>-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_FORK
-AC_FUNC_STRERROR_R
-AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv])
</del><ins>+AC_CHECK_FUNCS([bzero memset fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv])
</ins><span class="cx"> MP_CHECK_READLINK_IS_P1003_1A
</span><span class="cx">
</span><span class="cx"> # Check for md5 implementation
</span><span class="cx"> MP_LIB_MD5
</span><span class="cx">
</span><span class="cx"> # Check for readline
</span><del>-AC_ARG_ENABLE(readline, AC_HELP_STRING([--enable-readline], [Enable addition of readline support, if readline present.]),
</del><ins>+AC_ARG_ENABLE(readline, AS_HELP_STRING([--enable-readline],[Enable addition of readline support, if readline present.]),
</ins><span class="cx"> [
</span><span class="cx"> AC_CHECK_LIB([readline], [readline], [
</span><span class="cx"> READLINE_LIBS=-lreadline
</span></span></pre></div>
<a id="branchesimagesandarchivesbasedocmacportsconfin"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/doc/macports.conf.in (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/doc/macports.conf.in 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/doc/macports.conf.in 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> # Number of simultaneous make jobs (commands) to use when building ports. This
</span><span class="cx"> # value may be set to 0 so the number of simultaneous make jobs will be set to
</span><span class="cx"> # the number of CPU cores that are automatically detected.
</span><del>-buildmakejobs 1
</del><ins>+#buildmakejobs 0
</ins><span class="cx">
</span><span class="cx"> # Set whether to automatically execute "clean" after "install" of ports
</span><span class="cx"> portautoclean yes
</span></span></pre></div>
<a id="branchesimagesandarchivesbasem4foundationm4"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/m4/foundation.m4 (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/m4/foundation.m4 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/m4/foundation.m4 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> #------------------------------------------------------------------------
</span><span class="cx"> AC_DEFUN([MP_OBJC_RUNTIME],[
</span><span class="cx"> AC_REQUIRE([AC_PROG_OBJC])
</span><del>- AC_ARG_WITH(objc-runtime, AC_HELP_STRING([--with-objc-runtime], [Specify either "GNU" or "apple"]), [with_objc_runtime=${withval}])
</del><ins>+ AC_ARG_WITH(objc-runtime, AS_HELP_STRING([--with-objc-runtime],[Specify either "GNU" or "apple"]), [with_objc_runtime=${withval}])
</ins><span class="cx">
</span><span class="cx"> if test x"${with_objc_runtime}" != x; then
</span><span class="cx"> case "${with_objc_runtime}" in
</span></span></pre></div>
<a id="branchesimagesandarchivesbasem4pthreadm4"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/m4/pthread.m4 (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/m4/pthread.m4 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/m4/pthread.m4 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -49,8 +49,7 @@
</span><span class="cx">
</span><span class="cx"> AC_DEFUN([ACX_PTHREAD], [
</span><span class="cx"> AC_REQUIRE([AC_CANONICAL_HOST])
</span><del>-AC_LANG_SAVE
-AC_LANG_C
</del><ins>+AC_LANG_PUSH([C])
</ins><span class="cx"> acx_pthread_ok=no
</span><span class="cx">
</span><span class="cx"> # We used to check for pthread.h first, but this fails if pthread.h
</span><span class="lines">@@ -167,11 +166,9 @@
</span><span class="cx"> # pthread_cleanup_push because it is one of the few pthread
</span><span class="cx"> # functions on Solaris that doesn't have a non-functional libc stub.
</span><span class="cx"> # We try pthread_create on general principles.
</span><del>- AC_TRY_LINK([#include <pthread.h>],
- [pthread_t th; pthread_join(th, 0);
</del><ins>+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t th; pthread_join(th, 0);
</ins><span class="cx"> pthread_attr_init(0); pthread_cleanup_push(0, 0);
</span><del>- pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
- [acx_pthread_ok=yes])
</del><ins>+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ]])],[acx_pthread_ok=yes],[])
</ins><span class="cx">
</span><span class="cx"> LIBS="$save_LIBS"
</span><span class="cx"> CFLAGS="$save_CFLAGS"
</span><span class="lines">@@ -197,8 +194,7 @@
</span><span class="cx"> AC_MSG_CHECKING([for joinable pthread attribute])
</span><span class="cx"> attr_name=unknown
</span><span class="cx"> for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
</span><del>- AC_TRY_LINK([#include <pthread.h>], [int attr=$attr;],
- [attr_name=$attr; break])
</del><ins>+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[int attr=$attr;]])],[attr_name=$attr; break],[])
</ins><span class="cx"> done
</span><span class="cx"> AC_MSG_RESULT($attr_name)
</span><span class="cx"> if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
</span><span class="lines">@@ -234,5 +230,5 @@
</span><span class="cx"> acx_pthread_ok=no
</span><span class="cx"> $2
</span><span class="cx"> fi
</span><del>-AC_LANG_RESTORE
</del><ins>+AC_LANG_POP([C])
</ins><span class="cx"> ])dnl ACX_PTHREAD
</span></span></pre></div>
<a id="branchesimagesandarchivesbaseregensh"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/regen.sh (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/regen.sh 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/regen.sh 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> #!/bin/sh
</span><span class="cx">
</span><del>-autoconf
-autoheader
</del><ins>+autoconf --warnings=all
+autoheader --warnings=all
</ins></span></pre></div>
<a id="branchesimagesandarchivesbasesrcconfighin"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/config.h.in (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/config.h.in 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/src/config.h.in 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -6,9 +6,6 @@
</span><span class="cx"> /* Define if using the Apple Objective-C runtime and compiler. */
</span><span class="cx"> #undef APPLE_RUNTIME
</span><span class="cx">
</span><del>-/* Define to 1 if the `closedir' function returns void instead of `int'. */
-#undef CLOSEDIR_VOID
-
</del><span class="cx"> /* Define if using the GNUstep Foundation library */
</span><span class="cx"> #undef GNUSTEP_FOUNDATION
</span><span class="cx">
</span><span class="lines">@@ -50,10 +47,6 @@
</span><span class="cx"> `rl_username_completion_function', and to 0 if you don't. */
</span><span class="cx"> #undef HAVE_DECL_RL_USERNAME_COMPLETION_FUNCTION
</span><span class="cx">
</span><del>-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
- don't. */
-#undef HAVE_DECL_STRERROR_R
-
</del><span class="cx"> /* Define to 1 if you have the declaration of `username_completion_function',
</span><span class="cx"> and to 0 if you don't. */
</span><span class="cx"> #undef HAVE_DECL_USERNAME_COMPLETION_FUNCTION
</span><span class="lines">@@ -62,9 +55,6 @@
</span><span class="cx"> */
</span><span class="cx"> #undef HAVE_DIRENT_H
</span><span class="cx">
</span><del>-/* Define to 1 if you have the `dup2' function. */
-#undef HAVE_DUP2
-
</del><span class="cx"> /* Define to 1 if you have the <err.h> header file. */
</span><span class="cx"> #undef HAVE_ERR_H
</span><span class="cx">
</span><span class="lines">@@ -77,9 +67,6 @@
</span><span class="cx"> /* Define to 1 if you have the `flock' function. */
</span><span class="cx"> #undef HAVE_FLOCK
</span><span class="cx">
</span><del>-/* Define to 1 if you have the `fork' function. */
-#undef HAVE_FORK
-
</del><span class="cx"> /* Define if CoreFoundation framework is available */
</span><span class="cx"> #undef HAVE_FRAMEWORK_COREFOUNDATION
</span><span class="cx">
</span><span class="lines">@@ -99,9 +86,6 @@
</span><span class="cx"> /* Define if you have the `crypto' library (-lcrypto). */
</span><span class="cx"> #undef HAVE_LIBCRYPTO
</span><span class="cx">
</span><del>-/* Define to 1 if you have the <libgen.h> header file. */
-#undef HAVE_LIBGEN_H
-
</del><span class="cx"> /* Define if you have the `md' library (-lmd). */
</span><span class="cx"> #undef HAVE_LIBMD
</span><span class="cx">
</span><span class="lines">@@ -147,9 +131,6 @@
</span><span class="cx"> /* Define to 1 if you have the <readline/readline.h> header file. */
</span><span class="cx"> #undef HAVE_READLINE_READLINE_H
</span><span class="cx">
</span><del>-/* Define to 1 if you have the `regcomp' function. */
-#undef HAVE_REGCOMP
-
</del><span class="cx"> /* Define to 1 if you have the `setmode' function. */
</span><span class="cx"> #undef HAVE_SETMODE
</span><span class="cx">
</span><span class="lines">@@ -162,15 +143,6 @@
</span><span class="cx"> /* Define to 1 if you have the `strcasecmp' function. */
</span><span class="cx"> #undef HAVE_STRCASECMP
</span><span class="cx">
</span><del>-/* Define to 1 if you have the `strdup' function. */
-#undef HAVE_STRDUP
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the `strerror_r' function. */
-#undef HAVE_STRERROR_R
-
</del><span class="cx"> /* Define to 1 if you have the <strings.h> header file. */
</span><span class="cx"> #undef HAVE_STRINGS_H
</span><span class="cx">
</span><span class="lines">@@ -183,9 +155,6 @@
</span><span class="cx"> /* Define to 1 if you have the `strncasecmp' function. */
</span><span class="cx"> #undef HAVE_STRNCASECMP
</span><span class="cx">
</span><del>-/* Define to 1 if you have the `strtol' function. */
-#undef HAVE_STRTOL
-
</del><span class="cx"> /* Define to 1 if you have the <sys/cdefs.h> header file. */
</span><span class="cx"> #undef HAVE_SYS_CDEFS_H
</span><span class="cx">
</span><span class="lines">@@ -224,18 +193,6 @@
</span><span class="cx"> /* Define to 1 if you have the <utime.h> header file. */
</span><span class="cx"> #undef HAVE_UTIME_H
</span><span class="cx">
</span><del>-/* Define to 1 if you have the `vfork' function. */
-#undef HAVE_VFORK
-
-/* Define to 1 if you have the <vfork.h> header file. */
-#undef HAVE_VFORK_H
-
-/* Define to 1 if `fork' works. */
-#undef HAVE_WORKING_FORK
-
-/* Define to 1 if `vfork' works. */
-#undef HAVE_WORKING_VFORK
-
</del><span class="cx"> /* Lowest non-system-reserved GID. */
</span><span class="cx"> #undef MIN_USABLE_GID
</span><span class="cx">
</span><span class="lines">@@ -271,23 +228,11 @@
</span><span class="cx"> /* Define to 1 if static build is requested */
</span><span class="cx"> #undef STATIC_BUILD
</span><span class="cx">
</span><del>-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-#undef STAT_MACROS_BROKEN
-
</del><span class="cx"> /* Define to 1 if you have the ANSI C header files. */
</span><span class="cx"> #undef STDC_HEADERS
</span><span class="cx">
</span><del>-/* Define to 1 if strerror_r returns char *. */
-#undef STRERROR_R_CHAR_P
-
</del><span class="cx"> /* SDK for SDK redirect in tracelib */
</span><span class="cx"> #undef TRACE_SDK
</span><span class="cx">
</span><span class="cx"> /* Attribute to mark unused variables */
</span><span class="cx"> #undef UNUSED
</span><del>-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define as `fork' if `vfork' does not work. */
-#undef vfork
</del></span></pre></div>
<a id="branchesimagesandarchivesbasesrcdarwintracelib10darwintracec"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/darwintracelib1.0/darwintrace.c (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/darwintracelib1.0/darwintrace.c 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/src/darwintracelib1.0/darwintrace.c 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -324,6 +324,7 @@
</span><span class="cx"> filemap=0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+__attribute__((always_inline))
</ins><span class="cx"> inline void __darwintrace_setup() {
</span><span class="cx"> #define open(x,y,z) syscall(SYS_open, (x), (y), (z))
</span><span class="cx"> #define close(x) syscall(SYS_close, (x))
</span><span class="lines">@@ -354,6 +355,7 @@
</span><span class="cx"> * path: the path of the file
</span><span class="cx"> * fd: a fd to the file, or 0 if we don't have any.
</span><span class="cx"> */
</span><ins>+__attribute__((always_inline))
</ins><span class="cx"> inline void __darwintrace_log_op(const char* op, const char* path, int fd) {
</span><span class="cx"> int size;
</span><span class="cx"> char somepath[MAXPATHLEN];
</span><span class="lines">@@ -530,6 +532,7 @@
</span><span class="cx"> /*
</span><span class="cx"> * return 1 if path (once normalized) is in sandbox or redirected, 0 otherwise.
</span><span class="cx"> */
</span><ins>+__attribute__((always_inline))
</ins><span class="cx"> inline int __darwintrace_is_in_sandbox(const char* path, char * newpath) {
</span><span class="cx"> char * t, * p, * _;
</span><span class="cx"> int result=-1;
</span><span class="lines">@@ -923,4 +926,4 @@
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="cx"> #undef stat
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="branchesimagesandarchivesbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> set macports::buildnicevalue 0
</span><span class="cx"> }
</span><span class="cx"> if {![info exists macports::buildmakejobs]} {
</span><del>- set macports::buildmakejobs 1
</del><ins>+ set macports::buildmakejobs 0
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Default mp universal options
</span></span></pre></div>
<a id="branchesimagesandarchivesbasesrcportportindextcl"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/port/portindex.tcl (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/port/portindex.tcl 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/src/port/portindex.tcl 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -23,8 +23,6 @@
</span><span class="cx"> # Pass global options into mportinit
</span><span class="cx"> mportinit ui_options global_options global_variations
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> # Standard procedures
</span><span class="cx"> proc print_usage args {
</span><span class="cx"> global argv0
</span><span class="lines">@@ -34,8 +32,8 @@
</span><span class="cx"> puts "-d:\tOutput debugging information"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc pindex {portdir} {
- global target fd directory archive outdir stats
</del><ins>+proc pindex {portdir} {
+ global target fd directory archive outdir stats
</ins><span class="cx"> incr stats(total)
</span><span class="cx"> global macports::prefix
</span><span class="cx"> set save_prefix $prefix
</span><span class="lines">@@ -92,19 +90,21 @@
</span><span class="cx"> {^-.+} {
</span><span class="cx"> if {$arg == "-a"} { # Turn on archiving
</span><span class="cx"> set archive 1
</span><del>- } elseif {$arg == "-d"} { # Turn on debug output
- set ui_options(ports_debug) yes
- } elseif {$arg == "-o"} { # Set output directory
- incr i
- set outdir [lindex $argv $i]
- } else {
- puts stderr "Unknown option: $arg"
- print_usage
- exit 1
</del><ins>+ } elseif {$arg == "-d"} { # Turn on debug output
+ set ui_options(ports_debug) yes
+ } elseif {$arg == "-o"} { # Set output directory
+ incr i
+ set outdir [lindex $argv $i]
+ } else {
+ puts stderr "Unknown option: $arg"
+ print_usage
+ exit 1
+ }
</ins><span class="cx"> }
</span><ins>+ default {
+ set directory $arg
+ }
</ins><span class="cx"> }
</span><del>- default { set directory $arg }
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {$archive == 1 && ![info exists outdir]} {
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> set directory .
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# cd to input directory
</del><ins>+# cd to input directory
</ins><span class="cx"> if {[catch {cd $directory} result]} {
</span><span class="cx"> puts stderr "$result"
</span><span class="cx"> exit 1
</span></span></pre></div>
<a id="branchesimagesandarchivesbasesrcport10portinstalltcl"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/port1.0/portinstall.tcl (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/port1.0/portinstall.tcl 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/src/port1.0/portinstall.tcl 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> registry_prop_store $regref categories $categories
</span><span class="cx">
</span><span class="cx"> if {[info exists description]} {
</span><del>- registry_prop_store $regref description $description
</del><ins>+ registry_prop_store $regref description [string map {\n \\n} ${description}]
</ins><span class="cx"> }
</span><span class="cx"> if {[info exists long_description]} {
</span><span class="cx"> registry_prop_store $regref long_description [string map {\n \\n} ${long_description}]
</span></span></pre></div>
<a id="branchesimagesandarchivesbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/port1.0/portutil.tcl (50751 => 50752)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-05-08 19:53:18 UTC (rev 50751)
+++ branches/images-and-archives/base/src/port1.0/portutil.tcl 2009-05-08 20:52:00 UTC (rev 50752)
</span><span class="lines">@@ -450,6 +450,9 @@
</span><span class="cx"> array set vinfo $PortInfo(vinfo)
</span><span class="cx">
</span><span class="cx"> set len [llength $args]
</span><ins>+ if {$len < 2} {
+ return -code error "Malformed variant specification"
+ }
</ins><span class="cx"> set code [lindex $args end]
</span><span class="cx"> set args [lrange $args 0 [expr $len - 2]]
</span><span class="cx">
</span><span class="lines">@@ -639,6 +642,9 @@
</span><span class="cx"> global all_variants PortInfo os.platform os.arch os.version os.major
</span><span class="cx">
</span><span class="cx"> set len [llength $args]
</span><ins>+ if {$len < 2} {
+ return -code error "Malformed platform variant specification"
+ }
</ins><span class="cx"> set code [lindex $args end]
</span><span class="cx"> set os [lindex $args 0]
</span><span class="cx"> set args [lrange $args 1 [expr $len - 2]]
</span></span></pre>
</div>
</div>
</body>
</html>