Subject: Re: Firefox packages broken on 2005Q1
To: None <tech-pkg@netbsd.org, kei@netbsd.org>
From: Jonathan Perkin <jonathan@perkin.org.uk>
List: tech-pkg
Date: 04/23/2005 10:25:00
--zhXaljGHf11kAtnf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

* On 2005-04-23 at 10:23 BST, Jonathan Perkin wrote:

> I've kludged it locally with the attached patch

Heh, and I always laugh at people who forget to attach the patch...

-- 
Jonathan Perkin                                     The NetBSD Project
http://www.perkin.org.uk/                       http://www.netbsd.org/

--zhXaljGHf11kAtnf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="firefox.diff"

Index: firefox-bin-acroread/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-acroread/Makefile.common,v
retrieving revision 1.1
diff -u -r1.1 Makefile.common
--- firefox-bin-acroread/Makefile.common	10 Feb 2004 12:26:24 -0000	1.1
+++ firefox-bin-acroread/Makefile.common	23 Apr 2005 09:16:25 -0000
@@ -5,7 +5,7 @@
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 
-DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
+DEPENDS+=		firefox-gtk2-bin>=0.8:../../www/firefox-bin
 
 ONLY_FOR_PLATFORM=	Linux-*-i386 NetBSD-*-i386
 PLATFORM=		intellinux
@@ -18,7 +18,7 @@
 PLIST_SRC=		../../www/firefox-bin-acroread/PLIST
 PLIST_SUBST+=		ACROREAD=${ACROREAD}
 PLIST_SUBST+=		PLATFORM=${PLATFORM}
-NS_PLUGINS_DIR=		${PREFIX}/lib/firefox-linux/plugins
+NS_PLUGINS_DIR=		${PREFIX}/lib/firefox-gtk2-linux/plugins
 
 do-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
Index: firefox-bin-acroread/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-acroread/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- firefox-bin-acroread/PLIST	10 Feb 2004 12:26:24 -0000	1.1
+++ firefox-bin-acroread/PLIST	23 Apr 2005 09:16:25 -0000
@@ -1,3 +1,2 @@
 @comment $NetBSD: PLIST,v 1.1 2004/02/10 12:26:24 grant Exp $
-@exec ${LN} -s %D/${ACROREAD}/Browsers/${PLATFORM}/nppdf.so %D/lib/firefox-linux/plugins/nppdf.so
-lib/firefox-linux/plugins/nppdf.so
+lib/firefox-gtk2-linux/plugins/nppdf.so
Index: firefox-bin-flash/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-flash/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- firefox-bin-flash/Makefile	28 Sep 2004 22:58:49 -0000	1.3
+++ firefox-bin-flash/Makefile	23 Apr 2005 09:16:25 -0000
@@ -3,7 +3,7 @@
 
 COMMENT=		Flash Player plugin for firefox-bin
 
-DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
+DEPENDS+=		firefox-gtk2-bin>=0.8:../../www/firefox-bin
 
 .include "../../emulators/suse_linux/Makefile.application"
 .include "../../mk/bsd.pkg.mk"
Index: firefox-bin-flash/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-flash/Makefile.common,v
retrieving revision 1.2
diff -u -r1.2 Makefile.common
--- firefox-bin-flash/Makefile.common	20 Dec 2004 22:44:31 -0000	1.2
+++ firefox-bin-flash/Makefile.common	23 Apr 2005 09:16:25 -0000
@@ -33,7 +33,7 @@
 CHECK_SHLIBS=		no
 CRYPTO=			yes
 
-MOZ_NAME?=		firefox-linux
+MOZ_NAME?=		firefox-gtk2-linux
 MOZ_BIN?=		${MOZ_NAME:S/linux/bin/}
 WRKSRC=			${WRKDIR}/${WRKNAME}
 NS_PLUGINS_DIR=		${PREFIX}/lib/${MOZ_NAME}/plugins
Index: firefox-bin-java/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-java/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- firefox-bin-java/Makefile	1 Oct 2004 19:20:27 -0000	1.8
+++ firefox-bin-java/Makefile	23 Apr 2005 09:16:25 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.8 2004/10/01 19:20:27 wiz Exp $
 .include "Makefile.common"
 
-DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
+DEPENDS+=		firefox-gtk2-bin>=0.8:../../www/firefox-bin
 
 .include "../../mk/bsd.pkg.mk"
Index: firefox-bin-java/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-java/Makefile.common,v
retrieving revision 1.2
diff -u -r1.2 Makefile.common
--- firefox-bin-java/Makefile.common	3 Feb 2005 23:46:58 -0000	1.2
+++ firefox-bin-java/Makefile.common	23 Apr 2005 09:16:25 -0000
@@ -20,7 +20,7 @@
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
 
-MOZ_NAME?=		firefox-linux
+MOZ_NAME?=		firefox-gtk2-linux
 MOZ_BIN?=		${MOZ_NAME:S/linux/bin/}
 
 PLIST_SUBST+=		MOZ_NAME=${MOZ_NAME:Q}
Index: firefox-bin-realplayer/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-realplayer/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- firefox-bin-realplayer/Makefile	10 Feb 2004 13:05:06 -0000	1.2
+++ firefox-bin-realplayer/Makefile	23 Apr 2005 09:16:26 -0000
@@ -9,7 +9,7 @@
 MAINTAINER=		kei@NetBSD.org
 COMMENT=		RealAudio and RealVideo player plugin for firefox-bin
 
-DEPENDS+=		firefox-bin>=0.8:../../www/firefox-bin
+DEPENDS+=		firefox-gtk2-bin>=0.8:../../www/firefox-bin
 DEPENDS+=		realplayer-[0-9]*:../../multimedia/realplayer
 
 ONLY_FOR_PLATFORM=	*-*-i386
@@ -19,10 +19,11 @@
 NO_CONFIGURE=		YES
 NO_BUILD=		YES
 
-NS_PLUGINS_DIR=		${PREFIX}/lib/firefox-linux/plugins
+NS_PLUGINS_DIR=		${PREFIX}/lib/firefox-gtk2-linux/plugins
 PLUGIN_SOURCE=		${PREFIX}/lib/netscape/plugins/rpnp.so
 
 do-install:
+	${MKDIR} -p ${NS_PLUGINS_DIR}
 	${LN} -s ${PLUGIN_SOURCE} ${NS_PLUGINS_DIR}/rpnp.so
 
 .include "../../mk/bsd.pkg.mk"
Index: firefox-bin-realplayer/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-realplayer/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- firefox-bin-realplayer/PLIST	10 Feb 2004 12:58:19 -0000	1.1
+++ firefox-bin-realplayer/PLIST	23 Apr 2005 09:16:26 -0000
@@ -1,3 +1,3 @@
 @comment $NetBSD: PLIST,v 1.1 2004/02/10 12:58:19 grant Exp $
-@exec ${LN} -s %D/lib/netscape/plugins/rpnp.so %D/lib/firefox-linux/plugins/rpnp.so
-lib/firefox-linux/plugins/rpnp.so
+@exec ${LN} -s %D/lib/netscape/plugins/rpnp.so %D/lib/firefox-gtk2-linux/plugins/rpnp.so
+lib/firefox-gtk2-linux/plugins/rpnp.so

--zhXaljGHf11kAtnf--