Finish what the previous revision intended to do, i.e., copy Wraphelp.c

from DISTDIR if found there, instead of looking for it in DISTDIR and
copying it from X11FIXES (which is no longer defined).

I guess it's impossible to test all cases for a port this size.

4 files changed, 8 insertions, 8 deletions

diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 82b59c164e8f..76a31a32c37b 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -147,7 +147,7 @@ cat <<'END'
  cryptography.
 
  If you have aquired a copy of "Wraphelp.c" and it currently resides in
- the same location as the XFree86 upgrade patches or in the ports "files"
+ the same location as the XFree86 source or in the ports "files"
  subdirectory,  it will be copied into the right place in the X11 source
  distribution and support for this feature will be enabled if you answer
  YES to the following question.
@@ -166,7 +166,7 @@ if [ $answ = YES ]; then
 	echo "==> $WH found in source distribution."
     elif [ -f $DISTDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$X11FIXES/Wraphelp.c
+	cpwh=$DISTDIR/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 82b59c164e8f..76a31a32c37b 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -147,7 +147,7 @@ cat <<'END'
  cryptography.
 
  If you have aquired a copy of "Wraphelp.c" and it currently resides in
- the same location as the XFree86 upgrade patches or in the ports "files"
+ the same location as the XFree86 source or in the ports "files"
  subdirectory,  it will be copied into the right place in the X11 source
  distribution and support for this feature will be enabled if you answer
  YES to the following question.
@@ -166,7 +166,7 @@ if [ $answ = YES ]; then
 	echo "==> $WH found in source distribution."
     elif [ -f $DISTDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$X11FIXES/Wraphelp.c
+	cpwh=$DISTDIR/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 82b59c164e8f..76a31a32c37b 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -147,7 +147,7 @@ cat <<'END'
  cryptography.
 
  If you have aquired a copy of "Wraphelp.c" and it currently resides in
- the same location as the XFree86 upgrade patches or in the ports "files"
+ the same location as the XFree86 source or in the ports "files"
  subdirectory,  it will be copied into the right place in the X11 source
  distribution and support for this feature will be enabled if you answer
  YES to the following question.
@@ -166,7 +166,7 @@ if [ $answ = YES ]; then
 	echo "==> $WH found in source distribution."
     elif [ -f $DISTDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$X11FIXES/Wraphelp.c
+	cpwh=$DISTDIR/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 82b59c164e8f..76a31a32c37b 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -147,7 +147,7 @@ cat <<'END'
  cryptography.
 
  If you have aquired a copy of "Wraphelp.c" and it currently resides in
- the same location as the XFree86 upgrade patches or in the ports "files"
+ the same location as the XFree86 source or in the ports "files"
  subdirectory,  it will be copied into the right place in the X11 source
  distribution and support for this feature will be enabled if you answer
  YES to the following question.
@@ -166,7 +166,7 @@ if [ $answ = YES ]; then
 	echo "==> $WH found in source distribution."
     elif [ -f $DISTDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in DISTDIR directory, copying to source tree."
-	cpwh=$X11FIXES/Wraphelp.c
+	cpwh=$DISTDIR/Wraphelp.c
     elif [ -f $FILESDIR/Wraphelp.c ] ; then
 	echo "==> Wraphelp.c found in files directory, copying to source tree."
 	cpwh=$FILESDIR/Wraphelp.c