From 605df68854d3bea2672a632d069651629d7ee225 Mon Sep 17 00:00:00 2001
From: dillo <dillo>
Date: Thu, 21 Jul 2005 13:11:42 +0000
Subject: Replace GECKO_PROVIDER with option group.  New options are firefox
 and mozilla.  Backwards compatibilty is provided.

Reviewed by wiz.
---
 mk/defaults/mk.conf             | 8 +-------
 mk/defaults/options.description | 2 ++
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'mk')

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 2988dcc2df8..5fa7356d2d1 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.69 2005/07/21 12:28:30 wiz Exp $
+# $NetBSD: mk.conf,v 1.70 2005/07/21 13:11:42 dillo Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -831,12 +831,6 @@ GAMEOWN?=	${BINOWN}
 # Possible:	any user name
 # Default:	${BINOWN}
 
-GECKO_PROVIDER?=	firefox
-# Selects which mozilla incarnation to use by packages which embed
-# the Gecko HTML renderer.
-# Possible: firefox, mozilla
-# Default: firefox
-
 GNU_PROGRAM_PREFIX?=	g
 # This is the prefix to add for GNU programs, like gls or gnutouch.
 # Possible: g, gnu, empty, ...
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index 7c4900ca1c9..3a5c1bc344d 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -67,6 +67,7 @@ faac
 faad	
 fam	
 ffmpeg	
+firefox			Use firefox as gecko rendering engine.
 flac	
 freetype	
 frontend-fastcgi	
@@ -154,6 +155,7 @@ mjpegtools-cmov		Enable CMOV support (i386 only).
 mlib			Enable usage of medialib (SunOS only).
 mmx			Enable MMX support (i386 only).
 modperl	
+mozilla			Use mozilla as gecko rendering engine.
 mplayer-menu		Enable support for user-defined menus.
 mplayer-real		Enable usage of Real codecs.
 mplayer-runtime-cpudetection	Enable CPU detection at run time.
-- 
cgit v1.2.3