From owner-svn-src-head@freebsd.org  Sat Nov  4 15:50:06 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BD147E4E192;
 Sat,  4 Nov 2017 15:50:06 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 833A37306D;
 Sat,  4 Nov 2017 15:50:06 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA4Fo5qH026643;
 Sat, 4 Nov 2017 15:50:05 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4Fo583026640;
 Sat, 4 Nov 2017 15:50:05 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201711041550.vA4Fo583026640@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to
 oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Sat, 4 Nov 2017 15:50:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325399 - in head: . lib/libcasper/libcasper
 lib/libcasper/services/cap_random
X-SVN-Group: head
X-SVN-Commit-Author: oshogbo
X-SVN-Commit-Paths: in head: . lib/libcasper/libcasper
 lib/libcasper/services/cap_random
X-SVN-Commit-Revision: 325399
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Nov 2017 15:50:06 -0000

Author: oshogbo
Date: Sat Nov  4 15:50:05 2017
New Revision: 325399
URL: https://svnweb.freebsd.org/changeset/base/325399

Log:
  The src.opts.mk sets default value for the SHLIBDIR, so our set was not
  respected.
  
  Please notice that libcasper is already in ObsoleteFiles so we don't add it
  again.
  
  Reported by:	Herbert J. Skuhra <herbert@mailbox.org>
  Reviewed by:	bdrewery@
  Differential Revision:	https://reviews.freebsd.org/D12918

Modified:
  head/ObsoleteFiles.inc
  head/lib/libcasper/libcasper/Makefile
  head/lib/libcasper/services/cap_random/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Sat Nov  4 15:47:18 2017	(r325398)
+++ head/ObsoleteFiles.inc	Sat Nov  4 15:50:05 2017	(r325399)
@@ -38,6 +38,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20171104: libcap_random should be in /lib not in /usr/lib
+OLD_LIBS+=usr/lib/libcap_random.so.0
 # 20171104: Casper can work only as shared library
 OLD_FILES+=usr/lib/libcasper.a
 OLD_FILES+=usr/lib/libcasper_p.a

Modified: head/lib/libcasper/libcasper/Makefile
==============================================================================
--- head/lib/libcasper/libcasper/Makefile	Sat Nov  4 15:47:18 2017	(r325398)
+++ head/lib/libcasper/libcasper/Makefile	Sat Nov  4 15:50:05 2017	(r325399)
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
+SHLIBDIR?=	/lib
+
 .include <src.opts.mk>
 
 PACKAGE=${LIB}
 
-SHLIB_MAJOR=	0
-SHLIBDIR?=	/lib
-
 .if ${MK_CASPER} != "no"
 SHLIB=	casper
+SHLIB_MAJOR=	0
 
 SRCS=	libcasper.c
 SRCS+=	libcasper_impl.c

Modified: head/lib/libcasper/services/cap_random/Makefile
==============================================================================
--- head/lib/libcasper/services/cap_random/Makefile	Sat Nov  4 15:47:18 2017	(r325398)
+++ head/lib/libcasper/services/cap_random/Makefile	Sat Nov  4 15:50:05 2017	(r325399)
@@ -1,11 +1,12 @@
 # $FreeBSD$
 
+SHLIBDIR?=	/lib/casper
+
 .include <src.opts.mk>
 
 PACKAGE=libcasper
 
 SHLIB_MAJOR=	0
-SHLIBDIR?=	/lib/casper
 INCSDIR?=	${INCLUDEDIR}/casper
 
 .if ${MK_CASPER} != "no"