From kubito@gmail.com  Wed Mar  9 06:49:13 2011
Return-Path: <kubito@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 925121065670
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Mar 2011 06:49:13 +0000 (UTC)
	(envelope-from kubito@gmail.com)
Received: from mail-yx0-f182.google.com (mail-yx0-f182.google.com [209.85.213.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B6FC8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  9 Mar 2011 06:49:12 +0000 (UTC)
Received: by yxl31 with SMTP id 31so121556yxl.13
        for <multiple recipients>; Tue, 08 Mar 2011 22:49:12 -0800 (PST)
Received: by 10.236.174.7 with SMTP id w7mr9628635yhl.99.1299653352441;
        Tue, 08 Mar 2011 22:49:12 -0800 (PST)
Received: from localhost ([201.82.189.168])
        by mx.google.com with ESMTPS id 69sm1120146yhl.4.2011.03.08.22.49.07
        (version=TLSv1/SSLv3 cipher=OTHER);
        Tue, 08 Mar 2011 22:49:10 -0800 (PST)
Message-Id: <4d7722e6.e905ec0a.2a6e.4cec@mx.google.com>
Date: Tue, 08 Mar 2011 22:49:10 -0800 (PST)
From: Raphael Kubo da Costa <kubito@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: lev@FreeBSD.org
Subject: [PATCH] devel/subversion: Fix plist when GNOME_KEYRING is on.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         155395
>Category:       ports
>Synopsis:       [PATCH] devel/subversion: Fix plist when GNOME_KEYRING is on.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    avilla
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 09 06:50:06 UTC 2011
>Closed-Date:    Fri Apr 01 15:23:09 UTC 2011
>Last-Modified:  Fri Apr  1 15:30:11 UTC 2011
>Originator:     Raphael Kubo da Costa
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD gibbon 8.2-STABLE FreeBSD 8.2-STABLE #26: Sat Feb 26 17:26:42 BRT 2011
>Description:
This patch fixes the port's plist when GNOME Keyring support is enabled: the
files installed due to Keyring support were not being listed at all.

PORTREVISION has been bumped due to the change in the plist.

Port maintainer (lev@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- subversion-1.6.16_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/subversion/Makefile.common /usr/home/rakuco/dev/ports/subversion/devel/subversion/Makefile.common
--- /usr/ports/devel/subversion/Makefile.common	2011-03-05 09:10:31.000000000 -0300
+++ /usr/home/rakuco/dev/ports/subversion/devel/subversion/Makefile.common	2011-03-09 03:47:33.000000000 -0300
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.6.16
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.5/:book
@@ -161,8 +161,10 @@
 .if defined(WITH_GNOME_KEYRING)
 LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 CONFIGURE_ARGS+=--with-gnome-keyring
+PLIST_SUB+=	GNOME_KEYRING_ENABLED=""
 .else
 CONFIGURE_ARGS+=--without-gnome-keyring
+PLIST_SUB+=	GNOME_KEYRING_ENABLED="@comment "
 .endif
 
 post-extract:
diff -ruN --exclude=CVS /usr/ports/devel/subversion/pkg-plist /usr/home/rakuco/dev/ports/subversion/devel/subversion/pkg-plist
--- /usr/ports/devel/subversion/pkg-plist	2010-04-19 07:39:12.000000000 -0300
+++ /usr/home/rakuco/dev/ports/subversion/devel/subversion/pkg-plist	2011-03-09 03:47:33.000000000 -0300
@@ -53,6 +53,10 @@
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
+%%GNOME_KEYRING_ENABLED%%lib/libsvn_auth_gnome_keyring-1.a
+%%GNOME_KEYRING_ENABLED%%lib/libsvn_auth_gnome_keyring-1.la
+%%DYNAMIC_ENABLED%%%%GNOME_KEYRING_ENABLED%%lib/libsvn_auth_gnome_keyring-1.so
+%%DYNAMIC_ENABLED%%%%GNOME_KEYRING_ENABLED%%lib/libsvn_auth_gnome_keyring-1.so.0
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
--- subversion-1.6.16_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->lev 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Mar 9 06:50:16 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155395 

From: Raphael Kubo da Costa <kubito@gmail.com>
To: bug-followup@FreeBSD.org
Cc: lev@FreeBSD.org
Subject: Re: ports/155395: [PATCH] devel/subversion: Fix plist when GNOME_KEYRING is on.
Date: Wed, 23 Mar 2011 22:41:56 -0300

 Hi, is there anything you'd like me to do before integrating this patch?
 
 Thanks,
 Raphael
Responsible-Changed-From-To: lev->avilla 
Responsible-Changed-By: avilla 
Responsible-Changed-When: Wed Mar 30 23:15:02 UTC 2011 
Responsible-Changed-Why:  
i'll take it (maintainer timeout) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155395 
State-Changed-From-To: open->closed 
State-Changed-By: avilla 
State-Changed-When: Fri Apr 1 15:23:08 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=155395 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/155395: commit references a PR
Date: Fri,  1 Apr 2011 15:22:36 +0000 (UTC)

 avilla      2011-04-01 15:19:58 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/subversion     Makefile Makefile.common pkg-plist 
     devel/subversion-freebsd Makefile 
   Log:
   - Fix plist when GNOME_KEYRING is on. [1]
   - Add optional KDE KWallet support. [2]
   - Bump PORTREVISION.
   
   PR:             155395 [1]
                   155419 [2]
   Submitted by:   Raphael Kubo da Costa <kubito@gmail.com>
   Approved by:    lev (maintainer timeout)
   
   Revision  Changes    Path
   1.141     +1 -1      ports/devel/subversion-freebsd/Makefile
   1.137     +1 -0      ports/devel/subversion/Makefile
   1.43      +14 -2     ports/devel/subversion/Makefile.common
   1.43      +9 -1      ports/devel/subversion/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
