From owner-svn-ports-head@freebsd.org  Tue Jul  7 06:03:36 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-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 3681F994A95;
 Tue,  7 Jul 2015 06:03:36 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 2702B1877;
 Tue,  7 Jul 2015 06:03:36 +0000 (UTC) (envelope-from zi@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6763a60069680;
 Tue, 7 Jul 2015 06:03:36 GMT (envelope-from zi@FreeBSD.org)
Received: (from zi@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6763a3m069679;
 Tue, 7 Jul 2015 06:03:36 GMT (envelope-from zi@FreeBSD.org)
Message-Id: <201507070603.t6763a3m069679@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zi set sender to zi@FreeBSD.org
 using -f
From: Ryan Steinmetz <zi@FreeBSD.org>
Date: Tue, 7 Jul 2015 06:03:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r391492 - head/Mk/Scripts
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jul 2015 06:03:36 -0000

Author: zi
Date: Tue Jul  7 06:03:35 2015
New Revision: 391492
URL: https://svnweb.freebsd.org/changeset/ports/391492

Log:
  - Provide a check/warning/fix for users that upgraded from an older release and missed UPDATING 20150213
  
  Approved by:	portmgr (bapt)

Modified:
  head/Mk/Scripts/find-lib.sh   (contents, props changed)

Modified: head/Mk/Scripts/find-lib.sh
==============================================================================
--- head/Mk/Scripts/find-lib.sh	Tue Jul  7 06:00:03 2015	(r391491)
+++ head/Mk/Scripts/find-lib.sh	Tue Jul  7 06:03:35 2015	(r391492)
@@ -7,6 +7,13 @@ if [ -z "${LIB_DIRS}" -o -z "${LOCALBASE
 	exit 1
 fi
 
+if [ -f /usr/share/misc/magic.mime -o -f /usr/share/misc/magic.mime.mgc ]; then
+	echo "Either /usr/share/misc/magic.mime or /usr/share/misc/mime.magic.mgc exist and must be removed." >&2
+	echo "These are legacy files from an older release and may safely be deleted." >&2
+	echo "Please see UPDATING 20150213 for more details." >&2
+	exit 1
+fi
+
 if [ $# -ne 1 ]; then
 	echo "$0: no argument provided." >&2
 fi