From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 26 21:17:33 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A2561239;
 Wed, 26 Nov 2014 21:17:33 +0000 (UTC)
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 8EB9E33F;
 Wed, 26 Nov 2014 21:17:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAQLHXtl071719;
 Wed, 26 Nov 2014 21:17:33 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAQLHXpG071718;
 Wed, 26 Nov 2014 21:17:33 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201411262117.sAQLHXpG071718@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 26 Nov 2014 21:17:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r275141 - projects/building-blocks/tools
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Nov 2014 21:17:33 -0000

Author: ngie
Date: Wed Nov 26 21:17:32 2014
New Revision: 275141
URL: https://svnweb.freebsd.org/changeset/base/275141

Log:
  - Handle OLD_LIBS properly by looking for versioned .so's
  - Filter out /usr/libdata and /usr/libdata/pkgconfig from OLD_DIRS

Modified:
  projects/building-blocks/tools/add-optional-obsolete-files-entries.sh

Modified: projects/building-blocks/tools/add-optional-obsolete-files-entries.sh
==============================================================================
--- projects/building-blocks/tools/add-optional-obsolete-files-entries.sh	Wed Nov 26 20:56:08 2014	(r275140)
+++ projects/building-blocks/tools/add-optional-obsolete-files-entries.sh	Wed Nov 26 21:17:32 2014	(r275141)
@@ -42,8 +42,10 @@ done
 
 # Enumerate all of the installed files/directories
 (cd $DESTDIR;
- find -s . -type f -mindepth 1 | sed -e 's,^,OLD_FILES+=,';
+ find -s . -type f -mindepth 1 | \
+    sed -e 's,^,OLD_FILES+=,' \
+        -e '/lib\/.*\.so\.[0-9]\.*/s/OLD_FILES+=/OLD_LIBS+=/g';
  find -s . -type d -mindepth 1 -and \! -empty | \
-    egrep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib|usr/lib/private|usr/libexec|usr/s*bin|usr/share|usr/share/man|usr/share/man/man[0-9])$' | \
+    grep -v '^\./(s*bin|libexec|usr|usr/include|usr/lib(data)?|usr/libdata/pkgconfig|usr/lib/private|usr/libexec|usr/s*bin|usr/share(/(examples|man))?|usr/share/man/man[0-9])$' | \
     sed -e 's,^,OLD_DIRS+=,'
 ) | sed -e 's,+=\./,+=,'