cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Subversion's gnome-keyring support which was accidentally broken

Browse Source 
during the upgrade to 1.8.
ok ajacoutot
This commit is contained in:
stsp 2014-01-20 15:12:24 +00:00
parent 41a59fab3f
commit 8accf24ff8
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devel/subversion/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.129 2013/11/25 17:08:06 stsp Exp $ # $OpenBSD: Makefile,v 1.130 2014/01/20 15:12:24 stsp Exp $
COMMENT-main= subversion revision control system COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion COMMENT-perl= perl interface to subversion
@ -9,6 +9,7 @@ COMMENT-gnome-keyring= GNOME keyring support for subversion
VERSION= 1.8.5 VERSION= 1.8.5
DISTNAME= subversion-${VERSION} DISTNAME= subversion-${VERSION}
REVISION-main = 0
PKGNAME-main= ${DISTNAME} PKGNAME-main= ${DISTNAME}
FULLPKGNAME-perl= p5-SVN-${VERSION} FULLPKGNAME-perl= p5-SVN-${VERSION}
FULLPKGPATH-perl= devel/subversion,-perl FULLPKGPATH-perl= devel/subversion,-perl
@ -175,7 +176,8 @@ CONFIGURE_ARGS+=--without-apxs
.endif .endif
TEST_DEPENDS=${MODPY_RUN_DEPENDS} TEST_DEPENDS=${MODPY_RUN_DEPENDS}
SUBST_VARS+= LOCALBASE TEST_DEPENDS+= ${FULLPKGNAME-gnome-keyring}:${BUILD_PKGPATH},-gnome-keyring
SUBST_VARS+= LOCALBASE SO_VERSION
pre-patch: pre-patch:
@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python @ln -s ${MODPY_BIN} ${WRKDIR}/bin/python

15
devel/subversion/patches/patch-subversion_libsvn_subr_auth_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-subversion_libsvn_subr_auth_c,v 1.7 2014/01/20 15:12:24 stsp Exp $
--- subversion/libsvn_subr/auth.c.orig Mon Jan 20 14:02:33 2014
+++ subversion/libsvn_subr/auth.c Mon Jan 20 14:11:07 2014
@@ -454,9 +454,9 @@ svn_auth_get_platform_specific_provider(svn_auth_provi
const char *library_label, *library_name;
const char *provider_function_name, *version_function_name;
library_name = apr_psprintf(pool,
- "libsvn_auth_%s-%d.so.%d",
+ "libsvn_auth_%s-%d.so.%s",
provider_name,
- SVN_VER_MAJOR, SVN_SOVERSION);
+ SVN_VER_MAJOR, "${SO_VERSION}");
library_label = apr_psprintf(pool, "svn_%s", provider_name);
provider_function_name = apr_psprintf(pool,
"svn_auth_get_%s_%s_provider",