Rename the generic "CLASS" to the more specific "GEOM_CLASS".

While I'm here remove redundancy and inconsistencies.

Obtained from: Juniper Networks

16 files changed, 26 insertions, 32 deletions

diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index 63109c29df6a..6f0141e3760c 100644
--- a/sbin/geom/class/Makefile.inc
+++ b/sbin/geom/class/Makefile.inc
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-SHLIBDIR?=${CLASS_DIR}
-SHLIB_NAME?=geom_${CLASS}.so
-LINKS=	${BINDIR}/geom ${BINDIR}/g${CLASS}
-MAN=	g${CLASS}.8
-SRCS+=	geom_${CLASS}.c subr.c
+SHLIBDIR?=${GEOM_CLASS_DIR}
+SHLIB_NAME?=geom_${GEOM_CLASS}.so
+LINKS=	${BINDIR}/geom ${BINDIR}/g${GEOM_CLASS}
+MAN=	g${GEOM_CLASS}.8
+SRCS+=	geom_${GEOM_CLASS}.c subr.c
 
 CFLAGS+= -I${.CURDIR}/../..
 
diff --git a/sbin/geom/class/cache/Makefile b/sbin/geom/class/cache/Makefile
index 615c927588ca..35f81d81b76f 100644
--- a/sbin/geom/class/cache/Makefile
+++ b/sbin/geom/class/cache/Makefile
@@ -2,6 +2,6 @@
 
 .PATH: ${.CURDIR}/../../misc
 
-CLASS=	cache
+GEOM_CLASS=	cache
 
 .include <bsd.lib.mk>
diff --git a/sbin/geom/class/concat/Makefile b/sbin/geom/class/concat/Makefile
index b3a3e23c449d..34e2c28fdecc 100644
--- a/sbin/geom/class/concat/Makefile
+++ b/sbin/geom/class/concat/Makefile
@@ -2,6 +2,6 @@
 
 .PATH: ${.CURDIR}/../../misc
 
-CLASS=	concat
+GEOM_CLASS=	concat
 
 .include <bsd.lib.mk>
diff --git a/sbin/geom/class/eli/Makefile b/sbin/geom/class/eli/Makefile
index 041e738465cf..119566876d71 100644
--- a/sbin/geom/class/eli/Makefile
+++ b/sbin/geom/class/eli/Makefile
@@ -2,7 +2,7 @@
 
 .PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/eli ${.CURDIR}/../../../../sys/crypto/sha2
 
-CLASS=	eli
+GEOM_CLASS=	eli
 SRCS=	g_eli_crypto.c
 SRCS+=	g_eli_key.c
 SRCS+=	pkcs5v2.c
diff --git a/sbin/geom/class/journal/Makefile b/sbin/geom/class/journal/Makefile
index 95f66de2085e..2db8d3002734 100644
--- a/sbin/geom/class/journal/Makefile
+++ b/sbin/geom/class/journal/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../misc
+.PATH: ${.CURDIR}/../../misc
 
-CLASS=	journal
+GEOM_CLASS=	journal
 SRCS+=	geom_journal_ufs.c
 
 DPADD=	${LIBMD} ${LIBUFS}
diff --git a/sbin/geom/class/label/Makefile b/sbin/geom/class/label/Makefile
index cba7ac6b4483..0b609a1dd3a0 100644
--- a/sbin/geom/class/label/Makefile
+++ b/sbin/geom/class/label/Makefile
@@ -2,6 +2,6 @@
 
 .PATH: ${.CURDIR}/../../misc
 
-CLASS=	label
+GEOM_CLASS=	label
 
 .include <bsd.lib.mk>
diff --git a/sbin/geom/class/mirror/Makefile b/sbin/geom/class/mirror/Makefile
index f07a790539b6..e38d617b6da5 100644
--- a/sbin/geom/class/mirror/Makefile
+++ b/sbin/geom/class/mirror/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../misc
+.PATH: ${.CURDIR}/../../misc
 
-CLASS=	mirror
+GEOM_CLASS=	mirror
 
 DPADD=	${LIBMD}
 LDADD=	-lmd
diff --git a/sbin/geom/class/mountver/Makefile b/sbin/geom/class/mountver/Makefile
index d7105d0d611d..750d1a557e5e 100644
--- a/sbin/geom/class/mountver/Makefile
+++ b/sbin/geom/class/mountver/Makefile
@@ -2,6 +2,6 @@
 
 .PATH: ${.CURDIR}/../../misc
 
-CLASS=	mountver
+GEOM_CLASS=	mountver
 
 .include <bsd.lib.mk>
diff --git a/sbin/geom/class/multipath/Makefile b/sbin/geom/class/multipath/Makefile
index b4eb7837e8eb..ff40fe9faa32 100644
--- a/sbin/geom/class/multipath/Makefile
+++ b/sbin/geom/class/multipath/Makefile
@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../misc
-CLASS=	multipath
 
-.include <bsd.lib.mk>
+GEOM_CLASS=	multipath
 
 CFLAGS+=  -I${.CURDIR}/../../../../sys
+
+.include <bsd.lib.mk>
diff --git a/sbin/geom/class/nop/Makefile b/sbin/geom/class/nop/Makefile
index 75a20376ff45..d9a6ca6f845e 100644
--- a/sbin/geom/class/nop/Makefile
+++ b/sbin/geom/class/nop/Makefile
@@ -2,6 +2,6 @@
 
 .PATH: ${.CURDIR}/../../misc
 
-CLASS=	nop
+GEOM_CLASS=	nop
 
 .include <bsd.lib.mk>
diff --git a/sbin/geom/class/part/Makefile b/sbin/geom/class/part/Makefile
index 7fe221a6f3d4..341cd42b8c97 100644
--- a/sbin/geom/class/part/Makefile
+++ b/sbin/geom/class/part/Makefile
@@ -2,7 +2,7 @@
 
 .PATH: ${.CURDIR}/../../misc
 
-CLASS=	part
+GEOM_CLASS=	part
 
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
diff --git a/sbin/geom/class/raid3/Makefile b/sbin/geom/class/raid3/Makefile
index 1791669dec92..d2405d4b4f5d 100644
--- a/sbin/geom/class/raid3/Makefile
+++ b/sbin/geom/class/raid3/Makefile
@@ -2,7 +2,7 @@
 
 .PATH:	${.CURDIR}/../../misc
 
-CLASS=	raid3
+GEOM_CLASS=	raid3
 
 DPADD=	${LIBMD}
 LDADD=	-lmd
diff --git a/sbin/geom/class/sched/Makefile b/sbin/geom/class/sched/Makefile
index 6656cdd466f2..abb47dca04eb 100644
--- a/sbin/geom/class/sched/Makefile
+++ b/sbin/geom/class/sched/Makefile
@@ -2,17 +2,10 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../misc
-#CFLAGS += -I/usr/src/sbin/geom
 
-CLASS=sched
+GEOM_CLASS=	sched
 
-WARNS?= 6
+WARNS?=	6
 CLASS_DIR?=/lib/geom
 
-SHLIBDIR?=${CLASS_DIR}
-SHLIB_NAME?=geom_${CLASS}.so
-LINKS=  ${BINDIR}/geom ${BINDIR}/g${CLASS}
-MAN=    g${CLASS}.8
-SRCS+=  geom_${CLASS}.c subr.c
-
 .include <bsd.lib.mk>
diff --git a/sbin/geom/class/shsec/Makefile b/sbin/geom/class/shsec/Makefile
index ea38f159241a..6b5c835551b2 100644
--- a/sbin/geom/class/shsec/Makefile
+++ b/sbin/geom/class/shsec/Makefile
@@ -2,6 +2,6 @@
 
 .PATH: ${.CURDIR}/../../misc
 
-CLASS=	shsec
+GEOM_CLASS=	shsec
 
 .include <bsd.lib.mk>
diff --git a/sbin/geom/class/stripe/Makefile b/sbin/geom/class/stripe/Makefile
index 53a35fff46bf..8ee5f6e2f871 100644
--- a/sbin/geom/class/stripe/Makefile
+++ b/sbin/geom/class/stripe/Makefile
@@ -2,6 +2,6 @@
 
 .PATH: ${.CURDIR}/../../misc
 
-CLASS=	stripe
+GEOM_CLASS=	stripe
 
 .include <bsd.lib.mk>
diff --git a/sbin/geom/class/virstor/Makefile b/sbin/geom/class/virstor/Makefile
index 0b4d5cdda31b..ac71b439513e 100644
--- a/sbin/geom/class/virstor/Makefile
+++ b/sbin/geom/class/virstor/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
+.PATH: ${.CURDIR}/../../misc ${.CURDIR}/../../../../sys/geom/virstor
 
-CLASS=	virstor
+GEOM_CLASS=	virstor
 
 SRCS+=	binstream.c
 SRCS+=	g_virstor_md.c