Date: Sat, 18 Aug 2001 21:28:01 +0900 From: "Akinori MUSHA" <knu@iDaemons.org> To: cjh@FreeBSD.org, girgen@partitur.se, keith@FreeBSD.org, sada@FreeBSD.org, trevor@FreeBSD.org, Cc: ports@FreeBSD.org Subject: changing netscape ports to not use the BROWSER variable Message-ID: <86vgjl4koe.wl@archon.local.idaemons.org>
next in thread | raw e-mail | index | archive | help
Hello,
Please review and approve the attached patch if it's okay.
It changes your netscape ports to not use the variable named BROWSER,
which is (not very, though) commonly used to expess one's favorite and
default web browser to use. The patch changes it to use BROWSER_NAME
instead.
The problem is figured as follows -- if one is setting an environment
variable named BROWSER to, say, w3m, those netscape ports wouldn't
work properly because they rely on a variable with the same name and
some of them have the lines like "BROWSER?= communicator" as you find
in the patch below.
Regards,
--
/
/__ __ Akinori.org / MUSHA.org
/ ) ) ) ) / FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp
"Freeze this moment a little bit longer, make each impression
a little bit stronger.. Experience slips away -- Time stand still"
Index: chinese/linux-netscape47-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/linux-netscape47-communicator/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- chinese/linux-netscape47-communicator/Makefile 2001/04/08 17:16:39 1.3
+++ chinese/linux-netscape47-communicator/Makefile 2001/08/18 12:13:44
@@ -17,17 +17,17 @@
# 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 @@
${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
Index: chinese/linux-netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/linux-netscape47-navigator/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- chinese/linux-netscape47-navigator/Makefile 2000/11/06 18:43:17 1.1
+++ chinese/linux-netscape47-navigator/Makefile 2001/08/18 12:13:44
@@ -5,7 +5,7 @@
# $FreeBSD: ports/chinese/linux-netscape47-navigator/Makefile,v 1.1 2000/11/06 18:43:17 keith Exp $
#
-BROWSER= navigator
+BROWSER_NAME= navigator
MASTERDIR= ${.CURDIR}/../linux-netscape47-communicator
.include "${.CURDIR}/../linux-netscape47-communicator/Makefile"
Index: chinese/netscape47-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/netscape47-communicator/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- chinese/netscape47-communicator/Makefile 2001/06/22 13:05:50 1.5
+++ chinese/netscape47-communicator/Makefile 2001/08/18 12:13:44
@@ -16,7 +16,7 @@
# ?= 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 @@
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 @@
${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
Index: chinese/netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/netscape47-navigator/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- chinese/netscape47-navigator/Makefile 2000/11/06 18:14:56 1.2
+++ chinese/netscape47-navigator/Makefile 2001/08/18 12:13:44
@@ -5,7 +5,7 @@
# $FreeBSD: ports/chinese/netscape47-navigator/Makefile,v 1.2 2000/11/06 18:14:56 keith Exp $
#
-BROWSER= navigator
+BROWSER_NAME= navigator
MASTERDIR= ${.CURDIR}/../netscape47-communicator
.include "${.CURDIR}/../netscape47-communicator/Makefile"
Index: japanese/linux-netscape47-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/linux-netscape47-communicator/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- japanese/linux-netscape47-communicator/Makefile 2001/07/31 04:44:57 1.6
+++ japanese/linux-netscape47-communicator/Makefile 2001/08/18 12:13:44
@@ -5,10 +5,10 @@
# $FreeBSD: ports/japanese/linux-netscape47-communicator/Makefile,v 1.6 2001/07/31 04:44:57 knu Exp $
#
-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
Index: japanese/linux-netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/linux-netscape47-navigator/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- japanese/linux-netscape47-navigator/Makefile 2000/04/11 14:14:45 1.2
+++ japanese/linux-netscape47-navigator/Makefile 2001/08/18 12:13:44
@@ -5,6 +5,6 @@
# $FreeBSD: ports/japanese/linux-netscape47-navigator/Makefile,v 1.2 2000/04/11 14:14:45 knu Exp $
#
-BROWSER= navigator
+BROWSER_NAME= navigator
.include "${.CURDIR}/../linux-netscape47-communicator/Makefile"
Index: japanese/netscape4-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/netscape4-communicator/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- japanese/netscape4-communicator/Makefile 2001/06/02 19:11:52 1.35
+++ japanese/netscape4-communicator/Makefile 2001/08/18 12:13:44
@@ -15,7 +15,7 @@
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 @@
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 @@
>${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
Index: japanese/netscape4-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/netscape4-navigator/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- japanese/netscape4-navigator/Makefile 2000/04/11 14:15:37 1.16
+++ japanese/netscape4-navigator/Makefile 2001/08/18 12:13:45
@@ -7,6 +7,6 @@
MASTERDIR= ${.CURDIR}/../netscape4-communicator
-BROWSER= navigator
+BROWSER_NAME= navigator
.include "${MASTERDIR}/Makefile"
Index: japanese/netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/netscape47-navigator/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- japanese/netscape47-navigator/Makefile 2000/04/11 14:15:43 1.13
+++ japanese/netscape47-navigator/Makefile 2001/08/18 12:13:45
@@ -5,6 +5,6 @@
# $FreeBSD: ports/japanese/netscape47-navigator/Makefile,v 1.13 2000/04/11 14:15:43 knu Exp $
#
-BROWSER= navigator
+BROWSER_NAME= navigator
.include "${.CURDIR}/../netscape47-communicator/Makefile"
Index: korean/linux-netscape47-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/korean/linux-netscape47-communicator/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- korean/linux-netscape47-communicator/Makefile 2001/08/12 14:40:54 1.3
+++ korean/linux-netscape47-communicator/Makefile 2001/08/18 12:13:45
@@ -5,12 +5,12 @@
# $FreeBSD: ports/korean/linux-netscape47-communicator/Makefile,v 1.3 2001/08/12 14:40:54 cjh Exp $
#
-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
Index: korean/linux-netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/korean/linux-netscape47-navigator/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- korean/linux-netscape47-navigator/Makefile 2000/06/25 13:15:41 1.1.1.1
+++ korean/linux-netscape47-navigator/Makefile 2001/08/18 12:13:45
@@ -5,6 +5,6 @@
# $FreeBSD: ports/korean/linux-netscape47-navigator/Makefile,v 1.1.1.1 2000/06/25 13:15:41 cjh Exp $
#
-BROWSER= navigator
+BROWSER_NAME= navigator
.include "${.CURDIR}/../linux-netscape47-communicator/Makefile"
Index: korean/netscape4-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/korean/netscape4-communicator/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- korean/netscape4-communicator/Makefile 2000/11/05 02:46:20 1.18
+++ korean/netscape4-communicator/Makefile 2001/08/18 12:13:45
@@ -16,7 +16,7 @@
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 @@
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 @@
> ${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" \
Index: korean/netscape4-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/korean/netscape4-navigator/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- korean/netscape4-navigator/Makefile 2000/06/25 13:28:20 1.14
+++ korean/netscape4-navigator/Makefile 2001/08/18 12:13:46
@@ -7,6 +7,6 @@
# based on japanese/netscape4-*
MASTERDIR= ${.CURDIR}/../netscape4-communicator
-BROWSER= navigator
+BROWSER_NAME= navigator
.include "${MASTERDIR}/Makefile"
Index: korean/netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/korean/netscape47-navigator/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- korean/netscape47-navigator/Makefile 2000/06/25 13:33:48 1.16
+++ korean/netscape47-navigator/Makefile 2001/08/18 12:13:46
@@ -6,6 +6,6 @@
#
MASTERDIR= ${.CURDIR}/../netscape47-communicator
-BROWSER= navigator
+BROWSER_NAME= navigator
.include "${MASTERDIR}/Makefile"
Index: www/bsdi-netscape47-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/bsdi-netscape47-communicator/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- www/bsdi-netscape47-communicator/Makefile 2001/04/10 08:21:50 1.73
+++ www/bsdi-netscape47-communicator/Makefile 2001/08/18 12:13:46
@@ -6,7 +6,7 @@
# $FreeBSD: ports/www/bsdi-netscape47-communicator/Makefile,v 1.73 2001/04/10 08:21:50 trevor Exp $
#
-PORTNAME= bsdi-netscape-${BROWSER}
+PORTNAME= bsdi-netscape-${BROWSER_NAME}
PORTVERSION= 4.75
MAINTAINER= trevor@FreeBSD.org
@@ -19,16 +19,16 @@
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
Index: www/bsdi-netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/bsdi-netscape47-navigator/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- www/bsdi-netscape47-navigator/Makefile 2000/11/04 23:08:02 1.53
+++ www/bsdi-netscape47-navigator/Makefile 2001/08/18 12:13:46
@@ -6,7 +6,7 @@
# $FreeBSD: ports/www/bsdi-netscape47-navigator/Makefile,v 1.53 2000/11/04 23:08:02 trevor Exp $
#
-BROWSER= navigator
+BROWSER_NAME= navigator
PKGMESSAGE= ../bsdi-netscape47-communicator/pkg-message
.include "../bsdi-netscape47-communicator/Makefile"
Index: www/linux-netscape47-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/linux-netscape47-communicator/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- www/linux-netscape47-communicator/Makefile 2001/07/28 23:17:50 1.26
+++ www/linux-netscape47-communicator/Makefile 2001/08/18 12:13:46
@@ -6,7 +6,7 @@
# $FreeBSD: ports/www/linux-netscape47-communicator/Makefile,v 1.26 2001/07/28 23:17:50 sada Exp $
#
-PORTNAME= linux-netscape-${BROWSER}
+PORTNAME= linux-netscape-${BROWSER_NAME}
PORTVERSION= 4.78
CATEGORIES= www linux
@@ -20,7 +20,7 @@
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
Index: www/linux-netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/linux-netscape47-navigator/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- www/linux-netscape47-navigator/Makefile 2000/04/10 00:05:45 1.22
+++ www/linux-netscape47-navigator/Makefile 2001/08/18 12:13:46
@@ -6,6 +6,6 @@
# $FreeBSD: ports/www/linux-netscape47-navigator/Makefile,v 1.22 2000/04/10 00:05:45 cpiazza Exp $
#
-BROWSER= navigator
+BROWSER_NAME= navigator
.include "../linux-netscape47-communicator/Makefile"
Index: www/netscape4-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/netscape4-communicator/Makefile,v
retrieving revision 1.81
diff -u -r1.81 Makefile
--- www/netscape4-communicator/Makefile 2001/08/05 18:18:01 1.81
+++ www/netscape4-communicator/Makefile 2001/08/18 12:13:48
@@ -30,12 +30,12 @@
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 @@
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 @@
${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)
Index: www/netscape4-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/netscape4-navigator/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- www/netscape4-navigator/Makefile 2000/04/10 00:06:04 1.45
+++ www/netscape4-navigator/Makefile 2001/08/18 12:13:48
@@ -11,7 +11,7 @@
MASTERDIR= ${.CURDIR}/../netscape4-communicator
NO_LATEST_LINK= yes
-BROWSER= navigator
+BROWSER_NAME= navigator
INFILE_HEAD= 'Navigator,4.08.0.98306'
.include "${MASTERDIR}/Makefile"
Index: www/netscape47-communicator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/netscape47-communicator/Makefile,v
retrieving revision 1.80
diff -u -r1.80 Makefile
--- www/netscape47-communicator/Makefile 2001/08/05 16:24:40 1.80
+++ www/netscape47-communicator/Makefile 2001/08/18 12:13:48
@@ -45,13 +45,13 @@
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_TAG= alpha-dec-osf4.0
.endif
-.if defined(BROWSER) && ${BROWSER} == "navigator"
+.if defined(BROWSER_NAME) && ${BROWSER_NAME} == "navigator"
NETSCAPE_DIST_GRADE= navigator_standalone
.endif
Index: www/netscape47-navigator/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/netscape47-navigator/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- www/netscape47-navigator/Makefile 2000/10/29 17:01:21 1.52
+++ www/netscape47-navigator/Makefile 2001/08/18 12:13:48
@@ -5,7 +5,7 @@
# $FreeBSD: ports/www/netscape47-navigator/Makefile,v 1.52 2000/10/29 17:01:21 sada Exp $
#
-BROWSER= navigator
+BROWSER_NAME= navigator
INFILE_HEAD= 'Navigator,4.76.0.20001006'
.include "${.CURDIR}/../netscape47-communicator/Makefile"
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86vgjl4koe.wl>