Mon Jan 4 12:43:06 2016 UTC ()
Remove gnome options in libsoup and always build libsoup-gnome.
this is done since gnomekeyring is not used by libsoup anymore.


(nros)
diff -r1.18 -r1.19 pkgsrc/net/libsoup/Makefile
diff -r1.7 -r1.8 pkgsrc/net/libsoup/PLIST
diff -r1.1 -r0 pkgsrc/net/libsoup/options.mk
cvs diff -r1.18 -r1.19 pkgsrc/net/libsoup/Makefile (expand / switch to unified diff)

--- pkgsrc/net/libsoup/Makefile 2015/10/10 01:57:54 1.18
+++ pkgsrc/net/libsoup/Makefile 2016/01/04 12:43:06 1.19
@@ -1,41 +1,40 @@ @@ -1,41 +1,40 @@
1# $NetBSD: Makefile,v 1.18 2015/10/10 01:57:54 ryoon Exp $ 1# $NetBSD: Makefile,v 1.19 2016/01/04 12:43:06 nros Exp $
2 2
3DISTNAME= libsoup-2.50.0 3DISTNAME= libsoup-2.50.0
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= net gnome 5CATEGORIES= net gnome
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/2.50/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libsoup/2.50/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gnome.org/ 10HOMEPAGE= http://www.gnome.org/
11COMMENT= HTTP library implementation in C 11COMMENT= HTTP library implementation in C
12LICENSE= gnu-lgpl-v2 12LICENSE= gnu-lgpl-v2
13 13
14USE_TOOLS+= pkg-config gmake intltool msgfmt 14USE_TOOLS+= pkg-config gmake intltool msgfmt
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17 17
18# XXX work around botched gettext check (ignores libintl) 18# XXX work around botched gettext check (ignores libintl)
19CONFIGURE_ENV+= DATADIRNAME=share 19CONFIGURE_ENV+= DATADIRNAME=share
20 20
21DEPENDS+= glib-networking-[0-9]*:../../net/glib-networking 21DEPENDS+= glib-networking-[0-9]*:../../net/glib-networking
22 22
23PKGCONFIG_OVERRIDE+= libsoup-2.4.pc.in 23PKGCONFIG_OVERRIDE+= libsoup-2.4.pc.in
 24PKGCONFIG_OVERRIDE+= libsoup-gnome-2.4.pc.in
24 25
25TEST_TARGET= check 26TEST_TARGET= check
26 27
27.include "options.mk" 
28 
29# gcc>=4.2 specific -Werror=XXX flags will be added unconditionally. 28# gcc>=4.2 specific -Werror=XXX flags will be added unconditionally.
30.include "../../mk/compiler.mk" 29.include "../../mk/compiler.mk"
31.if !empty(CC_VERSION:Mgcc-4.[01].*) || !empty(CC_VERSION:Mgcc-[1-3].*) 30.if !empty(CC_VERSION:Mgcc-4.[01].*) || !empty(CC_VERSION:Mgcc-[1-3].*)
32CONFIGURE_ARGS+= --disable-more-warnings 31CONFIGURE_ARGS+= --disable-more-warnings
33.endif 32.endif
34 33
35.if !empty(PKGSRC_COMPILER:Mclang) 34.if !empty(PKGSRC_COMPILER:Mclang)
36_WRAP_EXTRA_ARGS.CC+= -Wno-error=format-nonliteral 35_WRAP_EXTRA_ARGS.CC+= -Wno-error=format-nonliteral
37CWRAPPERS_APPEND.cc+= -Wno-error=format-nonliteral 36CWRAPPERS_APPEND.cc+= -Wno-error=format-nonliteral
38.endif 37.endif
39 38
40REPLACE_PYTHON= libsoup/tld-parser.py 39REPLACE_PYTHON= libsoup/tld-parser.py
41PYTHON_FOR_BUILD_ONLY= yes 40PYTHON_FOR_BUILD_ONLY= yes
cvs diff -r1.7 -r1.8 pkgsrc/net/libsoup/PLIST (expand / switch to unified diff)

--- pkgsrc/net/libsoup/PLIST 2015/06/07 14:03:20 1.7
+++ pkgsrc/net/libsoup/PLIST 2016/01/04 12:43:06 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.7 2015/06/07 14:03:20 youri Exp $ 1@comment $NetBSD: PLIST,v 1.8 2016/01/04 12:43:06 nros Exp $
2include/libsoup-2.4/libsoup/soup-address.h 2include/libsoup-2.4/libsoup/soup-address.h
3include/libsoup-2.4/libsoup/soup-auth-domain-basic.h 3include/libsoup-2.4/libsoup/soup-auth-domain-basic.h
4include/libsoup-2.4/libsoup/soup-auth-domain-digest.h 4include/libsoup-2.4/libsoup/soup-auth-domain-digest.h
5include/libsoup-2.4/libsoup/soup-auth-domain.h 5include/libsoup-2.4/libsoup/soup-auth-domain.h
6include/libsoup-2.4/libsoup/soup-auth-manager.h 6include/libsoup-2.4/libsoup/soup-auth-manager.h
7include/libsoup-2.4/libsoup/soup-auth.h 7include/libsoup-2.4/libsoup/soup-auth.h
8include/libsoup-2.4/libsoup/soup-cache.h 8include/libsoup-2.4/libsoup/soup-cache.h
9include/libsoup-2.4/libsoup/soup-content-decoder.h 9include/libsoup-2.4/libsoup/soup-content-decoder.h
10include/libsoup-2.4/libsoup/soup-content-sniffer.h 10include/libsoup-2.4/libsoup/soup-content-sniffer.h
11include/libsoup-2.4/libsoup/soup-cookie-jar-db.h 11include/libsoup-2.4/libsoup/soup-cookie-jar-db.h
12include/libsoup-2.4/libsoup/soup-cookie-jar-text.h 12include/libsoup-2.4/libsoup/soup-cookie-jar-text.h
13include/libsoup-2.4/libsoup/soup-cookie-jar.h 13include/libsoup-2.4/libsoup/soup-cookie-jar.h
14include/libsoup-2.4/libsoup/soup-cookie.h 14include/libsoup-2.4/libsoup/soup-cookie.h
@@ -40,37 +40,37 @@ include/libsoup-2.4/libsoup/soup-session @@ -40,37 +40,37 @@ include/libsoup-2.4/libsoup/soup-session
40include/libsoup-2.4/libsoup/soup-session-sync.h 40include/libsoup-2.4/libsoup/soup-session-sync.h
41include/libsoup-2.4/libsoup/soup-session.h 41include/libsoup-2.4/libsoup/soup-session.h
42include/libsoup-2.4/libsoup/soup-socket.h 42include/libsoup-2.4/libsoup/soup-socket.h
43include/libsoup-2.4/libsoup/soup-status.h 43include/libsoup-2.4/libsoup/soup-status.h
44include/libsoup-2.4/libsoup/soup-tld.h 44include/libsoup-2.4/libsoup/soup-tld.h
45include/libsoup-2.4/libsoup/soup-types.h 45include/libsoup-2.4/libsoup/soup-types.h
46include/libsoup-2.4/libsoup/soup-uri.h 46include/libsoup-2.4/libsoup/soup-uri.h
47include/libsoup-2.4/libsoup/soup-value-utils.h 47include/libsoup-2.4/libsoup/soup-value-utils.h
48include/libsoup-2.4/libsoup/soup-version.h 48include/libsoup-2.4/libsoup/soup-version.h
49include/libsoup-2.4/libsoup/soup-websocket-connection.h 49include/libsoup-2.4/libsoup/soup-websocket-connection.h
50include/libsoup-2.4/libsoup/soup-websocket.h 50include/libsoup-2.4/libsoup/soup-websocket.h
51include/libsoup-2.4/libsoup/soup-xmlrpc.h 51include/libsoup-2.4/libsoup/soup-xmlrpc.h
52include/libsoup-2.4/libsoup/soup.h 52include/libsoup-2.4/libsoup/soup.h
53${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-cookie-jar-sqlite.h 53include/libsoup-gnome-2.4/libsoup/soup-cookie-jar-sqlite.h
54${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h 54include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h
55${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-gnome.h 55include/libsoup-gnome-2.4/libsoup/soup-gnome.h
56lib/girepository-1.0/Soup-2.4.typelib 56lib/girepository-1.0/Soup-2.4.typelib
57${PLIST.gnome}lib/girepository-1.0/SoupGNOME-2.4.typelib 57lib/girepository-1.0/SoupGNOME-2.4.typelib
58lib/libsoup-2.4.la 58lib/libsoup-2.4.la
59${PLIST.gnome}lib/libsoup-gnome-2.4.la 59lib/libsoup-gnome-2.4.la
60lib/pkgconfig/libsoup-2.4.pc 60lib/pkgconfig/libsoup-2.4.pc
61${PLIST.gnome}lib/pkgconfig/libsoup-gnome-2.4.pc 61lib/pkgconfig/libsoup-gnome-2.4.pc
62share/gir-1.0/Soup-2.4.gir 62share/gir-1.0/Soup-2.4.gir
63${PLIST.gnome}share/gir-1.0/SoupGNOME-2.4.gir 63share/gir-1.0/SoupGNOME-2.4.gir
64share/gtk-doc/html/libsoup-2.4/SoupAddress.html 64share/gtk-doc/html/libsoup-2.4/SoupAddress.html
65share/gtk-doc/html/libsoup-2.4/SoupAuth.html 65share/gtk-doc/html/libsoup-2.4/SoupAuth.html
66share/gtk-doc/html/libsoup-2.4/SoupAuthDomain.html 66share/gtk-doc/html/libsoup-2.4/SoupAuthDomain.html
67share/gtk-doc/html/libsoup-2.4/SoupAuthDomainBasic.html 67share/gtk-doc/html/libsoup-2.4/SoupAuthDomainBasic.html
68share/gtk-doc/html/libsoup-2.4/SoupAuthDomainDigest.html 68share/gtk-doc/html/libsoup-2.4/SoupAuthDomainDigest.html
69share/gtk-doc/html/libsoup-2.4/SoupAuthManager.html 69share/gtk-doc/html/libsoup-2.4/SoupAuthManager.html
70share/gtk-doc/html/libsoup-2.4/SoupCache.html 70share/gtk-doc/html/libsoup-2.4/SoupCache.html
71share/gtk-doc/html/libsoup-2.4/SoupContentDecoder.html 71share/gtk-doc/html/libsoup-2.4/SoupContentDecoder.html
72share/gtk-doc/html/libsoup-2.4/SoupContentSniffer.html 72share/gtk-doc/html/libsoup-2.4/SoupContentSniffer.html
73share/gtk-doc/html/libsoup-2.4/SoupCookie.html 73share/gtk-doc/html/libsoup-2.4/SoupCookie.html
74share/gtk-doc/html/libsoup-2.4/SoupCookieJar.html 74share/gtk-doc/html/libsoup-2.4/SoupCookieJar.html
75share/gtk-doc/html/libsoup-2.4/SoupCookieJarDB.html 75share/gtk-doc/html/libsoup-2.4/SoupCookieJarDB.html
76share/gtk-doc/html/libsoup-2.4/SoupCookieJarText.html 76share/gtk-doc/html/libsoup-2.4/SoupCookieJarText.html
File Deleted: pkgsrc/net/libsoup/options.mk