[pkgsrc/trunk]: pkgsrc/net/aria2 having two options for the same thing is con...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e750cdac297c
branches:  trunk
changeset: 565398:e750cdac297c
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Sep 22 12:38:45 2009 +0000

description:
having two options for the same thing is confusing

diffstat:

 net/aria2/Makefile   |  3 ++-
 net/aria2/options.mk |  8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 89888f054e49 -r e750cdac297c net/aria2/Makefile
--- a/net/aria2/Makefile        Tue Sep 22 12:18:33 2009 +0000
+++ b/net/aria2/Makefile        Tue Sep 22 12:38:45 2009 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2009/03/08 23:41:33 bjs Exp $
+# $NetBSD: Makefile,v 1.20 2009/09/22 12:38:45 tnn Exp $
 #
 
 DISTNAME=      aria2-1.2.0
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=aria2/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 89888f054e49 -r e750cdac297c net/aria2/options.mk
--- a/net/aria2/options.mk      Tue Sep 22 12:18:33 2009 +0000
+++ b/net/aria2/options.mk      Tue Sep 22 12:38:45 2009 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.8 2009/07/03 10:31:30 drochner Exp $
+# $NetBSD: options.mk,v 1.9 2009/09/22 12:38:45 tnn Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.aria2
 
 PKG_OPTIONS_GROUP.ssl=         gnutls ssl
 PKG_OPTIONS_REQUIRED_GROUPS=   ssl
 
-PKG_SUPPORTED_OPTIONS=         sqlite firefox3
-PKG_SUGGESTED_OPTIONS=         ssl
+PKG_SUPPORTED_OPTIONS=         sqlite
+PKG_SUGGESTED_OPTIONS=         ssl sqlite
 ###
 ### XXX Remove this in the future [2008-04-15 bjs]
 ###
@@ -34,7 +34,7 @@
 ###
 ###    firefox3 cookie support via sqlite3
 ###
-.if !empty(PKG_OPTIONS:Mfirefox3) || !empty(PKG_OPTIONS:Msqlite)
+.if !empty(PKG_OPTIONS:Msqlite)
 CONFIGURE_ARGS+=       --with-sqlite3
 CONFIGURE_ARGS+=       --with-sqlite3-prefix=${BUILDLINK_PREFIX.sqlite:Q}
 .  include "../../databases/sqlite3/buildlink3.mk"