update www/linux-firefox to 1.5

	o Update 1.5
	o Partially rewrite the port
	o Add SHA256
	If the maintainer desires so, I can take maintainership.

PR:		ports/89884
Submitted by:	Andrew Pantyukhin <infofarmer@gmail.com>
Approved by:	Aaron Voisine <voisine@gmail.com>

5 files changed, 62 insertions, 75 deletions

diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 856db89bdd41..8e1336fc5bdf 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.7
+PORTVERSION=	1.5
 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@gmail.com
-COMMENT=	Web browser branched from Mozilla
+MAINTAINER=	infofarmer@gmail.com
+COMMENT=	Web browser based on the browser portion of Mozilla
 
 RUN_DEPENDS?=	${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 \
@@ -23,79 +22,40 @@ RUN_DEPENDS?=	${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/
 		${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig
 
 NO_BUILD=	yes
-ONLY_FOR_ARCHS=i386 amd64
+ONLY_FOR_ARCHS=	i386 amd64
 FIREFOX_NAME=	${PKGNAMEPREFIX}${PORTNAME}
-DESCR=		${.CURDIR}/pkg-descr
-MD5_FILE=	${.CURDIR}/distinfo
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PLIST=		${WRKDIR}/pkg-plist
 USE_LINUX=	yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/firefox
-
-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/${FIREFOX_NAME}/plugins" \
-		>>${WRKDIR}/linkfarm
-	${ECHO_CMD} "${FIND} -L . -type l -delete" \
-		>>${WRKDIR}/linkfarm
+WRKSRC=		${WRKDIR}/${PORTNAME}
+FDIR=		${PREFIX}/lib/${FIREFOX_NAME}
 
-.for ii in \
-	lib/linux-beonex/plugins \
-	lib/netscape-linux/plugins \
-	lib/flash \
-	lib/linux-mozilla/plugins \
-	lib/linux-netscape*/plugins \
-	lib/linux-flashplugin6 \
-	lib/linux-flashplugin7 \
-	linux-blackdown-jdk1.3.1/jre/plugin/i386/mozilla \
-	linux-blackdown-jdk1.4.2/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/${FIREFOX_NAME} > ${PLIST}
-	${ECHO_CMD} lib/${FIREFOX_NAME}/${FIREFOX_NAME}-bin >> ${PLIST}
-	${ECHO_CMD} \
-		"@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/${FIREFOX_NAME}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${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}
+PLIST_SUB+=	FIREFOX_NAME=${FIREFOX_NAME}
+SUB_LIST+=	FIREFOX_NAME=${FIREFOX_NAME}
+SUB_FILES=	linkfarm pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${FIREFOX_NAME}
-	${CHMOD} 755 ${PREFIX}/lib/${FIREFOX_NAME}
-	cd ${WRKSRC} && ${FIND} * | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} \
-		${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/${FIREFOX_NAME}
+	${INSTALL} -d ${FDIR}
+	${CP} -R ${WRKSRC}/ ${FDIR}
+	${LN} -sf ${FDIR}/firefox ${PREFIX}/bin/${FIREFOX_NAME}
+	${LN} -sf ${FDIR}/firefox-bin ${FDIR}/${FIREFOX_NAME}-bin
+	${INSTALL_SCRIPT} ${WRKDIR}/linkfarm ${FDIR}
 
 post-install:
-	@${ECHO_CMD} \*\* After adding plugins to \(Linux\) Beonex,
-	@${ECHO_CMD} \*\* Mozilla or Netscape, run\
-		> ${PKGMESSAGE}
-	@${ECHO_CMD} \*\* ${PREFIX}/lib/${FIREFOX_NAME}/linkfarm as root \
-		>> ${PKGMESSAGE}
-	@${ECHO_CMD} \*\* to make them available to ${FIREFOX_NAME}. \
-		>> ${PKGMESSAGE}
-	@- ${SH} ${PREFIX}/lib/${FIREFOX_NAME}/linkfarm || true
-	@ ${CAT} ${PKGMESSAGE}
+	@${SH} ${FDIR}/linkfarm
+	@${CAT} ${PKGMESSAGE}
+
+# Maintainer section
+create-plist:
+	${ECHO_CMD} bin/%%FIREFOX_NAME%% > ${PLIST}
+	${ECHO_CMD} lib/%%FIREFOX_NAME%%/%%FIREFOX_NAME%%-bin >> ${PLIST}
+	cd ${WRKDIR} && ${FIND} ${PORTNAME} -type f -or -type l | \
+		${SED} -e "s#^${PORTNAME}#lib/%%FIREFOX_NAME%%#" | ${SORT} >> ${PLIST}
+	${ECHO_CMD} lib/%%FIREFOX_NAME%%/linkfarm >> ${PLIST}
+	${ECHO_CMD} @exec %%PREFIX%%/lib/%%FIREFOX_NAME%%/linkfarm >> ${PLIST}
+	${ECHO_CMD} @unexec ${FIND} %%PREFIX%%/lib/%%FIREFOX_NAME%%/plugins \
+		-type l -delete >> ${PLIST}
+	cd ${WRKDIR} && ${FIND} -d ${PORTNAME} -type d | \
+		${SED} -e "s#^${PORTNAME}#@dirrm lib/%%FIREFOX_NAME%%#" >> ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/www/linux-firefox/distinfo b/www/linux-firefox/distinfo
index f9eaf74c2bf9..87ff948064a9 100644
--- a/www/linux-firefox/distinfo
+++ b/www/linux-firefox/distinfo
@@ -1,2 +1,3 @@
-MD5 (firefox-1.0.7.tar.gz) = 020cc6de5a3d90e7b85639bbf0f1bc18
-SIZE (firefox-1.0.7.tar.gz) = 8225844
+MD5 (firefox-1.5.tar.gz) = b63fcdf4863e59c93d2a29df853b6046
+SHA256 (firefox-1.5.tar.gz) = 8c32e059a6ec0bca094ffa6c73c000322b77e7e6a7d1dc826ec114787f8858e5
+SIZE (firefox-1.5.tar.gz) = 8444956
diff --git a/www/linux-firefox/files/linkfarm.in b/www/linux-firefox/files/linkfarm.in
new file mode 100644
index 000000000000..f8399d657665
--- /dev/null
+++ b/www/linux-firefox/files/linkfarm.in
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Run this after installing Beonex, Mozilla or Netscape plugins
+cd	%%PREFIX%%/lib/%%FIREFOX_NAME%%/plugins
+find -L . -type l -delete
+find	%%PREFIX%%/lib/linux-beonex/plugins \
+	%%PREFIX%%/lib/netscape-linux/plugins \
+	%%PREFIX%%/lib/flash \
+	%%PREFIX%%/lib/linux-mozilla/plugins \
+	%%PREFIX%%/lib/linux-netscape*/plugins \
+	%%PREFIX%%/lib/linux-flashplugin6 \
+	%%PREFIX%%/lib/linux-flashplugin7 \
+	%%PREFIX%%/linux-blackdown-jdk1.3.1/jre/plugin/i386/mozilla \
+	%%PREFIX%%/linux-blackdown-jdk1.4.2/jre/plugin/i386/mozilla \
+	-type f -maxdepth 1 -exec ln -s {} \; 2>/dev/null || true
diff --git a/www/linux-firefox/files/pkg-message.in b/www/linux-firefox/files/pkg-message.in
new file mode 100644
index 000000000000..16784949b089
--- /dev/null
+++ b/www/linux-firefox/files/pkg-message.in
@@ -0,0 +1,4 @@
+** After adding plugins to (Linux) Beonex,
+** Mozilla or Netscape, run
+** %%PREFIX%%/lib/%%FIREFOX_NAME%%/linkfarm as root
+** to make them available to %%FIREFOX_NAME%%.
diff --git a/www/linux-firefox/pkg-descr b/www/linux-firefox/pkg-descr
index fee9e6191bb1..efbab8e9a381 100644
--- a/www/linux-firefox/pkg-descr
+++ b/www/linux-firefox/pkg-descr
@@ -1,9 +1,17 @@
-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.
+Firefox is an award winning, free, open-source web browser for many platforms
+and is based on the Mozilla codebase. It is small, fast and easy to use, and
+offers many advanced features:
+ o Popup Blocking
+ o Tabbed Browsing
+ o Live Bookmarks (ie. RSS)
+ o Extensions
+ o Themes
+ o FastFind
+ o Improved Security
 
 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/
+WWW: http://www.mozilla.com/firefox/