rename phoenix-bin-* to MozillaFirebird-bin-*.

46 files changed, 161 insertions, 141 deletions

diff --git a/www/Makefile b/www/Makefile
index a00555c6b4b..91ce3bcc813 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.271 2003/09/11 09:03:08 agc Exp $
+# $NetBSD: Makefile,v 1.272 2003/09/27 14:13:07 grant Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -97,6 +97,14 @@ SUBDIR+=	links
 SUBDIR+=	links-gui
 SUBDIR+=	lynx
 SUBDIR+=	lynx-current
+SUBDIR+=	MozillaFirebird-bin
+SUBDIR+=	MozillaFirebird-bin-acroread
+SUBDIR+=	MozillaFirebird-bin-acroread3
+SUBDIR+=	MozillaFirebird-bin-acroread5
+SUBDIR+=	MozillaFirebird-bin-flash
+SUBDIR+=	MozillaFirebird-bin-java
+SUBDIR+=	MozillaFirebird-bin-nightly
+SUBDIR+=	MozillaFirebird-bin-realplayer
 SUBDIR+=	mMosaic
 SUBDIR+=	make_album
 SUBDIR+=	mknmz-wwwoffle
@@ -155,14 +163,6 @@ SUBDIR+=	p5-VRML
 SUBDIR+=	p5-WWW-Amazon-Wishlist
 SUBDIR+=	p5-libapreq
 SUBDIR+=	p5-libwww
-SUBDIR+=	phoenix-bin
-SUBDIR+=	phoenix-bin-acroread
-SUBDIR+=	phoenix-bin-acroread3
-SUBDIR+=	phoenix-bin-acroread5
-SUBDIR+=	phoenix-bin-flash
-SUBDIR+=	phoenix-bin-java
-SUBDIR+=	phoenix-bin-nightly
-SUBDIR+=	phoenix-bin-realplayer
 SUBDIR+=	php-FastTemplate
 SUBDIR+=	php3
 SUBDIR+=	php4
diff --git a/www/phoenix-bin-acroread/DESCR b/www/MozillaFirebird-bin-acroread/DESCR
index fd853109c20..fd853109c20 100644
--- a/www/phoenix-bin-acroread/DESCR
+++ b/www/MozillaFirebird-bin-acroread/DESCR
diff --git a/www/MozillaFirebird-bin-acroread/Makefile b/www/MozillaFirebird-bin-acroread/Makefile
new file mode 100644
index 00000000000..02a25d8c691
--- /dev/null
+++ b/www/MozillaFirebird-bin-acroread/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
+
+DISTNAME= 		MozillaFirebird-bin-acroread-1.0
+
+MAINTAINER=		kei@NetBSD.org
+COMMENT=		Acrobat Reader 4 plugin for phoenix-bin
+
+DEPENDS+=		acroread-4.[0-9]*:../../print/acroread
+CONFLICTS+=		phoenix-bin-acroread3-[0-9]*
+CONFLICTS+=		phoenix-bin-acroread3-[0-9]*
+CONFLICTS+=		MozillaFirebird-bin-acroread5-[0-9]*
+CONFLICTS+=		MozillaFirebird-bin-acroread5-[0-9]*
+
+ACROREAD=		Acrobat4
+
+.include "../../www/MozillaFirebird-bin-acroread/Makefile.common"
diff --git a/www/phoenix-bin-acroread/Makefile.common b/www/MozillaFirebird-bin-acroread/Makefile.common
index a1a6cec3718..20c3e6ef34e 100644
--- a/www/phoenix-bin-acroread/Makefile.common
+++ b/www/MozillaFirebird-bin-acroread/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.3 2003/08/08 18:18:05 jmc Exp $
+# $NetBSD: Makefile.common,v 1.1 2003/09/27 14:13:08 grant Exp $
 
 WRKSRC=			${WRKDIR}
 CATEGORIES=		www print
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 
-DEPENDS+=		phoenix-bin>=0.6:../../www/phoenix-bin
+DEPENDS+=		MozillaFirebird-bin>=0.6.1:../../www/MozillaFirebird-bin
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 PLATFORM=		intellinux
@@ -14,12 +14,11 @@ NO_CHECKSUM=		YES
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
 
-PLIST_SRC=		../../www/phoenix-bin-acroread/PLIST
+PLIST_SRC=		../../www/MozillaFirebird-bin-acroread/PLIST
 PLIST_SUBST+=		ACROREAD=${ACROREAD}
 PLIST_SUBST+=		PLATFORM=${PLATFORM}
 NS_PLUGINS_DIR=         ${PREFIX}/lib/MozillaFirebird-linux/plugins
 
-
 do-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
 	${LN} -s ${PREFIX}/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so \
diff --git a/www/phoenix-bin-acroread/PLIST b/www/MozillaFirebird-bin-acroread/PLIST
index 2dfd8eb3760..50c4323174b 100644
--- a/www/phoenix-bin-acroread/PLIST
+++ b/www/MozillaFirebird-bin-acroread/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2003/05/24 10:36:03 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.1 2003/09/27 14:13:08 grant Exp $
 @exec ${LN} -s %D/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so %D/lib/MozillaFirebird-linux/plugins/nppdf.so
 lib/MozillaFirebird-linux/plugins/nppdf.so
diff --git a/www/phoenix-bin-acroread3/DESCR b/www/MozillaFirebird-bin-acroread3/DESCR
index be6786015ef..be6786015ef 100644
--- a/www/phoenix-bin-acroread3/DESCR
+++ b/www/MozillaFirebird-bin-acroread3/DESCR
diff --git a/www/MozillaFirebird-bin-acroread3/Makefile b/www/MozillaFirebird-bin-acroread3/Makefile
new file mode 100644
index 00000000000..77a550c3f9f
--- /dev/null
+++ b/www/MozillaFirebird-bin-acroread3/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
+
+DISTNAME= 		MozillaFirebird-bin-acroread3-1.0
+
+MAINTAINER=		kei@NetBSD.org
+COMMENT=		Acrobat Reader 3 plugin for phoenix-bin
+
+DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread
+CONFLICTS+=		phoenix-bin-acroread-[0-9]*
+CONFLICTS+=		phoenix-bin-acroread5-[0-9]*
+CONFLICTS+=		MozillaFirebird-bin-acroread-[0-9]*
+CONFLICTS+=		MozillaFirebird-bin-acroread5-[0-9]*
+
+ACROREAD=		Acrobat3
+
+.include "../../www/MozillaFirebird-bin-acroread/Makefile.common"
diff --git a/www/phoenix-bin-acroread5/DESCR b/www/MozillaFirebird-bin-acroread5/DESCR
index 9a148998d55..9a148998d55 100644
--- a/www/phoenix-bin-acroread5/DESCR
+++ b/www/MozillaFirebird-bin-acroread5/DESCR
diff --git a/www/MozillaFirebird-bin-acroread5/Makefile b/www/MozillaFirebird-bin-acroread5/Makefile
new file mode 100644
index 00000000000..1b8dbb5a7e3
--- /dev/null
+++ b/www/MozillaFirebird-bin-acroread5/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
+
+DISTNAME= 		MozillaFirebird-bin-acroread5-1.0
+
+MAINTAINER=		kei@NetBSD.org
+COMMENT=		Acrobat Reader 5 plugin for phoenix-bin
+
+DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread5
+CONFLICTS+=		phoenix-bin-acroread3-[0-9]*
+CONFLICTS+=		phoenix-bin-acroread-[0-9]*
+CONFLICTS+=		MozillaFirebird-bin-acroread3-[0-9]*
+CONFLICTS+=		MozillaFirebird-bin-acroread-[0-9]*
+
+ACROREAD=		Acrobat5
+
+.include "../../www/MozillaFirebird-bin-acroread/Makefile.common"
diff --git a/www/MozillaFirebird-bin-flash/DESCR b/www/MozillaFirebird-bin-flash/DESCR
new file mode 100644
index 00000000000..3015ac3b10b
--- /dev/null
+++ b/www/MozillaFirebird-bin-flash/DESCR
@@ -0,0 +1,2 @@
+MozillaFirebird-bin-flash package provides Macromedia Flash player plugin for
+MozillaFirebird-bin package.
diff --git a/www/phoenix-bin-flash/Makefile b/www/MozillaFirebird-bin-flash/Makefile
index d0538b00f23..76e4f46a061 100644
--- a/www/phoenix-bin-flash/Makefile
+++ b/www/MozillaFirebird-bin-flash/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2003/07/30 10:41:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
 
 DISTNAME=		install_flash_player_6_${DISTUNAME}
-PKGNAME=		phoenix-bin-flash-${FLASH_VERS:S/r/./}
-PKGREVISION=		1
+PKGNAME=		MozillaFirebird-bin-flash-${FLASH_VERS:S/r/./}
 CATEGORIES=		www graphics
 MASTER_SITES=		http://download.macromedia.com/pub/shockwave/flash/${SUB}/
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.flash.com/
-COMMENT=		Flash Player plugin for phoenix-bin
+COMMENT=		Flash Player plugin for MozillaFirebird-bin
 
 ONLY_FOR_PLATFORM=      *-*-i386
 
@@ -21,7 +20,7 @@ SUB=			english/${DISTUNAME}/${FLASH_VERS}
 FLASH_VERS=		6.0r79
 DEPENDS+=		suse_compat>=6.3:../../emulators/${SUSE_DIR_PREFIX}_compat
 DEPENDS+=		suse_x11>=6.3:../../emulators/${SUSE_DIR_PREFIX}_x11
-DEPENDS+=		phoenix-bin>=0.6:../../www/phoenix-bin
+DEPENDS+=		MozillaFirebird-bin>=0.6.1:../../www/MozillaFirebird-bin
 DISTUNAME=		linux
 WRKNAME=		install_flash_player_6_${DISTUNAME}
 
diff --git a/www/phoenix-bin-flash/PLIST b/www/MozillaFirebird-bin-flash/PLIST
index eef5d5469ea..859a538f9bb 100644
--- a/www/phoenix-bin-flash/PLIST
+++ b/www/MozillaFirebird-bin-flash/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/29 13:37:09 kei Exp $
+@comment $NetBSD: PLIST,v 1.1 2003/09/27 14:13:08 grant Exp $
 lib/${MOZ_NAME}/plugins/flashplayer.xpt
 lib/${MOZ_NAME}/plugins/libflashplayer.so
diff --git a/www/phoenix-bin-flash/distinfo b/www/MozillaFirebird-bin-flash/distinfo
index 73f9971ae0e..34b06f84984 100644
--- a/www/phoenix-bin-flash/distinfo
+++ b/www/MozillaFirebird-bin-flash/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/04/29 13:37:09 kei Exp $
+$NetBSD: distinfo,v 1.1 2003/09/27 14:13:08 grant Exp $
 
 SHA1 (flash/6.0r79/install_flash_player_6_linux.tar.gz) = 2088edbae9816b04cf13ad6b82b0847e917ba234
 Size (flash/6.0r79/install_flash_player_6_linux.tar.gz) = 707027 bytes
diff --git a/www/MozillaFirebird-bin-java/DESCR b/www/MozillaFirebird-bin-java/DESCR
new file mode 100644
index 00000000000..c51b021bc32
--- /dev/null
+++ b/www/MozillaFirebird-bin-java/DESCR
@@ -0,0 +1,2 @@
+MozillaFirebird-bin-java package provides Sun Java Run Time Environment (JRE)
+plugin for MozillaFirebird-bin package.
diff --git a/www/phoenix-bin-java/Makefile b/www/MozillaFirebird-bin-java/Makefile
index 596c424022d..eb98115643f 100644
--- a/www/phoenix-bin-java/Makefile
+++ b/www/MozillaFirebird-bin-java/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/08/08 18:18:05 jmc Exp $
+# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
 
-DISTNAME=		phoenix-bin-java-1.0
-PKGREVISION=		1
+DISTNAME=		MozillaFirebird-bin-java-1.0
 WRKSRC=			${WRKDIR}
 CATEGORIES=		www lang
 MASTER_SITES=		# empty
@@ -11,7 +10,7 @@ MAINTAINER=		kei@NetBSD.org
 COMMENT=		Java Run Time Environment (JRE) 1.3 plugin for phoenix-bin
 
 DEPENDS+=		sun-jre13-[0-9]*:../../lang/sun-jre13
-DEPENDS+=		phoenix-bin>=0.6:../../www/phoenix-bin
+DEPENDS+=		MozillaFirebird-bin>=0.6.1:../../www/MozillaFirebird-bin
 
 ONLY_FOR_PLATFORM=	NetBSD-1.[6-9]*-i386
 
@@ -21,7 +20,7 @@ NO_EXTRACT=		YES
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
 
-NS_PLUGINS_DIR=         ${PREFIX}/lib/MozillaFirebird-linux/plugins
+NS_PLUGINS_DIR=	${PREFIX}/lib/MozillaFirebird-linux/plugins
 PLUGIN=		${PREFIX}/java/sun-1.3.1/plugin/i386/ns600/libjavaplugin_oji.so
 
 do-install:
diff --git a/www/phoenix-bin-java/PLIST b/www/MozillaFirebird-bin-java/PLIST
index 81411cc7fd9..cb96b825020 100644
--- a/www/phoenix-bin-java/PLIST
+++ b/www/MozillaFirebird-bin-java/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/24 10:36:04 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.1 2003/09/27 14:13:08 grant Exp $
 @exec ${LN} -s %D/java/sun-1.3.1/plugin/i386/ns600/libjavaplugin_oji.so %D/lib/MozillaFirebird-linux/plugins/libjavaplugin_oji.so
 lib/MozillaFirebird-linux/plugins/libjavaplugin_oji.so
diff --git a/www/MozillaFirebird-bin-nightly/DESCR b/www/MozillaFirebird-bin-nightly/DESCR
new file mode 100644
index 00000000000..9481d824adb
--- /dev/null
+++ b/www/MozillaFirebird-bin-nightly/DESCR
@@ -0,0 +1,9 @@
+Mozilla Firebird is a free, open-source and cross-platform web browser
+for Windows, Linux, MacOS X and many other operating systems. It is
+small, fast and easy to use, and offers many advantages over other web
+browsers, such as tabbed browsing and the ability to block pop-up
+windows.
+
+Firebird also offers excellent bookmark and history management, and it
+can be extended by developers using industry standards such as XML,
+CSS, JavaScript, C++, etc. Many extensions are available.
diff --git a/www/phoenix-bin/MESSAGE.NetBSD b/www/MozillaFirebird-bin-nightly/MESSAGE.NetBSD
index 1c7a5678240..4bd35b28cf4 100644
--- a/www/phoenix-bin/MESSAGE.NetBSD
+++ b/www/MozillaFirebird-bin-nightly/MESSAGE.NetBSD
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2003/04/14 19:56:28 grant Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.1 2003/09/27 14:13:08 grant Exp $
 
 	Phoenix requires your kernel to include 'COMPAT_LINUX' (plus in
 	NetBSD systems before 1.5 'EXEC_ELF32').
diff --git a/www/phoenix-bin-nightly/Makefile b/www/MozillaFirebird-bin-nightly/Makefile
index 47b2df99e33..bbad75b067d 100644
--- a/www/phoenix-bin-nightly/Makefile
+++ b/www/MozillaFirebird-bin-nightly/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2003/09/05 05:59:49 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
 #
 
 DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
-PKGNAME=		phoenix-bin-${PKGVER}
+PKGNAME=		MozillaFirebird-bin-${PKGVER}
 WRKSRC=			${WRKDIR}/MozillaFirebird
 CATEGORIES=		www
 
@@ -12,7 +12,10 @@ COMMENT=		Lightweight gecko-based web browser (nightly binary pkg)
 
 ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386 SunOS-5.[789]*-sparc
 
+# this package was formerly named "phoenix-linux", and
+# "phoenix-bin".
 CONFLICTS+=		phoenix-linux-[0-9]*
+CONFLICTS+=		phoenix-bin-[0-9]*
 
 DIST_SUBDIR=		${PKGNAME}
 NO_CHECKSUM=		# defined
@@ -31,24 +34,26 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 do-build:
 
 post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/phoenix.sh > ${WRKDIR}/phoenix.sh
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/MozillaFirebird.sh > \
+		${WRKDIR}/MozillaFirebird.sh
 
 do-install:
-	${INSTALL_DATA_DIR} ${PHOENIX_LIB}
-	cd ${WRKSRC} && ${PAX} -rw -pm . ${PHOENIX_LIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/phoenix.sh ${PREFIX}/bin/phoenix-${PLATFORM}
-	@${FIND} ${PHOENIX_LIB} -type f -print \
+	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
+	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
+	${INSTALL_SCRIPT} ${WRKDIR}/MozillaFirebird.sh > \
+		${PREFIX}/bin/MozillaFirebird-${PLATFORM}
+	@${FIND} ${MOZILLA_LIB} -type f -print \
 		| ${XARGS} ${CHMOD} a+r
-	@${FIND} ${PHOENIX_LIB} \( -type f -o -perm +x \) -print \
+	@${FIND} ${MOZILLA_LIB} \( -type f -o -perm +x \) -print \
 		| ${XARGS} ${CHMOD} a+rx
-	@${FIND} ${PHOENIX_LIB} -type d -print \
+	@${FIND} ${MOZILLA_LIB} -type d -print \
 		| ${XARGS} ${CHMOD} a+rx
-	@${RM} -f ${PHOENIX_LIB}/plugins/libnullplugin.so
+	@${RM} -f ${MOZILLA_LIB}/plugins/libnullplugin.so
 
 post-install:
 # this build for Solaris wants exactly 'libgtk-1.2.so.0', etc.
 .if ${OPSYS} == "SunOS"
-	@cd ${PHOENIX_LIB} && \
+	@cd ${MOZILLA_LIB} && \
 	${LN} -s ${LOCALBASE}/lib/libglib.*so* .;			\
 	${LN} -s ${LOCALBASE}/lib/libgmodule.*so* .;			\
 	${LN} -s ${X11BASE}/lib/libgdk.*so* .;				\
@@ -58,11 +63,11 @@ post-install:
 	${LN} -s libglib.so libglib-1.2.so.0
 .endif
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-	@${ECHO} bin/phoenix-${PLATFORM} >> ${PLIST_SRC}
-	@${FIND} ${PHOENIX_LIB} \( -type f -o -type l \) -print		\
+	@${ECHO} bin/MozillaFirebird-${PLATFORM} >> ${PLIST_SRC}
+	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
 		>> ${PLIST_SRC}
-	@${FIND} ${PHOENIX_LIB} -type d -print				\
+	@${FIND} ${MOZILLA_LIB} -type d -print				\
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
 
diff --git a/www/phoenix-bin-nightly/Makefile.Linux.i386 b/www/MozillaFirebird-bin-nightly/Makefile.Linux.i386
index a8d7b6e9636..f71569592b2 100644
--- a/www/phoenix-bin-nightly/Makefile.Linux.i386
+++ b/www/MozillaFirebird-bin-nightly/Makefile.Linux.i386
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.Linux.i386,v 1.5 2003/09/27 09:58:08 grant Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.1 2003/09/27 14:13:08 grant Exp $
 #
 
 DISTNAME=	MozillaFirebird-i686-pc-linux-gnu
 MASTER_SITES=	http://ftp.mozilla.org/pub/firebird/nightly/latest-trunk/
 
 PLATFORM=	linux
-PHOENIX_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
+MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
diff --git a/www/phoenix-bin-nightly/Makefile.NetBSD.i386 b/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386
index f16fbd8d33a..10e30464cb5 100644
--- a/www/phoenix-bin-nightly/Makefile.NetBSD.i386
+++ b/www/MozillaFirebird-bin-nightly/Makefile.NetBSD.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.2 2003/04/14 21:28:10 grant Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.1 2003/09/27 14:13:08 grant Exp $
 #
 
 DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
diff --git a/www/phoenix-bin-nightly/Makefile.SunOS.sparc b/www/MozillaFirebird-bin-nightly/Makefile.SunOS.sparc
index 5b81972e3db..3f30f3b7d42 100644
--- a/www/phoenix-bin-nightly/Makefile.SunOS.sparc
+++ b/www/MozillaFirebird-bin-nightly/Makefile.SunOS.sparc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.3 2003/09/27 06:43:25 grant Exp $
+# $NetBSD: Makefile.SunOS.sparc,v 1.1 2003/09/27 14:13:08 grant Exp $
 #
 
 DISTNAME=	MozillaFirebird-sparc-sun-solaris2.7-static
@@ -7,4 +7,4 @@ MASTER_SITES=	http://ftp.mozilla.org/pub/firebird/nightly/contrib/latest-trunk/
 DEPENDS+=	gtk+>=1.2:../../x11/gtk
 
 PLATFORM=	${LOWER_OPSYS}
-PHOENIX_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
+MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
diff --git a/www/MozillaFirebird-bin-nightly/PLIST b/www/MozillaFirebird-bin-nightly/PLIST
new file mode 100644
index 00000000000..e1a588685c7
--- /dev/null
+++ b/www/MozillaFirebird-bin-nightly/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2003/09/27 14:13:08 grant Exp $
+@comment this PLIST intentionally left blank
diff --git a/www/phoenix-bin-nightly/files/phoenix.sh b/www/MozillaFirebird-bin-nightly/files/MozillaFirebird.sh
index 9de6488c9ff..28fc5d1b27f 100644
--- a/www/phoenix-bin-nightly/files/phoenix.sh
+++ b/www/MozillaFirebird-bin-nightly/files/MozillaFirebird.sh
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: phoenix.sh,v 1.4 2003/07/18 07:31:15 grant Exp $
+# $NetBSD: MozillaFirebird.sh,v 1.1 2003/09/27 14:13:08 grant Exp $
 
 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-@PLATFORM@:@PREFIX@/lib"
 export LD_LIBRARY_PATH
diff --git a/www/phoenix-bin-realplayer/DESCR b/www/MozillaFirebird-bin-realplayer/DESCR
index 10dca6449f8..10dca6449f8 100644
--- a/www/phoenix-bin-realplayer/DESCR
+++ b/www/MozillaFirebird-bin-realplayer/DESCR
diff --git a/www/phoenix-bin-realplayer/Makefile b/www/MozillaFirebird-bin-realplayer/Makefile
index 3ea401a52ef..156836da1d5 100644
--- a/www/phoenix-bin-realplayer/Makefile
+++ b/www/MozillaFirebird-bin-realplayer/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2003/08/08 18:18:05 jmc Exp $
+# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
 
 DISTNAME= 		phoenix-bin-realplayer-1.0
-PKGREVISION=		1
 WRKSRC=			${WRKDIR}
 CATEGORIES=		www audio graphics
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 
 MAINTAINER=		kei@NetBSD.org
-COMMENT=		RealAudio and RealVideo player plugin for phoenix-bin
+COMMENT=		RealAudio and RealVideo player plugin for MozillaFirebird-bin
 
-DEPENDS+=		phoenix-bin>=0.6:../../www/phoenix-bin
+DEPENDS+=		MozillaFirebird-bin>=0.6.1:../../www/MozillaFirebird-bin
 DEPENDS+=		realplayer-[0-9]*:../../audio/realplayer
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
diff --git a/www/phoenix-bin-realplayer/PLIST b/www/MozillaFirebird-bin-realplayer/PLIST
index 67869841f75..f01a119aa63 100644
--- a/www/phoenix-bin-realplayer/PLIST
+++ b/www/MozillaFirebird-bin-realplayer/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/24 10:36:04 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.1 2003/09/27 14:13:08 grant Exp $
 @exec ${LN} -s %D/lib/netscape/plugins/rpnp.so %D/lib/MozillaFirebird-linux/plugins/rpnp.so
 lib/MozillaFirebird-linux/plugins/rpnp.so
diff --git a/www/MozillaFirebird-bin/DESCR b/www/MozillaFirebird-bin/DESCR
new file mode 100644
index 00000000000..9481d824adb
--- /dev/null
+++ b/www/MozillaFirebird-bin/DESCR
@@ -0,0 +1,9 @@
+Mozilla Firebird is a free, open-source and cross-platform web browser
+for Windows, Linux, MacOS X and many other operating systems. It is
+small, fast and easy to use, and offers many advantages over other web
+browsers, such as tabbed browsing and the ability to block pop-up
+windows.
+
+Firebird also offers excellent bookmark and history management, and it
+can be extended by developers using industry standards such as XML,
+CSS, JavaScript, C++, etc. Many extensions are available.
diff --git a/www/MozillaFirebird-bin/MESSAGE.NetBSD b/www/MozillaFirebird-bin/MESSAGE.NetBSD
new file mode 100644
index 00000000000..dfa45cca4c6
--- /dev/null
+++ b/www/MozillaFirebird-bin/MESSAGE.NetBSD
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE.NetBSD,v 1.1 2003/09/27 14:13:08 grant Exp $
+
+	Mozilla Firebird requires your kernel to include 'COMPAT_LINUX'
+	(plus in NetBSD systems before 1.5 'EXEC_ELF32').
+
+	Please note that if you have INET6 enabled in your kernel, you
+	will need to set net.inet6.ip6.v6only=0, using sysctl(8).
+	
+===========================================================================
diff --git a/www/phoenix-bin/Makefile b/www/MozillaFirebird-bin/Makefile
index 7f093b83d4a..25563e7a3cb 100644
--- a/www/phoenix-bin/Makefile
+++ b/www/MozillaFirebird-bin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2003/08/08 22:43:41 grant Exp $
+# $NetBSD: Makefile,v 1.1 2003/09/27 14:13:08 grant Exp $
 #
 
 DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
-PKGNAME=		phoenix-bin-0.6.1
+PKGNAME=		MozillaFirebird-bin-0.6.1
 WRKSRC=			${WRKDIR}/MozillaFirebird
 CATEGORIES=		www
 
@@ -12,7 +12,10 @@ COMMENT=		Lightweight gecko-based web browser (binary pkg)
 
 ONLY_FOR_PLATFORM=	Linux-*-i[3-6]86 NetBSD-*-i386 SunOS-5.[789]*-sparc
 
+# this package was formerly named "phoenix-linux", and
+# "phoenix-bin".
 CONFLICTS+=		phoenix-linux-[0-9]*
+CONFLICTS+=		phoenix-bin-[0-9]*
 
 NO_CONFIGURE=		YES
 USE_PKGINSTALL=		YES
@@ -25,19 +28,20 @@ PLIST_SRC=		${WRKDIR}/PLIST_DYNAMIC
 do-build:
 
 post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/phoenix.sh > \
-		${WRKDIR}/phoenix.sh
+	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/MozillaFirebird.sh > \
+		${WRKDIR}/MozillaFirebird.sh
 
 do-install:
-	${INSTALL_DATA_DIR} ${PHOENIX_LIB}
-	cd ${WRKSRC} && ${PAX} -rw -pm . ${PHOENIX_LIB}
-	${INSTALL_SCRIPT} ${WRKDIR}/phoenix.sh ${PREFIX}/bin/phoenix-${PLATFORM}
-	@${RM} -f ${PHOENIX_LIB}/plugins/libnullplugin.so
+	${INSTALL_DATA_DIR} ${MOZILLA_LIB}
+	cd ${WRKSRC} && ${PAX} -rw -pm . ${MOZILLA_LIB}
+	${INSTALL_SCRIPT} ${WRKDIR}/MozillaFirebird.sh \
+		${PREFIX}/bin/MozillaFirebird-${PLATFORM}
+	@${RM} -f ${MOZILLA_LIB}/plugins/libnullplugin.so
 
 post-install:
 # this build for Solaris wants exactly 'libgtk-1.2.so.0', etc.
 .if ${OPSYS} == "SunOS"
-	@cd ${PHOENIX_LIB} && \
+	@cd ${MOZILLA_LIB} && \
 	${LN} -s ${LOCALBASE}/lib/libglib.*so* .;			\
 	${LN} -s ${LOCALBASE}/lib/libgmodule.*so* .;			\
 	${LN} -s ${X11BASE}/lib/libgdk.*so* .;				\
@@ -47,11 +51,11 @@ post-install:
 	${LN} -s libglib.so libglib-1.2.so.0
 .endif
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
-	@${ECHO} bin/phoenix-${PLATFORM} >> ${PLIST_SRC}
-	@${FIND} ${PHOENIX_LIB} \( -type f -o -type l \) -print		\
+	@${ECHO} bin/MozillaFirebird-${PLATFORM} >> ${PLIST_SRC}
+	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
 		>> ${PLIST_SRC}
-	@${FIND} ${PHOENIX_LIB} -type d -print				\
+	@${FIND} ${MOZILLA_LIB} -type d -print				\
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
 
diff --git a/www/phoenix-bin/Makefile.Linux.i386 b/www/MozillaFirebird-bin/Makefile.Linux.i386
index 02585f0f463..55d8d040ed0 100644
--- a/www/phoenix-bin/Makefile.Linux.i386
+++ b/www/MozillaFirebird-bin/Makefile.Linux.i386
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.Linux.i386,v 1.5 2003/08/08 22:43:41 grant Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.1 2003/09/27 14:13:08 grant Exp $
 #
 
 DISTNAME=	MozillaFirebird-0.6.1-i686-pc-linux-gnu
 MASTER_SITES=	http://ftp.mozilla.org/pub/firebird/releases/0.6.1/
 
 PLATFORM=	linux
-PHOENIX_LIB=    ${PREFIX}/lib/MozillaFirebird-${PLATFORM}
+MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
diff --git a/www/phoenix-bin/Makefile.NetBSD.i386 b/www/MozillaFirebird-bin/Makefile.NetBSD.i386
index 435b6ebe087..be7f924ee77 100644
--- a/www/phoenix-bin/Makefile.NetBSD.i386
+++ b/www/MozillaFirebird-bin/Makefile.NetBSD.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.NetBSD.i386,v 1.4 2003/08/08 22:43:41 grant Exp $
+# $NetBSD: Makefile.NetBSD.i386,v 1.1 2003/09/27 14:13:08 grant Exp $
 #
 
 DEPENDS+=	suse_compat>=7.3:../../emulators/${SUSE_DIR_PREFIX}_compat
diff --git a/www/phoenix-bin/Makefile.SunOS.sparc b/www/MozillaFirebird-bin/Makefile.SunOS.sparc
index 1b89cd02a5c..a777db3f6eb 100644
--- a/www/phoenix-bin/Makefile.SunOS.sparc
+++ b/www/MozillaFirebird-bin/Makefile.SunOS.sparc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.SunOS.sparc,v 1.3 2003/08/08 22:43:41 grant Exp $
+# $NetBSD: Makefile.SunOS.sparc,v 1.1 2003/09/27 14:13:08 grant Exp $
 #
 
 DISTNAME=	MozillaFirebird-0.6.1-sparc-sun-solaris2.7
@@ -7,4 +7,4 @@ MASTER_SITES=	http://ftp.mozilla.org/pub/firebird/releases/0.6.1/contrib/
 DEPENDS+=	gtk+>=1.2:../../x11/gtk
 
 PLATFORM=	${LOWER_OPSYS}
-PHOENIX_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
+MOZILLA_LIB=	${PREFIX}/lib/MozillaFirebird-${PLATFORM}
diff --git a/www/MozillaFirebird-bin/PLIST b/www/MozillaFirebird-bin/PLIST
new file mode 100644
index 00000000000..e1a588685c7
--- /dev/null
+++ b/www/MozillaFirebird-bin/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2003/09/27 14:13:08 grant Exp $
+@comment this PLIST intentionally left blank
diff --git a/www/phoenix-bin/distinfo b/www/MozillaFirebird-bin/distinfo
index a619579bfde..41dabfea18a 100644
--- a/www/phoenix-bin/distinfo
+++ b/www/MozillaFirebird-bin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/08/08 22:43:41 grant Exp $
+$NetBSD: distinfo,v 1.1 2003/09/27 14:13:08 grant Exp $
 
 SHA1 (MozillaFirebird-0.6.1-i686-pc-linux-gnu.tar.gz) = 9977d940f2de38a94e09c4c4a094dd64e3fee904
 Size (MozillaFirebird-0.6.1-i686-pc-linux-gnu.tar.gz) = 9686069 bytes
diff --git a/www/phoenix-bin/files/phoenix.sh b/www/MozillaFirebird-bin/files/MozillaFirebird.sh
index bc5ee964338..28fc5d1b27f 100644
--- a/www/phoenix-bin/files/phoenix.sh
+++ b/www/MozillaFirebird-bin/files/MozillaFirebird.sh
@@ -1,5 +1,5 @@
 #!@SH@
-# $NetBSD: phoenix.sh,v 1.4 2003/07/18 07:31:14 grant Exp $
+# $NetBSD: MozillaFirebird.sh,v 1.1 2003/09/27 14:13:08 grant Exp $
 
 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-@PLATFORM@:@PREFIX@/lib"
 export LD_LIBRARY_PATH
diff --git a/www/phoenix-bin-acroread/Makefile b/www/phoenix-bin-acroread/Makefile
deleted file mode 100644
index d9bba820b4b..00000000000
--- a/www/phoenix-bin-acroread/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:55 grant Exp $
-
-DISTNAME= 		phoenix-bin-acroread-1.0
-PKGREVISION=		2
-
-MAINTAINER=		kei@NetBSD.org
-COMMENT=		Acrobat Reader 4 plugin for phoenix-bin
-
-DEPENDS+=		acroread-4.[0-9]*:../../print/acroread
-CONFLICTS+=		phoenix-bin-acroread3-[0-9]*
-CONFLICTS+=		phoenix-bin-acroread5-[0-9]*
-
-ACROREAD=		Acrobat4
-
-.include "../../www/phoenix-bin-acroread/Makefile.common"
diff --git a/www/phoenix-bin-acroread3/Makefile b/www/phoenix-bin-acroread3/Makefile
deleted file mode 100644
index a51fe3e2d85..00000000000
--- a/www/phoenix-bin-acroread3/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:55:55 grant Exp $
-
-DISTNAME= 		phoenix-bin-acroread3-1.0
-PKGREVISION=		1
-
-MAINTAINER=		kei@NetBSD.org
-COMMENT=		Acrobat Reader 3 plugin for phoenix-bin
-
-DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread
-CONFLICTS+=		phoenix-bin-acroread-[0-9]*
-CONFLICTS+=		phoenix-bin-acroread5-[0-9]*
-
-ACROREAD=		Acrobat3
-
-.include "../../www/phoenix-bin-acroread/Makefile.common"
diff --git a/www/phoenix-bin-acroread5/Makefile b/www/phoenix-bin-acroread5/Makefile
deleted file mode 100644
index b1c5ce6a2e0..00000000000
--- a/www/phoenix-bin-acroread5/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:55:56 grant Exp $
-
-DISTNAME= 		phoenix-bin-acroread5-1.0
-PKGREVISION=		1
-
-MAINTAINER=		kei@NetBSD.org
-COMMENT=		Acrobat Reader 5 plugin for phoenix-bin
-
-DEPENDS+=		acroread5-5.[0-9]*:../../print/acroread5
-CONFLICTS+=		phoenix-bin-acroread3-[0-9]*
-CONFLICTS+=		phoenix-bin-acroread-[0-9]*
-
-ACROREAD=		Acrobat5
-
-.include "../../www/phoenix-bin-acroread/Makefile.common"
diff --git a/www/phoenix-bin-flash/DESCR b/www/phoenix-bin-flash/DESCR
deleted file mode 100644
index 51a603430ea..00000000000
--- a/www/phoenix-bin-flash/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-phoenix-bin-flash package provides Macromedia Flash player plugin for
-phoenix-bin package.
diff --git a/www/phoenix-bin-java/DESCR b/www/phoenix-bin-java/DESCR
deleted file mode 100644
index b553153fe13..00000000000
--- a/www/phoenix-bin-java/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-phoenix-bin-java package provides Sun Java Run Time Environment (JRE)
-plugin for phoenix-bin package.
diff --git a/www/phoenix-bin-nightly/DESCR b/www/phoenix-bin-nightly/DESCR
deleted file mode 100644
index 7c84ebe230c..00000000000
--- a/www/phoenix-bin-nightly/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Phoenix is a redesign of the Mozilla browser component, similar to Galeon,
-K-Meleon and Chimera, but written using the XUL user interface language
-and designed to be cross-platform.
diff --git a/www/phoenix-bin-nightly/MESSAGE.NetBSD b/www/phoenix-bin-nightly/MESSAGE.NetBSD
deleted file mode 100644
index f4d6f41a741..00000000000
--- a/www/phoenix-bin-nightly/MESSAGE.NetBSD
+++ /dev/null
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2003/04/14 20:11:48 grant Exp $
-
-	Phoenix requires your kernel to include 'COMPAT_LINUX' (plus in
-	NetBSD systems before 1.5 'EXEC_ELF32').
-
-	Please note that if you have INET6 enabled in your kernel, you
-	will need to set net.inet6.ip6.v6only = 0, using sysctl(8).
-
-===========================================================================
diff --git a/www/phoenix-bin-nightly/PLIST b/www/phoenix-bin-nightly/PLIST
deleted file mode 100644
index 4909e05651c..00000000000
--- a/www/phoenix-bin-nightly/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/14 21:28:10 grant Exp $
-@comment this PLIST intentionally left blank
diff --git a/www/phoenix-bin/DESCR b/www/phoenix-bin/DESCR
deleted file mode 100644
index 7c84ebe230c..00000000000
--- a/www/phoenix-bin/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Phoenix is a redesign of the Mozilla browser component, similar to Galeon,
-K-Meleon and Chimera, but written using the XUL user interface language
-and designed to be cross-platform.
diff --git a/www/phoenix-bin/PLIST b/www/phoenix-bin/PLIST
deleted file mode 100644
index 483f3b782ae..00000000000
--- a/www/phoenix-bin/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2003/04/14 22:59:31 grant Exp $
-@comment this PLIST intentionally left blank