4 files changed, 65 insertions, 7 deletions

diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 98f361dbdad5..b063ae45885f 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liferea
-PORTVERSION=	1.0.11
+PORTVERSION=	1.0.12
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	liferea
@@ -26,7 +26,9 @@ MAN1=		liferea.1
 GCONF_SCHEMAS=	liferea.schemas
 
 OPTIONS=	DBUS "Enable dbus support" on \
-		MOZILLA "Use Mozilla for rendering" off
+		XPI "Firefox extension to subscribe feeds (req. dbus)" off \
+		MOZILLA "Use Mozilla for rendering" off \
+		XULRUNNER "Use Xulrunner for rendering" off
 
 .include <bsd.port.pre.mk>
 
@@ -39,6 +41,23 @@ CONFIGURE_ARGS+=--disable-gecko
 PLIST_SUB=	MOZ="@comment "
 .endif
 
+.ifdef WITH_XPI
+PATCH_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+RUN_DEPENDS+=	firefox:${PORTSDIR}/www/firefox
+PLIST_SUB+=	XPI=""
+.else
+PLIST_SUB+=	XPI="@comment "
+.endif
+
+.ifdef WITH_XULRUNNER
+BUILD_DEPENDS+=	xulrunner:${PORTSDIR}/www/xulrunner
+RUN_DEPENDS+=	xulrunner:${PORTSDIR}/www/xulrunner
+PLIST_SUB+=	XUL=""
+.else
+CONFIGURE_ARGS+=--disable-xulrunner
+PLIST_SUB+=	XUL="@comment "
+.endif
+
 .ifdef WITHOUT_DBUS
 CONFIGURE_ARGS+=--disable-dbus
 .else
@@ -55,7 +74,19 @@ post-patch:
 		-e 's,{print $$1},{print $$2},g' \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's|gtk_moz_embed_set_comp_path(NULL)|gtk_moz_embed_set_comp_path("${X11BASE}/lib/${GECKO}")|' \
-		${WRKSRC}/src/mozilla/mozembed.c
+		${WRKSRC}/src/mozilla/mozilla.c
+.endif
+.ifdef WITH_XPI
+	@${MKDIR} ${WRKDIR}/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
+	@${UNZIP_CMD} -q -d ${WRKDIR}/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab} ${WRKSRC}/feedbag.xpi
+.endif
+
+post-install:
+.ifdef WITH_XPI
+	${MKDIR} ${PREFIX}/lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome
+	${INSTALL_DATA} ${WRKDIR}/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome/feedbag.jar ${PREFIX}/lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome
+	${INSTALL_DATA} ${WRKDIR}/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome.manifest ${PREFIX}/lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
+	${INSTALL_DATA} ${WRKDIR}/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/install.rdf ${PREFIX}/lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index a6faa6ec0566..82282693eae9 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,3 +1,3 @@
-MD5 (liferea-1.0.11.tar.gz) = 6a0bff2a9764b49c35a23d6a9551b79d
-SHA256 (liferea-1.0.11.tar.gz) = a426e716fcba97753b95eb810ee43e0dd0b4cc8e36c62a24545fc516bb601f24
-SIZE (liferea-1.0.11.tar.gz) = 1566681
+MD5 (liferea-1.0.12.tar.gz) = ade0dc39ad6582cecb953da031f7b8eb
+SHA256 (liferea-1.0.12.tar.gz) = 9c76825f0eb68cc6378b1c4a46303599ad4d3d93da82ad1fb38bcd9ce3585bce
+SIZE (liferea-1.0.12.tar.gz) = 1570961
diff --git a/net/liferea/files/patch-dont_install_wrapper_script b/net/liferea/files/patch-dont_install_wrapper_script
new file mode 100644
index 000000000000..561e90d78562
--- /dev/null
+++ b/net/liferea/files/patch-dont_install_wrapper_script
@@ -0,0 +1,21 @@
+--- src/Makefile.in.orig	Mon May  8 18:30:25 2006
++++ src/Makefile.in	Mon May  8 18:43:31 2006
+@@ -199,7 +199,6 @@
+ 
+ 
+ bin_PROGRAMS = liferea-bin 
+-bin_SCRIPTS = liferea
+ 
+ liferea_bin_SOURCES = \
+ 	atom10.c atom10.h \
+@@ -369,8 +368,8 @@
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/liferea"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/liferea || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index b859af5781d9..2aa1d91d5f86 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -1,9 +1,13 @@
 bin/liferea
-bin/liferea-bin
+%%XPI%%lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome/feedbag.jar
+%%XPI%%lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome.manifest
+%%XPI%%lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/install.rdf
 lib/liferea/liblihtmlg.la
 lib/liferea/liblihtmlg.so
 %%MOZ%%lib/liferea/liblihtmlm.la
 %%MOZ%%lib/liferea/liblihtmlm.so
+%%XUL%%lib/liferea/liblihtmlx.la
+%%XUL%%lib/liferea/liblihtmlx.so
 share/gnome/applications/liferea.desktop
 share/gnome/liferea/css/adblock.css
 share/gnome/liferea/css/liferea.css
@@ -107,3 +111,5 @@ share/locale/zh_TW/LC_MESSAGES/liferea.mo
 @dirrm share/gnome/liferea/css
 @dirrm share/gnome/liferea
 @dirrm lib/liferea
+%%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}/chrome
+%%XPI%%@dirrm lib/firefox/extensions/{79ea0ec1-3fc3-4ade-8220-262d4c4825ab}