Date: Sat, 10 Jul 2004 11:32:04 -0500 (CDT) From: Mark Linimon <linimon@lonesome.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: portmgr@FreeBSD.org Subject: ports/68895: [patch] fix location of default MAINTAINER definition in bsd.port.mk Message-ID: <200407101632.i6AGW417065741@lonesome.lonesome.com> Resent-Message-ID: <200407101640.i6AGeIZ9065115@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407101632.i6AGW417065741>