NetBSD Problem Report #42854

From www@NetBSD.org  Sat Feb 20 20:30:15 2010
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 6D09363C47A
	for <gnats-bugs@gnats.NetBSD.org>; Sat, 20 Feb 2010 20:30:15 +0000 (UTC)
Message-Id: <20100220203015.0A5C463C142@www.NetBSD.org>
Date: Sat, 20 Feb 2010 20:30:15 +0000 (UTC)
From: demelier.david@gmail.com
Reply-To: demelier.david@gmail.com
To: gnats-bugs@NetBSD.org
Subject: net/libsoup24 without gnome stuff.
X-Send-Pr-Version: www-1.0

>Number:         42854
>Category:       pkg
>Synopsis:       net/libsoup24 without gnome stuff.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    tonio
>State:          closed
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Feb 20 20:35:00 +0000 2010
>Closed-Date:    Sun Feb 28 21:02:11 +0000 2010
>Last-Modified:  Sun Feb 28 21:02:11 +0000 2010
>Originator:     Demelier David
>Release:        NetBSD-5
>Organization:
>Environment:
NetBSD Abricot.malikania.org 5.0_STABLE NetBSD 5.0_STABLE (Abricot 0.2) #1: Fri Feb 12 13:38:30 CET 2010  root@Abricot.malikania.org:/usr/obj/sys/arch/i386/compile/Abricot i386

>Description:
Because the libsoup24 ./configure script has a --without-gnome options we could remove some useless dependencies. 

This prevent packages which uses libsoup24 to prevent installing gnome stuff (ie. ario)
>How-To-Repeat:

>Fix:
--- Makefile.orig       2010-02-20 20:36:27.000000000 +0100
+++ Makefile    2010-02-20 21:27:00.000000000 +0100
@@ -18,16 +18,18 @@
 GNU_CONFIGURE=         yes

 PKGCONFIG_OVERRIDE+=   libsoup-2.4.pc.in
+PKGCONFIG_OVERRIDE+=   libsoup-gnome-2.4.pc.in

 TEST_TARGET=   check

-.include "options.mk"
-
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/GConf/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.21.3
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnutls+= gnutls>=2.1.7
 .include "../../security/gnutls/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../www/libproxy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- /dev/null   2010-02-20 21:22:28.000000000 +0100
+++ options.mk  2010-02-20 21:00:47.000000000 +0100
@@ -0,0 +1,20 @@
+PKG_OPTIONS_VAR=       PKG_OPTIONS.libsoup
+PKG_SUPPORTED_OPTIONS= gnome doc
+PKG_SUGGESTED_OPTIONS= gnome
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+= gnome
+
+.if !empty(PKG_OPTIONS:Mgnome)
+.include "../../devel/GConf/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
+PKGCONFIG_OVERRIDE+=   libsoup-gnome-2.4.pc.in
+PLIST.gnome=   yes
+.else
+CONFIGURE_ARGS+= --without-gnome
+.endif
+
+.if !empty(PKG_OPTIONS:Mdoc)
+.include "../../textproc/gtk-doc/buildlink3.mk"
+.endif

>Release-Note:

>Audit-Trail:
From: Demelier David <demelier.david@gmail.com>
To: gnats-bugs@NetBSD.org
Cc: demelier.david@gmail.com
Subject: Re: pkg/42854: net/libsoup24 without gnome stuff.
Date: Sat, 20 Feb 2010 22:13:17 +0100

 --EVF5PPMfhYS0aIcm
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline

 I'm sorry I missed the patch, there is a new patch attached below.

 King regards.

 -- 
 Demelier David

 ()  ascii ribbon campaign - against html e-mail
 /\  www.asciiribbon.org   - against proprietary attachments

 --EVF5PPMfhYS0aIcm
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="libsoup24.patch"

 --- Makefile.orig	2010-02-20 22:06:49.000000000 +0100
 +++ Makefile	2010-02-20 22:07:35.000000000 +0100
 @@ -18,18 +18,16 @@
  GNU_CONFIGURE=		yes

  PKGCONFIG_OVERRIDE+=	libsoup-2.4.pc.in
 -PKGCONFIG_OVERRIDE+=	libsoup-gnome-2.4.pc.in

  TEST_TARGET=	check

 +.include "options.mk"
 +
  .include "../../databases/sqlite3/buildlink3.mk"
 -.include "../../devel/GConf/buildlink3.mk"
  BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.21.3
  .include "../../devel/glib2/buildlink3.mk"
 -.include "../../security/gnome-keyring/buildlink3.mk"
  BUILDLINK_API_DEPENDS.gnutls+=	gnutls>=2.1.7
  .include "../../security/gnutls/buildlink3.mk"
 -.include "../../textproc/gtk-doc/buildlink3.mk"
  .include "../../textproc/libxml2/buildlink3.mk"
  .include "../../www/libproxy/buildlink3.mk"
  .include "../../mk/bsd.pkg.mk"
 --- PLIST.orig	2010-02-20 22:04:15.000000000 +0100
 +++ PLIST	2010-02-20 22:06:04.000000000 +0100
 @@ -36,13 +36,13 @@
  include/libsoup-2.4/libsoup/soup-value-utils.h
  include/libsoup-2.4/libsoup/soup-xmlrpc.h
  include/libsoup-2.4/libsoup/soup.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
 +${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
  lib/libsoup-2.4.la
 -lib/libsoup-gnome-2.4.la
 +${PLIST.gnome}lib/libsoup-gnome-2.4.la
  lib/pkgconfig/libsoup-2.4.pc
 -lib/pkgconfig/libsoup-gnome-2.4.pc
 +${PLIST.gnome}lib/pkgconfig/libsoup-gnome-2.4.pc
  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
 --- /dev/null	2010-02-20 22:08:08.000000000 +0100
 +++ options.mk	2010-02-20 22:06:04.000000000 +0100
 @@ -0,0 +1,20 @@
 +PKG_OPTIONS_VAR=	PKG_OPTIONS.libsoup
 +PKG_SUPPORTED_OPTIONS=	gnome doc
 +PKG_SUGGESTED_OPTIONS=	gnome
 +
 +.include "../../mk/bsd.options.mk"
 +
 +PLIST_VARS+= gnome
 +
 +.if !empty(PKG_OPTIONS:Mgnome)
 +.include "../../devel/GConf/buildlink3.mk"
 +.include "../../security/gnome-keyring/buildlink3.mk"
 +PKGCONFIG_OVERRIDE+=	libsoup-gnome-2.4.pc.in
 +PLIST.gnome=	yes
 +.else
 +CONFIGURE_ARGS+= --without-gnome
 +.endif
 +
 +.if !empty(PKG_OPTIONS:Mdoc)
 +.include "../../textproc/gtk-doc/buildlink3.mk"
 +.endif

 --EVF5PPMfhYS0aIcm--

Responsible-Changed-From-To: pkg-manager->tonio
Responsible-Changed-By: tonio@NetBSD.org
Responsible-Changed-When: Sat, 20 Feb 2010 21:25:13 +0000
Responsible-Changed-Why:
Seems reasonable, I will handle it


From: Antoine Reilles <tonio@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/42854 CVS commit: pkgsrc/net/libsoup24
Date: Sun, 28 Feb 2010 20:49:21 +0000

 Module Name:	pkgsrc
 Committed By:	tonio
 Date:		Sun Feb 28 20:49:21 UTC 2010

 Modified Files:
 	pkgsrc/net/libsoup24: Makefile PLIST buildlink3.mk
 Added Files:
 	pkgsrc/net/libsoup24: options.mk

 Log Message:
 Add a gnome option, enabled by default.
 Fix PR pkg/42854, applying a similar patch.

 Remove the dependency on gtk-doc, it wasn't used.


 To generate a diff of this commit:
 cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/libsoup24/Makefile
 cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/libsoup24/PLIST
 cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/libsoup24/buildlink3.mk
 cvs rdiff -u -r0 -r1.1 pkgsrc/net/libsoup24/options.mk

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: open->closed
State-Changed-By: tonio@NetBSD.org
State-Changed-When: Sun, 28 Feb 2010 21:02:11 +0000
State-Changed-Why:
the gnome option was added. Thanks for the PR


>Unformatted:

Home	PR Database Search