8 files changed, 14 insertions, 18 deletions
diff --git a/release/powerpc/boot.tbxi b/release/powerpc/boot.tbxi
index 70897866bec8..adf76e1c6e07 100644
--- a/release/powerpc/boot.tbxi
+++ b/release/powerpc/boot.tbxi
@@ -1,6 +1,5 @@
 <CHRP-BOOT>
 <LICENSE>
-$FreeBSD$
 </LICENSE>
 <COMPATIBLE>
 MacRISC MacRISC3 MacRISC4
diff --git a/release/powerpc/generate-hfs.sh b/release/powerpc/generate-hfs.sh
index 7db43d671488..e88db0ad771e 100755
--- a/release/powerpc/generate-hfs.sh
+++ b/release/powerpc/generate-hfs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This script generates the dummy HFS filesystem used for the PowerPC boot
-# blocks. It uses hfsutils (emulators/hfsutils) to generate a template
+# blocks. It uses hfsutils (filesystems/hfsutils) to generate a template
 # filesystem with the relevant interesting files. These are then found by
 # grep, and the offsets written to a Makefile snippet.
 #
@@ -10,8 +10,6 @@
 # template (e.g. because the boot block or the CHRP script have grown),
 # you must install it from ports.
 
-# $FreeBSD$
-
 HFS_SIZE=400		#Size in 2048-byte blocks of the produced image
 LOADER_SIZE=500k
 
@@ -57,7 +55,6 @@ rm loader.tmp
 bzip2 $OUTPUT_FILE
 echo 'HFS boot filesystem created by generate-hfs.sh' > $OUTPUT_FILE.bz2.uu
 echo 'DO NOT EDIT' >> $OUTPUT_FILE.bz2.uu
-echo '$FreeBSD$' >> $OUTPUT_FILE.bz2.uu
 
 uuencode $OUTPUT_FILE.bz2 $OUTPUT_FILE.bz2 >> $OUTPUT_FILE.bz2.uu
 rm $OUTPUT_FILE.bz2
diff --git a/release/powerpc/hfs-boot.bz2.uu b/release/powerpc/hfs-boot.bz2.uu
index dccd3fa4906e..fbae44dcb432 100644
--- a/release/powerpc/hfs-boot.bz2.uu
+++ b/release/powerpc/hfs-boot.bz2.uu
@@ -1,6 +1,5 @@
 HFS boot filesystem created by generate-hfs.sh
 DO NOT EDIT
-$FreeBSD$
 begin 644 hfs-boot.bz2
 M0EIH.3%!62936=IZTD$``"__]__O_G)7!_Y]OV??5']UW\1$0`$$0```P&`@
 M`$A`3,`"L#DRUJM"4E,32>D\*>4\HS2-`:`#0````>IH`>H!H-`$B23)H"8%
diff --git a/release/powerpc/mkisoimages.sh b/release/powerpc/mkisoimages.sh
index 0f13464567f1..705545dead4b 100644
--- a/release/powerpc/mkisoimages.sh
+++ b/release/powerpc/mkisoimages.sh
@@ -4,7 +4,6 @@
 # Author: Jordan K Hubbard
 # Date:   22 June 2001
 #
-# $FreeBSD$
 #
 # This script is used by release/Makefile to build the (optional) ISO images
 # for a FreeBSD release.  It is considered architecture dependent since each
@@ -25,6 +24,9 @@
 
 set -e
 
+scriptdir=$(dirname $(realpath $0))
+. ${scriptdir}/../scripts/tools.subr
+
 if [ "$1" = "-b" ]; then
 	MAKEFSARG="$4"
 else
@@ -68,14 +70,15 @@ fi
 if [ -n "$bootable" ]; then
 	echo "Building bootable disc"
 
+	BOOTBLOCK=$(mktemp /tmp/hfs-boot-block.XXXXXX)
+
 	# Apple boot code
-	uudecode -o /tmp/hfs-boot-block.bz2 "`dirname "$0"`/hfs-boot.bz2.uu"
-	bzip2 -d /tmp/hfs-boot-block.bz2
-	OFFSET=$(hd /tmp/hfs-boot-block | grep 'Loader START' | cut -f 1 -d ' ')
+	uudecode -p "`dirname "$0"`/hfs-boot.bz2.uu" | bunzip2 > $BOOTBLOCK
+	OFFSET=$(hd $BOOTBLOCK | grep 'Loader START' | cut -f 1 -d ' ')
 	OFFSET=0x$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}')
-	dd if="$BASEBITSDIR/boot/loader" of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
+	dd if="$BASEBITSDIR/boot/loader" of=$BOOTBLOCK seek=$OFFSET conv=notrunc
 
-	bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"
+	bootable="-o bootimage=macppc;$BOOTBLOCK -o no-emul-boot"
 
 	# pSeries/PAPR boot code
 	mkdir -p "$BASEBITSDIR/ppc/chrp"
@@ -107,9 +110,11 @@ echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab"
 if [ -n "${METALOG}" ]; then
 	echo "./etc/fstab type=file uname=root gname=wheel mode=0644" >> ${metalogfilename}
 fi
-makefs -D -N ${BASEBITSDIR}/etc -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$MAKEFSARG" "$@"
+${MAKEFS} -D -N ${BASEBITSDIR}/etc -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$MAKEFSARG" "$@"
 rm -f "$BASEBITSDIR/etc/fstab"
-rm -f /tmp/hfs-boot-block
+if [ -n "$bootable" ]; then
+	rm $BOOTBLOCK
+fi
 rm -rf "$BASEBITSDIR/ppc"
 if [ -n "${METALOG}" ]; then
 	rm ${metalogfilename}
diff --git a/release/powerpc/powerpc.conf b/release/powerpc/powerpc.conf
index 5cf9a48387fd..8acafaa8bd86 100644
--- a/release/powerpc/powerpc.conf
+++ b/release/powerpc/powerpc.conf
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
 #
 
 # Configuration file for release/release.sh to build powerpc/powerpc.
diff --git a/release/powerpc/powerpc64.conf b/release/powerpc/powerpc64.conf
index 7c756d413dc3..fe859bdb7624 100644
--- a/release/powerpc/powerpc64.conf
+++ b/release/powerpc/powerpc64.conf
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
 #
 
 # Configuration file for release/release.sh to build powerpc/powerpc64.
diff --git a/release/powerpc/powerpc64le.conf b/release/powerpc/powerpc64le.conf
index af7acfbdc8ea..f9660836c364 100644
--- a/release/powerpc/powerpc64le.conf
+++ b/release/powerpc/powerpc64le.conf
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
 #
 
 # Configuration file for release/release.sh to build powerpc/powerpc64le.
diff --git a/release/powerpc/powerpcspe.conf b/release/powerpc/powerpcspe.conf
index 13b043e4cd23..955287f94e3c 100644
--- a/release/powerpc/powerpcspe.conf
+++ b/release/powerpc/powerpcspe.conf
@@ -1,6 +1,5 @@
 #!/bin/sh
 #
-# $FreeBSD$
 #
 
 # Configuration file for release/release.sh to build powerpc/powerpcspe.