Changeset 24366


Ignore:
Timestamp:
Apr 23, 2007, 9:20:05 PM (13 years ago)
Author:
jmpp@…
Message:

Cruft cleanup: there's no need to keep mtree sources around, since every copy of Mac OS X ships with mtree(8) by default.
We had them around when Mac(Darwin)Ports was targeted at other platforms too, but that's no longer the case.
Therefore I'm removing mtree sources from our repo and references to them from our autoconf macros (default path in Mac OS X
includes /usr/sbin, so there should be no need for autoconf to find the binary).

Location:
trunk/base
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Mk/dports.autoconf.mk.in

    r19376 r24366  
    2626MD5_LIBS                = @MD5_LIBS@
    2727INSTALL                 = @INSTALL@
    28 MTREE                   = @MTREE@
    2928LN_S                    = @LN_S@
    3029XCODEBUILD              = @XCODEBUILD@
  • trunk/base/aclocal.m4

    r23687 r24366  
    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#---------------------------------------
  • trunk/base/configure

    r24115 r24366  
    689689TAR_CMD
    690690CFLAGS_QUICHEEATERS
    691 MTREE
    692 subdirs
    693691HAVE_FRAMEWORK_COREFOUNDATION
    694692HAVE_FRAMEWORK_SYSTEMCONFIGURATION
     
    728726CFLAGS_LIBCURL
    729727LDFLAGS_LIBCURL
     728subdirs
    730729OUR_INCLUDED_PACKAGES
    731730INCLUDES
     
    761760CPP
    762761XMKMF'
    763 ac_subdirs_all='src/programs/mtree
    764 src/thread2.6'
     762ac_subdirs_all='src/thread2.6'
    765763
    766764# Initialize some variables set by options.
     
    34873485
    34883486
    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 
    35433487        FRAMEWORK_LIBS="-framework CoreFoundation"
    35443488
     
    39133857echo "${ECHO_T}${result}" >&6; }
    39143858
     3859#OD_PROG_XAR
    39153860
    39163861
     
    1024310188TAR_CMD!$TAR_CMD$ac_delim
    1024410189CFLAGS_QUICHEEATERS!$CFLAGS_QUICHEEATERS$ac_delim
    10245 MTREE!$MTREE$ac_delim
    10246 subdirs!$subdirs$ac_delim
    1024710190HAVE_FRAMEWORK_COREFOUNDATION!$HAVE_FRAMEWORK_COREFOUNDATION$ac_delim
    1024810191HAVE_FRAMEWORK_SYSTEMCONFIGURATION!$HAVE_FRAMEWORK_SYSTEMCONFIGURATION$ac_delim
     
    1026810211X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
    1026910212TCL_VERSION!$TCL_VERSION$ac_delim
     10213TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
     10214TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
    1027010215_ACEOF
    1027110216
     
    1030910254for ac_last_try in false false false false false :; do
    1031010255  cat >conf$$subs.sed <<_ACEOF
    10311 TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
    10312 TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
    1031310256TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim
    1031410257TCL_LIB_FLAG!$TCL_LIB_FLAG$ac_delim
     
    1032310266CFLAGS_LIBCURL!$CFLAGS_LIBCURL$ac_delim
    1032410267LDFLAGS_LIBCURL!$LDFLAGS_LIBCURL$ac_delim
     10268subdirs!$subdirs$ac_delim
    1032510269OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
    1032610270INCLUDES!$INCLUDES$ac_delim
     
    1034110285_ACEOF
    1034210286
    10343   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
     10287  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
    1034410288    break
    1034510289  elif $ac_last_try; then
  • trunk/base/configure.ac

    r24114 r24366  
    4040OD_COMPILER_ATTRIBUTE_UNUSED
    4141
    42 OD_PROG_MTREE
     42OD_PROG_DAEMONDO
    4343#OD_PROG_XAR
    44 OD_PROG_DAEMONDO
    4544
    4645AC_SUBST(REPLACEMENT_PROGS)
  • trunk/base/doc/Makefile

    r19376 r24366  
    2121        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${portconfigdir}
    2222
    23         cat prefix.mtree | $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
     23        cat prefix.mtree | mtree -U -e -p ${INSTALLDIR} > /dev/null
    2424        if test -L "${INSTALLDIR}/man" ; then \
    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; \
  • trunk/base/src/port/Makefile

    r19766 r24366  
    2222
    2323mkdirs:
    24         cat ../../doc/prefix.mtree | $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
     24        cat ../../doc/prefix.mtree | mtree -U -d -e -p ${INSTALLDIR} > /dev/null
    2525
    2626clean:
Note: See TracChangeset for help on using the changeset viewer.