Avoid the usage of a variable named "BROWSER", not to conflict with

user's environment variable with the same name.

cf. http://tuxedo.org/~esr/BROWSER/
    http://www.dwheeler.com/browse/secure_browser.html

Approved by:	cjh, girgen@partitur.se, sada, trevor

6 files changed, 13 insertions, 13 deletions

diff --git a/japanese/linux-netscape47-communicator/Makefile b/japanese/linux-netscape47-communicator/Makefile
index 5a22799e0c86..55dfd4d16e0f 100644
--- a/japanese/linux-netscape47-communicator/Makefile
+++ b/japanese/linux-netscape47-communicator/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-RUN_DEPENDS=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/linux-netscape47-${BROWSER}
+RUN_DEPENDS=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/linux-netscape47-${BROWSER_NAME}
 RUN_DEPENDS+=	/compat/linux/usr/share/locale/ja_JP:${PORTSDIR}/japanese/linux_locale
 
-BROWSER_ARC=	${BROWSER}-linux
+BROWSER_ARC=	${BROWSER_NAME}-linux
 BROWSER_VERSION=	4.78
 MASTERDIR_LINUX= ${.CURDIR}/../linux-netscape47-communicator
 NSUBDIR=	lib/netscape-linux
diff --git a/japanese/linux-netscape47-navigator/Makefile b/japanese/linux-netscape47-navigator/Makefile
index ea4e4e8e50d9..fe6658643014 100644
--- a/japanese/linux-netscape47-navigator/Makefile
+++ b/japanese/linux-netscape47-navigator/Makefile
@@ -5,6 +5,6 @@
 # $FreeBSD$
 #
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 .include	"${.CURDIR}/../linux-netscape47-communicator/Makefile"
diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index 60fe60555603..7086773785dd 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -15,7 +15,7 @@ DISTNAME?=	communicator-ja-euc-v407-export.generic-generic-generic
 MAINTAINER?=	sada@FreeBSD.org
 
 # ?= for ports that include this Makefile
-RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
+RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER_NAME}
 RUN_DEPENDS+=	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
 .if (!defined(BROWSER_VERSION) || ${PORTVERSION} == "4.76")
@@ -29,8 +29,8 @@ PKGINSTALL=	${WRKDIR}/INSTALL
 PLIST_SUB=	BROWSER=${BROWSER_ARC} NSUBDIR=${NSUBDIR} LANG=${LANG} VER=${BROWSER_VER}
 WRKSRC=		${WRKDIR}/netscape-ja_euc
 
-BROWSER?=	communicator
-BROWSER_ARC?=	${BROWSER}
+BROWSER_NAME?=	communicator
+BROWSER_ARC?=	${BROWSER_NAME}
 BROWSER_BIN?=	${BROWSER_ARC}-${BROWSER_VERSION}.bin
 BROWSER_CMD?=	ja-${BROWSER_ARC}-${BROWSER_VER}
 BROWSER_VER?=	4
@@ -58,7 +58,7 @@ do-configure:
 	 >${WRKDIR}/Netscape
 	${MAKESCRIPT} ${MASTERDIR}/files/INSTALL >${PKGINSTALL}
 	${CP} ${WRKSRC}/about ${WRKDIR}/about
-.if (${BROWSER} == navigator)
+.if (${BROWSER_NAME} == navigator)
 	${CP} ${WRKDIR}/Netscape ${WRKDIR}/Netscape.orig
 	${SED} "s/Communicator/Navigator/g" ${WRKDIR}/Netscape.orig \
 	 > ${WRKDIR}/Netscape
diff --git a/japanese/netscape4-navigator/Makefile b/japanese/netscape4-navigator/Makefile
index 89f11f6a1013..32cdeb0dd2a7 100644
--- a/japanese/netscape4-navigator/Makefile
+++ b/japanese/netscape4-navigator/Makefile
@@ -7,6 +7,6 @@
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/netscape47-navigator/Makefile b/japanese/netscape47-navigator/Makefile
index 9580d70739aa..fd0203a24eda 100644
--- a/japanese/netscape47-navigator/Makefile
+++ b/japanese/netscape47-navigator/Makefile
@@ -5,6 +5,6 @@
 # $FreeBSD$
 #
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 .include	"${.CURDIR}/../netscape47-communicator/Makefile"
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index 60fe60555603..7086773785dd 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -15,7 +15,7 @@ DISTNAME?=	communicator-ja-euc-v407-export.generic-generic-generic
 MAINTAINER?=	sada@FreeBSD.org
 
 # ?= for ports that include this Makefile
-RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
+RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER_NAME}
 RUN_DEPENDS+=	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
 .if (!defined(BROWSER_VERSION) || ${PORTVERSION} == "4.76")
@@ -29,8 +29,8 @@ PKGINSTALL=	${WRKDIR}/INSTALL
 PLIST_SUB=	BROWSER=${BROWSER_ARC} NSUBDIR=${NSUBDIR} LANG=${LANG} VER=${BROWSER_VER}
 WRKSRC=		${WRKDIR}/netscape-ja_euc
 
-BROWSER?=	communicator
-BROWSER_ARC?=	${BROWSER}
+BROWSER_NAME?=	communicator
+BROWSER_ARC?=	${BROWSER_NAME}
 BROWSER_BIN?=	${BROWSER_ARC}-${BROWSER_VERSION}.bin
 BROWSER_CMD?=	ja-${BROWSER_ARC}-${BROWSER_VER}
 BROWSER_VER?=	4
@@ -58,7 +58,7 @@ do-configure:
 	 >${WRKDIR}/Netscape
 	${MAKESCRIPT} ${MASTERDIR}/files/INSTALL >${PKGINSTALL}
 	${CP} ${WRKSRC}/about ${WRKDIR}/about
-.if (${BROWSER} == navigator)
+.if (${BROWSER_NAME} == navigator)
 	${CP} ${WRKDIR}/Netscape ${WRKDIR}/Netscape.orig
 	${SED} "s/Communicator/Navigator/g" ${WRKDIR}/Netscape.orig \
 	 > ${WRKDIR}/Netscape