summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorgls <gls>2011-08-02 21:50:46 +0000
committergls <gls>2011-08-02 21:50:46 +0000
commit53ba9156edccb80a5c0603e71708e3b6fc20225f (patch)
treeee3fb894f602fca85207fba0cdbfa9222e7fb8a8 /net
parent09fc1152915b1700373a0b8cd8f4e842529a8191 (diff)
downloadpkgsrc-53ba9156edccb80a5c0603e71708e3b6fc20225f.tar.gz
Fix build with PKG_OPTIONS.libgdata+= -gnome. It requires libsoup24, even
with -gnome option set. Spotted by Pierre Pronchery in private mail. PKGREV++ While here, silence pkglint.
Diffstat (limited to 'net')
-rw-r--r--net/libgdata/DESCR6
-rw-r--r--net/libgdata/Makefile12
-rw-r--r--net/libgdata/buildlink3.mk4
3 files changed, 12 insertions, 10 deletions
diff --git a/net/libgdata/DESCR b/net/libgdata/DESCR
index 9634afdce48..9883b6b3777 100644
--- a/net/libgdata/DESCR
+++ b/net/libgdata/DESCR
@@ -1,3 +1,3 @@
-libgdata is a GLib-based library for accessing online service APIs using the GData protocol
-Google's services. It provides APIs to access the common Google services, and has full
-asynchronous support
+libgdata is a GLib-based library for accessing online service APIs using the
+GData protocol Google's services. It provides APIs to access the common Google
+services, and has full asynchronous support.
diff --git a/net/libgdata/Makefile b/net/libgdata/Makefile
index e9d6f0f6d40..9be524f1bdd 100644
--- a/net/libgdata/Makefile
+++ b/net/libgdata/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/06/10 09:39:45 obache Exp $
+# $NetBSD: Makefile,v 1.10 2011/08/02 21:50:46 gls Exp $
#
DISTNAME= libgdata-0.6.6
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgdata/0.6/}
EXTRACT_SUFX= .tar.bz2
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake intltool msgfmt
-USE_LANGUAGES+= c c++
+USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= libgdata.pc.in
@@ -29,14 +29,16 @@ PKG_SUGGESTED_OPTIONS= gnome
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgnome)
-BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.26.0
-. include "../../net/libsoup24/buildlink3.mk"
CONFIGURE_ARGS+= --enable-gnome
+.else
+CONFIGURE_ARGS+= --disable-gnome
.endif
.include "../../devel/GConf/schemas.mk"
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.19.7
.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.26.0
+.include "../../net/libsoup24/buildlink3.mk"
.include "../../textproc/gtk-doc/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/libgdata/buildlink3.mk b/net/libgdata/buildlink3.mk
index 91d74c1b134..0da8a6daa60 100644
--- a/net/libgdata/buildlink3.mk
+++ b/net/libgdata/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2011/06/10 09:39:45 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2011/08/02 21:50:46 gls Exp $
BUILDLINK_TREE+= libgdata
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgdata
LIBGDATA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libgdata+= libgdata>=0.6.4
-BUILDLINK_ABI_DEPENDS.libgdata?= libgdata>=0.6.6nb2
+BUILDLINK_ABI_DEPENDS.libgdata+= libgdata>=0.6.6nb2
BUILDLINK_PKGSRCDIR.libgdata?= ../../net/libgdata