aboutsummaryrefslogtreecommitdiff
path: root/lib/libpam
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libpam')
-rw-r--r--lib/libpam/Makefile.inc2
-rw-r--r--lib/libpam/libpam/Makefile2
-rw-r--r--lib/libpam/modules/pam_lastlog/Makefile2
-rw-r--r--lib/libpam/modules/pam_login_access/Makefile2
-rw-r--r--lib/libpam/modules/pam_nologin/Makefile2
-rw-r--r--lib/libpam/modules/pam_securetty/Makefile2
-rw-r--r--lib/libpam/modules/pam_self/Makefile2
-rw-r--r--lib/libpam/modules/pam_unix/Makefile2
-rw-r--r--lib/libpam/pam.d/Makefile20
9 files changed, 10 insertions, 26 deletions
diff --git a/lib/libpam/Makefile.inc b/lib/libpam/Makefile.inc
index bec0687d1b7f..28630e46b949 100644
--- a/lib/libpam/Makefile.inc
+++ b/lib/libpam/Makefile.inc
@@ -23,6 +23,8 @@
# SUCH DAMAGE.
#
+PACKAGE?= pam
+
CFLAGS+= -DOPENPAM_DEBUG
SHLIB_MAJOR= 6
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index c6db4992bb36..f220063971d7 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -42,7 +42,7 @@ OPENPAM= ${SRCTOP}/contrib/openpam
SHLIB= pam
.endif
-PACKAGE= runtime
+LIB_PACKAGE=
SRCS= openpam_asprintf.c \
openpam_borrow_cred.c \
diff --git a/lib/libpam/modules/pam_lastlog/Makefile b/lib/libpam/modules/pam_lastlog/Makefile
index ecaf013c504a..9d27f4779184 100644
--- a/lib/libpam/modules/pam_lastlog/Makefile
+++ b/lib/libpam/modules/pam_lastlog/Makefile
@@ -23,8 +23,6 @@
# SUCH DAMAGE.
#
-PACKAGE= runtime
-
LIB= pam_lastlog
SRCS= pam_lastlog.c
MANNODEV= pam_lastlog.8
diff --git a/lib/libpam/modules/pam_login_access/Makefile b/lib/libpam/modules/pam_login_access/Makefile
index 41bc32212351..e31866395a94 100644
--- a/lib/libpam/modules/pam_login_access/Makefile
+++ b/lib/libpam/modules/pam_login_access/Makefile
@@ -23,8 +23,6 @@
# SUCH DAMAGE.
#
-PACKAGE= runtime
-
LIB= pam_login_access
SRCS= pam_login_access.c login_access.c
MANNODEV= login.access.5 pam_login_access.8
diff --git a/lib/libpam/modules/pam_nologin/Makefile b/lib/libpam/modules/pam_nologin/Makefile
index c4ccc27b8958..38c9ea2b0a2a 100644
--- a/lib/libpam/modules/pam_nologin/Makefile
+++ b/lib/libpam/modules/pam_nologin/Makefile
@@ -23,8 +23,6 @@
# SUCH DAMAGE.
#
-PACKAGE= runtime
-
LIB= pam_nologin
SRCS= pam_nologin.c
MANNODEV= pam_nologin.8
diff --git a/lib/libpam/modules/pam_securetty/Makefile b/lib/libpam/modules/pam_securetty/Makefile
index 6e5e7d929b7d..90740721a3f5 100644
--- a/lib/libpam/modules/pam_securetty/Makefile
+++ b/lib/libpam/modules/pam_securetty/Makefile
@@ -23,8 +23,6 @@
# SUCH DAMAGE.
#
-PACKAGE= runtime
-
LIB= pam_securetty
SRCS= pam_securetty.c
MANNODEV= pam_securetty.8
diff --git a/lib/libpam/modules/pam_self/Makefile b/lib/libpam/modules/pam_self/Makefile
index ecf85b8de70a..8a6b3702b5a1 100644
--- a/lib/libpam/modules/pam_self/Makefile
+++ b/lib/libpam/modules/pam_self/Makefile
@@ -23,8 +23,6 @@
# SUCH DAMAGE.
#
-PACKAGE= runtime
-
LIB= pam_self
SRCS= pam_self.c
MANNODEV= pam_self.8
diff --git a/lib/libpam/modules/pam_unix/Makefile b/lib/libpam/modules/pam_unix/Makefile
index 1bb1e6f2c71a..124a757eae9d 100644
--- a/lib/libpam/modules/pam_unix/Makefile
+++ b/lib/libpam/modules/pam_unix/Makefile
@@ -36,8 +36,6 @@
.include <src.opts.mk>
.include <bsd.init.mk>
-PACKAGE= runtime
-
LIB= pam_unix
SRCS= pam_unix.c
MANNODEV= pam_unix.8
diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile
index a58c37b6c223..2cc5122b2ecc 100644
--- a/lib/libpam/pam.d/Makefile
+++ b/lib/libpam/pam.d/Makefile
@@ -1,7 +1,5 @@
.include <src.opts.mk>
-PACKAGE= runtime
-
NO_OBJ=
CONFGROUPS= CONFS
@@ -17,20 +15,16 @@ CONFDIR= /etc/pam.d
CONFSMODE_README= 444
CONFGROUPS+= CRON
-CRON+= cron
+CRON= cron
CRONPACKAGE= cron
-.if ${MK_AT} != "no"
-CONFGROUPS+= AT
-AT+= atrun
-ATPACKAGE+= at
-.endif
+CONFGROUPS.${MK_AT}+= AT
+AT= atrun
+ATPACKAGE= at
-.if ${MK_FTP} != "no"
-CONFGROUPS+= FTP
-FTP+= ftp ftpd
+CONFGROUPS.${MK_FTP}+= FTP
+FTP= ftp ftpd
# Do not put these in the ftp package, since ports also use them.
-FTPPACKAGE= runtime
-.endif
+FTPPACKAGE= pam
.include <bsd.prog.mk>