mkbindist is in scripts/ now, with ${branch}/mkbindist.conf specifying

necessary per-branch options.

4 files changed, 12 insertions, 100 deletions

diff --git a/Tools/portbuild/3/mkbindist b/Tools/portbuild/3/mkbindist
deleted file mode 100644
index 5e953b394f22..000000000000
--- a/Tools/portbuild/3/mkbindist
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-rel=3.3-19990908-RC
-ftpserver=current.freebsd.org
-ftpdists="bin dict des games compat22"
-ftp=1
-useworld=0
-chrootdir=/a/asami/chroot
-here=$(pwd)
-tmpdir=${here}/tmp
-rm -rf ${tmpdir}
-mkdir -p ${tmpdir}
-if [ "${ftp}" != 0 ]; then
-  rm -rf bindist/ftp
-  mkdir -p bindist/ftp
-  cd bindist/ftp
-  for i in ${ftpdists}; do
-    /usr/bin/ftp -a "ftp://${ftpserver}/pub/FreeBSD/snapshots/i386/${rel}/$i/$i.??"
-  done
-  cd ${here}
-fi
-cd ${tmpdir}
-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
-  for i in ${ftpdists}; do
-    cat ${here}/bindist/ftp/$i.?? | tar --unlink -xzpf -
-  done
-fi
-rm -rf $(cat ${here}/bindist/delete)
-mkdir -p $(cat ${here}/bindist/dirlist)
-(cd ${here}/bindist/files; find -dx . | cpio -dump ${tmpdir})
-echo "HAVE_MOTIF=t" >> etc/make.conf
-echo "MOTIF_STATIC=t" >> etc/make.conf
-date '+%Y%m%d' > var/db/port.mkversion
-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
-tar cf ${here}/tarballs/bindist.tar.new .
-mv -f ${here}/tarballs/bindist.tar.new ${here}/tarballs/bindist.tar
-cd ${here}
-rm -rf ${tmpdir}
diff --git a/Tools/portbuild/3/mkbindist.conf b/Tools/portbuild/3/mkbindist.conf
new file mode 100644
index 000000000000..879294a2b826
--- /dev/null
+++ b/Tools/portbuild/3/mkbindist.conf
@@ -0,0 +1,6 @@
+rel=3-LATEST
+ftpserver=current.jp.freebsd.org
+ftpdists="bin/bin dict/dict des/des games/games compat22/compat22"
+kernel=CLUSTER
+ftp=1
+useworld=0
diff --git a/Tools/portbuild/4/mkbindist b/Tools/portbuild/4/mkbindist
deleted file mode 100644
index f10f30c1622e..000000000000
--- a/Tools/portbuild/4/mkbindist
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-date=19990826
-ftpserver=current.freebsd.org
-ftpdists="bin dict des games compat22"
-ftp=1
-useworld=0
-chrootdir=/a/asami/chroot
-here=$(pwd)
-tmpdir=${here}/tmp
-rm -rf ${tmpdir}
-mkdir -p ${tmpdir}
-if [ "${ftp}" != 0 ]; then
-  rm -rf bindist/ftp
-  mkdir -p bindist/ftp
-  cd bindist/ftp
-  for i in ${ftpdists}; do
-    /usr/bin/ftp -a "ftp://${ftpserver}/pub/FreeBSD/snapshots/i386/4.0-${date}-CURRENT/$i/$i.??"
-  done
-  cd ${here}
-fi
-cd ${tmpdir}
-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
-  for i in ${ftpdists}; do
-    cat ${here}/bindist/ftp/$i.?? | tar --unlink -xzpf -
-  done
-fi
-rm -rf $(cat ${here}/bindist/delete)
-mkdir -p $(cat ${here}/bindist/dirlist)
-(cd ${here}/bindist/files; find -dx . | cpio -dump ${tmpdir})
-echo "HAVE_MOTIF=t" >> etc/make.conf
-echo "MOTIF_STATIC=t" >> etc/make.conf
-date '+%Y%m%d' > var/db/port.mkversion
-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
-tar cf ${here}/tarballs/bindist.tar.new .
-mv -f ${here}/tarballs/bindist.tar.new ${here}/tarballs/bindist.tar
-cd ${here}
-rm -rf ${tmpdir}
diff --git a/Tools/portbuild/4/mkbindist.conf b/Tools/portbuild/4/mkbindist.conf
new file mode 100644
index 000000000000..cb5af460287e
--- /dev/null
+++ b/Tools/portbuild/4/mkbindist.conf
@@ -0,0 +1,6 @@
+rel=4-LATEST
+ftpserver=current.jp.freebsd.org
+ftpdists="bin/bin dict/dict games/games manpages/manpages compat22/compat22 compat3x/compat3x crypto/crypto crypto/krb4"
+kernel=CLUSTER
+ftp=1
+useworld=0