Projects
New Ticket     Wiki     Browse Source     Timeline     Roadmap     Bug Reports     Search

Changeset 24908

Show
Ignore:
Timestamp:
05/07/07 20:53:32 (19 months ago)
Author:
jberry@…
Message:

Merge from trunk to release_1_4 branch in preparation for release 1.4.40 release

Location:
branches/release_1_4/base
Files:
1 removed
36 modified
5 copied

Legend:

Unmodified
Added
Removed

  • branches/release_1_4/base/ChangeLog

    r24155 r24908  
    55# 
    66 
    7  
    87(unreleased): 
     8 
     9Release 1.4.40 (7-May-2007): 
     10 
     11    - Note the bump in version naming. To leave ourselves lots of room in our versioning 
     12      scheme, we've jumped from 1.4.3 to 1.4.40. The floating point represenation as 
     13      reported by port version (1.440) will still be the same; we're just interpreting 
     14      it differently. 
     15 
     16    - variable tracing now works in a much better way and handles unsets properly. 
     17      Similarly, ${option}-delete now works better. Depends validation no longer 
     18      attempts to validate when the variable is unset. Additionally, the validation 
     19      now actually validates each depspec instead of simply finding a single spec 
     20      within the list that works (ticket #11868, eridius r24678). 
     21 
     22    - macports infrastructure now easier to use from scripts. 
     23      ui_prefix and ui_channels have default implementations, and 
     24      all arguments to dportinit are now optional (ticket #11837, eridius r24460). 
     25 
     26    - ln now accepts combined flags (ex. ln -sf foo bar) (eridius r24452) 
     27 
     28    - default_variants now handles multiple values correctly (ticket #11828, eridius r24450). 
     29 
     30    - ln uses new symlink command so it can create symlinks that point to 
     31      files that don't actually exist (eridius r24444). 
     32 
     33    - New bare-bones Pextlib command `symlink source target` (ticket #11840, eridius r24444). 
     34 
     35    - delete reimplemented using fs-traverse (eridius r24435). 
     36 
     37    - fs-traverse now uses the fts(3) family of functions instead of readdir/opendir. 
     38      This fixes a couple behavioral oddities, and makes deleting during traversal work on 10.3 
     39      (ticket #11839, eridius r24423). 
     40 
     41    - fs-traverse now takes a list of targets rather than a variable number of arguments 
     42      (ticket #11836, eridius r24410). 
     43 
     44    - Fixed a potential crasher in fs-traverse when showing error message 
     45      (ticket #11827, eridius r24396, thanks sfiera). 
     46     
     47    - Fixed a bug where livecheck failed on ports that do not define a homepage 
     48      (ticket #11818, pguyot r24319). 
     49 
     50    - Added the downloads section of our repo to the macports mirrors list (jmpp r24278). 
     51 
     52    - Fixed a bug with the archive mode introduced with r23238 change (1.4.1) 
     53      (pguyot r24273). 
     54 
     55    - Trace mode now take dependencies into account when executing the activate 
     56      phase. This fixes an unwanted warning when activating ports that depend 
     57      on teTeX (pguyot r24199). 
     58       
     59    - Support for mpwa submit through "port submit". 
     60      This work is in progress. (jberry) 
     61       - Expose autoconf XAR variable as portutil::autoconf::xar_path. (r24194). 
     62       - Start to build portpkg.xar and meta data, hijacking Kevin's 
     63         portsubmit.tcl. (r24195-24196). 
     64          
     65    - Revise error messages in port image activation to use syntax that 
     66      matches port(1). (jberry r24543, r24548). 
     67 
     68    - Create new interp variable prefix_frozen, which is available to port phases 
     69      even when the Portfile redefines prefix. (jberry r24848-r24849) 
     70       
     71    - Search for prefix-relative commands in prefix_frozen rather than prefix. 
     72      Affects port submit (xar) and port fetch (svn). (jberry r24849) 
     73 
     74    - Always create a ~/.macports user directory if it doesn't yet exist. (jberry r24831) 
     75     
     76    - Move port(1) readline history file to ~/.macports/history (jberry r24832, r24843) 
    977 
    1078Release 1.4.3 (17-Apr-2007): 

  • branches/release_1_4/base/ReleaseProcess

    r23646 r24908  
    4141The actual release, alpha or beta releases, release candidates, and any point releases will all live on this branch, and tagged appropriately and if necessary (a must for the actual releases, optional for beta snapshots) into the /tags svn directory. 
    4242 
    43 Only the base subdirectory, not the dports subdirectory, is branched for a given release. 
     43Only the base subdirectory, not the ports subdirectory, is branched for a given release. 
    4444 
    4545 
    … …  
    134134 
    135135* The macports-users@lists.macosforge.org and macports-dev@lists.macosforge.org mailing lists. 
    136 * Apple's [http://www.apple.com/downloads/macosx/unix_open_source/darwinports.html Mac OS X software download page] (submitter: mww@) 
    137 * [http://freshmeat.net/projects/darwinports/ Freshmeat] (submitter: mww@) 
     136* Apple's [http://www.apple.com/downloads/macosx/unix_open_source/macports.html Mac OS X software downloads page] (submitter: jmpp@) 
     137* [http://freshmeat.net/projects/macports/ Freshmeat] (submitter: mww@) 
    138138* [http://www.versiontracker.com/dyn/moreinfo/macosx/26679 VersionTracker] (submitter: mij@) 
    139139* (Where else? -- MacUpdate?) 
    140 (Following three locations --last two being leftovers from darwinports days-- need to be carefully thought out and reworked in view of a much --*URGENTLY*-- needed website redesign!!!) 
    141 * Wordpress news section at the main MacPorts site, www.macports.org 
    142 * The [http://www.darwinports.org/getdp/ getdp] and [http://www.darwinports.org/ main] sites (the "$dp_version" variable in the includes/common.inc file for the main English site --www/includes/common.inc-- and each localization has to be updated with the release version) 
    143 * The darwinports wiki (updating the "Current DarwinPorts release" line on the [[DarwinPorts|main]] page) 
    144  
    145  
    146 == Additional Release Resources == 
    147  
    148 * Landon Fuller's [http://www.opendarwin.org/pipermail/darwinports/2005-May/026055.html release process] suggestions 

  • branches/release_1_4/base/aclocal.m4

    r23969 r24908  
    483483]) 
    484484 
    485 # OD_PROG_MTREE 
    486 #--------------------------------------- 
    487 AC_DEFUN([OD_PROG_MTREE],[ 
    488  
    489         AC_PATH_PROG([MTREE], [mtree], ,  [/usr/bin:/usr/sbin:/bin:/sbin]) 
    490  
    491         if test "x$MTREE" = "x" ; then 
    492                 AC_CONFIG_SUBDIRS([src/programs/mtree]) 
    493                 MTREE='$(TOPSRCDIR)/src/programs/mtree/mtree' 
    494                 REPLACEMENT_PROGS="$REPLACEMENT_PROGS mtree" 
    495         fi 
    496  
    497         AC_SUBST(MTREE) 
    498 ]) 
    499  
    500485# OD_PROG_XAR 
    501486#--------------------------------------- 

  • branches/release_1_4/base/config/RELEASE_URL

    r24155 r24908  
    1 http://svn.macports.org/repository/macports/tags/release_1_4_2/ 
     1http://svn.macports.org/repository/macports/tags/release_1_4_3/ 

  • branches/release_1_4/base/config/dp_version

    r24155 r24908  
    1 1.430 
     11.440 

  • branches/release_1_4/base/configure

    r24329 r24908  
    678678SET_MAKE 
    679679LN_S 
     680MTREE 
    680681CVS 
     682SVN 
    681683RSYNC 
    682684HAVE_LAUNCHD 
    … …  
    685687BZIP2 
    686688XAR 
     689OPEN 
    687690TAR 
    688691GNUTAR 
    689692TAR_CMD 
    690693CFLAGS_QUICHEEATERS 
    691 MTREE 
    692 subdirs 
    693694HAVE_FRAMEWORK_COREFOUNDATION 
    694695HAVE_FRAMEWORK_SYSTEMCONFIGURATION 
    … …  
    728729CFLAGS_LIBCURL 
    729730LDFLAGS_LIBCURL 
     731subdirs 
    730732OUR_INCLUDED_PACKAGES 
    731733INCLUDES 
    … …  
    753755LIBS 
    754756CPPFLAGS 
     757MTREE 
    755758CVS 
     759SVN 
    756760RSYNC 
    757761TAR 
    … …  
    759763BZIP2 
    760764XAR 
     765OPEN 
    761766CPP 
    762767XMKMF' 
    763 ac_subdirs_all='src/programs/mtree 
    764 src/thread2.6' 
     768ac_subdirs_all='src/thread2.6' 
    765769 
    766770# Initialize some variables set by options. 
    … …  
    13691373  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if 
    13701374              you have headers in a nonstandard directory <include dir> 
     1375  MTREE       path to mtree command 
    13711376  CVS         path to cvs command 
     1377  SVN         path to svn command 
    13721378  RSYNC       path to rsync command 
    13731379  TAR         path to tar command 
    … …  
    13751381  BZIP2       path to bzip2 command 
    13761382  XAR         path to xar command 
     1383  OPEN        path to open command 
    13771384  CPP         C preprocessor 
    13781385  XMKMF       Path to xmkmf, Makefile generator for X Window System 
    … …  
    30363043fi 
    30373044 
     3045# Extract the first word of "mtree", so it can be a program name with args. 
     3046set dummy mtree; ac_word=$2 
     3047{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     3048echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     3049if test "${ac_cv_path_MTREE+set}" = set; then 
     3050  echo $ECHO_N "(cached) $ECHO_C" >&6 
     3051else 
     3052  case $MTREE in 
     3053  [\\/]* | ?:[\\/]*) 
     3054  ac_cv_path_MTREE="$MTREE" # Let the user override the test with a path. 
     3055  ;; 
     3056  *) 
     3057  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     3058for as_dir in $PATH 
     3059do 
     3060  IFS=$as_save_IFS 
     3061  test -z "$as_dir" && as_dir=. 
     3062  for ac_exec_ext in '' $ac_executable_extensions; do 
     3063  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3064    ac_cv_path_MTREE="$as_dir/$ac_word$ac_exec_ext" 
     3065    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     3066    break 2 
     3067  fi 
     3068done 
     3069done 
     3070IFS=$as_save_IFS 
     3071 
     3072  ;; 
     3073esac 
     3074fi 
     3075MTREE=$ac_cv_path_MTREE 
     3076if test -n "$MTREE"; then 
     3077  { echo "$as_me:$LINENO: result: $MTREE" >&5 
     3078echo "${ECHO_T}$MTREE" >&6; } 
     3079else 
     3080  { echo "$as_me:$LINENO: result: no" >&5 
     3081echo "${ECHO_T}no" >&6; } 
     3082fi 
     3083 
     3084 
    30383085# Extract the first word of "cvs", so it can be a program name with args. 
    30393086set dummy cvs; ac_word=$2 
    … …  
    30763123 
    30773124 
     3125# Extract the first word of "svn", so it can be a program name with args. 
     3126set dummy svn; ac_word=$2 
     3127{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     3128echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     3129if test "${ac_cv_path_SVN+set}" = set; then 
     3130  echo $ECHO_N "(cached) $ECHO_C" >&6 
     3131else 
     3132  case $SVN in 
     3133  [\\/]* | ?:[\\/]*) 
     3134  ac_cv_path_SVN="$SVN" # Let the user override the test with a path. 
     3135  ;; 
     3136  *) 
     3137  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     3138for as_dir in $PATH 
     3139do 
     3140  IFS=$as_save_IFS 
     3141  test -z "$as_dir" && as_dir=. 
     3142  for ac_exec_ext in '' $ac_executable_extensions; do 
     3143  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3144    ac_cv_path_SVN="$as_dir/$ac_word$ac_exec_ext" 
     3145    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     3146    break 2 
     3147  fi 
     3148done 
     3149done 
     3150IFS=$as_save_IFS 
     3151 
     3152  ;; 
     3153esac 
     3154fi 
     3155SVN=$ac_cv_path_SVN 
     3156if test -n "$SVN"; then 
     3157  { echo "$as_me:$LINENO: result: $SVN" >&5 
     3158echo "${ECHO_T}$SVN" >&6; } 
     3159else 
     3160  { echo "$as_me:$LINENO: result: no" >&5 
     3161echo "${ECHO_T}no" >&6; } 
     3162fi 
     3163 
     3164 
    30783165# Extract the first word of "rsync", so it can be a program name with args. 
    30793166set dummy rsync; ac_word=$2 
    … …  
    33133400 
    33143401 
     3402# Extract the first word of "open", so it can be a program name with args. 
     3403set dummy open; ac_word=$2 
     3404{ echo "$as_me:$LINENO: checking for $ac_word" >&5 
     3405echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
     3406if test "${ac_cv_path_OPEN+set}" = set; then 
     3407  echo $ECHO_N "(cached) $ECHO_C" >&6 
     3408else 
     3409  case $OPEN in 
     3410  [\\/]* | ?:[\\/]*) 
     3411  ac_cv_path_OPEN="$OPEN" # Let the user override the test with a path. 
     3412  ;; 
     3413  *) 
     3414  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
     3415for as_dir in $PATH 
     3416do 
     3417  IFS=$as_save_IFS 
     3418  test -z "$as_dir" && as_dir=. 
     3419  for ac_exec_ext in '' $ac_executable_extensions; do 
     3420  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
     3421    ac_cv_path_OPEN="$as_dir/$ac_word$ac_exec_ext" 
     3422    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
     3423    break 2 
     3424  fi 
     3425done 
     3426done 
     3427IFS=$as_save_IFS 
     3428 
     3429  ;; 
     3430esac 
     3431fi 
     3432OPEN=$ac_cv_path_OPEN 
     3433if test -n "$OPEN"; then 
     3434  { echo "$as_me:$LINENO: result: $OPEN" >&5 
     3435echo "${ECHO_T}$OPEN" >&6; } 
     3436else 
     3437  { echo "$as_me:$LINENO: result: no" >&5 
     3438echo "${ECHO_T}no" >&6; } 
     3439fi 
     3440 
     3441 
    33153442 
    33163443# Define some precious variables allowing user to override PATH for some programs 
     3444 
     3445 
     3446 
    33173447 
    33183448 
    … …  
    34873617 
    34883618 
    3489  
    3490         # Extract the first word of "mtree", so it can be a program name with args. 
    3491 set dummy mtree; ac_word=$2 
    3492 { echo "$as_me:$LINENO: checking for $ac_word" >&5 
    3493 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } 
    3494 if test "${ac_cv_path_MTREE+set}" = set; then 
    3495   echo $ECHO_N "(cached) $ECHO_C" >&6 
    3496 else 
    3497   case $MTREE in 
    3498   [\\/]* | ?:[\\/]*) 
    3499   ac_cv_path_MTREE="$MTREE" # Let the user override the test with a path. 
    3500   ;; 
    3501   *) 
    3502   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
    3503 as_dummy="/usr/bin:/usr/sbin:/bin:/sbin" 
    3504 for as_dir in $as_dummy 
    3505 do 
    3506   IFS=$as_save_IFS 
    3507   test -z "$as_dir" && as_dir=. 
    3508   for ac_exec_ext in '' $ac_executable_extensions; do 
    3509   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    3510     ac_cv_path_MTREE="$as_dir/$ac_word$ac_exec_ext" 
    3511     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 
    3512     break 2 
    3513   fi 
    3514 done 
    3515 done 
    3516 IFS=$as_save_IFS 
    3517  
    3518   ;; 
    3519 esac 
    3520 fi 
    3521 MTREE=$ac_cv_path_MTREE 
    3522 if test -n "$MTREE"; then 
    3523   { echo "$as_me:$LINENO: result: $MTREE" >&5 
    3524 echo "${ECHO_T}$MTREE" >&6; } 
    3525 else 
    3526   { echo "$as_me:$LINENO: result: no" >&5 
    3527 echo "${ECHO_T}no" >&6; } 
    3528 fi 
    3529  
    3530  
    3531  
    3532         if test "x$MTREE" = "x" ; then 
    3533                 subdirs="$subdirs src/programs/mtree" 
    3534  
    3535                 MTREE='$(TOPSRCDIR)/src/programs/mtree/mtree' 
    3536                 REPLACEMENT_PROGS="$REPLACEMENT_PROGS mtree" 
    3537         fi 
    3538  
    3539  
    3540  
    3541 #OD_PROG_XAR 
    3542  
    35433619        FRAMEWORK_LIBS="-framework CoreFoundation" 
    35443620 
    … …  
    39133989echo "${ECHO_T}${result}" >&6; } 
    39143990 
     3991#OD_PROG_XAR 
    39153992 
    39163993 
    … …  
    1023210309SET_MAKE!$SET_MAKE$ac_delim 
    1023310310LN_S!$LN_S$ac_delim 
     10311MTREE!$MTREE$ac_delim 
    1023410312CVS!$CVS$ac_delim 
     10313SVN!$SVN$ac_delim 
    1023510314RSYNC!$RSYNC$ac_delim 
    1023610315HAVE_LAUNCHD!$HAVE_LAUNCHD$ac_delim 
    … …  
    1023910318BZIP2!$BZIP2$ac_delim 
    1024010319XAR!$XAR$ac_delim 
     10320OPEN!$OPEN$ac_delim 
    1024110321TAR!$TAR$ac_delim 
    1024210322GNUTAR!$GNUTAR$ac_delim 
    1024310323TAR_CMD!$TAR_CMD$ac_delim 
    1024410324CFLAGS_QUICHEEATERS!$CFLAGS_QUICHEEATERS$ac_delim 
    10245 MTREE!$MTREE$ac_delim 
    10246 subdirs!$subdirs$ac_delim 
    1024710325HAVE_FRAMEWORK_COREFOUNDATION!$HAVE_FRAMEWORK_COREFOUNDATION$ac_delim 
    1024810326HAVE_FRAMEWORK_SYSTEMCONFIGURATION!$HAVE_FRAMEWORK_SYSTEMCONFIGURATION$ac_delim 
    … …  
    1026710345X_LIBS!$X_LIBS$ac_delim 
    1026810346X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim 
    10269 TCL_VERSION!$TCL_VERSION$ac_delim 
    1027010347_ACEOF 
    1027110348 
    … …  
    1030910386for ac_last_try in false false false false false :; do 
    1031010387  cat >conf$$subs.sed <<_ACEOF 
     10388TCL_VERSION!$TCL_VERSION$ac_delim 
    1031110389TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim 
    1031210390TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim 
    … …  
    1032310401CFLAGS_LIBCURL!$CFLAGS_LIBCURL$ac_delim 
    1032410402LDFLAGS_LIBCURL!$LDFLAGS_LIBCURL$ac_delim 
     10403subdirs!$subdirs$ac_delim 
    1032510404OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim 
    1032610405INCLUDES!$INCLUDES$ac_delim 
    … …  
    1034110420_ACEOF 
    1034210421 
    10343   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then 
     10422  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then 
    1034410423    break 
    1034510424  elif $ac_last_try; then 

  • branches/release_1_4/base/configure.ac

    r24329 r24908  
    1414AC_PROG_MAKE_SET 
    1515AC_PROG_LN_S 
     16AC_PATH_PROG(MTREE, [mtree], []) 
    1617AC_PATH_PROG(CVS, [cvs], []) 
     18AC_PATH_PROG(SVN, [svn], []) 
    1719AC_PATH_PROG(RSYNC, [rsync], []) 
    1820AC_CHECK_PROG(HAVE_LAUNCHD, [launchd], [yes], []) 
    … …  
    2123AC_PATH_PROG(BZIP2, [bzip2], []) 
    2224AC_PATH_PROG(XAR, [xar], []) 
     25AC_PATH_PROG(OPEN, [open], []) 
    2326 
    2427# Define some precious variables allowing user to override PATH for some programs 
     28AC_ARG_VAR(MTREE, [path to mtree command]) 
    2529AC_ARG_VAR(CVS, [path to cvs command]) 
     30AC_ARG_VAR(SVN, [path to svn command]) 
    2631AC_ARG_VAR(RSYNC, [path to rsync command]) 
    2732AC_ARG_VAR(TAR, [path to tar command]) 
    … …  
    2934AC_ARG_VAR(BZIP2, [path to bzip2 command]) 
    3035AC_ARG_VAR(XAR, [path to xar command]) 
     36AC_ARG_VAR(OPEN, [path to open command]) 
    3137 
    3238OD_TAR_NO_SAME_OWNER 
    … …  
    4046OD_COMPILER_ATTRIBUTE_UNUSED 
    4147 
    42 OD_PROG_MTREE 
     48OD_PROG_DAEMONDO 
    4349#OD_PROG_XAR 
    44 OD_PROG_DAEMONDO 
    4550 
    4651AC_SUBST(REPLACEMENT_PROGS) 

  • branches/release_1_4/base/doc/INTERNALS

    r19376 r24908  
    11DARWIN PORTS INTERNALS 
    22 
    3 The darwin ports system is composed of a three TCL libraries: 
     3The DarwinPorts system is composed of three TCL libraries: 
    44        darwinports - public API 
    55        port - portfile parsing and execution 
    6         pextlib - neccesary C extensions to TCL 
     6        pextlib - necessary C extensions to TCL 
    77 
    8     These three TCL libraries are grouped as a TCL "package". TCL packages 
    9 allow for complex versioning and have a provide/require model of use, making 
     8    These three TCL libraries are grouped as TCL "packages". They allow 
     9for complex versioning and have a provide/require model of use, making 
    1010them well suited for maintaining a backwards compatable ports system. 
    1111 
    12     The "darwinports" TCL Library provides a public API into the darwin 
    13 ports system. Any external application wishing to manipulate a port can 
     12    The "darwinports" TCL Library provides a public API into the MarwinPorts 
     13system. Any external application wishing to manipulate a port can 
    1414load the "darwinports" TCL library. 'port', the included command line port 
    1515utility, uses only the exported "darwinports" API. 
    … …  
    1919knowledge of the contents of a portfile; instead, it relies entirely upon 
    2020the "port" TCL library. By keeping the high level API simple and generic, 
    21 a revision of the underlying ports system will not neccesarily require 
     21a revision of the underlying ports system will not necessarily require 
    2222a revision of the high level "darwinports" API. 
    2323 

  • branches/release_1_4/base/doc/Makefile

    r19376 r24908  
    2525                rm -f "${INSTALLDIR}/man"; \ 
    2626        fi 
    27          
     27 
    2828        if test ! -e "${INSTALLDIR}/man" ; then \ 
    2929                $(LN_S) share/man ${INSTALLDIR}/man; \ 
    3030        fi 
    31          
    3231        # Install the ports.conf file. If it's already installed, upgrade it 
    3332        if test ! -e ${DESTDIR}/${portconfigdir}/ports.conf ; then \ 
    … …  
    4746                        mv ${DESTDIR}${portconfigdir}/sources.conf.tmp ${DESTDIR}${portconfigdir}/sources.conf; \ 
    4847        fi 
    49          
     48 
    5049        $(SILENT)if test ! -e ${DESTDIR}${portconfigdir}/variants.conf ; then \ 
    5150                set -x; \ 

  • branches/release_1_4/base/doc/portfile.7

    r24118 r24908  
    2929.\" 
    3030.Dd February 13, 2007 
    31 .Dt PORTFILE 7 "Apple Computer, Inc." 
    32 .Os 
     31.Dt PORTFILE 7 "Apple Inc." 
     32.Os Darwin 
    3333.Sh NAME 
    3434.Nm Portfile 
    … …  
    14871487.Op Fl ignoreErrors 
    14881488.Ar varname 
    1489 .Ar target 
    1490 .Op Ar target ... 
     1489.Ar target-list 
    14911490.Ar body 
    14921491.Xc 
    1493 Traverse the filesystem hierarchy rooted in each 
    1494 .Ar target 
     1492Traverse the filesystem hierarchy rooted in each element of 
     1493.Ar target-list 
    14951494and execute 
    14961495.Ar body 
    1497 for each found file/directory. Sets 
    1498 .Ar varname 
    1499 to the path of the file/directory. If