pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/libgdata Fix build with PKG_OPTIONS.libgdata+= -gn...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/04a38a011124
branches:  trunk
changeset: 591068:04a38a011124
user:      gls <gls%pkgsrc.org@localhost>
date:      Tue Aug 02 21:50:46 2011 +0000

description:
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:

 net/libgdata/DESCR         |   6 +++---
 net/libgdata/Makefile      |  12 +++++++-----
 net/libgdata/buildlink3.mk |   4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diffs (70 lines):

diff -r 35edbbb7dd5c -r 04a38a011124 net/libgdata/DESCR
--- a/net/libgdata/DESCR        Tue Aug 02 21:27:45 2011 +0000
+++ b/net/libgdata/DESCR        Tue Aug 02 21:50:46 2011 +0000
@@ -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 -r 35edbbb7dd5c -r 04a38a011124 net/libgdata/Makefile
--- a/net/libgdata/Makefile     Tue Aug 02 21:27:45 2011 +0000
+++ b/net/libgdata/Makefile     Tue Aug 02 21:50:46 2011 +0000
@@ -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 @@
 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 @@
 .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 -r 35edbbb7dd5c -r 04a38a011124 net/libgdata/buildlink3.mk
--- a/net/libgdata/buildlink3.mk        Tue Aug 02 21:27:45 2011 +0000
+++ b/net/libgdata/buildlink3.mk        Tue Aug 02 21:50:46 2011 +0000
@@ -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 @@
 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
 
 



Home | Main Index | Thread Index | Old Index