1 files changed, 11 insertions, 32 deletions

diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild
index 8e9067fe57cd..2613363cfa87 100755
--- a/Tools/portbuild/scripts/portbuild
+++ b/Tools/portbuild/scripts/portbuild
@@ -158,26 +158,11 @@ if [ -f ${chroot}/.notready ]; then
     tar -C ${chroot} -xpf ${bindistlocal}
   fi
 
-  # to be able to run ps and killall inside chroot area
-  if [ "${branch}" = "4" -o "${branch}" = "4-exp" ]; then
-    mkdir -p ${chroot}/libexec
-    mkdir -p ${chroot}/lib
-    if [ "${arch}" = "i386" ]; then
-      cp -p /sbin/mount_linprocfs /sbin/mount /sbin/umount ${chroot}/sbin
-      cp -p /lib/libufs.so.2 ${chroot}/lib
-    fi
-    cp -p /libexec/ld-elf.so.1 ${chroot}/libexec
-    cp -p /lib/libkvm.so.2 /lib/libm.so.3 ${chroot}/lib
-    if [ -f /lib/libc.so.6 ]; then
-      cp -p /lib/libc.so.6 ${chroot}/lib
-    else
-      cp -p /lib/libc.so.5 ${chroot}/lib
-    fi
-  elif [ "${branch}" = "6" ]; then
-    cp -p /lib/libc.so.5 ${chroot}/lib
-  fi
+  # to be able to run certain kernel-dependent binaries
+  # inside the chroot area
+  cp -p /rescue/mount /rescue/umount ${chroot}/sbin
   cp -p /rescue/ps ${chroot}/bin
-  cp -p /usr/bin/killall ${chroot}/usr/bin
+
   rm ${chroot}/.notready
   touch ${chroot}/.ready
 fi
@@ -215,7 +200,11 @@ mkdir -p ${chroot}/${WRKDIRPREFIX}
 
 if [ ! -z "${ccache_dir}" ]; then
   mkdir -p ${chroot}/root/.ccache/
-  mount -o rw -t nullfs ${ccache_dir} ${chroot}/root/.ccache/
+  if [ "${ccache_dir_nfs}" = "1" ]; then
+    mount_nfs -o rw -T -3 ${ccache_dir} ${chroot}/root/.ccache/
+  else
+    mount -o rw -t nullfs ${ccache_dir} ${chroot}/root/.ccache/
+  fi
 fi
 
 mount_fs ${pb}/${arch}/${branch}/ports ${chroot}/a/ports ${master}
@@ -226,7 +215,6 @@ mkdir -p ${chroot}/usr/src
 mount_fs ${pb}/${arch}/${branch}/src ${chroot}/usr/src ${master}
 
 mount -t devfs foo ${chroot}/dev
-
 umount -f ${chroot}/compat/linux/proc > /dev/null 2>&1
 
 # just in case...
@@ -246,22 +234,13 @@ mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.var.dist -p ${chroot}/var \
 mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.usr.dist -p ${chroot}/usr \
   >/dev/null 2>&1
 mkdir -p ${chroot}${LOCALBASE}
-mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.local.dist -p ${chroot}${LOCALBASE} \
+mtree -deU -f ${chroot}/a/ports/Templates/BSD.local.dist -p ${chroot}${LOCALBASE} \
   >/dev/null 2>&1
 
-mkdir -p ${chroot}${X11BASE}
-if [ $X_WINDOW_SYSTEM = "xfree86-3" ]; then
-  mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11.dist -p ${chroot}${X11BASE} \
-    >/dev/null 2>&1
-else
-  mtree -deU -f ${chroot}/usr/src/etc/mtree/BSD.x11-4.dist -p ${chroot}${X11BASE} \
-    >/dev/null 2>&1
-fi
-
 if [ ${arch} = "i386" -o ${arch} = "amd64" ]; then
   # JDK ports need linprocfs :(
   mkdir -p ${chroot}/compat/linux/proc
-  mount_linprocfs linprocfs ${chroot}/compat/linux/proc
+  mount -t linprocfs linprocfs ${chroot}/compat/linux/proc
 fi
 
 _ldconfig_dirs="/lib /usr/lib /usr/lib/compat"