subversion: fix for cross build

srcpkgs/subversion/patches/cross.patch

@@ -1,26 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -56,8 +56,6 @@
- SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
- SVN_LZ4_LIBS = @SVN_LZ4_LIBS@
- SVN_UTF8PROC_LIBS = @SVN_UTF8PROC_LIBS@
--SVN_MACOS_PLIST_LIBS = @SVN_MACOS_PLIST_LIBS@
--SVN_MACOS_KEYCHAIN_LIBS = @SVN_MACOS_KEYCHAIN_LIBS@
- 
- LIBS = @LIBS@
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -479,12 +479,6 @@
-             [Defined if Cyrus SASL v2 is present on the system])
- fi
- 
--dnl Mac OS specific features -------------------
--
--SVN_LIB_MACHO_ITERATE
--SVN_LIB_MACOS_PLIST
--SVN_LIB_MACOS_KEYCHAIN
--
- dnl APR_HAS_DSO -------------------
- 
- AC_MSG_CHECKING([whether APR has support for DSOs])

srcpkgs/subversion/patches/python3.12.patch

@@ -1,11 +0,0 @@
---- ./build/generator/gen_base.py
-+++ ./build/generator/gen_base.py
-@@ -76,7 +76,7 @@
- 
-     # Now read and parse build.conf
-     parser = configparser.ConfigParser()
--    parser.readfp(open(fname))
-+    parser.read_file(open(fname))
- 
-     self.conf = build_path(os.path.abspath(fname))
- 

srcpkgs/subversion/template

@@ -8,10 +8,9 @@ revision=5
 build_style=gnu-configure
 configure_args="--disable-javahl --disable-static --config-cache
  --with-gnome-keyring --with-editor=vi --disable-mod-activation
- --with-utf8proc=internal"
-hostmakedepends="automake libtool pkg-config perl python3
- apache-devel gettext swig"
-makedepends="apache-devel gdbm-devel libgnome-keyring-devel serf-devel
+ --with-utf8proc=internal --with-apr=${XBPS_CROSS_BASE}/usr/bin/apr-1-config"
+hostmakedepends="pkg-config perl python3 gettext"
+makedepends="apache-devel gdbm-devel serf-devel
  libsecret-devel liblz4-devel python3-devel sqlite-devel py3c
  file-devel perl"
 depends="ca-certificates"
@@ -24,8 +23,6 @@ distfiles="https://archive.apache.org/dist/subversion/subversion-${version}.tar.
 checksum=c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
 
 pre_configure() {
-	./autogen.sh --release
-
 	# Based on native build values
 	cat <<-EOF >config.cache
 	ac_cv_python_includes=-I${XBPS_CROSS_BASE}/usr/include/python${py3_ver}
@@ -42,13 +39,14 @@ pre_configure() {
 
 		# Use the ${wrksrc}/config_vars.mk
 		vsed -i apxs \
-			-e "s;[$]installbuilddir/config_vars.mk;${wrksrc}/config_vars.mk;g"
+			-e "/^my [$]destdir/s%=.*%= \"${XBPS_CROSS_BASE}\";%" \
+			-e "s;(.*config_vars[.]mk;(\"${wrksrc}/config_vars.mk;g" \
+			-e "/[$]apu_config =/s%=.*%= \"${XBPS_WRAPPERDIR}/apu-1-config\";%"
 
-		# Use apr-1-config and apu-1-config wrappers
 		vsed -i config_vars.mk \
-			-e "/^APR_CONFIG/ s;=.*;= ${XBPS_WRAPPERDIR}/apr-1-config;" \
-			-e "/^APU_CONFIG/ s;=.*;= ${XBPS_WRAPPERDIR}/apu-1-config;" \
-			-e "s;\([I ]\)/usr/include;\1${XBPS_CROSS_BASE}/usr/include;g"
+			-e "s; \(/usr/include\); $XBPS_CROSS_BASE\1;g" \
+			-e "s;-I\(/usr/include\);-I$XBPS_CROSS_BASE\1;g" \
+			-e "/^includedir =/s;=.*include;= $XBPS_CROSS_BASE/usr/include;"
 
 		export PERL5LIB=${XBPS_STATEDIR}/perlprefix/${XBPS_TARGET_MACHINE}-linux
 		mkdir -p $PERL5LIB
@@ -83,7 +81,7 @@ post_configure() {
 }
 
 do_build() {
-	make ${makejobs} LT_LDFLAGS="-L$Fdestdir/usr/lib"
+	make ${makejobs}
 	make ${makejobs} \
 		swig_pydir=${XBPS_CROSS_BASE}/usr/lib/python$py3_ver/site-packages/libsvn \
 		swig_pydir_extra=${XBPS_CROSS_BASE}/usr/lib/python$py3_ver/site-packages/svn \