--- bash_completion.orig	Mon Oct 25 10:10:30 2004
+++ bash_completion	Mon Oct 25 10:12:35 2004
@@ -31,14 +31,15 @@
 if [ -n "${FUNCNAME:-}" ]; then
 	# we're being sourced from within a function, so we can't use
 	# 'declare', as this will create local variables within a function
-	BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" 2>/dev/null
-	BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}" \
+	BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" \
+	  2>/dev/null
+	BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}" \
 	  2>/dev/null
 else
-	declare -r BASH_COMPLETION="${BASH_COMPLETION:-/etc/bash_completion}" \
+	declare -r BASH_COMPLETION="${BASH_COMPLETION:-/usr/local/etc/bash_completion}" \
 	  2>/dev/null
 	declare -r \
-	  BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/etc/bash_completion.d}"\
+	  BASH_COMPLETION_DIR="${BASH_COMPLETION_DIR:=/usr/local/etc/bash_completion.d}"\
 	  2>/dev/null
 fi
 
@@ -1131,7 +1132,7 @@
 	else
 		len=${#cur}
 		idx=0
-		for pval in $( /usr/sbin/postconf -m ); do
+		for pval in $( postconf -m ); do
 			if [[ "$cur" == "${pval:0:$len}" ]]; then
 				COMPREPLY[$idx]="$pval:"
 				idx=$(($idx+1))
@@ -1207,7 +1208,7 @@
 	fi
 	len=${#cur}
 	idx=0
-	for pval in $( /usr/sbin/postconf | cut -d ' ' -f 1 ); do
+	for pval in $( postconf | cut -d ' ' -f 1 ); do
 		if [[ "$cur" == "${pval:0:$len}" ]]; then
 			COMPREPLY[$idx]="$pval$eqext"
 			idx=$(($idx+1))