ports/84489: Depreciated MACHINE_ARCH being used in bsd.port.mk

[David O'Brien]

>Number:         84489
>Category:       ports
>Synopsis:       Depreciated MACHINE_ARCH being used in bsd.port.mk
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 02 18:40:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     David O'Brien
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD dragon.NUXI.org 7.0-CURRENT FreeBSD 7.0-CURRENT #522: Sun Jul 31 21:52:18 PDT 2005 rootk at dragon:/SRC/fbsd/sys/i386/compile/DRAGON i386


	
>Description:
	'MACHINE_ARCH' is depreciated, 'ARCH' should be used instead.
>How-To-Repeat:
	cat ports/Mk/bsd.port.mk
>Fix:

Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.515
diff -u -r1.515 bsd.port.mk
--- bsd.port.mk	24 Jun 2005 09:18:54 -0000	1.515
+++ bsd.port.mk	2 Aug 2005 18:34:35 -0000
@@ -775,7 +775,7 @@
 # CONFIGURE_TARGET
 #				- The name of target to call when GNU_CONFIGURE is
 #				  defined.
-#				  Default: ${MACHINE_ARCH}-portbld-freebsd${OSREL}
+#				  Default: ${ARCH}-portbld-freebsd${OSREL}
 # CONFIGURE_ARGS
 #				- Pass these args to configure if ${HAS_CONFIGURE} is set.
 #				  Default: "--prefix=${PREFIX} ${CONFIGURE_TARGET}" if
@@ -2651,7 +2651,7 @@
 .endif
 
 CONFIGURE_SCRIPT?=	configure
-CONFIGURE_TARGET?=	${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET?=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_LOG?=		config.log
 
 # A default message to print if do-configure fails.
@@ -2830,7 +2830,7 @@
 
 .if defined(ONLY_FOR_ARCHS)
 .for __ARCH in ${ONLY_FOR_ARCHS}
-.if ${MACHINE_ARCH:M${__ARCH}} != ""
+.if ${ARCH:M${__ARCH}} != ""
 __ARCH_OK?=     1
 .endif
 .endfor
@@ -2840,7 +2840,7 @@
 
 .if defined(NOT_FOR_ARCHS)
 .for __NARCH in ${NOT_FOR_ARCHS}
-.if ${MACHINE_ARCH:M${__NARCH}} != ""
+.if ${ARCH:M${__NARCH}} != ""
 .undef __ARCH_OK
 .endif
 .endfor
>Release-Note:
>Audit-Trail:
>Unformatted: