ports/89265: Move location of bsd.autotools.mk within bsd.port.mk

[Ade Lovett]

>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 at 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: