Index: head/sbin/geom/Makefile.inc
===================================================================
--- head/sbin/geom/Makefile.inc	(revision 129511)
+++ head/sbin/geom/Makefile.inc	(revision 129512)
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
-BINDIR?=/sbin
-CLASSDIR?=/lib/geom
 WARNS?=	6
+CLASSDIR?=/lib/geom
+
+.include "../Makefile.inc"
Index: head/sbin/geom/class/Makefile.inc
===================================================================
--- head/sbin/geom/class/Makefile.inc	(revision 129511)
+++ head/sbin/geom/class/Makefile.inc	(revision 129512)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-.include "../Makefile.inc"
+LIBDIR?= ${CLASSDIR}
 
-LIBDIR?=${CLASSDIR}
-SHLIB_MAJOR=1
-
-SRCS=   geom_${CLASS}.c subr.c
-SHLIB_NAME?=geom_${CLASS}.so.${SHLIB_MAJOR}
+SHLIB_MAJOR= 1
+SHLIB_NAME?= geom_${CLASS}.so.${SHLIB_MAJOR}
 LINKS=  ${BINDIR}/geom ${BINDIR}/g${CLASS}
 MAN=	g${CLASS}.8
+SRCS=   geom_${CLASS}.c subr.c
 
-CFLAGS+=-I${.CURDIR}/../..
+CFLAGS+= -I${.CURDIR}/../..
+
+.include "../Makefile.inc"
Index: head/sbin/geom/class/concat/Makefile
===================================================================
--- head/sbin/geom/class/concat/Makefile	(revision 129511)
+++ head/sbin/geom/class/concat/Makefile	(revision 129512)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../misc
+.PATH: ${.CURDIR}/../../misc
 
 CLASS=	concat
-
 NOMAN=	notyet
 
 .include <bsd.lib.mk>
Index: head/sbin/geom/class/nop/Makefile
===================================================================
--- head/sbin/geom/class/nop/Makefile	(revision 129511)
+++ head/sbin/geom/class/nop/Makefile	(revision 129512)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../misc
+.PATH: ${.CURDIR}/../../misc
 
 CLASS=	nop
-
 NOMAN=	notyet
 
 .include <bsd.lib.mk>
Index: head/sbin/geom/class/stripe/Makefile
===================================================================
--- head/sbin/geom/class/stripe/Makefile	(revision 129511)
+++ head/sbin/geom/class/stripe/Makefile	(revision 129512)
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../misc
+.PATH: ${.CURDIR}/../../misc
 
 CLASS=	stripe
-
 NOMAN=	notyet
 
 .include <bsd.lib.mk>
Index: head/sbin/geom/core/Makefile
===================================================================
--- head/sbin/geom/core/Makefile	(revision 129511)
+++ head/sbin/geom/core/Makefile	(revision 129512)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../misc
+.PATH: ${.CURDIR}/../misc
 
 PROG=	geom
-SRCS=	geom.c subr.c
-#MAN=	geom.8
 NOMAN=	notyet
+SRCS=	geom.c subr.c
+
+CFLAGS+= -DCLASSDIR=\"${CLASSDIR}\"
+CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
+
 DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML}
 LDADD=	-lgeom -lsbuf -lbsdxml
-WARNS?=	6
-CFLAGS+=-I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
-CFLAGS+=-DCLASSDIR=\"${CLASSDIR}\"
 
 .include <bsd.prog.mk>