Upgrade to 1.0.0. The primary differences are support for geom and ufs

labels plus a startup script that allows disks to be configured at boot
based on the existance of a geom label.

This release de-supports FreeBSD < 5.3 due to the geom label support
requirment.

3 files changed, 51 insertions, 4 deletions

diff --git a/sysutils/diskprep/Makefile b/sysutils/diskprep/Makefile
index ce5007f7adc7..1c1e21feff4a 100644
--- a/sysutils/diskprep/Makefile
+++ b/sysutils/diskprep/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	diskprep
-PORTVERSION=	0.9.2
+PORTVERSION=	1.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.freebsd.org/~brooks/diskprep/
 
@@ -17,7 +17,15 @@ USE_BZIP2=	yes
 USE_PERL5_RUN=	yes
 MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
 
+USE_RCORDER=	${NAME}
+
 MAN8=		diskprep.8
 MANCOMPRESSED=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 503000
+IGNORE=		Requires glabel(8) and thus >= FreeBSD-5.3
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/diskprep/distinfo b/sysutils/diskprep/distinfo
index c2cf572eca44..af7e755cb246 100644
--- a/sysutils/diskprep/distinfo
+++ b/sysutils/diskprep/distinfo
@@ -1,2 +1,2 @@
-MD5 (diskprep-0.9.2.tar.bz2) = 3dc3b006b27a4658f54a92d1283a8d17
-SIZE (diskprep-0.9.2.tar.bz2) = 105761
+MD5 (diskprep-1.0.0.tar.bz2) = cc896a3eee4131da929282cb7c886aae
+SIZE (diskprep-1.0.0.tar.bz2) = 106572
diff --git a/sysutils/diskprep/files/diskprep.in b/sysutils/diskprep/files/diskprep.in
new file mode 100644
index 000000000000..8c16c8ef0db4
--- /dev/null
+++ b/sysutils/diskprep/files/diskprep.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+# $Aero: util/diskprep/diskprep.rc,v 1.1 2005/08/06 00:50:59 brooks Exp $
+
+# PROVIDE: diskprep
+# REQUIRE: disks
+# BEFORE: fsck localswap
+# KEYWORD: nojail
+
+rc_debug=YES
+
+. /etc/rc.subr
+
+name="diskprep"
+rc_var=`set_rcvar`
+start_precmd="diskprep_prestart"
+stop_cmd=":"
+command="/usr/local/sbin/diskprep"
+
+diskprep_prestart()
+{
+	if [ -n "${diskprep_label}" ]; then
+		# If our label exists, we're done.
+		if [ -c /dev/label/${curlabel} ]; then
+			return 0
+		fi
+		command_args="$command_args -l $diskprep_label"
+	fi
+	if [ -n "${diskprep_config}" ]; then
+		command_args="$command_args -c $diskprep_config"
+	fi
+	if [ -z "${diskprep_disk}" -o ! -c "/dev/${diskprep_disk}" ]; then
+		err 1 "diskprep enabled, but no disk found!"
+	fi
+	command_args="$command_args $diskprep_disk"
+}
+
+load_rc_config $name
+
+run_rc_command "$1"