From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 10 16:40:18 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 A6A5916A4DB for ; Sat, 10 Jul 2004 16:40:18 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E4BA43D46 for ; Sat, 10 Jul 2004 16:40:18 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6AGeIwC065118 for ; Sat, 10 Jul 2004 16:40:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6AGeIZ9065115; Sat, 10 Jul 2004 16:40:18 GMT (envelope-from gnats) Resent-Date: Sat, 10 Jul 2004 16:40:18 GMT Resent-Message-Id: <200407101640.i6AGeIZ9065115@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, Mark Linimon Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D3FFE16A4CE; Sat, 10 Jul 2004 16:34:54 +0000 (GMT) Received: from mail.soaustin.net (mail.soaustin.net [207.200.4.66]) by mx1.FreeBSD.org (Postfix) with ESMTP id B0A6E43D2F; Sat, 10 Jul 2004 16:34:54 +0000 (GMT) (envelope-from linimon@lonesome.com) Received: from lonesome.lonesome.com (cs242743-143.austin.rr.com [24.27.43.143]) (using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits)) (No client certificate requested) by mail.soaustin.net (Postfix) with ESMTP id 76C6314316; Sat, 10 Jul 2004 11:34:53 -0500 (CDT) Received: from lonesome.lonesome.com (localhost.lonesome.com [127.0.0.1]) by lonesome.lonesome.com (8.12.9/8.12.9) with ESMTP id i6AGW4Yu065742; Sat, 10 Jul 2004 11:32:06 -0500 (CDT) (envelope-from linimon@lonesome.lonesome.com) Received: (from linimon@localhost) by lonesome.lonesome.com (8.12.9/8.12.9/Submit) id i6AGW417065741; Sat, 10 Jul 2004 11:32:04 -0500 (CDT) (envelope-from linimon) Message-Id: <200407101632.i6AGW417065741@lonesome.lonesome.com> Date: Sat, 10 Jul 2004 11:32:04 -0500 (CDT) From: Mark Linimon To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: portmgr@FreeBSD.org Subject: ports/68895: [patch] fix location of default MAINTAINER definition in bsd.port.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Mark Linimon List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Jul 2004 16:40:18 -0000 >Number: 68895 >Category: ports >Synopsis: [patch] fix location of default MAINTAINER definition in bsd.port.mk >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Jul 10 16:40:18 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Mark Linimon >Release: FreeBSD 4.9-PRERELEASE i386 >Organization: Lonesome Dove Computing Services >Environment: System: FreeBSD lonesome.lonesome.com 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #3: Thu Jan 22 20:41:05 CST 2004 root@lonesome.lonesome.com:/usr/src/sys/compile/MULTIMEDIA i386 >Description: The commit to bsd.gnome.mk of Jun 7 2004 added a conditional test of MAINTAINER. However, bsd.port.mk does not define the default MAINTAINER until after the inclusion of bsd.gnome.mk. This led to portsdb -Uu failing during an inclusion of a port (www/http_load) that had had its MAINTAINER line removed: fisk /root# portsdb -Uu Updating the ports index ... Generating INDEX.tmp - please wait.."/usr/ports/Mk/bsd.gnome.mk", line 608: Malformed conditional (${MAINTAINER}=="gnome@FreeBSD.org") "/usr/ports/Mk/bsd.gnome.mk", line 608: Need an operator "/usr/ports/Mk/bsd.port.mk", line 4836: if-less endif "/usr/ports/Mk/bsd.port.mk", line 4836: Need an operator make: fatal errors encountered -- cannot continue ===> www/http_load failed *** Error code 1 >How-To-Repeat: See above. >Fix: The following patch moves the default definition up into the area where other defaults are defined (such as ARCH, ...) Index: bsd.port.mk =================================================================== RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.491 diff -u -r1.491 bsd.port.mk --- bsd.port.mk 10 Jun 2004 07:30:19 -0000 1.491 +++ bsd.port.mk 10 Jul 2004 16:20:01 -0000 @@ -879,6 +882,9 @@ # Used to print all the '===>' style prompts - override this to turn them off. ECHO_MSG?= ${ECHO_CMD} +# Get the default maintainer +MAINTAINER?= ports@FreeBSD.org + # Get the architecture .if !defined(ARCH) ARCH!= ${UNAME} -p @@ -2263,9 +2338,6 @@ # by user. EXTRACT_ONLY?= ${_DISTFILES} -# Documentation -MAINTAINER?= ports@FreeBSD.org - .if !target(maintainer) maintainer: @${ECHO_CMD} "${MAINTAINER}" >Release-Note: >Audit-Trail: >Unformatted: