 @@ -1,18 +1,20 @@
-#	$NetBSD: Makefile,v 1.24 2002/05/02 16:42:53 wiz Exp $
+#	$NetBSD: Makefile,v 1.24.46.1 2009/12/14 06:29:20 mrg Exp $
 .include <bsd.own.mk>
-.if ${OBJECT_FMT} == "ELF" && exists(${MACHINE_ARCH}_elf)
+.if ${OBJECT_FMT} == "ELF" && exists(${CSU_MACHINE_ARCH}_elf)
 SUBDIR=	${CSU_MACHINE_ARCH}_elf
 .elif ${OBJECT_FMT} == "ELF" && exists(${MACHINE_ARCH}_elf)
 SUBDIR=	${MACHINE_ARCH}_elf
 .elif ${OBJECT_FMT} == "ELF" && exists(${MACHINE_CPU}_elf)
 SUBDIR=	${MACHINE_CPU}_elf
 .elif exists(${MACHINE_ARCH})
 SUBDIR=	${MACHINE_ARCH}
 .elif exists(${MACHINE_CPU})
 SUBDIR=	${MACHINE_CPU}
 .else
 .BEGIN:
 	@echo no SUBDIR for ${MACHINE_ARCH}_elf, ${MACHINE_ARCH} nor \
 	    ${MACHINE_CPU}
 	@false
 .endif

 @@ -1,26 +1,26 @@
-#	$NetBSD: Makefile.inc,v 1.10 2008/10/26 07:06:07 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.10.8.1 2009/12/14 06:29:20 mrg Exp $
 NOLINT=		# defined
 NOPICINSTALL=	# defined
 NOPROFILE=	# defined
 .include <bsd.own.mk>
 SHLIB_VERSION_FILE=	${NETBSDSRCDIR}/lib/i18n_module/shlib_version
-.if defined(LD32DIR)
+.if defined(MLIBDIR)
-LIBDIR=		/usr/lib/${LD32DIR}/i18n
+LIBDIR=		/usr/lib/${MLIBDIR}/i18n
-SHLIBDIR=	/usr/lib/${LD32DIR}/i18n
+SHLIBDIR=	/usr/lib/${MLIBDIR}/i18n
-SHLIBINSTALLDIR=/usr/lib/${LD32DIR}/i18n
+SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/i18n
 .else
 LIBDIR=		/usr/lib/i18n
 SHLIBDIR=	/usr/lib/i18n
 SHLIBINSTALLDIR=/usr/lib/i18n
 .endif
 CPPFLAGS+=	-I${NETBSDSRCDIR}/lib/libc/citrus
 CPPFLAGS+=	-DLOCALEMOD_MAJOR=${SHLIB_MAJOR}
 CPPFLAGS+=	-DLIBC_SCCS
 BASENAME=	${.CURDIR:T}
 LIB=		${BASENAME}
 SRCS?=		${SRCPRE:tl}${BASENAME:tl}.c
 .PATH:	${NETBSDSRCDIR}/lib/libc/citrus ${NETBSDSRCDIR}/lib/libc/citrus/modules

 @@ -1,29 +1,29 @@
-#	$NetBSD: Makefile,v 1.21 2008/10/26 07:05:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.21.8.1 2009/12/14 06:29:20 mrg Exp $
 # These should always be a MACHINE_CPU value
 ARCHDIRS= alpha arm i386 m68k sparc x86_64
 .for arch in ${ARCHDIRS}
 .include "${.CURDIR}/${arch}/Makefile.inc"
 .PATH:	${.CURDIR}/${arch}
 .endfor
 OBJS+= ${ASM}
 POBJS+=	${ASM:.o=.po}
 CLEANFILES+= ${ASM} ${POBJS}
 # Build the library if SRCS is now defined ...
 .if defined(SRCS)
-.if defined(LD32DIR) && ${LD32DIR} != "none"
+.if defined(MLIBDIR) && ${MLIBDIR} != "none"
-LIB=	${LD32DIR}
+LIB=	${MLIBDIR}
 .else
 LIB=	${MACHINE_CPU}
 .endif
 SHLIB_VERSION_FILE= ${.CURDIR}/${LIB}/shlib_version
 .include <bsd.lib.mk>
 .else
 # ... otherwise just build the manpages
 .include <bsd.man.mk>
 .endif
 .include <bsd.subdir.mk>

 @@ -1,18 +1,18 @@
-#	$NetBSD: Makefile.inc,v 1.13 2008/10/26 07:05:33 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.13.8.1 2009/12/14 06:29:20 mrg Exp $
-LD32DIR?=	none
+MLIBDIR?=	none
-.if (${MACHINE_ARCH} == "i386" || ${LD32DIR} == "i386")
+.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR} == "i386")
 SRCS+=	i386_get_ldt.c i386_set_ldt.c \
 	i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
 	i386_vm86.c i386_pmc.c i386_mtrr.c
 .endif
 MAN+=	i386_get_ldt.2 \
 	i386_get_mtrr.2 \
 	i386_iopl.2 \
 	i386_pmc_info.2 \
 	i386_vm86.2
 MLINKS+=i386_get_ldt.2 i386_set_ldt.2 \
 	i386_get_mtrr.2 i386_set_mtrr.2 \

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.8 2008/05/11 19:17:07 he Exp $
+# $NetBSD: Makefile.inc,v 1.8.8.1 2009/12/14 06:29:20 mrg Exp $
 # Copyright 1998 Juniper Networks, Inc.
 # All rights reserved.
+#
 # 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.
+#
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 @@ -17,25 +17,36 @@
 # 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.
+#
 # $FreeBSD: src/lib/libpam/Makefile.inc,v 1.15 2004/03/15 13:23:20 des Exp $
 USE_FORT?= yes	# network client software *and* authentication software
-CPPFLAGS+= -DOPENPAM_MODULES_DIR=\"/usr/lib/security\"
+# This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
 .include <${BSD_MK_COMPAT_FILE}>
 .endif
 .if defined(MLIBDIR)
 MODLIBDIR=/usr/lib/${MLIBDIR}/security
 .else
 MODLIBDIR=/usr/lib/security
 .endif
 CPPFLAGS+= -DOPENPAM_MODULES_DIR=\"${MODLIBDIR}\"
 # No debugging
 #CPPFLAGS+= -DDEBUG
 # ...and don't do either of those on the shared library.
 # XXX CSHLIBFLAGS isn't perfect, but it'll do for now.
 CSHLIBFLAGS+= -DNO_STATIC_MODULES
 # Define the shared library version here.  libpam and the modules share a
 # version, and we need these variables early for module install rules.
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0

 @@ -1,25 +1,25 @@
-#	$NetBSD: mod.mk,v 1.6 2008/10/27 07:48:27 mrg Exp $
+#	$NetBSD: mod.mk,v 1.6.8.1 2009/12/14 06:29:20 mrg Exp $
 NOLINT=		# don't build a lint library
 NOPROFILE=	# don't build a profile library
 NOPICINSTALL=	# don't install _pic.a library
 .include <bsd.own.mk>
 .include "${.CURDIR}/../../Makefile.inc"
-.if defined(LD32DIR)
+.if defined(MLIBDIR)
-LIBDIR=/usr/lib/${LD32DIR}/security
+LIBDIR=/usr/lib/${MLIBDIR}/security
 .else
 LIBDIR=/usr/lib/security
 .endif
 WARNS=3
 .if ${MKPIC} != "no"
 .PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
 libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
 .else
 libinstall::
 .endif
 .include <bsd.lib.mk>

 @@ -1,11 +1,11 @@
-#	$NetBSD: Makefile.inc,v 1.3 2008/10/26 07:05:33 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.3.8.1 2009/12/14 06:29:20 mrg Exp $
-LD32DIR?=	none
+MLIBDIR?=	none
-.if (${MACHINE_ARCH} == "x86_64" && ${LD32DIR} != "i386")
+.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR} != "i386")
 SRCS+=	x86_64_mtrr.c x86_64_iopl.c
 .endif
 MAN+=	x86_64_get_mtrr.2 x86_64_iopl.2
 MLINKS+=x86_64_get_mtrr.2 x86_64_set_mtrr.2