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

26 files changed, 63 insertions, 63 deletions

diff --git a/chinese/linux-netscape47-communicator/Makefile b/chinese/linux-netscape47-communicator/Makefile
index bbcfd2667a5b..780dee3a3fb1 100644
--- a/chinese/linux-netscape47-communicator/Makefile
+++ b/chinese/linux-netscape47-communicator/Makefile
@@ -17,17 +17,17 @@ MAINTAINER=	keith@FreeBSD.org
 # We need Arphic because there's no font with all sizes to deal with Java.
 RUN_DEPENDS?=	\
 		/compat/linux/CLE-0.9p1:${PORTSDIR}/chinese/cle_base \
-		${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/linux-netscape47-${BROWSER} \
+		${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/linux-netscape47-${BROWSER_NAME} \
 		${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 
 # These variables can be defined in ports that include this Makefile.
 PKGNAMEPREFIX?=		zh_TW-
 LOCALE?=		zh_TW.Big5
 REGION?=		tw
-BROWSER?=		communicator
+BROWSER_NAME?=		communicator
 BROWSER_VER?=		47
 BROWSER_VERSION?=	4.77
-BROWSER_ARC?=		${BROWSER}-linux
+BROWSER_ARC?=		${BROWSER_NAME}-linux
 BROWSER_BIN?=		${BROWSER_ARC}-${BROWSER_VERSION}.bin
 BROWSER_CMD?=		${REGION}-${BROWSER_ARC}-${BROWSER_VER}
 NSUBDIR?=		lib/netscape-linux
@@ -56,7 +56,7 @@ post-extract:
 	${MAKESCRIPT} ${FILESDIR}/INSTALL.in > ${WRKDIR}/pkg-install
 	${MAKESCRIPT} ${FILESDIR}/MESSAGE.in > ${WRKDIR}/pkg-message
 	${MAKESCRIPT} ${FILESDIR}/DEINSTALL.in > ${WRKDIR}/pkg-deinstall
-.if (${BROWSER} == navigator)
+.if (${BROWSER_NAME} == navigator)
 	${SED} "s/Communicator/Navigator/g" ${NSKITDIR}/Netscape.ad \
 	 > ${NSKITDIR}/Netscape
 .else
diff --git a/chinese/linux-netscape47-navigator/Makefile b/chinese/linux-netscape47-navigator/Makefile
index 38e56945c662..6ca7c17a3fce 100644
--- a/chinese/linux-netscape47-navigator/Makefile
+++ b/chinese/linux-netscape47-navigator/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 MASTERDIR=	${.CURDIR}/../linux-netscape47-communicator
 .include	"${.CURDIR}/../linux-netscape47-communicator/Makefile"
diff --git a/chinese/netscape47-communicator/Makefile b/chinese/netscape47-communicator/Makefile
index 046eb2669f9c..3f25c18abeab 100644
--- a/chinese/netscape47-communicator/Makefile
+++ b/chinese/netscape47-communicator/Makefile
@@ -2,7 +2,7 @@
 # Date created:		11 Mar 2000
 # Whom:			Jing-Tang Keith Jang <keith@FreeBSD.org>
 #
-# $FreeBSD: /tmp/pcvs/ports/chinese/netscape47-communicator/Attic/Makefile,v 1.5 2001-06-22 13:05:50 keith Exp $
+# $FreeBSD: /tmp/pcvs/ports/chinese/netscape47-communicator/Attic/Makefile,v 1.6 2001-08-19 08:33:22 knu Exp $
 #
 
 PORTNAME=	netscape-${BROWSER_ARC}
@@ -16,7 +16,7 @@ MAINTAINER=	keith@FreeBSD.org
 # ?= is for ports that include this Makefile.
 # We need Arphic because there's no font with all sizes to deal with Java.
 RUN_DEPENDS?=	\
-		${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER} \
+		${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER_NAME} \
 		${LOCALBASE}/lib/aout/libxpg4-ns.so.2.0:${PORTSDIR}/www/libxpg4-ns \
 		${X11BASE}/lib/X11/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 
@@ -24,10 +24,10 @@ RUN_DEPENDS?=	\
 PKGNAMEPREFIX?=		zh_TW-
 LOCALE?=		zh_TW.Big5
 REGION?=		tw
-BROWSER?=		communicator
+BROWSER_NAME?=		communicator
 BROWSER_VER?=		47
 BROWSER_VERSION?=	4.76
-BROWSER_ARC?=		${BROWSER}
+BROWSER_ARC?=		${BROWSER_NAME}
 BROWSER_BIN?=		${BROWSER_ARC}-${BROWSER_VERSION}.bin
 BROWSER_CMD?=		${REGION}-${BROWSER_ARC}-${BROWSER_VER}
 NSUBDIR?=		lib/netscape
@@ -55,7 +55,7 @@ do-configure:
 	${MAKESCRIPT} ${FILESDIR}/INSTALL.in > ${WRKDIR}/pkg-install
 	${MAKESCRIPT} ${FILESDIR}/MESSAGE.in > ${WRKDIR}/pkg-message
 	${MAKESCRIPT} ${FILESDIR}/DEINSTALL.in > ${WRKDIR}/pkg-deinstall
-.if (${BROWSER} == navigator)
+.if (${BROWSER_NAME} == navigator)
 	${SED} "s/Communicator/Navigator/g" ${WRKSRC}/Netscape.ad \
 	 > ${WRKSRC}/Netscape
 .else
diff --git a/chinese/netscape47-navigator/Makefile b/chinese/netscape47-navigator/Makefile
index e858a3665a47..a11fb6a6dc02 100644
--- a/chinese/netscape47-navigator/Makefile
+++ b/chinese/netscape47-navigator/Makefile
@@ -2,10 +2,10 @@
 # Date created:		23 Oct 2000
 # Whom:			Jing-Tang Keith Jang <keith@FreeBSD.org>
 #
-# $FreeBSD: /tmp/pcvs/ports/chinese/netscape47-navigator/Attic/Makefile,v 1.2 2000-11-06 18:14:56 keith Exp $
+# $FreeBSD: /tmp/pcvs/ports/chinese/netscape47-navigator/Attic/Makefile,v 1.3 2001-08-19 08:33:23 knu Exp $
 #
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 MASTERDIR=	${.CURDIR}/../netscape47-communicator
 .include	"${.CURDIR}/../netscape47-communicator/Makefile"
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
diff --git a/korean/linux-netscape47-communicator/Makefile b/korean/linux-netscape47-communicator/Makefile
index 5fa72b064526..a58cfef3b1ac 100644
--- a/korean/linux-netscape47-communicator/Makefile
+++ b/korean/linux-netscape47-communicator/Makefile
@@ -5,12 +5,12 @@
 # $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/ko/LC_MESSAGES/SYS_LC_MESSAGES:${PORTSDIR}/korean/linux_locale
 
 MAINTAINER=	cjh@FreeBSD.org
 
-BROWSER_ARC=    ${BROWSER}-linux
+BROWSER_ARC=    ${BROWSER_NAME}-linux
 MASTERDIR_LINUX= ${.CURDIR}/../linux-netscape47-communicator
 NSUBDIR=	lib/netscape-linux
 START_SCRIPT=	${MASTERDIR_LINUX}/files/start.sh.in
diff --git a/korean/linux-netscape47-navigator/Makefile b/korean/linux-netscape47-navigator/Makefile
index d55b7c7c848a..a630eece341f 100644
--- a/korean/linux-netscape47-navigator/Makefile
+++ b/korean/linux-netscape47-navigator/Makefile
@@ -5,6 +5,6 @@
 # $FreeBSD$
 #
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 .include	"${.CURDIR}/../linux-netscape47-communicator/Makefile"
diff --git a/korean/netscape4-communicator/Makefile b/korean/netscape4-communicator/Makefile
index d589a3d86158..9e1c40a55761 100644
--- a/korean/netscape4-communicator/Makefile
+++ b/korean/netscape4-communicator/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${KOREAN_KIT}
 MAINTAINER?=	cjh@FreeBSD.org
 
 # ?= for ports that include this Makefile
-RUN_DEPENDS?=	${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
+RUN_DEPENDS?=	${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER_NAME}
 RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
 NO_BUILD=	yes
@@ -27,8 +27,8 @@ NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
 
 # should be changed by versions
-BROWSER?=       communicator
-BROWSER_ARC?=	${BROWSER}
+BROWSER_NAME?=       communicator
+BROWSER_ARC?=	${BROWSER_NAME}
 BROWSER_BIN?=   ${BROWSER_ARC}-${BROWSER_VERSION}.bin
 BROWSER_CMD?=   ko-${BROWSER_ARC}-${BROWSER_VER}
 BROWSER_VER?=	4
@@ -69,7 +69,7 @@ do-configure:
 		> ${WRKSRC}/Netscape
 	${MAKESCRIPT} ${FILESDIR}/INSTALL >${PKGINSTALL}
 	# make navigator resource
-.if defined(BROWSER) && ${BROWSER} == navigator
+.if defined(BROWSER_NAME) && ${BROWSER_NAME} == navigator
 	${SED} -e "s;Communicator;Navigator;g" \
 		${WRKSRC}/about > ${WRKDIR}/about
 	${SED} -e "s;Communicator;Navigator;g" \
diff --git a/korean/netscape4-navigator/Makefile b/korean/netscape4-navigator/Makefile
index 0b4f708f1fef..3f3add622f6a 100644
--- a/korean/netscape4-navigator/Makefile
+++ b/korean/netscape4-navigator/Makefile
@@ -7,6 +7,6 @@
 # based on japanese/netscape4-*
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 .include "${MASTERDIR}/Makefile"
diff --git a/korean/netscape47-navigator/Makefile b/korean/netscape47-navigator/Makefile
index bb60a64123ec..cf2a1f6b83fb 100644
--- a/korean/netscape47-navigator/Makefile
+++ b/korean/netscape47-navigator/Makefile
@@ -6,6 +6,6 @@
 #
 
 MASTERDIR=	${.CURDIR}/../netscape47-communicator
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/korean/netscape48-communicator/Makefile b/korean/netscape48-communicator/Makefile
index d589a3d86158..9e1c40a55761 100644
--- a/korean/netscape48-communicator/Makefile
+++ b/korean/netscape48-communicator/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${KOREAN_KIT}
 MAINTAINER?=	cjh@FreeBSD.org
 
 # ?= for ports that include this Makefile
-RUN_DEPENDS?=	${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
+RUN_DEPENDS?=	${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER_NAME}
 RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
 NO_BUILD=	yes
@@ -27,8 +27,8 @@ NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
 
 # should be changed by versions
-BROWSER?=       communicator
-BROWSER_ARC?=	${BROWSER}
+BROWSER_NAME?=       communicator
+BROWSER_ARC?=	${BROWSER_NAME}
 BROWSER_BIN?=   ${BROWSER_ARC}-${BROWSER_VERSION}.bin
 BROWSER_CMD?=   ko-${BROWSER_ARC}-${BROWSER_VER}
 BROWSER_VER?=	4
@@ -69,7 +69,7 @@ do-configure:
 		> ${WRKSRC}/Netscape
 	${MAKESCRIPT} ${FILESDIR}/INSTALL >${PKGINSTALL}
 	# make navigator resource
-.if defined(BROWSER) && ${BROWSER} == navigator
+.if defined(BROWSER_NAME) && ${BROWSER_NAME} == navigator
 	${SED} -e "s;Communicator;Navigator;g" \
 		${WRKSRC}/about > ${WRKDIR}/about
 	${SED} -e "s;Communicator;Navigator;g" \
diff --git a/korean/netscape48-navigator/Makefile b/korean/netscape48-navigator/Makefile
index 0b4f708f1fef..3f3add622f6a 100644
--- a/korean/netscape48-navigator/Makefile
+++ b/korean/netscape48-navigator/Makefile
@@ -7,6 +7,6 @@
 # based on japanese/netscape4-*
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index 6907510f7c9c..b3e887956a06 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bsdi-netscape-${BROWSER}
+PORTNAME=	bsdi-netscape-${BROWSER_NAME}
 PORTVERSION=	4.75
 
 MAINTAINER=	trevor@FreeBSD.org
@@ -19,16 +19,16 @@ FORBIDDEN=	"buffer overflow in password field of HTML forms,\
 
 ONLY_FOR_ARCHS=	i386
 
-DISTFILES=	${BROWSER}-v475-us.${NETSCAPE_DIST_TAG}.tar.gz
+DISTFILES=	${BROWSER_NAME}-v475-us.${NETSCAPE_DIST_TAG}.tar.gz
 INFILE_HEAD=	'Communicator,4.75.0.20000814'
 BROWSER_VER=	4.75
-WRKSRC=		${WRKDIR}/${BROWSER}-v475.${NETSCAPE_DIST_TAG}
+WRKSRC=		${WRKDIR}/${BROWSER_NAME}-v475.${NETSCAPE_DIST_TAG}
 
 NETSCAPE_DIST_ARCH=	unsupported/bsdi21
 NETSCAPE_DIST_TAG=	x86-bsdi-bsd2
 
 # don't overwrite the FreeBSD port's shell script wrapper in ${PREFIX}/bin
-BROWSER_ARC=	${BROWSER}-bsdi
+BROWSER_ARC=	${BROWSER_NAME}-bsdi
 
 MAILCAP=	${.CURDIR}/../bsdi-netscape47-communicator/files/mailcap
 NSUBDIR=	lib/netscape-bsdi
diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index 5dd691585cfc..017b84a212ef 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 PKGMESSAGE=	../bsdi-netscape47-communicator/pkg-message
 
 .include "../bsdi-netscape47-communicator/Makefile"
diff --git a/www/linux-netscape47-communicator/Makefile b/www/linux-netscape47-communicator/Makefile
index e2ab158492fc..d18ad8f139ac 100644
--- a/www/linux-netscape47-communicator/Makefile
+++ b/www/linux-netscape47-communicator/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	linux-netscape-${BROWSER}
+PORTNAME=	linux-netscape-${BROWSER_NAME}
 PORTVERSION=	4.78
 CATEGORIES=	www linux
 
@@ -20,7 +20,7 @@ NETSCAPE_DIST_ARCH=	supported/linux22
 NETSCAPE_DIST_TAG=	x86-unknown-linux2.2
 
 # don't overwrite the native FreeBSD port's shell script wrapper in ${PREFIX}/bin
-BROWSER_ARC=	${BROWSER}-linux
+BROWSER_ARC=	${BROWSER_NAME}-linux
 
 USE_LINUX_LIB=	yes
 
diff --git a/www/linux-netscape47-navigator/Makefile b/www/linux-netscape47-navigator/Makefile
index 47057dafe534..a9e6d352e52b 100644
--- a/www/linux-netscape47-navigator/Makefile
+++ b/www/linux-netscape47-navigator/Makefile
@@ -6,6 +6,6 @@
 # $FreeBSD$
 #
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 
 .include "../linux-netscape47-communicator/Makefile"
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index b9254f531e50..a7b7814e14e0 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -30,12 +30,12 @@ USE_XLIB=	yes
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 STRIP=
-WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
+WRKSRC?=	${WRKDIR}/${BROWSER_NAME}-v408.x86-unknown-freebsd
 PKGDIR=		${.CURDIR}
 
 AUTOADMIN?=	autoadmin-v408.x86-unknown-freebsd.tar.gz
-BROWSER?=	communicator
-BROWSER_ARC?=	${BROWSER}
+BROWSER_NAME?=	communicator
+BROWSER_ARC?=	${BROWSER_NAME}
 BROWSER_VER?=	4.08
 FORTIFY=	Fortify-1.4.6-unix-x86
 NDIR=		${PREFIX}/${NSUBDIR}
@@ -48,7 +48,7 @@ MAILCAP?=	${MASTERDIR}/files/mailcap
 PLIST_SUB=	BROWSER=${BROWSER_ARC} BROWSER_VER=${BROWSER_VER} \
 		NSUBDIR=${NSUBDIR}
 
-.if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
+.if (${BROWSER_NAME} == "communicator") && !defined(NO_AUTOADMIN)
 DISTFILES+=	${AUTOADMIN}
 .endif
 
@@ -110,7 +110,7 @@ do-install:
 		${INSTALL_DATA} ${MAILCAP} ${NDIR}; \
 	fi
 	${RM} -rf ${NDIR}/movemail-src
-.if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
+.if (${BROWSER_NAME} == "communicator") && !defined(NO_AUTOADMIN)
 	tar zxf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
 .endif
 .if defined(WITH_128BIT) && !defined(NO_FORTIFY)
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index ee7e73e0f81f..5b81ad9b2ac9 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -11,7 +11,7 @@ DISTFILES=	navigator-v408-export.x86-unknown-freebsd.tar.gz
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 NO_LATEST_LINK=	yes
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 INFILE_HEAD=	'Navigator,4.08.0.98306'
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index d475b0522301..4ef1f7913624 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -45,13 +45,13 @@ MASTER_SITES+=	ftp://ftp.bu.edu/pub/mirrors/ftp.netscape.com/pub/${NETSCAPE_DIST
 		ftp://ftp.nsu.ru/pub/mirrors/ftp-de.netscape.com/pub/${NETSCAPE_DIST_SUBDIR}/ \
 		ftp://ftp.curtin.edu.au/pub/internet/netscape/${NETSCAPE_DIST_SUBDIR}/
 .endif
-DISTFILES=	${BROWSER}-v${BROWSER_V}-us.${NETSCAPE_DIST_TAG}.tar.gz
+DISTFILES=	${BROWSER_NAME}-v${BROWSER_V}-us.${NETSCAPE_DIST_TAG}.tar.gz
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
-WRKSRC=		${WRKDIR}/${BROWSER}-v${BROWSER_V}.${NETSCAPE_DIST_TAG}
+WRKSRC=		${WRKDIR}/${BROWSER_NAME}-v${BROWSER_V}.${NETSCAPE_DIST_TAG}
 ONLY_FOR_ARCHS?=	i386 alpha
 
-.if ${ARCH} == "alpha" && !defined(BROWSER)
+.if ${ARCH} == "alpha" && !defined(BROWSER_NAME)
 PLIST=		${PKGDIR}/pkg-plist.alpha
 .endif
 
@@ -60,7 +60,7 @@ NETSCAPE_DIST_ARCH=	supported/dec_unix40
 NETSCAPE_DIST_TAG=	alpha-dec-osf4.0
 .endif
 
-.if defined(BROWSER) && ${BROWSER} == "navigator"
+.if defined(BROWSER_NAME) && ${BROWSER_NAME} == "navigator"
 NETSCAPE_DIST_GRADE=	navigator_standalone
 .endif
 
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index afad9c6a108c..befcd22e3791 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-BROWSER=	navigator
+BROWSER_NAME=	navigator
 INFILE_HEAD=	'Navigator,4.76.0.20001006'
 
 .include "${.CURDIR}/../netscape47-communicator/Makefile"
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index b9254f531e50..a7b7814e14e0 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -30,12 +30,12 @@ USE_XLIB=	yes
 NO_BUILD=	yes
 NO_FILTER_SHLIBS=	yes
 STRIP=
-WRKSRC?=	${WRKDIR}/${BROWSER}-v408.x86-unknown-freebsd
+WRKSRC?=	${WRKDIR}/${BROWSER_NAME}-v408.x86-unknown-freebsd
 PKGDIR=		${.CURDIR}
 
 AUTOADMIN?=	autoadmin-v408.x86-unknown-freebsd.tar.gz
-BROWSER?=	communicator
-BROWSER_ARC?=	${BROWSER}
+BROWSER_NAME?=	communicator
+BROWSER_ARC?=	${BROWSER_NAME}
 BROWSER_VER?=	4.08
 FORTIFY=	Fortify-1.4.6-unix-x86
 NDIR=		${PREFIX}/${NSUBDIR}
@@ -48,7 +48,7 @@ MAILCAP?=	${MASTERDIR}/files/mailcap
 PLIST_SUB=	BROWSER=${BROWSER_ARC} BROWSER_VER=${BROWSER_VER} \
 		NSUBDIR=${NSUBDIR}
 
-.if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
+.if (${BROWSER_NAME} == "communicator") && !defined(NO_AUTOADMIN)
 DISTFILES+=	${AUTOADMIN}
 .endif
 
@@ -110,7 +110,7 @@ do-install:
 		${INSTALL_DATA} ${MAILCAP} ${NDIR}; \
 	fi
 	${RM} -rf ${NDIR}/movemail-src
-.if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
+.if (${BROWSER_NAME} == "communicator") && !defined(NO_AUTOADMIN)
 	tar zxf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
 .endif
 .if defined(WITH_128BIT) && !defined(NO_FORTIFY)