3 files changed, 42 insertions, 34 deletions

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 250b5046a61a..b8a4ba9d81d0 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -1,18 +1,17 @@
-# New ports collection makefile for:	linux-phoenix
-# Date created:				2002-10-10
+# New ports collection makefile for:	linux-mozillafirebird
+# Date created:				2003-06-03
 # Whom:					trevor
 #
 # $FreeBSD$
 #
 
-PORTNAME=	phoenix
-PORTVERSION=	0.5
-PORTREVISION=	1
+PORTNAME=	mozillafirebird
+PORTVERSION=	0.6
 CATEGORIES=	www linux
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	phoenix/releases/${PORTVERSION}
+MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	phoenix-${PORTVERSION}-i686-pc-linux-gnu
+DISTNAME=	MozillaFirebird-${PORTVERSION}-i686-pc-linux-gnu
 
 MAINTAINER=	voisine@yahoo.com
 COMMENT=	Web browser branched from Mozilla
@@ -28,43 +27,50 @@ PLIST=		${WRKDIR}/pkg-plist
 USE_LINUX=	yes
 USE_XLIB=	yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/phoenix
+WRKSRC=		${WRKDIR}/MozillaFirebird
 
 do-patch:
 	${ECHO_CMD} "#!/bin/sh"		> ${WRKDIR}/linkfarm
 	${ECHO_CMD} \
 	"# Run this after installing Beonex, Mozilla or Netscape plugins." \
 		>>${WRKDIR}/linkfarm
-	${ECHO_CMD} "cd ${PREFIX}/lib/linux-phoenix/plugins" \
+	${ECHO_CMD} "cd ${PREFIX}/lib/linux-mozillafirebird/plugins" \
 		>>${WRKDIR}/linkfarm
-.for ii in linux-beonex/plugins netscape-linux/plugins flash \
-	linux-mozilla/plugins linux-netscape*/plugins
-		${ECHO_CMD} -n "${FIND} ${LOCALBASE}/lib/${ii}/*" \
+.for ii in lib/linux-beonex/plugins lib/netscape-linux/plugins lib/flash \
+	lib/linux-mozilla/plugins lib/linux-netscape*/plugins \
+	lib/linux-flashplugin6 \
+linux-blackdown-jdk1.3.1/jre/plugin/i386/mozilla \
+linux-blackdown-jdk1.4.1/jre/plugin/i386/mozilla
+		${ECHO_CMD} -n "${FIND} ${LOCALBASE}/${ii}/*" \
 			>>${WRKDIR}/linkfarm
 		${ECHO_CMD} " -maxdepth 1 -exec ${LN} -s {} \; 2>/dev/null" \
 			>>${WRKDIR}/linkfarm
 .endfor
 
 pre-install:
-	${ECHO_CMD} bin/linux-phoenix > ${PLIST}
-	${ECHO_CMD} "@unexec ${FIND} ${PREFIX}/lib/linux-phoenix/plugins \
+	${ECHO_CMD} bin/linux-mozillafirebird > ${PLIST}
+	${ECHO_CMD} \
+		"@unexec ${FIND} ${PREFIX}/lib/linux-mozillafirebird/plugins \
 		-type l -exec ${RM} {} \;" >> ${PLIST}
 	cd ${WRKSRC} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:lib/linux-phoenix/:' >> ${PLIST} \
+		${SED} -e 's:^:lib/linux-mozillafirebird/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm lib/linux-phoenix/:' >> ${PLIST}
-	${ECHO_CMD} lib/linux-phoenix/linkfarm >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/linux-phoenix >> ${PLIST}
-	${ECHO_CMD} "@exec ${PREFIX}/lib/linux-phoenix/linkfarm" >> ${PLIST}
+		${SED} -e 's:^:@dirrm lib/linux-mozillafirebird/:' >> ${PLIST}
+	${ECHO_CMD} lib/linux-mozillafirebird/linkfarm >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/linux-mozillafirebird >> ${PLIST}
+	${ECHO_CMD} "@exec ${PREFIX}/lib/linux-mozillafirebird/linkfarm" \
+		>> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/linux-phoenix
-	${CHMOD} 755 ${PREFIX}/lib/linux-phoenix
+	${MKDIR} ${PREFIX}/lib/linux-mozillafirebird
+	${CHMOD} 755 ${PREFIX}/lib/linux-mozillafirebird
 	cd ${WRKSRC} && ${FIND} * | \
-		cpio -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/linux-phoenix
-	${LN} -sf ${PREFIX}/lib/linux-phoenix/phoenix \
-		${PREFIX}/bin/linux-phoenix
-	${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${PREFIX}/lib/linux-phoenix
+		cpio -pdm -L -R ${LIBOWN}:${LIBGRP} \
+		${PREFIX}/lib/linux-mozillafirebird
+	${LN} -sf ${PREFIX}/lib/linux-mozillafirebird/MozillaFirebird \
+		${PREFIX}/bin/linux-mozillafirebird
+	${INSTALL_SCRIPT} ${WRKDIR}/linkfarm \
+		${PREFIX}/lib/linux-mozillafirebird
 
 NEW_LIBSTDCXX=	${LINUXBASE}/usr/lib/libstdc++-libc6.2-2.so.3
 OLD_LIBSTDCXX=	libstdc++-libc6.1-1.so.2
@@ -78,10 +84,11 @@ post-install:
 	@${ECHO_CMD} \*\* After adding plugins to \(Linux\) Beonex,
 	@${ECHO_CMD} \*\* Mozilla or Netscape, run\
 		> ${PKGMESSAGE}
-	@${ECHO_CMD} \*\* ${PREFIX}/lib/linux-beonex/linkfarm >> ${PKGMESSAGE}
-	@${ECHO_CMD} \*\* as root to make them available to linux-phoenix. \
+	@${ECHO_CMD} \*\* ${PREFIX}/lib/linux-mozillafirebird/linkfarm as root \
+		>> ${PKGMESSAGE}
+	@${ECHO_CMD} \*\* to make them available to linux-mozillafirebird. \
 		>> ${PKGMESSAGE}
-	@- ${SH} ${PREFIX}/lib/linux-phoenix/linkfarm || true
+	@- ${SH} ${PREFIX}/lib/linux-mozillafirebird/linkfarm || true
 	@ ${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index 0df8af9201ed..519974866b4e 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.5-i686-pc-linux-gnu.tar.gz) = 6cd5cdb4d7106a2d3843e4f907831ab7
+MD5 (MozillaFirebird-0.6-i686-pc-linux-gnu.tar.gz) = 52376f4f0b088256f75a87920de0e4c4
diff --git a/www/linux-firefox/pkg-descr b/www/linux-firefox/pkg-descr
index d3e3e04eee0e..5342d48943e3 100644
--- a/www/linux-firefox/pkg-descr
+++ b/www/linux-firefox/pkg-descr
@@ -1,8 +1,9 @@
-Phoenix is a Web, FTP and gopher browser branched from Mozilla.  It does not
-include an HTML editor, e-mail user agent, IRC client, or news reader.
+Mozilla Firebird is a Web, FTP and gopher browser branched from Mozilla.  It
+does not include an HTML editor, e-mail user agent, IRC client, or news reader.
 
 This is a pre-compiled Linux/i386 version, able to run plugins from that
-platform.  This port is compatible with the Flash plugins from the
-www/linux-flashplugin and www/netscape7 ports.
+platform.  This port is compatible with the Flash plugin from
+ports/www/linux-flashplugin6/ and with the Java plugin from
+ports/java/linux-blackdown-jdk14/.
 
-WWW:  http://mozilla.org/projects/phoenix/
+WWW:  http://mozilla.org/projects/firebird/