From fe5e0baab7775a68a5a6b41964b8582b791a2bda Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 2 Aug 2004 09:05:29 +0000
Subject: [PATCH] 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       | 1 -
 sbin/geom/class/Makefile.inc | 3 +--
 sbin/geom/core/Makefile      | 2 +-
 sbin/geom/core/geom.c        | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sbin/geom/Makefile.inc b/sbin/geom/Makefile.inc
index d3914abe0b28..94ca09f3889c 100644
--- a/sbin/geom/Makefile.inc
+++ b/sbin/geom/Makefile.inc
@@ -2,6 +2,5 @@
 
 WARNS?=	6
 CLASS_DIR?=/lib/geom
-CLASS_MAJOR?=1
 
 .include "../Makefile.inc"
diff --git a/sbin/geom/class/Makefile.inc b/sbin/geom/class/Makefile.inc
index aeb0dcdea5bf..112756d5f73c 100644
--- a/sbin/geom/class/Makefile.inc
+++ b/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
diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile
index 6ee6c39c82b3..ab5d94ab21f4 100644
--- a/sbin/geom/core/Makefile
+++ b/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}
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index dcc663139005..c32717966d32 100644
--- a/sbin/geom/core/geom.c
+++ b/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