summaryrefslogtreecommitdiffstats
path: root/net/liferea
diff options
context:
space:
mode:
authorperky <perky@FreeBSD.org>2005-04-17 03:48:58 +0000
committerperky <perky@FreeBSD.org>2005-04-17 03:48:58 +0000
commit8f8b0aca2e577bebb80efef3db464556c1072f30 (patch)
treea3fe287a749bacbd9f8ec64bae70ab79ffd28d35 /net/liferea
parentceb0dd514c2f99960330f1368366416557dc14a4 (diff)
downloadFreeBSD-ports-8f8b0aca2e577bebb80efef3db464556c1072f30.zip
FreeBSD-ports-8f8b0aca2e577bebb80efef3db464556c1072f30.tar.gz
- Respect value of WITH_MOZILLA=(firefox|mozilla|mozilla-devel) [1]
- Apply a simple patch to fix a memory leak. [2] Advised by: adamw [1] Submitted by: Roman Shterenzon
Diffstat (limited to 'net/liferea')
-rw-r--r--net/liferea/Makefile33
-rw-r--r--net/liferea/files/patch-src::net::netio.c9
2 files changed, 31 insertions, 11 deletions
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 777ed08..f6cd460 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,7 +7,7 @@
PORTNAME= liferea
PORTVERSION= 0.9.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= liferea
@@ -15,11 +15,6 @@ MASTER_SITE_SUBDIR= liferea
MAINTAINER= perky@FreeBSD.org
COMMENT= Simple RSS/RDF feed reader
-.ifdef WITH_MOZILLA
-BUILD_DEPENDS= mozilla:${PORTSDIR}/www/mozilla
-RUN_DEPENDS= mozilla:${PORTSDIR}/www/mozilla
-.endif
-
USE_X_PREFIX= yes
USE_GNOME= gnomeprefix gnomehack libgtkhtml
USE_GMAKE= yes
@@ -27,23 +22,39 @@ USE_REINPLACE= yes
USE_LIBTOOL_VER=15
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS+=${MOZILLA_ARG}
MAN1= liferea.1
GCONF_SCHEMAS= liferea.schemas
.ifdef WITH_MOZILLA
+.if ${WITH_MOZILLA}=="mozilla" || ${WITH_MOZILLA}=="yes"
+MOZILLA= mozilla
+MOZ_BUILD= mozilla
+.elif ${WITH_MOZILLA}=="mozilla-devel"
+MOZILLA= mozilla-devel
+MOZ_BUILD= mozilla
+.elif ${WITH_MOZILLA}=="firefox"
+MOZILLA= firefox
+MOZ_BUILD= firefox
+.else
+IGNORE= : Available options for WITH_MOZILLA are: mozilla mozilla-devel firefox
+.endif
+.endif # WITH_MOZILLA
+
+.ifdef MOZILLA
+BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
PLIST_SUB= MOZ=""
.else
PLIST_SUB= MOZ="@comment "
.endif
post-patch:
-.ifdef WITH_MOZILLA
- ${REINPLACE_CMD} -e 's,/usr/lib/moz,${X11BASE}/lib/moz,g' \
+ ${REINPLACE_CMD} -e 's,/usr/lib/mozilla,${X11BASE}/lib/${MOZ_BUILD},g' \
${WRKSRC}/src/liferea
-.else
- ${REINPLACE_CMD} -e 's,gtkmozembed,donttrythis,g' \
+ ${REINPLACE_CMD} -e 's,firefox-,$$gecko_provider-,g' \
+ -e 's,\(gecko_provider=\).*$$,\1${MOZ_BUILD},' \
${WRKSRC}/configure
-.endif
.include <bsd.port.mk>
diff --git a/net/liferea/files/patch-src::net::netio.c b/net/liferea/files/patch-src::net::netio.c
new file mode 100644
index 0000000..a7f0fe5
--- /dev/null
+++ b/net/liferea/files/patch-src::net::netio.c
@@ -0,0 +1,9 @@
+--- src/net/netio.c.orig 2005-04-10 17:43:21.000000000 +0300
++++ src/net/netio.c 2005-04-10 17:45:17.000000000 +0300
+@@ -1065,5 +1065,6 @@
+ g_free(cur_ptr.authinfo);
+ g_free(cur_ptr.cookies);
+ debug4(DEBUG_UPDATE, "download result - HTTP status: %d, error: %d, netio error:%d, data: %d", request->httpstatus, cur_ptr.problem, cur_ptr.netio_error, request->data);
++ free(cur_ptr.content_type);
+ return;
+ }
OpenPOWER on IntegriCloud