From d750b641217345a94e31e2fc7ae1f4b03dbe4a6f Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 3 Mar 2016 06:22:51 +0000
Subject: [PATCH] Move casper library entries to proper places.

Sponsored by:	EMC / Isilon Storage Division
---
 share/mk/bsd.libnames.mk |  5 +++++
 share/mk/src.libnames.mk | 25 ++++++-------------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 6db697363d5..d7e00e648b0 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -30,6 +30,11 @@ LIBBZ2?=	${DESTDIR}${LIBDIR}/libbz2.a
 LIBC?=		${DESTDIR}${LIBDIR}/libc.a
 LIBCALENDAR?=	${DESTDIR}${LIBDIR}/libcalendar.a
 LIBCAM?=	${DESTDIR}${LIBDIR}/libcam.a
+LIBCAP_DNS?=	${DESTDIR}${LIBDIR}/libcap_dns.a
+LIBCAP_GRP?=	${DESTDIR}${LIBDIR}/libcap_grp.a
+LIBCAP_PWD?=	${DESTDIR}${LIBDIR}/libcap_pwd.a
+LIBCAP_RANDOM?=	${DESTDIR}${LIBDIR}/libcap_random.a
+LIBCAP_SYSCTL?=	${DESTDIR}${LIBDIR}/libcap_sysctl.a
 LIBCASPER?=	${DESTDIR}${LIBDIR}/libcasper.a
 LIBCOMPAT?=	${DESTDIR}${LIBDIR}/libcompat.a
 LIBCOMPILER_RT?=${DESTDIR}${LIBDIR}/libcompiler_rt.a
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 902f4fb371b..1ff2f6d1bd5 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -488,6 +488,12 @@ LIBWINDDIR=	${OBJTOP}/kerberos5/lib/libwind
 LIBALIASDIR=	${OBJTOP}/lib/libalias/libalias
 LIBBLOCKSRUNTIMEDIR=	${OBJTOP}/lib/libblocksruntime
 LIBBSNMPDIR=	${OBJTOP}/lib/libbsnmp/libbsnmp
+LIBCAP_CASPERDIR=	${OBJTOP}/lib/libcasper/libcasper
+LIBCAP_DNSDIR=	${OBJTOP}/lib/libcasper/services/cap_dns
+LIBCAP_GRPDIR=	${OBJTOP}/lib/libcasper/services/cap_grp
+LIBCAP_PWDDIR=	${OBJTOP}/lib/libcasper/services/cap_pwd
+LIBCAP_RANDOMDIR=	${OBJTOP}/lib/libcasper/services/cap_random
+LIBCAP_SYSCTLDIR=	${OBJTOP}/lib/libcasper/services/cap_sysctl
 LIBBSDXMLDIR=	${OBJTOP}/lib/libexpat
 LIBKVMDIR=	${OBJTOP}/lib/libkvm
 LIBPTHREADDIR=	${OBJTOP}/lib/libthr
@@ -515,25 +521,6 @@ LIBTERMCAPWDIR=	${LIBNCURSESWDIR}
 LIB${lib:tu}DIR?=	${OBJTOP}/lib/lib${lib}
 .endfor
 
-# Casper exception.
-LIBCAP_CASPERDIR=	${OBJTOP}/lib/libcasper/libcasper
-LIBCAP_CASPER=		${DESTDIR}${LIBDIR}/libcasper.a
-
-LIBCAP_DNSDIR=		${OBJTOP}/lib/libcasper/services/cap_dns
-LIBCAP_DNS?=		${DESTDIR}${LIBDIR}/libcap_dns.a
-
-LIBCAP_GRPDIR=		${OBJTOP}/lib/libcasper/services/cap_grp
-LIBCAP_GRP?=		${DESTDIR}${LIBDIR}/libcap_grp.a
-
-LIBCAP_PWDDIR=		${OBJTOP}/lib/libcasper/services/cap_pwd
-LIBCAP_PWD?=		${DESTDIR}${LIBDIR}/libcap_pwd.a
-
-LIBCAP_RANDOMDIR=	${OBJTOP}/lib/libcasper/services/cap_random
-LIBCAP_RANDOM?=		${DESTDIR}${LIBDIR}/libcap_random.a
-
-LIBCAP_SYSCTLDIR=	${OBJTOP}/lib/libcasper/services/cap_sysctl
-LIBCAP_SYSCTL?=		${DESTDIR}${LIBDIR}/libcap_sysctl.a
-
 # Validate that listed LIBADD are valid.
 .for _l in ${LIBADD}
 .if empty(_LIBRARIES:M${_l})