From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 24 17:00:21 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7DF3816A4CE for ; Sat, 24 Jan 2004 17:00:21 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D64343D45 for ; Sat, 24 Jan 2004 17:00:13 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0P10DFR065620 for ; Sat, 24 Jan 2004 17:00:13 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0P10D2F065619; Sat, 24 Jan 2004 17:00:13 -0800 (PST) (envelope-from gnats) Resent-Date: Sat, 24 Jan 2004 17:00:13 -0800 (PST) Resent-Message-Id: <200401250100.i0P10D2F065619@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dag-Erling Smørgrav Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 01F7316A4CE for ; Sat, 24 Jan 2004 16:54:22 -0800 (PST) Received: from smtp.des.no (flood.des.no [217.116.83.31]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1956843D1F for ; Sat, 24 Jan 2004 16:54:06 -0800 (PST) (envelope-from des@des.no) Received: by smtp.des.no (Pony Express, from userid 666) id 3E9D2530A; Sun, 25 Jan 2004 01:54:05 +0100 (CET) Received: from dwp.des.no (des.no [80.203.228.37]) by smtp.des.no (Pony Express) with ESMTP id C3B3C5309 for ; Sun, 25 Jan 2004 01:53:55 +0100 (CET) Received: by dwp.des.no (Postfix, from userid 2602) id 57A4C33C9A; Sun, 25 Jan 2004 01:53:55 +0100 (CET) Message-Id: <20040125005355.57A4C33C9A@dwp.des.no> Date: Sun, 25 Jan 2004 01:53:55 +0100 (CET) From: Dag-Erling Smørgrav To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/61855: [PATCH] cosmetic fixes for bsd.ports.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Dag-Erling Smørgrav List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Jan 2004 01:00:21 -0000 >Number: 61855 >Category: ports >Synopsis: [PATCH] cosmetic fixes for bsd.ports.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Jan 24 17:00:13 PST 2004 >Closed-Date: >Last-Modified: >Originator: Dag-Erling Smørgrav >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD dwp.des.no 5.2-CURRENT FreeBSD 5.2-CURRENT #22: Sat Jan 24 20:11:54 CET 2004 des@dwp.des.no:/usr/obj/usr/src/sys/dwp_smp i386 ports-current >Description: bsd.ports.mk makes repeated use of `id -n` despite the fact that it defines a variable (${UID}) to hold this value. at least one line starts with spaces instead of tabs >How-To-Repeat: n/a >Fix: apply attached patch. --- ports-misc.diff begins here --- Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.483 diff -u -r1.483 bsd.port.mk --- Mk/bsd.port.mk 24 Jan 2004 01:26:30 -0000 1.483 +++ Mk/bsd.port.mk 25 Jan 2004 00:50:24 -0000 @@ -3125,7 +3125,7 @@ fi \ done .if !defined(EXTRACT_PRESERVE_OWNERSHIP) - @if [ `id -u` = 0 ]; then \ + @if [ ${UID} -eq 0 ]; then \ ${CHMOD} -R ug-s ${WRKDIR}; \ ${CHOWN} -R 0:0 ${WRKDIR}; \ fi @@ -3462,7 +3462,7 @@ .if !target(install-mtree) install-mtree: @${MKDIR} ${PREFIX} - @if [ `id -u` != 0 ]; then \ + @if [ ${UID} -ne 0 ]; then \ if [ -w ${PREFIX}/ ]; then \ ${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \ else \ @@ -3471,7 +3471,7 @@ fi; \ fi .if !defined(NO_MTREE) - @if [ `id -u` = 0 ]; then \ + @if [ ${UID} -eq 0 ]; then \ if [ ! -f ${MTREE_FILE} ]; then \ ${ECHO_CMD} "Error: mtree file \"${MTREE_FILE}\" is missing."; \ ${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ @@ -4145,7 +4145,7 @@ OK="true"; \ fi; \ fi; \ - fi ; \ + fi ; \ if [ "$$OK" != "true" -a ${FETCH_REGET} -eq 0 ]; then \ ${ECHO_MSG} "===> Giving up on fetching files: $$refetchlist"; \ ${ECHO_MSG} "Make sure the Makefile and distinfo file (${MD5_FILE})"; \ --- ports-misc.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: