Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sbin/gpt/gpt.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sbin/gpt/gpt.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.4.6.2
retrieving revision 1.5
diff -u -p -r1.4.6.2 -r1.5
--- src/sbin/gpt/gpt.c	2008/02/18 21:04:17	1.4.6.2
+++ src/sbin/gpt/gpt.c	2007/12/18 21:46:46	1.5
@@ -31,7 +31,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.4.6.2 2008/02/18 21:04:17 mjf Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.5 2007/12/18 21:46:46 riz Exp $");
 #endif
 
 #include <sys/param.h>
@@ -280,17 +280,6 @@ parse_uuid(const char *s, uuid_t *uuid)
 		return (0);
 
 	switch (*s) {
-	case 'c':
-		if (strcmp(s, "ccd") == 0) {
-			uuid_t ccd = GPT_ENT_TYPE_NETBSD_CCD;
-			*uuid = ccd;
-			return (0);
-		} else if (strcmp(s, "cgd") == 0) {
-			uuid_t cgd = GPT_ENT_TYPE_NETBSD_CGD;
-			*uuid = cgd;
-			return (0);
-		}
-		break;
 	case 'e':
 		if (strcmp(s, "efi") == 0) {
 			uuid_t efi = GPT_ENT_TYPE_EFI;
@@ -306,33 +295,22 @@ parse_uuid(const char *s, uuid_t *uuid)
 		}
 		break;
 	case 'l':
-		if (strcmp(s, "lfs") == 0) {
-			uuid_t lfs = GPT_ENT_TYPE_NETBSD_LFS;
-			*uuid = lfs;
-			return (0);
-		} else if (strcmp(s, "linux") == 0) {
+		if (strcmp(s, "linux") == 0) {
 			uuid_t lnx = GPT_ENT_TYPE_MS_BASIC_DATA;
 			*uuid = lnx;
 			return (0);
 		}
 		break;
-	case 'r':
-		if (strcmp(s, "raid") == 0) {
-			uuid_t raid = GPT_ENT_TYPE_NETBSD_RAIDFRAME;
-			*uuid = raid;
-			return (0);
-		}
-		break;
 	case 's':
 		if (strcmp(s, "swap") == 0) {
-			uuid_t sw = GPT_ENT_TYPE_NETBSD_SWAP;
+			uuid_t sw = GPT_ENT_TYPE_FREEBSD_SWAP;
 			*uuid = sw;
 			return (0);
 		}
 		break;
 	case 'u':
 		if (strcmp(s, "ufs") == 0) {
-			uuid_t ufs = GPT_ENT_TYPE_NETBSD_FFS;
+			uuid_t ufs = GPT_ENT_TYPE_FREEBSD_UFS;
 			*uuid = ufs;
 			return (0);
 		}
@@ -778,7 +756,7 @@ usage(void)
 	    getprogname(), destroymsg,
 	    getprogname(), labelmsg1,
 	    getprogname(), labelmsg2,
-	    (int)strlen(getprogname()), "", labelmsg3,
+	    strlen(getprogname()), "", labelmsg3,
 	    getprogname(), migratemsg,
 	    getprogname(), recovermsg,
 	    getprogname(), removemsg1,