From owner-cvs-all@FreeBSD.ORG Mon Jul 18 10:06:50 2011 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B570B106566B; Mon, 18 Jul 2011 10:06:50 +0000 (UTC) (envelope-from rea@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A53988FC08; Mon, 18 Jul 2011 10:06:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p6IA6oSE004602; Mon, 18 Jul 2011 10:06:50 GMT (envelope-from rea@repoman.freebsd.org) Received: (from rea@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p6IA6oXt004601; Mon, 18 Jul 2011 10:06:50 GMT (envelope-from rea) Message-Id: <201107181006.p6IA6oXt004601@repoman.freebsd.org> From: Eygene Ryabinkin Date: Mon, 18 Jul 2011 10:06:50 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/sysutils/bsdadminscripts Makefile ports/sysutils/bsdadminscripts/files patch-src::pkg_libchk X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jul 2011 10:06:50 -0000 rea 2011-07-18 10:06:50 UTC FreeBSD ports repository Modified files: sysutils/bsdadminscripts Makefile Added files: sysutils/bsdadminscripts/files patch-src::pkg_libchk Log: Allow pkg_libchk to work from non-CSH shells /bin/sh does not set OSTYPE, so this variable is inherited from the shell from which pkg_libchk is invoked. From all standard shells in the base system, only csh and tcsh do set this variable, so when pkg_libchk is invoked from sh (that is not invoked from csh-like shell), this variable will be empty. Moreover, bash sets OSTYPE to freebsdX.Y, so grepping on output of 'readelf -e' wont work either. 'uname -s' provides much more reliable way to get the name of the operating system and all *BSD ELF ABI types inside readelf correspond to the 'uname -s': {{{ case ELFOSABI_NETBSD: return "UNIX - NetBSD"; case ELFOSABI_FREEBSD: return "UNIX - FreeBSD"; case ELFOSABI_OPENBSD: return "UNIX - OpenBSD"; }}} PR: ports/158967 Approved-by: Dominic Fandrey (maintainer), erwin (mentor) Feature-safe: yes Revision Changes Path 1.25 +1 -0 ports/sysutils/bsdadminscripts/Makefile 1.1 +19 -0 ports/sysutils/bsdadminscripts/files/patch-src::pkg_libchk (new)