- Update to 1.4.28

3 files changed, 11 insertions, 35 deletions

diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 262e5653b502..d4fdce46cce9 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	liferea
-PORTVERSION=	1.4.27
+PORTVERSION=	1.4.28
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	liferea
@@ -21,6 +21,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		liferea.1
 MANLANG=	"" pl
@@ -32,7 +33,6 @@ OPTIONS=	LIBNOTIFY "Enable libnotify support" on \
 		GNUTLS "Enable SSL/HTTPS support" on \
 		GTKHTML "Use GtkHtml for rendering" on \
 		WEBKIT "Use Webkit for rendering" off
-#		MOZILLA "Use Firefox for rendering" off \
 #		XULRUNNER "Use Xulrunner for rendering" off
 
 .include <bsd.port.pre.mk>
@@ -69,28 +69,14 @@ CONFIGURE_ARGS+=--disable-webkit
 PLIST_SUB+=	WEBKIT="@comment "
 .endif
 
-.ifdef WITH_MOZILLA
-USE_GNOME+=	gconf2 libxslt
-USE_GECKO=	firefox mozilla
-CONFIGURE_ARGS+=--with-gecko=${GECKO}
-PLIST_SUB+=	MOZ=""
-BROKEN=		does not compile
-.else
-PLIST_SUB+=	MOZ="@comment "
-.endif
-
 .ifdef WITH_XULRUNNER
-CONFIGURE_ARGS+=--with-gecko=xulrunner
-BUILD_DEPENDS+=	xulrunner:${PORTSDIR}/www/xulrunner
-RUN_DEPENDS+=	xulrunner:${PORTSDIR}/www/xulrunner
+CONFIGURE_ARGS+=--with-gecko=libxul
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libxul/libxul.so:${PORTSDIR}/www/libxul
+RUN_DEPENDS+=	${LOCALBASE}/lib/libxul/libxul.so:${PORTSDIR}/www/libxul
 PLIST_SUB+=	XUL=""
-BROKEN=		does not configure
 .else
-PLIST_SUB+=	XUL="@comment "
-.endif
-
-.if !defined(WITH_MOZILLA) && !defined(WITH_XULRUNNER)
 CONFIGURE_ARGS+=--disable-gecko
+PLIST_SUB+=	XUL="@comment "
 .endif
 
 .ifdef WITHOUT_DBUS
@@ -99,12 +85,4 @@ CONFIGURE_ARGS+=--disable-dbus
 LIB_DEPENDS+=	dbus-1.3:${PORTSDIR}/devel/dbus
 .endif
 
-post-patch:
-.ifdef WITH_MOZILLA
-	@${REINPLACE_CMD} -e 's,firefox-,$$gecko_provider-,g' \
-		-e 's,\(gecko_provider=\).*$$,\1${GECKO},' \
-		-e '/INCLUDE/s,{print $$1},{print $$2},g' \
-		${WRKSRC}/configure
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net/liferea/distinfo b/net/liferea/distinfo
index dbec3eb30243..59d76eac13dd 100644
--- a/net/liferea/distinfo
+++ b/net/liferea/distinfo
@@ -1,3 +1,3 @@
-MD5 (liferea-1.4.27.tar.gz) = a798c9eb8c7f18cf00369ef0c4119d62
-SHA256 (liferea-1.4.27.tar.gz) = 5eb44c82bd0635a551786c9d0b4187f41d47d1f5e987e7d781b98096b09c4105
-SIZE (liferea-1.4.27.tar.gz) = 1659122
+MD5 (liferea-1.4.28.tar.gz) = 411bd9e56a648056cdce96dbea104c3e
+SHA256 (liferea-1.4.28.tar.gz) = d39abe7d9651783f4ecd59a0f6c5e2650f32df834e0e742a6b5d003795913fd6
+SIZE (liferea-1.4.28.tar.gz) = 1697036
diff --git a/net/liferea/pkg-plist b/net/liferea/pkg-plist
index 1f09e11795fe..28b87c0dbe4c 100644
--- a/net/liferea/pkg-plist
+++ b/net/liferea/pkg-plist
@@ -3,12 +3,10 @@ bin/liferea-add-feed
 bin/liferea-bin
 %%GTKHTML%%lib/liferea/liblihtmlg.la
 %%GTKHTML%%lib/liferea/liblihtmlg.so
-%%MOZ%%lib/liferea/liblihtmlm.la
-%%MOZ%%lib/liferea/liblihtmlm.so
 %%WEBKIT%%lib/liferea/liblihtmlw.la
 %%WEBKIT%%lib/liferea/liblihtmlw.so
-%%XUL%%lib/liferea/liblihtmlx.la
-%%XUL%%lib/liferea/liblihtmlx.so
+@comment %%XUL%%lib/liferea/liblihtmlx.la
+@comment %%XUL%%lib/liferea/liblihtmlx.so
 %%NOTIFY%%lib/liferea/liblinotiflibnotify.la
 %%NOTIFY%%lib/liferea/liblinotiflibnotify.so
 share/applications/liferea.desktop