Mon Jun 14 17:58:44 2010 UTC ()
replace the gnome-keyring dependency by one on libgnome-keyring which
is a subset of the former, ride on the libpng update


(drochner)
diff -r1.11 -r1.12 pkgsrc/net/libsoup24/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/net/libsoup24/options.mk
cvs diff -r1.11 -r1.12 pkgsrc/net/libsoup24/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/libsoup24/Attic/buildlink3.mk 2010/06/13 22:45:11 1.11
+++ pkgsrc/net/libsoup24/Attic/buildlink3.mk 2010/06/14 17:58:44 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.11 2010/06/13 22:45:11 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.12 2010/06/14 17:58:44 drochner Exp $
2 2
3BUILDLINK_TREE+= libsoup24 3BUILDLINK_TREE+= libsoup24
4 4
5.if !defined(LIBSOUP24_BUILDLINK3_MK) 5.if !defined(LIBSOUP24_BUILDLINK3_MK)
6LIBSOUP24_BUILDLINK3_MK:= 6LIBSOUP24_BUILDLINK3_MK:=
7 7
8# API 2.4.0 but 2.28.0 due to buildlink dependency change 8# API 2.4.0 but 2.28.0 due to buildlink dependency change
9BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.28.0 9BUILDLINK_API_DEPENDS.libsoup24+= libsoup24>=2.28.0
10BUILDLINK_ABI_DEPENDS.libsoup24?= libsoup24>=2.30.1 10BUILDLINK_ABI_DEPENDS.libsoup24?= libsoup24>=2.30.1
11BUILDLINK_PKGSRCDIR.libsoup24?= ../../net/libsoup24 11BUILDLINK_PKGSRCDIR.libsoup24?= ../../net/libsoup24
12 12
13.include "../../databases/sqlite3/buildlink3.mk" 13.include "../../databases/sqlite3/buildlink3.mk"
14.include "../../devel/glib2/buildlink3.mk" 14.include "../../devel/glib2/buildlink3.mk"
@@ -17,20 +17,20 @@ BUILDLINK_PKGSRCDIR.libsoup24?= ../../n @@ -17,20 +17,20 @@ BUILDLINK_PKGSRCDIR.libsoup24?= ../../n
17.include "../../www/libproxy/buildlink3.mk" 17.include "../../www/libproxy/buildlink3.mk"
18 18
19_LIBSOUP24_PRE_GNOME_OPTION!= \ 19_LIBSOUP24_PRE_GNOME_OPTION!= \
20 if ${PKG_INFO} -qe 'libsoup24<=2.28.2'; then \ 20 if ${PKG_INFO} -qe 'libsoup24<=2.28.2'; then \
21 ${ECHO} yes; \ 21 ${ECHO} yes; \
22 else \ 22 else \
23 ${ECHO} no; \ 23 ${ECHO} no; \
24 fi 24 fi
25 25
26pkgbase := libsoup24 26pkgbase := libsoup24
27.include "../../mk/pkg-build-options.mk" 27.include "../../mk/pkg-build-options.mk"
28 28
29.if ${_LIBSOUP24_PRE_GNOME_OPTION} == "yes" || !empty(PKG_BUILD_OPTIONS.libsoup24:Mgnome) 29.if ${_LIBSOUP24_PRE_GNOME_OPTION} == "yes" || !empty(PKG_BUILD_OPTIONS.libsoup24:Mgnome)
30.include "../../security/gnome-keyring/buildlink3.mk" 30.include "../../security/libgnome-keyring/buildlink3.mk"
31.include "../../devel/GConf/buildlink3.mk" 31.include "../../devel/GConf/buildlink3.mk"
32.endif 32.endif
33 33
34.endif # LIBSOUP24_BUILDLINK3_MK 34.endif # LIBSOUP24_BUILDLINK3_MK
35 35
36BUILDLINK_TREE+= -libsoup24 36BUILDLINK_TREE+= -libsoup24
cvs diff -r1.1 -r1.2 pkgsrc/net/libsoup24/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/net/libsoup24/Attic/options.mk 2010/02/28 20:49:21 1.1
+++ pkgsrc/net/libsoup24/Attic/options.mk 2010/06/14 17:58:44 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: options.mk,v 1.1 2010/02/28 20:49:21 tonio Exp $ 1# $NetBSD: options.mk,v 1.2 2010/06/14 17:58:44 drochner Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.libsoup24 3PKG_OPTIONS_VAR= PKG_OPTIONS.libsoup24
4PKG_SUPPORTED_OPTIONS= gnome 4PKG_SUPPORTED_OPTIONS= gnome
5PKG_SUGGESTED_OPTIONS= gnome 5PKG_SUGGESTED_OPTIONS= gnome
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9PLIST_VARS+= gnome 9PLIST_VARS+= gnome
10 10
11.if !empty(PKG_OPTIONS:Mgnome) 11.if !empty(PKG_OPTIONS:Mgnome)
12.include "../../devel/GConf/buildlink3.mk" 12.include "../../devel/GConf/buildlink3.mk"
13.include "../../security/gnome-keyring/buildlink3.mk" 13.include "../../security/libgnome-keyring/buildlink3.mk"
14PKGCONFIG_OVERRIDE+= libsoup-gnome-2.4.pc.in 14PKGCONFIG_OVERRIDE+= libsoup-gnome-2.4.pc.in
15PLIST.gnome= yes 15PLIST.gnome= yes
16.else 16.else
17CONFIGURE_ARGS+= --without-gnome 17CONFIGURE_ARGS+= --without-gnome
18.endif 18.endif