[24366] trunk/base
source_changes at macosforge.org
source_changes at macosforge.org
Mon Apr 23 14:20:06 PDT 2007
Revision: 24366
http://trac.macosforge.org/projects/macports/changeset/24366
Author: jmpp at macports.org
Date: 2007-04-23 14:20:05 -0700 (Mon, 23 Apr 2007)
Log 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).
Modified Paths:
--------------
trunk/base/Mk/dports.autoconf.mk.in
trunk/base/aclocal.m4
trunk/base/configure
trunk/base/configure.ac
trunk/base/doc/Makefile
trunk/base/src/port/Makefile
Removed Paths:
-------------
trunk/base/src/programs/mtree/
Modified: trunk/base/Mk/dports.autoconf.mk.in
===================================================================
--- trunk/base/Mk/dports.autoconf.mk.in 2007-04-23 21:08:49 UTC (rev 24365)
+++ trunk/base/Mk/dports.autoconf.mk.in 2007-04-23 21:20:05 UTC (rev 24366)
@@ -25,7 +25,6 @@
LIBS = @LIBS@
MD5_LIBS = @MD5_LIBS@
INSTALL = @INSTALL@
-MTREE = @MTREE@
LN_S = @LN_S@
XCODEBUILD = @XCODEBUILD@
Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4 2007-04-23 21:08:49 UTC (rev 24365)
+++ trunk/base/aclocal.m4 2007-04-23 21:20:05 UTC (rev 24366)
@@ -482,21 +482,6 @@
])
-# OD_PROG_MTREE
-#---------------------------------------
-AC_DEFUN([OD_PROG_MTREE],[
-
- AC_PATH_PROG([MTREE], [mtree], , [/usr/bin:/usr/sbin:/bin:/sbin])
-
- if test "x$MTREE" = "x" ; then
- AC_CONFIG_SUBDIRS([src/programs/mtree])
- MTREE='$(TOPSRCDIR)/src/programs/mtree/mtree'
- REPLACEMENT_PROGS="$REPLACEMENT_PROGS mtree"
- fi
-
- AC_SUBST(MTREE)
-])
-
# OD_PROG_XAR
#---------------------------------------
AC_DEFUN([OD_PROG_XAR],[
Modified: trunk/base/configure
===================================================================
--- trunk/base/configure 2007-04-23 21:08:49 UTC (rev 24365)
+++ trunk/base/configure 2007-04-23 21:20:05 UTC (rev 24366)
@@ -688,8 +688,6 @@
GNUTAR
TAR_CMD
CFLAGS_QUICHEEATERS
-MTREE
-subdirs
HAVE_FRAMEWORK_COREFOUNDATION
HAVE_FRAMEWORK_SYSTEMCONFIGURATION
HAVE_FRAMEWORK_IOKIT
@@ -727,6 +725,7 @@
CURL_CONFIG
CFLAGS_LIBCURL
LDFLAGS_LIBCURL
+subdirs
OUR_INCLUDED_PACKAGES
INCLUDES
CFLAGS_DEBUG
@@ -760,8 +759,7 @@
XAR
CPP
XMKMF'
-ac_subdirs_all='src/programs/mtree
-src/thread2.6'
+ac_subdirs_all='src/thread2.6'
# Initialize some variables set by options.
ac_init_help=
@@ -3486,60 +3484,6 @@
-
- # Extract the first word of "mtree", so it can be a program name with args.
-set dummy mtree; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_MTREE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $MTREE in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_MTREE="$MTREE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_dummy="/usr/bin:/usr/sbin:/bin:/sbin"
-for as_dir in $as_dummy
-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_MTREE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-MTREE=$ac_cv_path_MTREE
-if test -n "$MTREE"; then
- { echo "$as_me:$LINENO: result: $MTREE" >&5
-echo "${ECHO_T}$MTREE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-
- if test "x$MTREE" = "x" ; then
- subdirs="$subdirs src/programs/mtree"
-
- MTREE='$(TOPSRCDIR)/src/programs/mtree/mtree'
- REPLACEMENT_PROGS="$REPLACEMENT_PROGS mtree"
- fi
-
-
-
-#OD_PROG_XAR
-
FRAMEWORK_LIBS="-framework CoreFoundation"
{ echo "$as_me:$LINENO: checking for CoreFoundation framework" >&5
@@ -3912,6 +3856,7 @@
{ echo "$as_me:$LINENO: result: ${result}" >&5
echo "${ECHO_T}${result}" >&6; }
+#OD_PROG_XAR
@@ -10242,8 +10187,6 @@
GNUTAR!$GNUTAR$ac_delim
TAR_CMD!$TAR_CMD$ac_delim
CFLAGS_QUICHEEATERS!$CFLAGS_QUICHEEATERS$ac_delim
-MTREE!$MTREE$ac_delim
-subdirs!$subdirs$ac_delim
HAVE_FRAMEWORK_COREFOUNDATION!$HAVE_FRAMEWORK_COREFOUNDATION$ac_delim
HAVE_FRAMEWORK_SYSTEMCONFIGURATION!$HAVE_FRAMEWORK_SYSTEMCONFIGURATION$ac_delim
HAVE_FRAMEWORK_IOKIT!$HAVE_FRAMEWORK_IOKIT$ac_delim
@@ -10267,6 +10210,8 @@
X_LIBS!$X_LIBS$ac_delim
X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
TCL_VERSION!$TCL_VERSION$ac_delim
+TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
+TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -10308,8 +10253,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-TCL_BIN_DIR!$TCL_BIN_DIR$ac_delim
-TCL_SRC_DIR!$TCL_SRC_DIR$ac_delim
TCL_LIB_FILE!$TCL_LIB_FILE$ac_delim
TCL_LIB_FLAG!$TCL_LIB_FLAG$ac_delim
TCL_LIB_SPEC!$TCL_LIB_SPEC$ac_delim
@@ -10322,6 +10265,7 @@
CURL_CONFIG!$CURL_CONFIG$ac_delim
CFLAGS_LIBCURL!$CFLAGS_LIBCURL$ac_delim
LDFLAGS_LIBCURL!$LDFLAGS_LIBCURL$ac_delim
+subdirs!$subdirs$ac_delim
OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
INCLUDES!$INCLUDES$ac_delim
CFLAGS_DEBUG!$CFLAGS_DEBUG$ac_delim
@@ -10340,7 +10284,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: trunk/base/configure.ac
===================================================================
--- trunk/base/configure.ac 2007-04-23 21:08:49 UTC (rev 24365)
+++ trunk/base/configure.ac 2007-04-23 21:20:05 UTC (rev 24366)
@@ -39,9 +39,8 @@
OD_COMPILER_ATTRIBUTE_UNUSED
-OD_PROG_MTREE
-#OD_PROG_XAR
OD_PROG_DAEMONDO
+#OD_PROG_XAR
AC_SUBST(REPLACEMENT_PROGS)
AC_SUBST(EXTRA_PROGS)
Modified: trunk/base/doc/Makefile
===================================================================
--- trunk/base/doc/Makefile 2007-04-23 21:08:49 UTC (rev 24365)
+++ trunk/base/doc/Makefile 2007-04-23 21:20:05 UTC (rev 24366)
@@ -20,15 +20,14 @@
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${DESTDIR}${portconfigdir}
- cat prefix.mtree | $(MTREE) -U -e -p ${INSTALLDIR} > /dev/null
+ cat prefix.mtree | mtree -U -e -p ${INSTALLDIR} > /dev/null
if test -L "${INSTALLDIR}/man" ; then \
rm -f "${INSTALLDIR}/man"; \
fi
-
+
if test ! -e "${INSTALLDIR}/man" ; then \
$(LN_S) share/man ${INSTALLDIR}/man; \
fi
-
# Install the ports.conf file. If it's already installed, upgrade it
if test ! -e ${DESTDIR}/${portconfigdir}/ports.conf ; then \
set -x; \
@@ -46,7 +45,7 @@
sed -e s/rsync.opendarwin.org/rsync.darwinports.org/ ${DESTDIR}${portconfigdir}/sources.conf > ${DESTDIR}${portconfigdir}/sources.conf.tmp && \
mv ${DESTDIR}${portconfigdir}/sources.conf.tmp ${DESTDIR}${portconfigdir}/sources.conf; \
fi
-
+
$(SILENT)if test ! -e ${DESTDIR}${portconfigdir}/variants.conf ; then \
set -x; \
$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 variants.conf ${DESTDIR}${portconfigdir}; \
Modified: trunk/base/src/port/Makefile
===================================================================
--- trunk/base/src/port/Makefile 2007-04-23 21:08:49 UTC (rev 24365)
+++ trunk/base/src/port/Makefile 2007-04-23 21:20:05 UTC (rev 24366)
@@ -21,7 +21,7 @@
${edit} port.tcl > $@
mkdirs:
- cat ../../doc/prefix.mtree | $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
+ cat ../../doc/prefix.mtree | mtree -U -d -e -p ${INSTALLDIR} > /dev/null
clean:
rm -f ${SCRIPTS}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070423/afb0d745/attachment.html
More information about the macports-changes
mailing list