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

9 files changed, 24 insertions, 24 deletions

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)