From owner-svn-src-head@FreeBSD.ORG  Mon Jun 15 15:34:31 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6F940C80;
 Mon, 15 Jun 2015 15:34:31 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5B1AD8E0;
 Mon, 15 Jun 2015 15:34:31 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5FFYVXq009161;
 Mon, 15 Jun 2015 15:34:31 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5FFYLi4009100;
 Mon, 15 Jun 2015 15:34:21 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201506151534.t5FFYLi4009100@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 15 Jun 2015 15:34:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284417 - in head: cddl/lib gnu/lib/libgcc gnu/lib/libssp
 lib/libalias/libalias lib/libalias/modules lib/libbegemot lib/libc lib/libcam
 lib/libcapsicum lib/libcasper lib/libcrypt lib/li...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Jun 2015 15:34:31 -0000

Author: bapt
Date: Mon Jun 15 15:34:20 2015
New Revision: 284417
URL: https://svnweb.freebsd.org/changeset/base/284417

Log:
  Enforce overwritting SHLIBDIR
  
  Since METAMODE has been added, sys.mk loads bsd.mkopt.mk which ends load loading
  bsd.own.mk which then defines SHLIBDIR before all the Makefile.inc everywhere.
  
  This makes /lib being populated again.
  
  Reported by:	many

Modified:
  head/cddl/lib/Makefile.inc
  head/gnu/lib/libgcc/Makefile
  head/gnu/lib/libssp/Makefile
  head/lib/libalias/libalias/Makefile
  head/lib/libalias/modules/Makefile.inc
  head/lib/libbegemot/Makefile
  head/lib/libc/Makefile
  head/lib/libcam/Makefile
  head/lib/libcapsicum/Makefile
  head/lib/libcasper/Makefile
  head/lib/libcrypt/Makefile
  head/lib/libcxxrt/Makefile
  head/lib/libedit/Makefile
  head/lib/libexpat/Makefile
  head/lib/libgeom/Makefile
  head/lib/libipsec/Makefile
  head/lib/libjail/Makefile
  head/lib/libkiconv/Makefile
  head/lib/libkvm/Makefile
  head/lib/libmd/Makefile
  head/lib/libmt/Makefile
  head/lib/libnv/Makefile
  head/lib/libpcap/Makefile
  head/lib/libpjdlog/Makefile
  head/lib/libsbuf/Makefile
  head/lib/libthr/Makefile
  head/lib/libufs/Makefile
  head/lib/libulog/Makefile
  head/lib/libutil/Makefile
  head/lib/libxo/Makefile
  head/lib/libz/Makefile
  head/lib/msun/Makefile
  head/lib/ncurses/ncurses/Makefile
  head/sbin/geom/class/Makefile.inc
  head/secure/lib/libcrypto/Makefile

Modified: head/cddl/lib/Makefile.inc
==============================================================================
--- head/cddl/lib/Makefile.inc	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/cddl/lib/Makefile.inc	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 SHLIB_MAJOR?= 2
 
 .include "../Makefile.inc"

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/gnu/lib/libgcc/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -4,7 +4,7 @@ GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 
 SHLIB_NAME=	libgcc_s.so.1
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 .include <src.opts.mk>
 #

Modified: head/gnu/lib/libssp/Makefile
==============================================================================
--- head/gnu/lib/libssp/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/gnu/lib/libssp/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 MK_PROFILE=	no
 MK_SSP=		no

Modified: head/lib/libalias/libalias/Makefile
==============================================================================
--- head/lib/libalias/libalias/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libalias/libalias/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../../sys/netinet/libalias
 
 LIB=	alias
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 SHLIB_MAJOR= 7
 MAN=	libalias.3
 SRCS=	alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c

Modified: head/lib/libalias/modules/Makefile.inc
==============================================================================
--- head/lib/libalias/modules/Makefile.inc	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libalias/modules/Makefile.inc	Mon Jun 15 15:34:20 2015	(r284417)
@@ -2,7 +2,7 @@
 
 .PATH: ${.CURDIR}/../../../../sys/netinet/libalias
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 LIB?=   alias_${NAME}
 SHLIB_NAME?=libalias_${NAME}.so
 WARNS?=	1

Modified: head/lib/libbegemot/Makefile
==============================================================================
--- head/lib/libbegemot/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libbegemot/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -6,7 +6,7 @@ LIBBEGEMOT_DIR=${.CURDIR}/../../contrib/
 
 LIB=	begemot
 SHLIB_MAJOR= 4
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 
 CFLAGS+=	-DUSE_SELECT -DQUADFMT='"ll"'
 SRCS=	rpoll.c

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libc/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
 # $FreeBSD$
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 
 .include <src.opts.mk>
 

Modified: head/lib/libcam/Makefile
==============================================================================
--- head/lib/libcam/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libcam/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		cam
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c \
 		ata_all.c smp_all.c
 INCS=		camlib.h

Modified: head/lib/libcapsicum/Makefile
==============================================================================
--- head/lib/libcapsicum/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libcapsicum/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -3,7 +3,7 @@
 LIB=	capsicum
 
 SHLIB_MAJOR=	0
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 SRCS=	libcapsicum.c
 SRCS+=	libcapsicum_dns.c

Modified: head/lib/libcasper/Makefile
==============================================================================
--- head/lib/libcasper/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libcasper/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -3,7 +3,7 @@
 LIB=	casper
 
 SHLIB_MAJOR=	0
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 SRCS=	libcasper.c
 INCS=	libcasper.h

Modified: head/lib/libcrypt/Makefile
==============================================================================
--- head/lib/libcrypt/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libcrypt/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 .include <src.opts.mk>
 

Modified: head/lib/libcxxrt/Makefile
==============================================================================
--- head/lib/libcxxrt/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libcxxrt/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -3,7 +3,7 @@
 SRCDIR=		${.CURDIR}/../../contrib/libcxxrt
 
 SHLIB_MAJOR=	1
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 .PATH: ${SRCDIR}
 

Modified: head/lib/libedit/Makefile
==============================================================================
--- head/lib/libedit/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libedit/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -4,7 +4,7 @@
 
 LIB=	edit
 SHLIB_MAJOR=	7
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 
 OSRCS=	chared.c common.c el.c emacs.c fcns.c filecomplete.c help.c \
 	hist.c keymacro.c map.c chartype.c \

Modified: head/lib/libexpat/Makefile
==============================================================================
--- head/lib/libexpat/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libexpat/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -3,7 +3,7 @@
 EXPAT=		${.CURDIR}/../../contrib/expat
 
 LIB=		bsdxml
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 SHLIB_MAJOR=	4
 SRCS=		xmlparse.c xmlrole.c xmltok.c
 INCS=		bsdxml.h bsdxml_external.h

Modified: head/lib/libgeom/Makefile
==============================================================================
--- head/lib/libgeom/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libgeom/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	geom
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 SRCS+=	geom_getxml.c
 SRCS+=	geom_stats.c
 SRCS+=	geom_xml2tree.c

Modified: head/lib/libipsec/Makefile
==============================================================================
--- head/lib/libipsec/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libipsec/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -27,7 +27,7 @@
 #
 # $FreeBSD$
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 
 .include <src.opts.mk>
 

Modified: head/lib/libjail/Makefile
==============================================================================
--- head/lib/libjail/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libjail/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	jail
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 SHLIB_MAJOR= 1
 SRCS=	jail.c jail_getid.c
 INCS=	jail.h

Modified: head/lib/libkiconv/Makefile
==============================================================================
--- head/lib/libkiconv/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libkiconv/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 .include <src.opts.mk>
 

Modified: head/lib/libkvm/Makefile
==============================================================================
--- head/lib/libkvm/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libkvm/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -16,7 +16,7 @@ CFLAGS+=-DCROSS_LIBKVM
 LIB=	kvm
 .endif
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 SHLIB_MAJOR=	6
 CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
 

Modified: head/lib/libmd/Makefile
==============================================================================
--- head/lib/libmd/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libmd/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -2,7 +2,7 @@
 
 LIB=	md
 SHLIB_MAJOR= 6
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 SRCS=	md4c.c md5c.c md4hl.c md5hl.c \
 	rmd160c.c rmd160hl.c \
 	sha0c.c sha0hl.c sha1c.c sha1hl.c \

Modified: head/lib/libmt/Makefile
==============================================================================
--- head/lib/libmt/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libmt/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		mt
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 SRCS=		mtlib.c
 INCS=		mtlib.h
 

Modified: head/lib/libnv/Makefile
==============================================================================
--- head/lib/libnv/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libnv/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 
 .include <src.opts.mk>
 

Modified: head/lib/libpcap/Makefile
==============================================================================
--- head/lib/libpcap/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libpcap/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 # Makefile for libpcap
 # $FreeBSD$
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 
 .include <src.opts.mk>
 

Modified: head/lib/libpjdlog/Makefile
==============================================================================
--- head/lib/libpjdlog/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libpjdlog/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #
 
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 .include <bsd.own.mk>
 

Modified: head/lib/libsbuf/Makefile
==============================================================================
--- head/lib/libsbuf/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libsbuf/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=		sbuf
-SHLIBDIR?= 	/lib
+SHLIBDIR= 	/lib
 SRCS=		subr_prf.c subr_sbuf.c
 
 SHLIB_MAJOR	= 6

Modified: head/lib/libthr/Makefile
==============================================================================
--- head/lib/libthr/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libthr/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -8,7 +8,7 @@
 # (for system call stubs) to CFLAGS below.  -DSYSLIBC_SCCS affects just the
 # system call stubs.
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 
 .include <src.opts.mk>
 MK_SSP=	no

Modified: head/lib/libufs/Makefile
==============================================================================
--- head/lib/libufs/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libufs/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 LIB=	ufs
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 SHLIB_MAJOR=	6
 
 SRCS=	block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c

Modified: head/lib/libulog/Makefile
==============================================================================
--- head/lib/libulog/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libulog/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=/lib
+SHLIBDIR=/lib
 
 .include <src.opts.mk>
 

Modified: head/lib/libutil/Makefile
==============================================================================
--- head/lib/libutil/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libutil/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 #	$FreeBSD$
 
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 
 .include <src.opts.mk>
 

Modified: head/lib/libxo/Makefile
==============================================================================
--- head/lib/libxo/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libxo/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -7,7 +7,7 @@ LIBXO=	${.CURDIR:H:H}/contrib/libxo
 LIB=	xo
 SHLIB_MAJOR=0
 
-SHLIBDIR?=      /lib
+SHLIBDIR=      /lib
 
 SRCS=	libxo.c
 

Modified: head/lib/libz/Makefile
==============================================================================
--- head/lib/libz/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/libz/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -3,7 +3,7 @@
 #
 
 LIB=		z
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 SHLIB_MAJOR=	6
 MAN=		zlib.3 zopen.3
 

Modified: head/lib/msun/Makefile
==============================================================================
--- head/lib/msun/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/msun/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -42,7 +42,7 @@ CFLAGS+=	-I${.CURDIR}/${ARCH_SUBDIR}
 .PATH:	${.CURDIR}/man
 
 LIB=	m
-SHLIBDIR?= /lib
+SHLIBDIR= /lib
 SHLIB_MAJOR= 5
 WARNS?=	1
 IGNORE_PRAGMA=

Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/lib/ncurses/ncurses/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 
 .if !defined(ENABLE_WIDEC)
 # Override any MAN= setting below..

Modified: head/sbin/geom/class/Makefile.inc
==============================================================================
--- head/sbin/geom/class/Makefile.inc	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/sbin/geom/class/Makefile.inc	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=${GEOM_CLASS_DIR}
+SHLIBDIR=${GEOM_CLASS_DIR}
 SHLIB_NAME?=geom_${GEOM_CLASS}.so
 LINKS=	${BINDIR}/geom ${BINDIR}/g${GEOM_CLASS}
 MAN=	g${GEOM_CLASS}.8

Modified: head/secure/lib/libcrypto/Makefile
==============================================================================
--- head/secure/lib/libcrypto/Makefile	Mon Jun 15 13:43:23 2015	(r284416)
+++ head/secure/lib/libcrypto/Makefile	Mon Jun 15 15:34:20 2015	(r284417)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SHLIBDIR?=	/lib
+SHLIBDIR=	/lib
 SUBDIR=		engines
 
 .include <bsd.own.mk>