ports/155419: [PATCH] devel/subversion: Add optional KDE KWallet support

[Raphael Kubo da Costa]

>Number:         155419
>Category:       ports
>Synopsis:       [PATCH] devel/subversion: Add optional KDE KWallet support
>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 18:10:16 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:
Besides GNOME Keyring, Subversion also supports KDE's KWallet for password
storage.

This patch enables this optional support, and bumps PORTREVISION due to the
plist changes. PORTREVISION has been bumped from 0 to 2 because I expect PR
ports/155395 (which bumps PORTREVISION from 0 to 1) to be merged first,
although the patches are independent from each other.

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

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

--- subversion-1.6.16_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/subversion/Makefile /usr/home/rakuco/dev/ports/subversion/devel/subversion/Makefile
--- /usr/ports/devel/subversion/Makefile	2011-03-09 15:04:07.000000000 -0300
+++ /usr/home/rakuco/dev/ports/subversion/devel/subversion/Makefile	2011-03-09 03:51:29.000000000 -0300
@@ -29,6 +29,7 @@
 		SVNAUTHZ_VALIDATE	"install svnauthz-validate" off \
 		STATIC		"Build static version (no shared libs)" off \
 		GNOME_KEYRING	"Build with GNOME Keyring auth support" off \
+		KDE_KWALLET	"Build with KDE KWallet auth support" off \
 		BOOK		"Install the Subversion Book" off
 
 .include "${.CURDIR}/../../devel/subversion/Makefile.common"
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-09 15:04:21.000000000 -0300
+++ /usr/home/rakuco/dev/ports/subversion/devel/subversion/Makefile.common	2011-03-09 14:53:44.000000000 -0300
@@ -24,6 +24,7 @@
 MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
+USE_KDE4=	# Used below if KWallet support is enabled
 
 CONFIGURE_ARGS=	--with-ssl
 
@@ -165,6 +166,15 @@
 CONFIGURE_ARGS+=--without-gnome-keyring
 .endif
 
+.if defined(WITH_KDE_KWALLET)
+USE_KDE4=	kdelibs
+CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX}
+PLIST_SUB+=	KDE_KWALLET_ENABLED=""
+.else
+CONFIGURE_ARGS+=--without-kwallet
+PLIST_SUB+=	KDE_KWALLET_ENABLED="@comment "
+.endif
+
 post-extract:
 	@${RM} -rf ${WRKSRC}/neon
 	@${RM} -rf ${WRKSRC}/apr
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	2011-03-09 15:03:58.000000000 -0300
+++ /usr/home/rakuco/dev/ports/subversion/devel/subversion/pkg-plist	2011-03-09 04:06:35.000000000 -0300
@@ -53,6 +53,10 @@
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
+%%KDE_KWALLET_ENABLED%%lib/libsvn_auth_kwallet-1.a
+%%KDE_KWALLET_ENABLED%%lib/libsvn_auth_kwallet-1.la
+%%DYNAMIC_ENABLED%%%%KDE_KWALLET_ENABLED%%lib/libsvn_auth_kwallet-1.so
+%%DYNAMIC_ENABLED%%%%KDE_KWALLET_ENABLED%%lib/libsvn_auth_kwallet-1.so.0
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
--- subversion-1.6.16_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: