From 20e431655eb1649d139c814f1027b350571fe9c6 Mon Sep 17 00:00:00 2001
From: tnn <tnn>
Date: Tue, 21 Apr 2009 16:47:48 +0000
Subject: drop references to firefox-gtk1

---
 devel/cpuflags/files/optimize_gcc.mk | 8 +++-----
 misc/openoffice2/options.mk          | 5 +----
 misc/openoffice3/options.mk          | 5 +----
 multimedia/ns-flash/DESCR            | 3 +--
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk
index 8695dcf49c7..bd85fefecd7 100644
--- a/devel/cpuflags/files/optimize_gcc.mk
+++ b/devel/cpuflags/files/optimize_gcc.mk
@@ -1,4 +1,4 @@
-# $Id: optimize_gcc.mk,v 1.35 2007/09/20 10:19:03 abs Exp $
+# $Id: optimize_gcc.mk,v 1.36 2009/04/21 16:47:48 tnn Exp $
 
 # This file is 'experimental' - which is doublespeak for unspeakably
 # ugly, and quite broken by design.
@@ -14,10 +14,8 @@
 # Per package exclusions
 
 # firefox-1: v1.0, NetBSD i386/2.0
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/firefox www/firefox-gtk1
-PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/firefox15 www/firefox15-gtk1
-PKG_EXCLUDE_FAST_MATH+=www/firefox www/firefox-gtk1
-PKG_EXCLUDE_FAST_MATH+=www/firefox15 www/firefox15-gtk1
+PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/firefox
+PKG_EXCLUDE_FAST_MATH+=www/firefox
 
 # seamonkey-1.0.5: gcc-4.1.2 NetBSD 4.99.3 i386
 PKG_EXCLUDE_OMIT_FRAME_POINTER+=www/seamonkey www/seamonkey-gtk1
diff --git a/misc/openoffice2/options.mk b/misc/openoffice2/options.mk
index 15a72ac2bd0..0428698367e 100644
--- a/misc/openoffice2/options.mk
+++ b/misc/openoffice2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2008/11/24 11:58:44 hira Exp $
+# $NetBSD: options.mk,v 1.24 2009/04/21 16:47:48 tnn Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice2
 PKG_SUPPORTED_OPTIONS=		cups gnome gtk2 kde nas ooo-external-libwpd
@@ -46,9 +46,6 @@ CONFIGURE_ARGS+=	--with-system-mozilla=firefox3
 CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 .include "../../www/seamonkey/buildlink3.mk"
 # The following browsers do not install *.pc files.
-#.elif !empty(PKG_OPTIONS:Mfirefox-gtk1)
-#CONFIGURE_ARGS+=	--with-system-mozilla=firefox
-#.include "../../www/firefox-gtk1/buildlink3.mk"
 #.elif !empty(PKG_OPTIONS:Mseamonkey-gtk1)
 #CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 #.include "../../www/seamonkey-gtk1/buildlink3.mk"
diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
index bc1683ac481..f707b1a9fef 100644
--- a/misc/openoffice3/options.mk
+++ b/misc/openoffice3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2008/11/22 07:57:03 hira Exp $
+# $NetBSD: options.mk,v 1.14 2009/04/21 16:47:48 tnn Exp $
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.openoffice3
@@ -54,9 +54,6 @@ MOZ_FLAVOUR=		seamonkey
 CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 .include "../../www/seamonkey/buildlink3.mk"
 # The following browsers do not install *.pc files.
-#.elif !empty(PKG_OPTIONS:Mfirefox-gtk1)
-#CONFIGURE_ARGS+=	--with-system-mozilla=firefox
-#.include "../../www/firefox-gtk1/buildlink3.mk"
 #.elif !empty(PKG_OPTIONS:Mseamonkey-gtk1)
 #CONFIGURE_ARGS+=	--with-system-mozilla=seamonkey
 #.include "../../www/seamonkey-gtk1/buildlink3.mk"
diff --git a/multimedia/ns-flash/DESCR b/multimedia/ns-flash/DESCR
index e6c95e471b7..cc9f548735c 100644
--- a/multimedia/ns-flash/DESCR
+++ b/multimedia/ns-flash/DESCR
@@ -7,6 +7,5 @@ systems.
 
 Systems tested with nspluginwrapper:
     - NetBSD 3.1, 4.0, 4.99.x		- works
-    - firefox 1.5.0.x, 2.0.0.x		- works
-    - firefox-gtk1 (any version)	- does not work
+    - firefox 2.0.0.x, 3.0.x		- works
     - seamonkey 1.1.x			- works
-- 
cgit v1.2.3