5 files changed, 16 insertions, 15 deletions

diff --git a/x11/XFree86/pkg-plist b/x11/XFree86/pkg-plist
index 6dea3e02e343..6f86bb0a122b 100644
--- a/x11/XFree86/pkg-plist
+++ b/x11/XFree86/pkg-plist
@@ -627,6 +627,7 @@ lib/X11/doc/README.epson
 lib/X11/doc/README.i740
 lib/X11/doc/README.mouse
 lib/X11/doc/README.neo
+lib/X11/doc/README.r128
 lib/X11/doc/README.rendition
 lib/X11/doc/README.trident
 lib/X11/doc/README.tseng
diff --git a/x11/XFree86/pkg-plist.alpha b/x11/XFree86/pkg-plist.alpha
index 5a220891f7b7..4c54dc35d02d 100644
--- a/x11/XFree86/pkg-plist.alpha
+++ b/x11/XFree86/pkg-plist.alpha
@@ -620,6 +620,7 @@ lib/X11/doc/README.epson
 lib/X11/doc/README.i740
 lib/X11/doc/README.mouse
 lib/X11/doc/README.neo
+lib/X11/doc/README.r128
 lib/X11/doc/README.rendition
 lib/X11/doc/README.trident
 lib/X11/doc/README.tseng
diff --git a/x11/XFree86/pkg-plist.pc98 b/x11/XFree86/pkg-plist.pc98
index 2e4d6697069f..a00816f73dd2 100644
--- a/x11/XFree86/pkg-plist.pc98
+++ b/x11/XFree86/pkg-plist.pc98
@@ -624,6 +624,7 @@ lib/X11/doc/README.cyrix
 lib/X11/doc/README.epson
 lib/X11/doc/README.mouse
 lib/X11/doc/README.neo
+lib/X11/doc/README.r128
 lib/X11/doc/README.rendition
 lib/X11/doc/README.trident
 lib/X11/doc/README.tseng
diff --git a/x11/XFree86/pkg-plist.stripped b/x11/XFree86/pkg-plist.stripped
index c20256a33f6b..a57bc00f2a41 100644
--- a/x11/XFree86/pkg-plist.stripped
+++ b/x11/XFree86/pkg-plist.stripped
@@ -555,21 +555,6 @@ lib/X11/locale/zh_TW.Big5/XLC_LOCALE
 lib/X11/proxymngr/pmconfig
 lib/X11/rgb.txt
 lib/X11/xserver/SecurityPolicy
-lib/aout/libICE.so.6.3
-lib/aout/libPEX5.so.6.0
-lib/aout/libSM.so.6.0
-lib/aout/libX11.so.6.1
-lib/aout/libXIE.so.6.0
-lib/aout/libXaw.so.6.1
-lib/aout/libXext.so.6.3
-lib/aout/libXi.so.6.0
-lib/aout/libXmu.so.6.0
-lib/aout/libXp.so.6.2
-lib/aout/libXt.so.6.0
-lib/aout/libXtst.so.6.1
-lib/aout/liboldX.so.6.0
-@exec /usr/bin/env OBJFORMAT=aout /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=aout /sbin/ldconfig -R
 lib/libFS.a
 lib/libICE.a
 lib/libICE.so
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 83fe24470eb2..735bfee3fd23 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -293,6 +293,19 @@ fi
 # ELF detection
 if [ `sysctl -n kern.osreldate` -ge 300004 -a  X`objformat` = Xelf ]; then
   ELF=yes
+cat <<'END'
+
+ Some programs still require a.out X libraries.  Most noteable amongst
+ these is Nestcape, but it is reported to work best with older X libraries. 
+ You can build a.out libraries here, using the lastest sources and
+ compiler, or you can use the XFree86-aoutlibs port, which installs older
+ a.out compatibility libraries.
+ 
+ If you decide to build the libraries here they will not be uninstalled by
+ this port, and they will be overwritten by the XFree86-aoutlibs port, if
+ for some reason you install it.
+
+END
   noyes "Do you want to build and install a.out compatibility libraries?"
   if [ $answ = YES ]; then
     echo "#define BuildAoutLibraries		YES" >> $F