From: Jan Schaumann <jschauma@netmeister.org>
Subject: firefox-bin-* packages
Date: Tue, 3 May 2005 16:41:35 -0400

> It seems that the default firefox-bin package has become
> firefox-gtk2-bin.  This causes problems with the firefox-bin-* packages,
> as they (a) try to pull in 'firefox-bin' and don't know that
> 'firefox-gtk2-bin' is acceptable and (b) try to install the plugins into
> .../firefox-linux/... instead of .../firefox-gtk2-linux/...

So how about this patch?

Index: firefox-bin-acroread/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-acroread/Makefile.common,v
retrieving revision 1.1
diff -u -d -r1.1 Makefile.common
--- firefox-bin-acroread/Makefile.common	10 Feb 2004 12:26:24 -0000	1.1
+++ firefox-bin-acroread/Makefile.common	4 May 2005 06:37:50 -0000
@@ -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-flash/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-flash/Makefile.common,v
retrieving revision 1.3
diff -u -d -r1.3 Makefile.common
--- firefox-bin-flash/Makefile.common	11 Apr 2005 21:47:53 -0000	1.3
+++ firefox-bin-flash/Makefile.common	4 May 2005 06:37:50 -0000
@@ -32,12 +32,12 @@
 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
 
-PLIST_SUBST+=		MOZ_NAME="${MOZ_NAME}"
+PLIST_SUBST+=		MOZ_NAME=${MOZ_NAME:Q}
 
 do-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
Index: firefox-bin-java/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/firefox-bin-java/Makefile.common,v
retrieving revision 1.3
diff -u -d -r1.3 Makefile.common
--- firefox-bin-java/Makefile.common	11 Apr 2005 21:47:53 -0000	1.3
+++ firefox-bin-java/Makefile.common	4 May 2005 06:37:50 -0000
@@ -19,7 +19,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}

--
SUNAGAWA Keiki <kei_sun@ba2.so-net.ne.jp>