From owner-svn-ports-head@FreeBSD.ORG Fri Dec 14 14:38:16 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7ACD0962; Fri, 14 Dec 2012 14:38:16 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 551198FC12; Fri, 14 Dec 2012 14:38:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBEEcGbp079020; Fri, 14 Dec 2012 14:38:16 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBEEcGeZ079018; Fri, 14 Dec 2012 14:38:16 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201212141438.qBEEcGeZ079018@svn.freebsd.org> From: Emanuel Haupt Date: Fri, 14 Dec 2012 14:38:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308906 - in head/sysutils/bsdadminscripts: . files 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.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2012 14:38:16 -0000 Author: ehaupt Date: Fri Dec 14 14:38:15 2012 New Revision: 308906 URL: http://svnweb.freebsd.org/changeset/ports/308906 Log: Provide a patch to make pkg_libchk pkgng aware. PR: 174387 Approved by: Dominic Fandrey (maintainer, implicit) Added: head/sysutils/bsdadminscripts/files/patch-pkg_libchk - copied, changed from r308904, head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk Deleted: head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk Modified: head/sysutils/bsdadminscripts/Makefile Modified: head/sysutils/bsdadminscripts/Makefile ============================================================================== --- head/sysutils/bsdadminscripts/Makefile Fri Dec 14 14:30:28 2012 (r308905) +++ head/sysutils/bsdadminscripts/Makefile Fri Dec 14 14:38:15 2012 (r308906) @@ -1,13 +1,9 @@ -# New ports collection makefile for: bsdadminscripts -# Date created: 15 May 2006 -# Whom: Dominic Fandrey -# +# Created by: Dominic Fandrey # $FreeBSD$ -# PORTNAME= bsdadminscripts PORTVERSION= 6.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils ports-mgmt MASTER_SITES= SF/${PORTNAME}/${PORTNAME} Copied and modified: head/sysutils/bsdadminscripts/files/patch-pkg_libchk (from r308904, head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk) ============================================================================== --- head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk Fri Dec 14 14:18:50 2012 (r308904, copy source) +++ head/sysutils/bsdadminscripts/files/patch-pkg_libchk Fri Dec 14 14:38:15 2012 (r308906) @@ -1,14 +1,15 @@ ---- pkg_libchk.orig 2011-07-16 21:42:34.990085774 +0400 -+++ pkg_libchk 2011-07-16 21:45:53.405082081 +0400 -@@ -23,6 +23,7 @@ +--- ./pkg_libchk.orig 2012-12-12 19:38:36.000000000 +0100 ++++ ./pkg_libchk 2012-12-12 19:40:22.000000000 +0100 +@@ -23,6 +23,8 @@ readonly name=pkg_libchk readonly version=1.6.1 +readonly osname=`uname -s` ++readonly pkgng=`make -VWITH_PKGNG` # Use a line break as delimiter. IFS=' -@@ -206,7 +207,7 @@ +@@ -206,7 +208,7 @@ # We cannot handle non-native binaries, # so assume everything is in order. if ! readelf -e "$1" 2>&1 | \ @@ -17,3 +18,58 @@ > /dev/null then return 2 +@@ -405,10 +407,17 @@ + + # Get the packages to work on. + test -z "$packages" && packages="-a" +-packages="$(pkg_info -E $packages)" +-test -z "$recursive" -a -z "$Recursive" || packages="$packages +-$(pkg_info -q $recursive $Recursive "$packages" 2> /dev/null | \ +-sed -E 's|^@pkgdep[[:space:]]*||1')" ++if [ "$pkgng" = "yes" ]; then ++ packages="$(pkg info -q $packages)" ++ test -z "$recursive" -a -z "$Recursive" || packages="$packages ++ $(pkg info -q $recursive $Recursive "$packages" 2> /dev/null | \ ++ sed -E 's|^@pkgdep[[:space:]]*||1')" ++else ++ packages="$(pkg_info -E $packages)" ++ test -z "$recursive" -a -z "$Recursive" || packages="$packages ++ $(pkg_info -q $recursive $Recursive "$packages" 2> /dev/null | \ ++ sed -E 's|^@pkgdep[[:space:]]*||1')" ++fi + + # Create the regexp to match ldd output + match_expr="$compat=> not found|dependency .+ not found" +@@ -420,9 +429,15 @@ + # Check each selected package. + for package in $packages; { + package_num="$(($package_num + 1))" +- test $origin \ +- && package_name="$(pkg_info -qo "$package")" \ +- || package_name="$package" ++ if [ "$pkgng" = "yes" ]; then ++ test $origin \ ++ && package_name="$(pkg info -qo "$package")" \ ++ || package_name="$package" ++ else ++ test $origin \ ++ && package_name="$(pkg_info -qo "$package")" \ ++ || package_name="$package" ++ fi + + # Print what we're doing. + statusSet "Starting job $package_num of $package_amount: $package_name" +@@ -432,7 +447,12 @@ + # Remember freeing the semaphore. + trap 'semaphoreFree jobs' EXIT + +- files="$(pkg_info -qL "$package")" ++ files="" ++ if [ "$pkgng" = "yes" ]; then ++ files="$(pkg info -lq "$package")" ++ else ++ files="$(pkg_info -qL "$package")" ++ fi + # Get the programs libraries in case it doesn't use the + # operating system to find its libraries. + libraries="$(echo "$files" | grep -E '\.so[\.0-9]*$')"