- 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)

7 files changed, 45 insertions, 3 deletions

diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 7af4ad90c3fe..53571cccbfe3 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -4,7 +4,7 @@
 #
 # $FreeBSD$
 
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX=	-freebsd
 
 COMMENT=	Version control system with FreeBSD Project repo customizations
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 4fdb2f33ba25..1e822a96547d 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -29,6 +29,7 @@ OPTIONS=	MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
 		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 --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 5f19d7112437..eccc9ed7e8fd 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -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
@@ -24,6 +24,7 @@ PATCHFILES+=		svn_hacks_1.4.diff
 MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
+USE_KDE4=	# Used below if KWallet support is enabled
 
 CONFIGURE_ARGS=	--with-ssl
 
@@ -161,8 +162,19 @@ PLIST_SUB+=	DYNAMIC_ENABLED=""
 .if defined(WITH_GNOME_KEYRING)
 LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 CONFIGURE_ARGS+=--with-gnome-keyring
+PLIST_SUB+=	GNOME_KEYRING=""
 .else
 CONFIGURE_ARGS+=--without-gnome-keyring
+PLIST_SUB+=	GNOME_KEYRING="@comment "
+.endif
+
+.if defined(WITH_KDE_KWALLET)
+USE_KDE4=	kdelibs
+CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX}
+PLIST_SUB+=	KDE_KWALLET=""
+.else
+CONFIGURE_ARGS+=--without-kwallet
+PLIST_SUB+=	KDE_KWALLET="@comment "
 .endif
 
 post-extract:
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 79800c0e0f01..0d69101b0622 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -53,6 +53,14 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
+%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a
+%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la
+%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
+%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
+%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a
+%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la
+%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
+%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 4fdb2f33ba25..1e822a96547d 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -29,6 +29,7 @@ OPTIONS=	MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
 		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 --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 5f19d7112437..eccc9ed7e8fd 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -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
@@ -24,6 +24,7 @@ PATCHFILES+=		svn_hacks_1.4.diff
 MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
+USE_KDE4=	# Used below if KWallet support is enabled
 
 CONFIGURE_ARGS=	--with-ssl
 
@@ -161,8 +162,19 @@ PLIST_SUB+=	DYNAMIC_ENABLED=""
 .if defined(WITH_GNOME_KEYRING)
 LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
 CONFIGURE_ARGS+=--with-gnome-keyring
+PLIST_SUB+=	GNOME_KEYRING=""
 .else
 CONFIGURE_ARGS+=--without-gnome-keyring
+PLIST_SUB+=	GNOME_KEYRING="@comment "
+.endif
+
+.if defined(WITH_KDE_KWALLET)
+USE_KDE4=	kdelibs
+CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX}
+PLIST_SUB+=	KDE_KWALLET=""
+.else
+CONFIGURE_ARGS+=--without-kwallet
+PLIST_SUB+=	KDE_KWALLET="@comment "
 .endif
 
 post-extract:
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index 79800c0e0f01..0d69101b0622 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -53,6 +53,14 @@ include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
+%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a
+%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la
+%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
+%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
+%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a
+%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la
+%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
+%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_client-1.so