From 5696dc10601ceb64620e441ac52a11c673d3001f Mon Sep 17 00:00:00 2001
From: piso <piso@FreeBSD.org>
Date: Sun, 8 Oct 2006 14:02:00 +0000
Subject: Fix a regression: let natd load libalias modules before /usr is
 mounted renaming /lib/libalias_*.so.4 to /lib/libalias_*.so.

Approved by: glebius
Reviewed by: glebius, ru
---
 lib/libalias/modules/Makefile.inc     | 3 ++-
 lib/libalias/modules/cuseeme/Makefile | 2 +-
 lib/libalias/modules/dummy/Makefile   | 2 +-
 lib/libalias/modules/ftp/Makefile     | 2 +-
 lib/libalias/modules/irc/Makefile     | 2 +-
 lib/libalias/modules/nbt/Makefile     | 2 +-
 lib/libalias/modules/pptp/Makefile    | 2 +-
 lib/libalias/modules/skinny/Makefile  | 2 +-
 lib/libalias/modules/smedia/Makefile  | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'lib/libalias')

diff --git a/lib/libalias/modules/Makefile.inc b/lib/libalias/modules/Makefile.inc
index a3c11c0..23df02d 100644
--- a/lib/libalias/modules/Makefile.inc
+++ b/lib/libalias/modules/Makefile.inc
@@ -3,5 +3,6 @@
 .PATH: ${.CURDIR}/../../../../sys/netinet/libalias
 
 SHLIBDIR?= /lib
-SHLIB_MAJOR= 4
+LIB?=   alias_${NAME}
+SHLIB_NAME?=libalias_${NAME}.so
 WARNS?=	1
diff --git a/lib/libalias/modules/cuseeme/Makefile b/lib/libalias/modules/cuseeme/Makefile
index 482ce93..aad93c0 100644
--- a/lib/libalias/modules/cuseeme/Makefile
+++ b/lib/libalias/modules/cuseeme/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	alias_cuseeme
+NAME=	cuseeme
 SRCS=	alias_cuseeme.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libalias/modules/dummy/Makefile b/lib/libalias/modules/dummy/Makefile
index a79ca85..8a2abe5 100644
--- a/lib/libalias/modules/dummy/Makefile
+++ b/lib/libalias/modules/dummy/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	alias_dummy
+NAME=	dummy
 SRCS=	alias_dummy.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libalias/modules/ftp/Makefile b/lib/libalias/modules/ftp/Makefile
index 4865fa2..ad3f86f 100644
--- a/lib/libalias/modules/ftp/Makefile
+++ b/lib/libalias/modules/ftp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	alias_ftp
+NAME=	ftp
 SRCS=	alias_ftp.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libalias/modules/irc/Makefile b/lib/libalias/modules/irc/Makefile
index 98f4e85..1d5308d 100644
--- a/lib/libalias/modules/irc/Makefile
+++ b/lib/libalias/modules/irc/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	alias_irc
+NAME=	irc
 SRCS=	alias_irc.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libalias/modules/nbt/Makefile b/lib/libalias/modules/nbt/Makefile
index c26b5d9..a8cfc8c 100644
--- a/lib/libalias/modules/nbt/Makefile
+++ b/lib/libalias/modules/nbt/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	alias_nbt
+NAME=	nbt
 SRCS=	alias_nbt.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libalias/modules/pptp/Makefile b/lib/libalias/modules/pptp/Makefile
index 69d8e61..ffbae7e 100644
--- a/lib/libalias/modules/pptp/Makefile
+++ b/lib/libalias/modules/pptp/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	alias_pptp
+NAME=	pptp
 SRCS=	alias_pptp.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libalias/modules/skinny/Makefile b/lib/libalias/modules/skinny/Makefile
index f554e9c..4969ecb 100644
--- a/lib/libalias/modules/skinny/Makefile
+++ b/lib/libalias/modules/skinny/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	alias_skinny
+NAME=	skinny
 SRCS=	alias_skinny.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libalias/modules/smedia/Makefile b/lib/libalias/modules/smedia/Makefile
index 56c4ddd..135d22c 100644
--- a/lib/libalias/modules/smedia/Makefile
+++ b/lib/libalias/modules/smedia/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-LIB=	alias_smedia
+NAME=	smedia
 SRCS=	alias_smedia.c
 
 .include <bsd.lib.mk>
-- 
cgit v1.1