diff --git a/contrib/openpam/Makefile b/contrib/openpam/Makefile
deleted file mode 100644
index 1e29452081fe..000000000000
--- a/contrib/openpam/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS
-# and Network Associates Laboratories, the Security Research Division
-# of Network Associates, Inc.  under DARPA/SPAWAR contract
-# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
-# program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/Makefile#8 $
-#
-
-SUBDIR		 =
-SUBDIR		+= modules
-SUBDIR		+= lib
-SUBDIR		+= bin
-SUBDIR		+= doc
-
-.include <bsd.subdir.mk>
diff --git a/contrib/openpam/Makefile.inc b/contrib/openpam/Makefile.inc
deleted file mode 100644
index 3b95c597ad7f..000000000000
--- a/contrib/openpam/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-# $P4: //depot/projects/openpam/Makefile.inc#2 $
-
-DESTDIR		?= /usr
-BINDIR		 = /bin
-LIBDIR		 = /lib
-
-SHLIB_MAJOR	 = 2
-SHLIB_MINOR	 = 0
diff --git a/contrib/openpam/bin/Makefile b/contrib/openpam/bin/Makefile
deleted file mode 100644
index 75bb5ad3710f..000000000000
--- a/contrib/openpam/bin/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS
-# and Network Associates Laboratories, the Security Research Division
-# of Network Associates, Inc.  under DARPA/SPAWAR contract
-# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
-# program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/bin/Makefile#7 $
-#
-
-SUBDIR		 =
-SUBDIR		+= su
-
-.include <bsd.subdir.mk>
diff --git a/contrib/openpam/bin/Makefile.inc b/contrib/openpam/bin/Makefile.inc
deleted file mode 100644
index a368da3fa300..000000000000
--- a/contrib/openpam/bin/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# $P4: //depot/projects/openpam/bin/Makefile.inc#1 $
-
-.include "../Makefile.inc"
diff --git a/contrib/openpam/bin/su/Makefile b/contrib/openpam/bin/su/Makefile
deleted file mode 100644
index 17a78a8dcbeb..000000000000
--- a/contrib/openpam/bin/su/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS
-# and Network Associates Laboratories, the Security Research Division
-# of Network Associates, Inc.  under DARPA/SPAWAR contract
-# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
-# program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/bin/su/Makefile#8 $
-#
-
-PROG		 = su
-WARNS		?= 4
-CFLAGS		+= -I${.CURDIR}/../../include
-DPADD		 = ${.OBJDIR}/../../lib/libpam.a
-LDADD		 = -L${.OBJDIR}/../../lib -R${.OBJDIR}/../../lib -lpam
-NOMAN		 = YES
-
-.include <bsd.prog.mk>
diff --git a/contrib/openpam/doc/Makefile b/contrib/openpam/doc/Makefile
deleted file mode 100644
index 18ff33e9fe4f..000000000000
--- a/contrib/openpam/doc/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS
-# and Network Associates Laboratories, the Security Research Division
-# of Network Associates, Inc.  under DARPA/SPAWAR contract
-# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
-# program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/doc/Makefile#5 $
-#
-
-SUBDIR		 =
-SUBDIR		+= man
-
-.include <bsd.subdir.mk>
diff --git a/contrib/openpam/doc/man/Makefile b/contrib/openpam/doc/man/Makefile
deleted file mode 100644
index 32c9e4601b66..000000000000
--- a/contrib/openpam/doc/man/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS
-# and Network Associates Laboratories, the Security Research Division
-# of Network Associates, Inc.  under DARPA/SPAWAR contract
-# N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS research
-# program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/doc/man/Makefile#13 $
-#
-
-GENDOC		 = ${.CURDIR}/../../misc/gendoc.pl
-
-# Standard PAM API
-PMAN		 =
-PMAN		+= pam_acct_mgmt.3
-PMAN		+= pam_authenticate.3
-PMAN		+= pam_chauthtok.3
-PMAN		+= pam_close_session.3
-PMAN		+= pam_end.3
-PMAN		+= pam_get_data.3
-PMAN		+= pam_get_item.3
-PMAN		+= pam_get_user.3
-PMAN		+= pam_getenv.3
-PMAN		+= pam_getenvlist.3
-PMAN		+= pam_open_session.3
-PMAN		+= pam_putenv.3
-PMAN		+= pam_set_data.3
-PMAN		+= pam_set_item.3
-PMAN		+= pam_setcred.3
-PMAN		+= pam_start.3
-PMAN		+= pam_strerror.3
-
-# Standard module API
-MMAN		 =
-MMAN		+= pam_sm_acct_mgmt.3
-MMAN		+= pam_sm_authenticate.3
-MMAN		+= pam_sm_chauthtok.3
-MMAN		+= pam_sm_close_session.3
-MMAN		+= pam_sm_open_session.3
-MMAN		+= pam_sm_setcred.3
-
-# OpenPAM extensions
-OMAN		 =
-OMAN		+= openpam_borrow_cred.3
-OMAN		+= openpam_free_data.3
-OMAN		+= openpam_get_option.3
-OMAN		+= openpam_log.3
-OMAN		+= openpam_nullconv.3
-OMAN		+= openpam_readline.3
-OMAN		+= openpam_restore_cred.3
-OMAN		+= openpam_set_option.3
-OMAN		+= openpam_ttyconv.3
-OMAN		+= pam_error.3
-OMAN		+= pam_get_authtok.3
-OMAN		+= pam_info.3
-OMAN		+= pam_prompt.3
-OMAN		+= pam_setenv.3
-OMAN		+= pam_verror.3
-OMAN		+= pam_vinfo.3
-OMAN		+= pam_vprompt.3
-
-MAN		 = ${PMAN} ${OMAN} ${MMAN}
-MAN		+= openpam.3
-MAN		+= pam.3
-MAN		+= pam_conv.3
-
-CLEANFILES	+= ${PMAN} ${OMAN} ${MMAN} openpam.3 pam.3
-
-.for man in ${PMAN} ${OMAN} ${MMAN}
-${man}: ${.CURDIR}/../../lib/${man:R}.c ${GENDOC}
-	perl -w ${GENDOC} ${.CURDIR}/../../lib/${man:R}.c
-.endfor
-
-openpam.3: ${OMAN} ${GENDOC} openpam.man
-	perl -w ${GENDOC} -o ${OMAN} <${.CURDIR}/openpam.man
-
-pam.3: ${PMAN} ${GENDOC} pam.man
-	perl -w ${GENDOC} -p ${PMAN} <${.CURDIR}/pam.man
-
-.include <bsd.prog.mk>
diff --git a/contrib/openpam/lib/Makefile b/contrib/openpam/lib/Makefile
deleted file mode 100644
index da3aecd8d37e..000000000000
--- a/contrib/openpam/lib/Makefile
+++ /dev/null
@@ -1,99 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# Network Associates Laboratories, the Security Research Division of
-# Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
-# ("CBOSS"), as part of the DARPA CHATS research program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/lib/Makefile#21 $
-#
-
-LIB		 = pam
-
-WARNS		?= 4
-NO_WERROR	 = yes
-CFLAGS		+= -I${.CURDIR}/../include
-CFLAGS		+= -DLIB_MAJ=${SHLIB_MAJOR}
-
-OSNAME		!= uname -s
-.if ${OSNAME} == "Linux"
-LDADD		+= -ldl
-.endif
-
-SRCS		 =
-SRCS		+= openpam_borrow_cred.c
-SRCS		+= openpam_configure.c
-SRCS		+= openpam_dispatch.c
-SRCS		+= openpam_dynamic.c
-SRCS		+= openpam_findenv.c
-SRCS		+= openpam_free_data.c
-SRCS		+= openpam_get_option.c
-SRCS		+= openpam_load.c
-SRCS		+= openpam_log.c
-SRCS		+= openpam_nullconv.c
-SRCS		+= openpam_readline.c
-SRCS		+= openpam_restore_cred.c
-SRCS		+= openpam_set_option.c
-SRCS		+= openpam_static.c
-SRCS		+= openpam_ttyconv.c
-SRCS		+= pam_acct_mgmt.c
-SRCS		+= pam_authenticate.c
-SRCS		+= pam_chauthtok.c
-SRCS		+= pam_close_session.c
-SRCS		+= pam_end.c
-SRCS		+= pam_error.c
-SRCS		+= pam_get_authtok.c
-SRCS		+= pam_get_data.c
-SRCS		+= pam_get_item.c
-SRCS		+= pam_get_user.c
-SRCS		+= pam_getenv.c
-SRCS		+= pam_getenvlist.c
-SRCS		+= pam_info.c
-SRCS		+= pam_open_session.c
-SRCS		+= pam_prompt.c
-SRCS		+= pam_putenv.c
-SRCS		+= pam_set_data.c
-SRCS		+= pam_set_item.c
-SRCS		+= pam_setcred.c
-SRCS		+= pam_setenv.c
-SRCS		+= pam_start.c
-SRCS		+= pam_strerror.c
-SRCS		+= pam_verror.c
-SRCS		+= pam_vinfo.c
-SRCS		+= pam_vprompt.c
-
-.if 0
-SRCS		+= pam_authenticate_secondary.c
-SRCS		+= pam_get_mapped_authtok.c
-SRCS		+= pam_get_mapped_username.c
-SRCS		+= pam_set_mapped_authtok.c
-SRCS		+= pam_set_mapped_username.c
-.endif
-
-.include <bsd.lib.mk>
diff --git a/contrib/openpam/modules/Makefile b/contrib/openpam/modules/Makefile
deleted file mode 100644
index 0818653ad6c1..000000000000
--- a/contrib/openpam/modules/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# Network Associates Laboratories, the Security Research Division of
-# Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
-# ("CBOSS"), as part of the DARPA CHATS research program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/modules/Makefile#9 $
-#
-
-SUBDIR		 =
-SUBDIR		+= pam_deny
-SUBDIR		+= pam_permit
-SUBDIR		+= pam_unix
-
-.include <bsd.subdir.mk>
diff --git a/contrib/openpam/modules/pam_deny/Makefile b/contrib/openpam/modules/pam_deny/Makefile
deleted file mode 100644
index 98a7ce37c301..000000000000
--- a/contrib/openpam/modules/pam_deny/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# Network Associates Laboratories, the Security Research Division of
-# Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
-# ("CBOSS"), as part of the DARPA CHATS research program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/modules/pam_deny/Makefile#6 $
-#
-
-LIB		 = pam_deny
-SHLIB_NAME	 = pam_deny.so
-SRCS		 = pam_deny.c
-CFLAGS		+= -I${.CURDIR}/../../include
-
-.include <bsd.lib.mk>
diff --git a/contrib/openpam/modules/pam_dummy/Makefile b/contrib/openpam/modules/pam_dummy/Makefile
deleted file mode 100644
index 90324083e1cd..000000000000
--- a/contrib/openpam/modules/pam_dummy/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#-
-# Copyright (c) 2002 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# Network Associates Laboratories, the Security Research Division of
-# Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
-# ("CBOSS"), as part of the DARPA CHATS research program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/modules/pam_dummy/Makefile#4 $
-#
-
-LIB		 = pam_dummy
-SHLIB_NAME	 = pam_dummy.so
-SRCS		 = pam_dummy.c
-CFLAGS		+= -I${.CURDIR}/../../include
-
-.include <bsd.lib.mk>
diff --git a/contrib/openpam/modules/pam_permit/Makefile b/contrib/openpam/modules/pam_permit/Makefile
deleted file mode 100644
index b443a6cacd57..000000000000
--- a/contrib/openpam/modules/pam_permit/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# Network Associates Laboratories, the Security Research Division of
-# Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
-# ("CBOSS"), as part of the DARPA CHATS research program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/modules/pam_permit/Makefile#6 $
-#
-
-LIB		 = pam_permit
-SHLIB_NAME	 = pam_permit.so
-SRCS		 = pam_permit.c
-CFLAGS		+= -I${.CURDIR}/../../include
-
-.include <bsd.lib.mk>
diff --git a/contrib/openpam/modules/pam_unix/Makefile b/contrib/openpam/modules/pam_unix/Makefile
deleted file mode 100644
index 2e4be4619c9b..000000000000
--- a/contrib/openpam/modules/pam_unix/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#-
-# Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-# All rights reserved.
-#
-# This software was developed for the FreeBSD Project by ThinkSec AS and
-# Network Associates Laboratories, the Security Research Division of
-# Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
-# ("CBOSS"), as part of the DARPA CHATS research program.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-#    products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $P4: //depot/projects/openpam/modules/pam_unix/Makefile#3 $
-#
-
-LIB		 = pam_unix
-SHLIB_NAME	 = pam_unix.so
-SRCS		 = pam_unix.c
-CFLAGS		+= -I${.CURDIR}/../../include
-DPADD		 = ${LIBCRYPT}
-LDADD		 = -lcrypt
-
-.include <bsd.lib.mk>