summaryrefslogtreecommitdiff
path: root/www/liferea
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2009-12-04 13:50:08 +0000
committertnn <tnn@pkgsrc.org>2009-12-04 13:50:08 +0000
commit8c6d01eb1af23d59c7b48ae0276b74309a7f8393 (patch)
tree36c74c68e19a17d8a7c625747fb7da93ca6c6343 /www/liferea
parent301a0ed556e72f4b25782ad9918e3612a72c4298 (diff)
downloadpkgsrc-8c6d01eb1af23d59c7b48ae0276b74309a7f8393.tar.gz
- clean up liferea mozilla options
- fix build with mozilla option
Diffstat (limited to 'www/liferea')
-rw-r--r--www/liferea/Makefile14
-rw-r--r--www/liferea/PLIST4
2 files changed, 8 insertions, 10 deletions
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index b70b1cb4a91..f48e9888774 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -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 @@ USE_LANGUAGES+= c
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 @@ CONFIGURE_ARGS+= --disable-gecko
.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 --git a/www/liferea/PLIST b/www/liferea/PLIST
index a8edbc94e6e..dc0878ed7ea 100644
--- a/www/liferea/PLIST
+++ b/www/liferea/PLIST
@@ -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