From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Nov 19 06:50:28 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 6F22116A41F for ; Sat, 19 Nov 2005 06:50:28 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 39A2543D55 for ; Sat, 19 Nov 2005 06:50:27 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAJ6oRvR064196 for ; Sat, 19 Nov 2005 06:50:27 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAJ6oRbF064193; Sat, 19 Nov 2005 06:50:27 GMT (envelope-from gnats) Resent-Date: Sat, 19 Nov 2005 06:50:27 GMT Resent-Message-Id: <200511190650.jAJ6oRbF064193@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, Ade Lovett Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 151C516A41F for ; Sat, 19 Nov 2005 06:42:28 +0000 (GMT) (envelope-from ade@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C0EFE43D4C for ; Sat, 19 Nov 2005 06:42:27 +0000 (GMT) (envelope-from ade@FreeBSD.org) Received: from freefall.freebsd.org (ade@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAJ6gRUu064129 for ; Sat, 19 Nov 2005 06:42:27 GMT (envelope-from ade@freefall.freebsd.org) Received: (from ade@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAJ6gRs2064128; Sat, 19 Nov 2005 06:42:27 GMT (envelope-from ade) Message-Id: <200511190642.jAJ6gRs2064128@freefall.freebsd.org> Date: Sat, 19 Nov 2005 06:42:27 GMT From: Ade Lovett To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/89265: Move location of bsd.autotools.mk within bsd.port.mk X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Ade Lovett List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Nov 2005 06:50:28 -0000 >Number: 89265 >Category: ports >Synopsis: Move location of bsd.autotools.mk within bsd.port.mk >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Nov 19 06:50:26 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Ade Lovett >Release: FreeBSD 4.11-STABLE i386 >Organization: >Environment: System: FreeBSD freefall.freebsd.org 4.11-STABLE FreeBSD 4.11-STABLE #16: Sat Feb 26 00:02:03 GMT 2005 kensmith@freefall.freebsd.org:/c/src/sys/compile/FREEFALL i386 N/A >Description: As things stand right now, bsd.autotools.mk is included from bsd.port.mk too late, resulting in some interesting failures where previous code in bsd.port.mk is assuming that things like GNU_CONFIGURE are getting set appropriately. >How-To-Repeat: N/A >Fix: Apply following patch to bsd.port.mk -- note that currently it is still an unconditional include, not relying on USE_AUTOTOOLS to be set by the port Makefile. Hopefully this can change before 5.5-RELEASE, but it's no great loss if it doesn't. Given the potential wide-impact of this particular change, it needs to be thrown in the mix for an -exp run. Localized testing through tinderboxes on a subset of likely failure-mode ports shows no issues, but this one is a little more than a no-op. Index: bsd.port.mk =================================================================== RCS file: /home/repos/FreeBSD/ports/Mk/bsd.port.mk,v retrieving revision 1.518 diff -u -1 -r1.518 bsd.port.mk --- bsd.port.mk 8 Nov 2005 09:02:51 -0000 1.518 +++ bsd.port.mk 19 Nov 2005 06:06:33 -0000 @@ -381,3 +381,2 @@ # See bsd.autotools.mk for more details. -# XXX: not currently in active use - this is a placeholder. ## @@ -1309,6 +1308,2 @@ -# XXX: (not yet): .if defined(USE_AUTOTOOLS) -# .include "${PORTSDIR}/Mk/bsd.autotools.mk" -# XXX: (not yet): .endif - .if defined(USE_OPENSSL) @@ -1731,6 +1726,2 @@ -# XXX: (not yet): .if defined(USE_AUTOTOOLS) -.include "${PORTSDIR}/Mk/bsd.autotools.mk" -# XXX: (not yet): .endif - .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ @@ -1765,2 +1756,6 @@ +# XXX: (not yet): .if defined(USE_AUTOTOOLS) +.include "${PORTSDIR}/Mk/bsd.autotools.mk" +# XXX: (not yet): .endif + .if exists(${PORTSDIR}/../Makefile.inc) >Release-Note: >Audit-Trail: >Unformatted: