Don't use version number in library name. The library version is checked

after dlopen() anyway, so we should be safe.

Suggested by:	ru

sbin/geom/Makefile.inc

@@ -2,6 +2,5 @@
 
 WARNS?=	6
 CLASS_DIR?=/lib/geom
-CLASS_MAJOR?=1
 
 .include "../Makefile.inc"

sbin/geom/class/Makefile.inc

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 SHLIBDIR?=${CLASS_DIR}
-SHLIB_MAJOR=${CLASS_MAJOR}
-SHLIB_NAME?=geom_${CLASS}.so.${SHLIB_MAJOR}
+SHLIB_NAME?=geom_${CLASS}.so
 LINKS=  ${BINDIR}/geom ${BINDIR}/g${CLASS}
 MAN=	g${CLASS}.8
 SRCS=   geom_${CLASS}.c subr.c

sbin/geom/core/Makefile

@@ -6,7 +6,7 @@ PROG=	geom
 MAN=	geom.8
 SRCS=	geom.c subr.c
 
-CFLAGS+= -DCLASS_DIR=\"${CLASS_DIR}\" -DCLASS_MAJOR=${CLASS_MAJOR}
+CFLAGS+= -DCLASS_DIR=\"${CLASS_DIR}\"
 CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/..
 
 DPADD=	${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}

sbin/geom/core/geom.c

@@ -438,8 +438,7 @@ load_library(void)
 	uint32_t *lib_version;
 	void *dlh;
 
-	snprintf(path, sizeof(path), "%s/geom_%s.so.%u", CLASS_DIR, class_name,
-	    CLASS_MAJOR);
+	snprintf(path, sizeof(path), "%s/geom_%s.so", CLASS_DIR, class_name);
 	dlh = dlopen(path, RTLD_NOW);
 	if (dlh == NULL) {
 #if 0