Various updates.

10 files changed, 80 insertions, 16 deletions

diff --git a/Tools/portbuild/3/bindist/README b/Tools/portbuild/3/bindist/README
index 237cbf54c3e5..93024fe99cce 100644
--- a/Tools/portbuild/3/bindist/README
+++ b/Tools/portbuild/3/bindist/README
@@ -3,10 +3,12 @@
     Copy the following files from a running 3.0 system:
 
     /dev/{kmem,lkm,mem,null,stderr,stdin,stdout,tty,zero}
+    /dev/fd/[0-9]
     /etc/resolv.conf
 
     Copy the following files from a very recent 3.0 system:
 
+    /usr/libdata/perl/5.00502/ExtUtils/MM_Unix.pm
     /usr/libexec/elf/ld
     /usr/bin/{install-,make}info
     /usr/sbin/pkg_{add,create,delete,info}
diff --git a/Tools/portbuild/3/bindist/delete b/Tools/portbuild/3/bindist/delete
index 3c6a2b0b6692..682e8a0eec6d 100644
--- a/Tools/portbuild/3/bindist/delete
+++ b/Tools/portbuild/3/bindist/delete
@@ -1,7 +1,21 @@
+compat
+dev
+modules
+tmp
+usr/games
+usr/lib/lib*_p.a
+usr/lib/aout/lib*_p.a
 usr/share/calendar
+usr/share/doc
 usr/share/examples
+usr/share/games
+usr/share/info/*.info.gz
+usr/share/isdn
 usr/share/locale
+usr/share/man
 usr/share/nls
+usr/share/perl/man
 usr/share/zoneinfo
 usr/sbin/sysctl
-dev
+var/games
+var/run
diff --git a/Tools/portbuild/3/bindist/dirlist b/Tools/portbuild/3/bindist/dirlist
index d9d7ef8d14be..d6b2cbef8f64 100644
--- a/Tools/portbuild/3/bindist/dirlist
+++ b/Tools/portbuild/3/bindist/dirlist
@@ -6,3 +6,4 @@ usr/local
 usr/opt/doc
 usr/opt/www
 usr/ports
+usr/src
diff --git a/Tools/portbuild/3/bindist/files/usr/bin/uname b/Tools/portbuild/3/bindist/files/usr/bin/uname
index 20c3bcd5f766..be4ac7f2e068 100755
--- a/Tools/portbuild/3/bindist/files/usr/bin/uname
+++ b/Tools/portbuild/3/bindist/files/usr/bin/uname
@@ -48,13 +48,13 @@ fi
 
 if [ "$r" = 1 ]; then
   printsp $printed
-  echo -n "3.0-CURRENT"
+  echo -n "3.1-RELEASE"
   printed=1
 fi
 
 if [ "$v" = 1 ]; then
   printsp $printed
-  echo -n "FreeBSD 3.0-CURRENT #0: Sun Dec 13 03:47:56 PST 1998 asami@bento.freebsd.org:/usr/src/sys/compile/BENTO"
+  echo -n "FreeBSD 3.1-RELEASE #0: Sun Dec 13 03:47:56 PST 1998 asami@bento.freebsd.org:/usr/src/sys/compile/BENTO"
   printed=1
 fi
 
diff --git a/Tools/portbuild/3/mkbindist b/Tools/portbuild/3/mkbindist
index 8cef5433400b..dec3c6f10f70 100644
--- a/Tools/portbuild/3/mkbindist
+++ b/Tools/portbuild/3/mkbindist
@@ -1,5 +1,7 @@
 #!/bin/sh
 ftp=0
+useworld=1
+chrootdir=/a/asami/chroot
 here=$(pwd)
 tmpdir=${here}/tmp
 rm -rf ${tmpdir}
@@ -13,14 +15,27 @@ if [ "${ftp}" != 0 ]; then
   cd ${here}
 fi
 cd ${tmpdir}
-cat ${here}/bindist/ftp/bin.?? | tar --unlink -xzpf -
-cat ${here}/bindist/ftp/dict.?? | tar --unlink -xzpf -
-cat ${here}/bindist/ftp/des.?? | tar --unlink -xzpf -
+if [ "${useworld}" = 1 ]; then
+  (cd ${chrootdir}; find -dx . | \
+    grep -v -E '^./usr/(X11R6|local|obj|opt|ports|src)' | \
+    grep -v '^./home' | \
+    grep -v '^./var/db/pkg' | \
+    cpio -dump ${tmpdir})
+else
+  cat ${here}/bindist/ftp/bin.?? | tar --unlink -xzpf -
+  cat ${here}/bindist/ftp/dict.?? | tar --unlink -xzpf -
+  cat ${here}/bindist/ftp/des.?? | tar --unlink -xzpf -
+fi
 rm -rf $(cat ${here}/bindist/delete)
 mkdir -p $(cat ${here}/bindist/dirlist)
-tar -C ${here}/bindist/files -cf - . | tar -xpf -
-mv kernel.GENERIC kernel
+(cd ${here}/bindist/files; find -dx . | cpio -dump ${tmpdir})
+echo "HAVE_MOTIF=t" >> etc/make.conf
+echo "MOTIF_STATIC=t" >> etc/make.conf
+if [ -f kernel.GENERIC -a ! -f kernel ]; then
+  mv kernel.GENERIC kernel
+fi
 rm -f /usr/lib/aout/lib*_p.a
+mkdir ${tmpdir}/var/run
 chroot $(pwd) /sbin/ldconfig /usr/lib
 chroot $(pwd) /sbin/ldconfig -aout /usr/lib/aout
 mkdir -p ${here}/tarballs
diff --git a/Tools/portbuild/4/bindist/README b/Tools/portbuild/4/bindist/README
index 237cbf54c3e5..93024fe99cce 100644
--- a/Tools/portbuild/4/bindist/README
+++ b/Tools/portbuild/4/bindist/README
@@ -3,10 +3,12 @@
     Copy the following files from a running 3.0 system:
 
     /dev/{kmem,lkm,mem,null,stderr,stdin,stdout,tty,zero}
+    /dev/fd/[0-9]
     /etc/resolv.conf
 
     Copy the following files from a very recent 3.0 system:
 
+    /usr/libdata/perl/5.00502/ExtUtils/MM_Unix.pm
     /usr/libexec/elf/ld
     /usr/bin/{install-,make}info
     /usr/sbin/pkg_{add,create,delete,info}
diff --git a/Tools/portbuild/4/bindist/delete b/Tools/portbuild/4/bindist/delete
index 3c6a2b0b6692..682e8a0eec6d 100644
--- a/Tools/portbuild/4/bindist/delete
+++ b/Tools/portbuild/4/bindist/delete
@@ -1,7 +1,21 @@
+compat
+dev
+modules
+tmp
+usr/games
+usr/lib/lib*_p.a
+usr/lib/aout/lib*_p.a
 usr/share/calendar
+usr/share/doc
 usr/share/examples
+usr/share/games
+usr/share/info/*.info.gz
+usr/share/isdn
 usr/share/locale
+usr/share/man
 usr/share/nls
+usr/share/perl/man
 usr/share/zoneinfo
 usr/sbin/sysctl
-dev
+var/games
+var/run
diff --git a/Tools/portbuild/4/bindist/dirlist b/Tools/portbuild/4/bindist/dirlist
index d9d7ef8d14be..d6b2cbef8f64 100644
--- a/Tools/portbuild/4/bindist/dirlist
+++ b/Tools/portbuild/4/bindist/dirlist
@@ -6,3 +6,4 @@ usr/local
 usr/opt/doc
 usr/opt/www
 usr/ports
+usr/src
diff --git a/Tools/portbuild/4/bindist/files/usr/bin/uname b/Tools/portbuild/4/bindist/files/usr/bin/uname
index 20c3bcd5f766..be4ac7f2e068 100755
--- a/Tools/portbuild/4/bindist/files/usr/bin/uname
+++ b/Tools/portbuild/4/bindist/files/usr/bin/uname
@@ -48,13 +48,13 @@ fi
 
 if [ "$r" = 1 ]; then
   printsp $printed
-  echo -n "3.0-CURRENT"
+  echo -n "3.1-RELEASE"
   printed=1
 fi
 
 if [ "$v" = 1 ]; then
   printsp $printed
-  echo -n "FreeBSD 3.0-CURRENT #0: Sun Dec 13 03:47:56 PST 1998 asami@bento.freebsd.org:/usr/src/sys/compile/BENTO"
+  echo -n "FreeBSD 3.1-RELEASE #0: Sun Dec 13 03:47:56 PST 1998 asami@bento.freebsd.org:/usr/src/sys/compile/BENTO"
   printed=1
 fi
 
diff --git a/Tools/portbuild/4/mkbindist b/Tools/portbuild/4/mkbindist
index 8cef5433400b..dec3c6f10f70 100644
--- a/Tools/portbuild/4/mkbindist
+++ b/Tools/portbuild/4/mkbindist
@@ -1,5 +1,7 @@
 #!/bin/sh
 ftp=0
+useworld=1
+chrootdir=/a/asami/chroot
 here=$(pwd)
 tmpdir=${here}/tmp
 rm -rf ${tmpdir}
@@ -13,14 +15,27 @@ if [ "${ftp}" != 0 ]; then
   cd ${here}
 fi
 cd ${tmpdir}
-cat ${here}/bindist/ftp/bin.?? | tar --unlink -xzpf -
-cat ${here}/bindist/ftp/dict.?? | tar --unlink -xzpf -
-cat ${here}/bindist/ftp/des.?? | tar --unlink -xzpf -
+if [ "${useworld}" = 1 ]; then
+  (cd ${chrootdir}; find -dx . | \
+    grep -v -E '^./usr/(X11R6|local|obj|opt|ports|src)' | \
+    grep -v '^./home' | \
+    grep -v '^./var/db/pkg' | \
+    cpio -dump ${tmpdir})
+else
+  cat ${here}/bindist/ftp/bin.?? | tar --unlink -xzpf -
+  cat ${here}/bindist/ftp/dict.?? | tar --unlink -xzpf -
+  cat ${here}/bindist/ftp/des.?? | tar --unlink -xzpf -
+fi
 rm -rf $(cat ${here}/bindist/delete)
 mkdir -p $(cat ${here}/bindist/dirlist)
-tar -C ${here}/bindist/files -cf - . | tar -xpf -
-mv kernel.GENERIC kernel
+(cd ${here}/bindist/files; find -dx . | cpio -dump ${tmpdir})
+echo "HAVE_MOTIF=t" >> etc/make.conf
+echo "MOTIF_STATIC=t" >> etc/make.conf
+if [ -f kernel.GENERIC -a ! -f kernel ]; then
+  mv kernel.GENERIC kernel
+fi
 rm -f /usr/lib/aout/lib*_p.a
+mkdir ${tmpdir}/var/run
 chroot $(pwd) /sbin/ldconfig /usr/lib
 chroot $(pwd) /sbin/ldconfig -aout /usr/lib/aout
 mkdir -p ${here}/tarballs