diff options
| author | nros <nros@pkgsrc.org> | 2016-01-04 12:43:06 +0000 |
|---|---|---|
| committer | nros <nros@pkgsrc.org> | 2016-01-04 12:43:06 +0000 |
| commit | 8f6ff70066cbbcb0ab80512e21a2dc37ff18baef (patch) | |
| tree | 5227e848488b44e821ca67149d87aa937c4443e8 /net | |
| parent | 868a7f0f6651b13238a63c323bb3205cbd927045 (diff) | |
| download | pkgsrc-8f6ff70066cbbcb0ab80512e21a2dc37ff18baef.tar.gz | |
Remove gnome options in libsoup and always build libsoup-gnome.
this is done since gnomekeyring is not used by libsoup anymore.
Diffstat (limited to 'net')
| -rw-r--r-- | net/libsoup/Makefile | 7 | ||||
| -rw-r--r-- | net/libsoup/PLIST | 16 | ||||
| -rw-r--r-- | net/libsoup/options.mk | 17 |
3 files changed, 11 insertions, 29 deletions
diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile index ea38824816e..22dafd0b883 100644 --- a/net/libsoup/Makefile +++ b/net/libsoup/Makefile @@ -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,11 +21,10 @@ CONFIGURE_ENV+= DATADIRNAME=share 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" .if !empty(CC_VERSION:Mgcc-4.[01].*) || !empty(CC_VERSION:Mgcc-[1-3].*) diff --git a/net/libsoup/PLIST b/net/libsoup/PLIST index 4ec8b878ea8..0af8f0df0ca 100644 --- a/net/libsoup/PLIST +++ b/net/libsoup/PLIST @@ -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-connection.h 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 diff --git a/net/libsoup/options.mk b/net/libsoup/options.mk deleted file mode 100644 index 2905ed20afa..00000000000 --- a/net/libsoup/options.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: options.mk,v 1.1 2015/06/07 14:03:20 youri Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.libsoup -PKG_SUPPORTED_OPTIONS= gnome -PKG_SUGGESTED_OPTIONS= gnome - -.include "../../mk/bsd.options.mk" - -PLIST_VARS+= gnome - -.if !empty(PKG_OPTIONS:Mgnome) -.include "../../security/libgnome-keyring/buildlink3.mk" -PKGCONFIG_OVERRIDE+= libsoup-gnome-2.4.pc.in -PLIST.gnome= yes -.else -CONFIGURE_ARGS+= --without-gnome -.endif |