configure: Remove --with-ports-tree option

This was entirely unsused and the purpose is unclear.

Mk/macports.autoconf.mk.in

@@ -57,7 +57,6 @@ localstatedir		= @localstatedir@
 infodir			= @infodir@
 
 mpconfigdir		= @MPCONFIGDIR@
-portsdir		= @PORTSDIR@
 
 MACPORTS_VERSION	= @MACPORTS_VERSION@
 

aclocal.m4

@@ -508,52 +508,11 @@ AC_DEFUN(MP_CHECK_FRAMEWORK_IOKIT, [
 	AC_SUBST(HAVE_FRAMEWORK_IOKIT, [$mp_cv_have_framework_iokit])
 ])
 
-
-dnl This macro checks if the user specified a ports tree
-dnl explicitly. If not, search for it
-
-# MP_PATH_PORTSDIR(DEFAULT_PORTSDIR)
-#---------------------------------------
- AC_DEFUN([MP_PATH_PORTSDIR],[
- 	dnl For ease of reading, run after gcc has been found/configured
- 	AC_REQUIRE([AC_PROG_CC])
-
- 	AC_ARG_WITH(ports-dir, [AS_HELP_STRING([--with-ports-dir=DIR],[specify alternate ports directory])], [ portsdir="$withval" ] )
-
-
- 	AC_MSG_CHECKING([for ports tree])
- 	if test "x$portsdir" != "x" ; then
- 	  if test -d "$portsdir" -a -e "$portsdir/PortIndex" ; then
- 		:
- 	  else
- 		AC_MSG_ERROR([$portsdir not a valid ports tree])
- 	  fi
- 	else
- 		dnl If the user didn't give a path, look for default
- 		if test "x$1" != "x" ; then
- 		  if test -d "$1" -a -e "$1/PortIndex" ; then
- 			portsdir=$1
- 		  fi
- 		fi
- 	fi
-
- 	if test "x$portsdir" != "x" ; then
- 		AC_MSG_RESULT($portsdir)
- 		PORTSDIR="$portsdir"
- 		AC_SUBST(PORTSDIR)
- 	else
- 		AC_MSG_WARN([No ports tree found])
- 	fi
-
-         ])
-
-
 # MP_PATH_MPCONFIGDIR
 #---------------------------------------
 AC_DEFUN([MP_PATH_MPCONFIGDIR],[
 	dnl if the user actually specified --prefix, shift
 	dnl mpconfigdir to $prefix/etc/macports
-	dnl 	AC_REQUIRE([MP_PATH_PORTSDIR])
 	
         AC_MSG_CHECKING([for MacPorts config directory])
 

configure

@@ -681,7 +681,6 @@ RUNUSR
 DSTGRP
 DSTUSR
 MPCONFIGDIR
-PORTSDIR
 EXTRA_PROGS
 HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER
 HAVE_FRAMEWORK_IOKIT
@@ -832,7 +831,6 @@ with_xar
 with_xz
 enable_werror
 with_unsupported_prefix
-with_ports_dir
 with_no_root_privileges
 with_install_user
 with_install_group
@@ -1503,7 +1501,6 @@ Optional Packages:
   --with-unsupported-prefix
                           acknowledge that you accept the consequences of
                           using an unsupported prefix
-  --with-ports-dir=DIR    specify alternate ports directory
   --with-no-root-privileges
                           specify that MacPorts should be installed in your
                           home directory
@@ -6414,9 +6411,6 @@ $as_echo "${result}" >&6; }
 
 
 
-# set default ports-directory
-PORTS_DIR_DEFAULT=`pwd | sed -e "s/base/ports/"`
-
 # Check for paths
 
 
@@ -6434,44 +6428,6 @@ to configure." "$LINENO" 5
 fi
 
 
-
-
-# Check whether --with-ports-dir was given.
-if test "${with_ports_dir+set}" = set; then :
-  withval=$with_ports_dir;  portsdir="$withval"
-fi
-
-
-
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ports tree" >&5
-$as_echo_n "checking for ports tree... " >&6; }
- 	if test "x$portsdir" != "x" ; then
- 	  if test -d "$portsdir" -a -e "$portsdir/PortIndex" ; then
- 		:
- 	  else
- 		as_fn_error $? "$portsdir not a valid ports tree" "$LINENO" 5
- 	  fi
- 	else
- 		 		if test "x$PORTS_DIR_DEFAULT" != "x" ; then
- 		  if test -d "$PORTS_DIR_DEFAULT" -a -e "$PORTS_DIR_DEFAULT/PortIndex" ; then
- 			portsdir=$PORTS_DIR_DEFAULT
- 		  fi
- 		fi
- 	fi
-
- 	if test "x$portsdir" != "x" ; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $portsdir" >&5
-$as_echo "$portsdir" >&6; }
- 		PORTSDIR="$portsdir"
-
- 	else
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No ports tree found" >&5
-$as_echo "$as_me: WARNING: No ports tree found" >&2;}
- 	fi
-
-
-
-
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacPorts config directory" >&5
 $as_echo_n "checking for MacPorts config directory... " >&6; }
 

configure.ac

@@ -196,9 +196,6 @@ MP_PROG_DAEMONDO
 
 AC_SUBST(EXTRA_PROGS)
 
-# set default ports-directory
-PORTS_DIR_DEFAULT=`pwd | sed -e "s/base/ports/"`
-
 # Check for paths
 AC_PREFIX_DEFAULT(/opt/local)
 AC_ARG_WITH(
@@ -212,7 +209,6 @@ if test x$prefix = x/usr/local -o x$prefix = x/usr && test x$with_unsupported_pr
 you understand this and wish to do so anyway, pass --with-unsupported-prefix \
 to configure.])
 fi
-MP_PATH_PORTSDIR([$PORTS_DIR_DEFAULT])
 MP_PATH_MPCONFIGDIR
 
 # Check whether to install without root privileges