* Silence gconf spam from the mtree checks (for now)

* Don't try and mount/umount procfs, it won't work when we build inside a
  jail.

* Report the uname -mr of the build environment, to ease confusion of
  people reading the error logs by mail.

1 files changed, 5 insertions, 4 deletions

diff --git a/Tools/portbuild/scripts/buildscript b/Tools/portbuild/scripts/buildscript
index b6c4d2d530aa..bd7ea6682e31 100755
--- a/Tools/portbuild/scripts/buildscript
+++ b/Tools/portbuild/scripts/buildscript
@@ -61,7 +61,6 @@ add_pkg() {
   export PKG_PATH=/tmp/depends
   if [ ! -z "${pkgs}" ]; then
     arch=$(uname -m)
-    umountprocfs ${arch}
     echo "adding dependencies"
     for i in $pkgs; do
       echo "pkg_add $i"
@@ -76,7 +75,6 @@ add_pkg() {
         fi
       fi
     done
-    mountprocfs ${arch}
   fi
 }
 
@@ -141,6 +139,7 @@ X=`echo ${X11BASE} | sed 's,^/,,'`
 if [ $phase = 1 ]; then
 
   cd $dir || exit 1
+  echo "building for: $(uname -mr)"
   echo "maintained by: $(make maintainer)"
   echo "port directory: ${dir}"
   echo "build started at $(date)"
@@ -170,6 +169,7 @@ if [ $phase = 1 ]; then
 ./usr/local/etc/apache2
 ./usr/local/news
 ./usr/local/share/xml
+./usr/X11R6/etc/gconf
 EOF
   # Record a "pristine" mtree.
   mtree -X /tmp/mtree.preexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.pristine
@@ -234,6 +234,7 @@ else
 ./usr/local/etc/apache2
 ./usr/local/news
 ./usr/local/share/xml
+./usr/X11R6/etc/gconf
 EOF
   # Record a "pristine" mtree.
   mtree -X /tmp/mtree.buildexclude -xcn -k uid,gid,mode -p / > /tmp/mtree.prebuild
@@ -258,7 +259,7 @@ EOF
   /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 |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list.preinstall
+  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 |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list.preinstall
 
   if [ -s /tmp/list.preinstall ]; then
     echo "================================================================"
@@ -304,7 +305,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 |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType )" > /tmp/list3
+  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 |${X} |etc/manpath.config|etc/.*.bak|${L}/info/dir|${X}/lib/X11/fonts/.*/fonts\.|usr/(X11R6|local)/man/..( |/man. )|${X}/lib/X11/fonts/TrueType|${X}/etc/gconf/gconf.xml.defaults/%gconf-tree.*.xml )" > /tmp/list3
 
   # Compare the state of the filesystem now to before the 'make install' phase
   dirty=0