new port: www/linux-firefox (replaces linux-mozillafirebird)

    Firefox 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
    plugin from ports/www/linux-flashplugin6/ and with the Java
    plugin from ports/java/linux-blackdown-jdk14/.

    WWW:  http://mozilla.org/projects/firefox/

PR:		ports/75326
Submitted by:	Aaron Voisine <voisine@gmail.com>

3 files changed, 69 insertions, 63 deletions

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 4b74899f2c2d..6f359323733b 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -1,96 +1,102 @@
-# New ports collection makefile for:	linux-mozillafirebird
-# Date created:				2003-06-03
-# Whom:					trevor
+# New ports collection makefile for:   linux-firefox
+# Date created:                                2004-09-17
+# Whom:                                        voisine
 #
 # $FreeBSD$
 #
 
-PORTNAME=	mozillafirebird
-PORTVERSION=	0.7
-CATEGORIES?=	www linux
-MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR?=	firebird/releases/${PORTVERSION}
-PKGNAMEPREFIX?=	linux-
-DISTNAME?=	MozillaFirebird-${PORTVERSION}-i686-pc-linux-gnu
+PORTNAME=      firefox
+PORTVERSION=   1.0
+CATEGORIES?=   www linux
+MASTER_SITES=  ${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR?=firefox/releases/${PORTVERSION}/linux-i686/en-US
+PKGNAMEPREFIX?=linux-
+DISTNAME?=     firefox-${PORTVERSION}
 
-MAINTAINER=	voisine@yahoo.com
-COMMENT?=	Web browser branched from Mozilla
+MAINTAINER=    voisine@gmail.com
+COMMENT=       Web browser branched from Mozilla
 
-RUN_DEPENDS?=	\
-	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
+RUN_DEPENDS?=  \
+${LINUXBASE}/usr/lib/libstdc++.so.5:${PORTSDIR}/emulators/linux_base-8 \
+${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
+${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
+${LINUXBASE}/usr/lib/libpangoxft-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango\
+${LINUXBASE}/usr/lib/libgobject-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
+${LINUXBASE}${X11BASE}/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
+${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
 
-NO_BUILD=	yes
+NO_BUILD=      yes
 NO_FILTER_SHLIBS=yes
-ONLY_FOR_ARCHS=	i386
-FIREBIRD_NAME=	${PKGNAMEPREFIX}${PORTNAME}
-DESCR=		${.CURDIR}/pkg-descr
-MD5_FILE=	${.CURDIR}/distinfo
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${WRKDIR}/pkg-plist
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/MozillaFirebird
+ONLY_FOR_ARCHS=i386
+FIREFOX_NAME=  ${PKGNAMEPREFIX}${PORTNAME}
+DESCR=         ${.CURDIR}/pkg-descr
+MD5_FILE=      ${.CURDIR}/distinfo
+PKGMESSAGE=    ${WRKDIR}/pkg-message
+PLIST=         ${WRKDIR}/pkg-plist
+USE_LINUX=     yes
+USE_XLIB=      yes
+USE_X_PREFIX=  yes
+WRKSRC=        ${WRKDIR}/firefox
 
 do-patch:
-	${ECHO_CMD} "#!/bin/sh"		> ${WRKDIR}/linkfarm
+	${ECHO_CMD} "#!/bin/sh" > ${WRKDIR}/linkfarm
 	${ECHO_CMD} \
 	"# Run this after installing Beonex, Mozilla or Netscape plugins." \
 		>>${WRKDIR}/linkfarm
-	${ECHO_CMD} "cd ${PREFIX}/lib/${FIREBIRD_NAME}/plugins" \
+	${ECHO_CMD} "cd ${PREFIX}/lib/${FIREFOX_NAME}/plugins" \
 		>>${WRKDIR}/linkfarm
-.for ii in lib/linux-beonex/plugins lib/netscape-linux/plugins lib/flash \
-	lib/linux-mozilla/plugins lib/linux-netscape*/plugins \
+.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
+	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/${FIREBIRD_NAME} > ${PLIST}
+	${ECHO_CMD} bin/${FIREFOX_NAME} > ${PLIST}
+	${ECHO_CMD} lib/${FIREFOX_NAME}/${FIREFOX_NAME}-bin >> ${PLIST}
 	${ECHO_CMD} \
-		"@unexec ${FIND} ${PREFIX}/lib/${FIREBIRD_NAME}/plugins \
+		"@unexec ${FIND} ${PREFIX}/lib/${FIREFOX_NAME}/plugins \
 		-type l -exec ${RM} {} \;" >> ${PLIST}
 	cd ${WRKSRC} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:lib/${FIREBIRD_NAME}/:' >> ${PLIST} \
+		${SED} -e 's:^:lib/${FIREFOX_NAME}/:' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm lib/${FIREBIRD_NAME}/:' >> ${PLIST}
-	${ECHO_CMD} lib/${FIREBIRD_NAME}/linkfarm >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${FIREBIRD_NAME} >> ${PLIST}
-	${ECHO_CMD} "@exec ${PREFIX}/lib/${FIREBIRD_NAME}/linkfarm" \
+		${SED} -e 's:^:@dirrm lib/${FIREFOX_NAME}/:' >> ${PLIST}
+	${ECHO_CMD} lib/${FIREFOX_NAME}/linkfarm >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/${FIREFOX_NAME} >> ${PLIST}
+	${ECHO_CMD} "@exec ${PREFIX}/lib/${FIREFOX_NAME}/linkfarm" \
 		>> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${FIREBIRD_NAME}
-	${CHMOD} 755 ${PREFIX}/lib/${FIREBIRD_NAME}
+	${MKDIR} ${PREFIX}/lib/${FIREFOX_NAME}
+	${CHMOD} 755 ${PREFIX}/lib/${FIREFOX_NAME}
 	cd ${WRKSRC} && ${FIND} * | \
 		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} \
-		${PREFIX}/lib/${FIREBIRD_NAME}
-	${LN} -sf ${PREFIX}/lib/${FIREBIRD_NAME}/MozillaFirebird \
-		${PREFIX}/bin/${FIREBIRD_NAME}
+		${PREFIX}/lib/${FIREFOX_NAME}
+	${LN} -sf ${PREFIX}/lib/${FIREFOX_NAME}/firefox \
+		${PREFIX}/bin/${FIREFOX_NAME}
+	${LN} -sf ${PREFIX}/lib/${FIREFOX_NAME}/firefox-bin \
+		${PREFIX}/lib/${FIREFOX_NAME}/${FIREFOX_NAME}-bin
 	${INSTALL_SCRIPT} ${WRKDIR}/linkfarm \
-		${PREFIX}/lib/${FIREBIRD_NAME}
-
-NEW_LIBSTDCXX=	${LINUXBASE}/usr/lib/libstdc++-libc6.2-2.so.3
-OLD_LIBSTDCXX=	libstdc++-libc6.1-1.so.2
+	${PREFIX}/lib/${FIREFOX_NAME}
 
 post-install:
-	if [ ! -f ${NEW_LIBSTDCXX} ]; then \
-		${LN} -s ${OLD_LIBSTDCXX} ${NEW_LIBSTDCXX}; \
-	fi
-	${ECHO_CMD} "@exec if [ ! -f ${NEW_LIBSTDCXX} ]; then ${LN} -s ${OLD_LIBSTDCXX} ${NEW_LIBSTDCXX}; fi" >> ${TMPPLIST}
-	${ECHO_CMD} "@unexec if [ -L ${NEW_LIBSTDCXX} ]; then ${RM} -f ${NEW_LIBSTDCXX}; fi" >> ${TMPPLIST}
 	@${ECHO_CMD} \*\* After adding plugins to \(Linux\) Beonex,
 	@${ECHO_CMD} \*\* Mozilla or Netscape, run\
 		> ${PKGMESSAGE}
-	@${ECHO_CMD} \*\* ${PREFIX}/lib/${FIREBIRD_NAME}/linkfarm as root \
+	@${ECHO_CMD} \*\* ${PREFIX}/lib/${FIREFOX_NAME}/linkfarm as root \
 		>> ${PKGMESSAGE}
-	@${ECHO_CMD} \*\* to make them available to ${FIREBIRD_NAME}. \
+	@${ECHO_CMD} \*\* to make them available to ${FIREFOX_NAME}. \
 		>> ${PKGMESSAGE}
-	@- ${SH} ${PREFIX}/lib/${FIREBIRD_NAME}/linkfarm || true
+	@- ${SH} ${PREFIX}/lib/${FIREFOX_NAME}/linkfarm || true
 	@ ${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index e90726c4e2a2..7fe342b889d0 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,3 +1,3 @@
 $FreeBSD$
-MD5 (MozillaFirebird-0.7-i686-pc-linux-gnu.tar.gz) = 673a453e2b8931ed08f25dbb763a3bf0
-SIZE (MozillaFirebird-0.7-i686-pc-linux-gnu.tar.gz) = 9509986
+MD5 (firefox-1.0.tar.gz) = 961fc684c55cb95d23bc465d5346de32
+SIZE (firefox-1.0.tar.gz) = 8223869
diff --git a/www/linux-firefox/pkg-descr b/www/linux-firefox/pkg-descr
index 5342d48943e3..fee9e6191bb1 100644
--- a/www/linux-firefox/pkg-descr
+++ b/www/linux-firefox/pkg-descr
@@ -1,9 +1,9 @@
-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.
+Firefox 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 plugin from
 ports/www/linux-flashplugin6/ and with the Java plugin from
 ports/java/linux-blackdown-jdk14/.
 
-WWW:  http://mozilla.org/projects/firebird/
+WWW:  http://mozilla.org/projects/firefox/