[pkgsrc/trunk]: pkgsrc - clean up liferea mozilla options

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/47f4b7232937
branches:  trunk
changeset: 568106:47f4b7232937
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Dec 04 13:50:08 2009 +0000

description:
- clean up liferea mozilla options
- fix build with mozilla option

diffstat:

 mk/defaults/options.description |   3 +--
 www/liferea/Makefile            |  14 ++++++--------
 www/liferea/PLIST               |   4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)

diffs (66 lines):

diff -r cf5b6cb628e3 -r 47f4b7232937 mk/defaults/options.description
--- a/mk/defaults/options.description   Fri Dec 04 10:39:01 2009 +0000
+++ b/mk/defaults/options.description   Fri Dec 04 13:50:08 2009 +0000
@@ -274,9 +274,8 @@
 libssh2                Use libssh2 for SSHv2 protocol support.
 libwww-aliases         Install aliases for p5-libwww (e.g. HEAD, GET etc.)
 libxml2                        Use the libxml2 library for XML support.
-liferea-firefox                Use Firefox to render HTML.
 liferea-gtkhtml                Use libgtkhtml2 to render HTML.
-liferea-seamonkey      Use Seamonkey to render HTML.
+liferea-mozilla                Use xulrunner to render HTML.
 links                  Use and enable support for the links browser.
 links-zlib             Enable zlib support for the links WWW browser.
 live                   Enable live555 support.
diff -r cf5b6cb628e3 -r 47f4b7232937 www/liferea/Makefile
--- a/www/liferea/Makefile      Fri Dec 04 10:39:01 2009 +0000
+++ b/www/liferea/Makefile      Fri Dec 04 13:50:08 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.87 2009/12/03 23:19:05 asau Exp $
+# $NetBSD: Makefile,v 1.88 2009/12/04 13:50:08 tnn Exp $
 
 DISTNAME=              liferea-1.4.28
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            www
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=liferea/}
 
@@ -19,7 +19,8 @@
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.liferea
 PKG_OPTIONS_REQUIRED_GROUPS=   renderer
-PKG_OPTIONS_GROUP.renderer=    liferea-gtkhtml liferea-seamonkey liferea-firefox liferea-webkit
+PKG_OPTIONS_GROUP.renderer=    liferea-gtkhtml liferea-mozilla liferea-webkit
+PKG_OPTIONS_LEGACY_OPTS=       liferea-firefox:liferea-mozilla liferea-seamonkey:liferea-mozilla
 PKG_SUGGESTED_OPTIONS= liferea-gtkhtml
 .include "../../mk/bsd.options.mk"
 
@@ -29,11 +30,8 @@
 .include "../../www/libgtkhtml/buildlink3.mk"
 PLIST.gtkhtml= yes
 .endif
-.if !empty(PKG_OPTIONS:Mliferea-firefox)
-.include "../../devel/xulrunner/buildlink3.mk"
-PLIST.mozilla= yes
-.endif
-.if !empty(PKG_OPTIONS:Mliferea-seamonkey)
+.if !empty(PKG_OPTIONS:Mliferea-mozilla)
+CONFIGURE_ARGS+=       --with-gecko=libxul
 .include "../../devel/xulrunner/buildlink3.mk"
 PLIST.mozilla= yes
 .endif
diff -r cf5b6cb628e3 -r 47f4b7232937 www/liferea/PLIST
--- a/www/liferea/PLIST Fri Dec 04 10:39:01 2009 +0000
+++ b/www/liferea/PLIST Fri Dec 04 13:50:08 2009 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.37 2009/06/14 22:00:25 joerg Exp $
+@comment $NetBSD: PLIST,v 1.38 2009/12/04 13:50:08 tnn Exp $
 bin/liferea
 bin/liferea-add-feed
 bin/liferea-bin
 ${PLIST.gtkhtml}lib/liferea/liblihtmlg.la
-${PLIST.mozilla}lib/liferea/liblihtmlm.la
+${PLIST.mozilla}lib/liferea/liblihtmlx.la
 ${PLIST.webkit}lib/liferea/liblihtmlw.la
 lib/liferea/liblinotiflibnotify.la
 man/man1/liferea.1