Skip site navigation (1)Skip section navigation (2)
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:   ports/155395: [PATCH] devel/subversion: Fix plist when GNOME_KEYRING is on.
Message-ID:  <4d7722e6.e905ec0a.2a6e.4cec@mx.google.com>
Resent-Message-ID: <201103090650.p296o6e5040299@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         155395
>Category:       ports
>Synopsis:       [PATCH] devel/subversion: Fix plist when GNOME_KEYRING is on.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 09 06:50:06 UTC 2011
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4d7722e6.e905ec0a.2a6e.4cec>