From ehaupt@FreeBSD.org  Wed Dec 12 10:22:26 2012
Return-Path: <ehaupt@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E76452C9
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Dec 2012 10:22:26 +0000 (UTC)
	(envelope-from ehaupt@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	by mx1.freebsd.org (Postfix) with ESMTP id C26238FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Dec 2012 10:22:26 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCAMQCT056616
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Dec 2012 10:22:26 GMT
	(envelope-from ehaupt@freefall.freebsd.org)
Received: (from ehaupt@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qBCAMQqv056615;
	Wed, 12 Dec 2012 11:22:26 +0100 (CET)
	(envelope-from ehaupt)
Message-Id: <201212121022.qBCAMQqv056615@freefall.freebsd.org>
Date: Wed, 12 Dec 2012 11:22:26 +0100 (CET)
From: Emanuel Haupt <ehaupt@freebsd.org>
Reply-To: Emanuel Haupt <ehaupt@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [update] sysutils/bsdadminscripts provide a patch to make pkg_libchk work with pkgng/pkg_* vice versa
X-Send-Pr-Version: 3.114
X-GNATS-Notify: kamikaze@bsdforen.de

>Number:         174387
>Category:       ports
>Synopsis:       [update] sysutils/bsdadminscripts provide a patch to make pkg_libchk work with pkgng/pkg_* vice versa
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    ehaupt
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 12 10:30:00 UTC 2012
>Closed-Date:    Fri Dec 14 15:38:39 CET 2012
>Last-Modified:  Fri Dec 14 15:38:39 CET 2012
>Originator:     Emanuel Haupt
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0 r243869M: Tue Dec 4 21:58:48 UTC 2012 root@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


	
>Description:
Provide a patch to make pkg_libchk work with pkgng/pkg_* vice versa.
>How-To-Repeat:
	
>Fix:

	

--- bsdadminscripts.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 308891)
+++ Makefile	(working copy)
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	bsdadminscripts
-# Date created:		15 May 2006
-# Whom:			Dominic Fandrey <lon_kamikaze@gmx.de>
-#
+# Created by: Dominic Fandrey <lon_kamikaze@gmx.de>
 # $FreeBSD$
-#
 
 PORTNAME=	bsdadminscripts
 PORTVERSION=	6.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils ports-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 
Index: files/patch-pkg_libchk
===================================================================
--- files/patch-pkg_libchk	(revision 0)
+++ files/patch-pkg_libchk	(working copy)
@@ -0,0 +1,75 @@
+--- ./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 +208,7 @@
+ 	# We cannot handle non-native binaries,
+ 	# so assume everything is in order.
+ 	if ! readelf -e "$1" 2>&1 | \
+-		grep -E "^[[:space:]]*OS/ABI:[[:space:]]*UNIX - $OSTYPE\$" \
++		grep -E "^[[:space:]]*OS/ABI:[[:space:]]*UNIX - $osname\$" \
+ 		> /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]*$')"

Property changes on: files/patch-pkg_libchk
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-src::pkg_libchk
===================================================================
--- files/patch-src::pkg_libchk	(revision 308891)
+++ files/patch-src::pkg_libchk	(working copy)
@@ -1,19 +0,0 @@
---- 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 @@
- 
- readonly name=pkg_libchk
- readonly version=1.6.1
-+readonly osname=`uname -s`
- 
- # Use a line break as delimiter.
- IFS='
-@@ -206,7 +207,7 @@
- 	# We cannot handle non-native binaries,
- 	# so assume everything is in order.
- 	if ! readelf -e "$1" 2>&1 | \
--		grep -E "^[[:space:]]*OS/ABI:[[:space:]]*UNIX - $OSTYPE\$" \
-+		grep -E "^[[:space:]]*OS/ABI:[[:space:]]*UNIX - $osname\$" \
- 		> /dev/null
- 	then
- 		return 2
--- bsdadminscripts.patch ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Wed Dec 12 10:30:08 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174387 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: kamikaze@bsdforen.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/174387: [update] sysutils/bsdadminscripts provide a patch to make pkg_libchk work with pkgng/pkg_* vice versa
Date: Wed, 12 Dec 2012 10:30:07 UT

 Maintainer of sysutils/bsdadminscripts,
 
 Please note that PR ports/174387 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/174387
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->ehaupt 
Responsible-Changed-By: ehaupt 
Responsible-Changed-When: Wed Dec 12 15:29:24 CET 2012 
Responsible-Changed-Why:  
I will take care of it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174387 
State-Changed-From-To: feedback->closed 
State-Changed-By: ehaupt 
State-Changed-When: Fri Dec 14 15:38:37 CET 2012 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=174387 
>Unformatted:
