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 context 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,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2015/10/10 01:57:54 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2016/01/04 12:43:06 nros Exp $
 
 DISTNAME=	libsoup-2.50.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libsoup/2.50/}
 EXTRACT_SUFX=	.tar.xz
@@ -21,10 +21,9 @@
 DEPENDS+=	glib-networking-[0-9]*:../../net/glib-networking
 
 PKGCONFIG_OVERRIDE+=	libsoup-2.4.pc.in
+PKGCONFIG_OVERRIDE+=    libsoup-gnome-2.4.pc.in
 
 TEST_TARGET=	check
-
-.include "options.mk"
 
 # gcc>=4.2 specific -Werror=XXX flags will be added unconditionally.
 .include "../../mk/compiler.mk"

cvs diff -r1.7 -r1.8 pkgsrc/net/libsoup/PLIST (expand / switch to context 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,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2015/06/07 14:03:20 youri Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/01/04 12:43:06 nros Exp $
 include/libsoup-2.4/libsoup/soup-address.h
 include/libsoup-2.4/libsoup/soup-auth-domain-basic.h
 include/libsoup-2.4/libsoup/soup-auth-domain-digest.h
@@ -50,17 +50,17 @@
 include/libsoup-2.4/libsoup/soup-websocket.h
 include/libsoup-2.4/libsoup/soup-xmlrpc.h
 include/libsoup-2.4/libsoup/soup.h
-${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-cookie-jar-sqlite.h
-${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h
-${PLIST.gnome}include/libsoup-gnome-2.4/libsoup/soup-gnome.h
+include/libsoup-gnome-2.4/libsoup/soup-cookie-jar-sqlite.h
+include/libsoup-gnome-2.4/libsoup/soup-gnome-features.h
+include/libsoup-gnome-2.4/libsoup/soup-gnome.h
 lib/girepository-1.0/Soup-2.4.typelib
-${PLIST.gnome}lib/girepository-1.0/SoupGNOME-2.4.typelib
+lib/girepository-1.0/SoupGNOME-2.4.typelib
 lib/libsoup-2.4.la
-${PLIST.gnome}lib/libsoup-gnome-2.4.la
+lib/libsoup-gnome-2.4.la
 lib/pkgconfig/libsoup-2.4.pc
-${PLIST.gnome}lib/pkgconfig/libsoup-gnome-2.4.pc
+lib/pkgconfig/libsoup-gnome-2.4.pc
 share/gir-1.0/Soup-2.4.gir
-${PLIST.gnome}share/gir-1.0/SoupGNOME-2.4.gir
+share/gir-1.0/SoupGNOME-2.4.gir
 share/gtk-doc/html/libsoup-2.4/SoupAddress.html
 share/gtk-doc/html/libsoup-2.4/SoupAuth.html
 share/gtk-doc/html/libsoup-2.4/SoupAuthDomain.html

File Deleted: pkgsrc/net/libsoup/options.mk