add missing xserv, and use ${MACHINE} throughout (still needs testing)

7 files changed, 106 insertions, 99 deletions

diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile
index 3c0159df501..c60cad54bf4 100644
--- a/distrib/alpha/iso/Makefile
+++ b/distrib/alpha/iso/Makefile
@@ -1,46 +1,47 @@
-#	$OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/08/10 12:29:53 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
 CDROM=		install${OSrev}.iso
-RELXDIR=	/home/relx-alpha
-RELDIR?=	/home/rel-alpha
+RELXDIR=	/home/relx-${MACHINE}
+RELDIR?=	/home/rel-${MACHINE}
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
 		${RELDIR}/bsd ${RELDIR}/bsd.rd \
-		${RELDIR}/INSTALL.alpha
+		${RELDIR}/INSTALL.${MACHINE}
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
-		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz
+		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
+		${RELXDIR}/xserv${OSrev}.tgz
 
 all: ${CDROM}
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/alpha
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/alpha
-	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/alpha
+	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/alpha
-	cp -p ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/alpha
+	cp -p ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
 	(mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \
-	    -A "OpenBSD ${OSREV} alpha Install CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/alpha   ${OSREV} Install CD" \
+	    -V "OpenBSD/${MACHINE}   ${OSREV} Install CD" \
 	    ${.OBJDIR}/cd-dir 2>&1) | tee log
 	vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
 	mount -t cd9660 /dev/svnd0a /mnt
 	/usr/mdec/installboot -v \
-	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/alpha/boot$$" | cut -d' ' -f1` \
-	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/alpha/boot$$" | cut -d' ' -f2` \
-	    /mnt/${OSREV}/alpha/boot /usr/mdec/bootxx /dev/rsvnd0c
-	#disklabel -w svnd0 fakecdrom "OpenBSD/alpha   "
+	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
+	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
+	    /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rsvnd0c
+	#disklabel -w svnd0 fakecdrom "OpenBSD/${MACHINE}   "
 	umount /mnt
 	vnconfig -u svnd0
 
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index ed8a08327f5..f27cd5e5353 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,41 +1,42 @@
-#	$OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
 CDROM=		install${REV}.iso
-RELXDIR=	/home/relx-amd64
-RELDIR?=	/home/rel-amd64
+RELXDIR=	/home/relx-${MACHINE}
+RELDIR?=	/home/rel-${MACHINE}
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
 		${RELDIR}/bsd ${RELDIR}/bsd.rd ${RELDIR}/bsd.mp \
-		${RELDIR}/INSTALL.amd64
+		${RELDIR}/INSTALL.${MACHINE}
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
-		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz
+		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
+		${RELXDIR}/xserv${OSrev}.tgz
 
 all: ${CDROM}
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	mkdir -p ${.OBJDIR}/cd-dir/etc
-	echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
+	echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
 
-	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/amd64
-	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/amd64
+	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64
-	cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/amd64/cdboot
+	cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
 
 	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
-	    -A "OpenBSD ${OSREV} amd64 Install CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/amd64   ${OSREV} Install CD" \
-	    -b ${OSREV}/amd64/cdbr -c ${OSREV}/amd64/boot.catalog \
+	    -V "OpenBSD/${MACHINE}   ${OSREV} Install CD" \
+	    -b ${OSREV}/${MACHINE}/cdbr -c ${OSREV}/${MACHINE}/boot.catalog \
 	    ${.OBJDIR}/cd-dir
 
 install:
diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile
index 69ee5e67b94..c7b22e216ca 100644
--- a/distrib/hppa/iso/Makefile
+++ b/distrib/hppa/iso/Makefile
@@ -1,43 +1,44 @@
-#	$OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
 CDROM=		install${REV}.iso
-RELXDIR=	/home/relx-hppa
-RELDIR?=	/home/rel-hppa
+RELXDIR=	/home/relx-${MACHINE}
+RELDIR?=	/home/rel-${MACHINE}
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
 		${RELDIR}/bsd ${RELDIR}/bsd.rd \
-		${RELDIR}/INSTALL.hppa
+		${RELDIR}/INSTALL.${MACHINE}
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
-		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz
+		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
+		${RELXDIR}/xserv${OSrev}.tgz
 
 all: ${CDROM}
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/hppa
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/hppa
-	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/hppa
+	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	ln -f ${.OBJDIR}/cd-dir/${OSREV}/hppa/bsd.rd \
+	ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd \
 	    ${.OBJDIR}/cd-dir/bsd.rd
 
 	mkhybrid  -R -T -L -d -D -N \
-	    -A "OpenBSD ${OSREV} hppa Install CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/hppa    ${OSREV} Install CD" \
+	    -V "OpenBSD/${MACHINE}    ${OSREV} Install CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
 	dd if=${DESTDIR}/usr/mdec/cdboot of=${.OBJDIR}/${CDROM} \
 	    bs=32k count=1 conv=notrunc
 	vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
-	disklabel -w svnd0 fakecdrom "OpenBSD/hppa    "
+	disklabel -w svnd0 fakecdrom "OpenBSD/${MACHINE}    "
 	vnconfig -u svnd0
 	dd if=/dev/zero bs=64k count=1 >> ${.OBJDIR}/${CDROM}
 
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 48019f210f5..5c7c391f59c 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,41 +1,42 @@
-#	$OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
 CDROM=		install${REV}.iso
-RELXDIR=	/home/relx-i386
-RELDIR?=	/home/rel-i386
+RELXDIR=	/home/relx-${MACHINE}
+RELDIR?=	/home/rel-${MACHINE}
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
 		${RELDIR}/bsd ${RELDIR}/bsd.rd ${RELDIR}/bsd.mp \
-		${RELDIR}/INSTALL.i386
+		${RELDIR}/INSTALL.${MACHINE}
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
-		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz
+		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
+		${RELXDIR}/xserv${OSrev}.tgz
 
 all: ${CDROM}
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/i386
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	mkdir -p ${.OBJDIR}/cd-dir/etc
-	echo "set image /${OSREV}/i386/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
+	echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
 
-	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/i386
-	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/i386
+	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/i386
-	cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/i386/cdboot
+	cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
 
 	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
-	    -A "OpenBSD ${OSREV} i386 Install CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/i386    ${OSREV} Install CD" \
-	    -b ${OSREV}/i386/cdbr -c ${OSREV}/i386/boot.catalog \
+	    -V "OpenBSD/${MACHINE}    ${OSREV} Install CD" \
+	    -b ${OSREV}/${MACHINE}/cdbr -c ${OSREV}/${MACHINE}/boot.catalog \
 	    ${.OBJDIR}/cd-dir
 
 install:
diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile
index feac2b4fa21..88a641a54a1 100644
--- a/distrib/macppc/iso/Makefile
+++ b/distrib/macppc/iso/Makefile
@@ -1,41 +1,42 @@
-#	$OpenBSD: Makefile,v 1.3 2007/08/10 03:02:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2007/08/10 12:29:55 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 #.include "${TOP}/Makefile.inc"
 
 CDROM=		install${OSrev}.iso
-RELXDIR=	/home/relx-macppc
-RELDIR?=	/home/rel-macppc
+RELXDIR=	/home/relx-${MACHINE}
+RELDIR?=	/home/rel-${MACHINE}
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
 		${RELDIR}/bsd ${RELDIR}/bsd.rd \
-		${RELDIR}/INSTALL.macppc
+		${RELDIR}/INSTALL.${MACHINE}
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
-		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz
+		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
+		${RELXDIR}/xserv${OSrev}.tgz
 
 all: ${CDROM}
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir/
-	-@mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/macppc/
+	-@mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/
 
-	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/macppc
-	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/macppc
+	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${.CURDIR}/../../../sys/arch/macppc/stand/tbxidata/bsd.tbxi \
-	    ${.OBJDIR}/cd-dir/${OSREV}/macppc
+	cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/stand/tbxidata/bsd.tbxi \
+	    ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	cp -p ${RELDIR}/ofwboot ${.OBJDIR}/cd-dir/
 
 	mkhybrid -v -v -r -part -hfs \
-	    -hfs-bless ${.OBJDIR}/cd-dir/${OSREV}/macppc \
+	    -hfs-bless ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} \
 	    -map ${.CURDIR}/../../../gnu/usr.sbin/mkhybrid/src/more.mapping \
-	    -A "OpenBSD ${OSREV} macppc Install CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/macppc  ${OSREV} Install CD" \
+	    -V "OpenBSD/${MACHINE}  ${OSREV} Install CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
 
 install:
diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile
index ee532336cdf..c9ef418169b 100644
--- a/distrib/sparc/iso/Makefile
+++ b/distrib/sparc/iso/Makefile
@@ -1,53 +1,54 @@
-#	$OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 #.include "${TOP}/Makefile.inc"
 
 CDROM=	install${OSrev}.iso
-RELXDIR=	/home/relx-sparc
-RELDIR?=	/home/rel-sparc
+RELXDIR=	/home/relx-${MACHINE}
+RELDIR?=	/home/rel-${MACHINE}
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
 		${RELDIR}/bsd ${RELDIR}/bsd.rd \
-		${RELDIR}/INSTALL.sparc
+		${RELDIR}/INSTALL.${MACHINE}
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
-		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz
+		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
+		${RELXDIR}/xserv${OSrev}.tgz
 
 all: ${CDROM}
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/sparc
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc
-	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc
+	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	ln -f ${.OBJDIR}/cd-dir/${OSREV}/sparc/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
+	ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
 	ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd
 	ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/vmunix # for kicks
 
-	cp ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/sparc
-	cp ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/sparc
+	cp ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
 	(mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \
-	    -A "OpenBSD ${OSREV} sparc Install CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/sparc   ${OSREV} Install CD" \
+	    -V "OpenBSD/${MACHINE}   ${OSREV} Install CD" \
 	    ${.OBJDIR}/cd-dir 2>&1) | tee log
 	vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
 	mount -t cd9660 /dev/svnd0a /mnt
 	/usr/mdec/installboot -v \
-	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f1` \
-	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/sparc/boot$$" | cut -d' ' -f2` \
-	    /mnt/${OSREV}/sparc/boot /usr/mdec/bootxx /dev/rsvnd0c
-	disklabel -w svnd0 fakecdrom "OpenBSD/sparc   "
+	    -s `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f1` \
+	    -e `cat log | grep -v 'Name' | egrep "/cd-dir/${OSREV}/${MACHINE}/boot$$" | cut -d' ' -f2` \
+	    /mnt/${OSREV}/${MACHINE}/boot /usr/mdec/bootxx /dev/rsvnd0c
+	disklabel -w svnd0 fakecdrom "OpenBSD/${MACHINE}   "
 	umount /mnt
 	vnconfig -u svnd0
-	# XXX Some sparc machines fail to load the kernel correctly if the
+	# XXX Some ${MACHINE} machines fail to load the kernel correctly if the
 	# XXX cd image is truncated.  It is not yet known why this happens.
 	# XXX For now we pad the image.
 	dd if=/dev/zero bs=2k count=200 >> ${.OBJDIR}/${CDROM}
diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index 407d9f0c4c2..595dc776c3c 100644
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,40 +1,41 @@
-#	$OpenBSD: Makefile,v 1.2 2007/08/10 03:02:38 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/08/10 12:29:55 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
 CDROM=		install${REV}.iso
-RELXDIR=	/home/relx-sparc64
-RELDIR?=	/home/rel-sparc64
+RELXDIR=	/home/relx-${MACHINE}
+RELDIR?=	/home/rel-${MACHINE}
 
 BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 		${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \
 		${RELDIR}/man${OSrev}.tgz ${RELDIR}/misc${OSrev}.tgz \
 		${RELDIR}/bsd ${RELDIR}/bsd.rd \
-		${RELDIR}/INSTALL.sparc64
+		${RELDIR}/INSTALL.${MACHINE}
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \
-		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz
+		${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \
+		${RELXDIR}/xserv${OSrev}.tgz
 
 all: ${CDROM}
 
 ${CDROM}: ${BASE} ${XBASE}
 	-rm -rf ${.OBJDIR}/cd-dir
-	-mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/sparc64
+	-mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc64
-	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/sparc64
+	cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
-	cp -p ${RELDIR}/ofwboot ${.OBJDIR}/cd-dir/${OSREV}/sparc64
+	cp -p ${RELDIR}/ofwboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
 	mkhybrid -R -T -L -d -D -N \
-	    -A "OpenBSD ${OSREV} sparc64 Install CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/sparc64 ${OSREV} Install CD" \
+	    -V "OpenBSD/${MACHINE} ${OSREV} Install CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
 	vnconfig -v -c svnd0 ${.OBJDIR}/${CDROM}
-	disklabel -w svnd0 fakecdrom "OpenBSD${REV}sparc64"
+	disklabel -w svnd0 fakecdrom "OpenBSD${REV}${MACHINE}"
 	vnconfig -u svnd0
 	mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs