- Remove use of X11BASE from pointyhat scripts

8 files changed, 9 insertions, 16 deletions

diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv
index 7abd9dc3e651..07af4dc54f68 100644
--- a/Tools/portbuild/scripts/buildenv
+++ b/Tools/portbuild/scripts/buildenv
@@ -115,7 +115,6 @@ buildenv () {
     export ARCH=${arch}
     export MACHINE_ARCH=${arch}
 
-    export X11BASE=/usr/local
     export LOCALBASE=/usr/local
     export PKGSUFFIX=.tbz
     export PKGZIPCMD=bzip2
diff --git a/Tools/portbuild/scripts/buildfailure b/Tools/portbuild/scripts/buildfailure
index 50fde5696960..75d3cf4a1651 100755
--- a/Tools/portbuild/scripts/buildfailure
+++ b/Tools/portbuild/scripts/buildfailure
@@ -35,7 +35,6 @@ buildenv ${pb} ${arch} ${branch} ${builddir}
 
 # Don't pick up installed packages from the host
 export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
 
 index=${PORTSDIR}/${INDEXFILE}
 
diff --git a/Tools/portbuild/scripts/buildscript b/Tools/portbuild/scripts/buildscript
index fc32d7d42b02..41d7471acb85 100755
--- a/Tools/portbuild/scripts/buildscript
+++ b/Tools/portbuild/scripts/buildscript
@@ -117,7 +117,6 @@ RD=$7
 export MALLOC_OPTIONS=AJ
 
 L=`echo ${LOCALBASE} | sed 's,^/,,'`
-X=`echo ${X11BASE} | sed 's,^/,,'`
 Z=`ident ${dir}/Makefile | grep 'FreeBSD:' | sed 's/^[ \t]*//'`
 
 cd $dir || exit 1
@@ -148,7 +147,7 @@ if [ $phase = 1 ]; then
   echo "BUILD_DEPENDS=${BD}"
   echo "RUN_DEPENDS=${RD}"
 
-  echo "prefixes: LOCALBASE=${L} X11BASE=${X}"
+  echo "prefixes: LOCALBASE=${L}"
 
   #Allow ports to notice they're being run on bento
   export PACKAGE_BUILDING=1
@@ -263,7 +262,7 @@ EOF
   cd $dir
   /pnohang $TIMEOUT /tmp/make.log5 ${pkgname} make -k regression-test
   cat /tmp/make.log5
-  mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |usr/X11R6 |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list.preinstall
+  mtree -X /tmp/mtree.buildexclude -x -f /tmp/mtree.prebuild -p / | egrep -v "^(${L}/var|${L}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |usr/X11R6 |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${L}/lib/X11/fonts/TrueType|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list.preinstall
 
   if [ -s /tmp/list.preinstall ]; then
     echo "================================================================"
@@ -309,7 +308,7 @@ EOF
     cleanup 7
   fi
 
-  mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |usr/X11R6 |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list3
+  mtree -X /tmp/mtree.exclude -x -f /tmp/mtree -p / | egrep -v "^(${L}/var|${L}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |usr/X11R6 |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${L}/lib/X11/fonts/TrueType|${L}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml|var/db/fontconfig/* )" > /tmp/list3
 
   # Compare the state of the filesystem now to before the 'make install' phase
   dirty=0
@@ -319,7 +318,7 @@ EOF
     grep ' missing$' /tmp/list3 > /tmp/list5
     grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6
     if [ "x${NOPLISTCHECK}" = "x" ]; then
-      if grep -vqE "($X|$L)/etc/" /tmp/list4; then
+      if grep -vq "$L/etc/" /tmp/list4; then
         echo "1" > /tmp/status
         dirty=1
       fi
@@ -363,7 +362,7 @@ EOF
   fi
 
   # Compare the state of the filesystem now to clean system (should again be clean)
-  mtree -X /tmp/mtree.preexclude -x -f /tmp/mtree.pristine -p / | egrep -v "^(${L}/var|${X}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |usr/X11R6 |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list3
+  mtree -X /tmp/mtree.preexclude -x -f /tmp/mtree.pristine -p / | egrep -v "^(${L}/var|${L}/lib/X11/xserver/SecurityPolicy|${L}/share/nls/POSIX|${L}/share/nls/en_US.US-ASCII|etc/services|compat |usr/X11R6 |etc/manpath.config|etc/.*.bak|${L}/info/dir|${L}/lib/X11/fonts/.*/fonts\.|usr/local/man/..( |/man. )|${L}/lib/X11/fonts/TrueType )" > /tmp/list3
 
   echo
   echo "=== Checking filesystem state after all packages deleted"
@@ -374,7 +373,7 @@ EOF
     grep ' missing$' /tmp/list3 > /tmp/list5
     grep -vE ' (extra|missing)$' /tmp/list3 > /tmp/list6
     if [ "x${NOPLISTCHECK}" = "x" ]; then
-      if grep -vqE "($X|$L)/etc/" /tmp/list4; then
+      if grep -vq "$L/etc/" /tmp/list4; then
         #echo "1" > /tmp/status
       fi
       if [ -s /tmp/list5 ]; then
diff --git a/Tools/portbuild/scripts/buildsuccess b/Tools/portbuild/scripts/buildsuccess
index 3c5b7d0e5ed8..e98201a334fe 100755
--- a/Tools/portbuild/scripts/buildsuccess
+++ b/Tools/portbuild/scripts/buildsuccess
@@ -29,7 +29,6 @@ buildenv ${pb} ${arch} ${branch} ${builddir}
 
 # Don't pick up installed packages from the host
 export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
 
 index=${PORTSDIR}/${INDEXFILE}
 
diff --git a/Tools/portbuild/scripts/makeduds b/Tools/portbuild/scripts/makeduds
index 809f73821d07..b1c330ea7474 100755
--- a/Tools/portbuild/scripts/makeduds
+++ b/Tools/portbuild/scripts/makeduds
@@ -34,7 +34,6 @@ unset DISPLAY
 export __MAKE_SHELL=/rescue/sh
 export PACKAGE_BUILDING=1
 export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
 export LINUXBASE=/nonexistentlinux
 export PKG_DBDIR=/nonexistentpkg
 export PORT_DBDIR=/nonexistentport
diff --git a/Tools/portbuild/scripts/makeindex b/Tools/portbuild/scripts/makeindex
index e14c1557442e..c0664b8e2295 100755
--- a/Tools/portbuild/scripts/makeindex
+++ b/Tools/portbuild/scripts/makeindex
@@ -38,11 +38,10 @@ unset DISPLAY
 
 # Don't pick up installed packages from the host
 export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
 
 cd ${PORTSDIR}
 make index
 
 # remove extra spaces in dependency list -- this causes problems
 # Also transform the dummy paths to their canonical locations
-sed -i '' -e 's/  */ /g' -e 's/|  */|/g' -e 's/  *|/|/g' -e "s,${LOCALBASE},/usr/local," -e "s,${X11BASE},/usr/local," ${INDEXFILE}
+sed -i '' -e 's/  */ /g' -e 's/|  */|/g' -e 's/  *|/|/g' -e "s,${LOCALBASE},/usr/local," ${INDEXFILE}
diff --git a/Tools/portbuild/scripts/makerestr b/Tools/portbuild/scripts/makerestr
index 85cc1e52d785..8346b863a6f7 100755
--- a/Tools/portbuild/scripts/makerestr
+++ b/Tools/portbuild/scripts/makerestr
@@ -27,7 +27,6 @@ unset DISPLAY
 export __MAKE_SHELL=/rescue/sh
 export PACKAGE_BUILDING=1
 export LOCALBASE=/nonexistentlocal
-export X11BASE=/nonexistentx
 export LINUXBASE=/nonexistentlinux
 export PKG_DBDIR=/nonexistentpkg
 export PORT_DBDIR=/nonexistentport
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild
index 30a26eb7881e..2f6d3238ef5d 100755
--- a/Tools/portbuild/scripts/portbuild
+++ b/Tools/portbuild/scripts/portbuild
@@ -137,13 +137,13 @@ ulimit -f 819200
 ulimit -t 7200
 
 # directories to clean
-cleandirs="${LOCALBASE} ${X11BASE} /compat /var/db/pkg"
+cleandirs="${LOCALBASE} /compat /var/db/pkg"
 
 # 15 minutes
 export FTP_TIMEOUT=900
 export HTTP_TIMEOUT=900
 
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin:${X11BASE}/bin
+export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin
 
 echo "building $pkgname in $chroot"