CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 29 Dec 2023 11:30:54 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Dec 29 11:30:53 UTC 2023

Modified Files:
        pkgsrc/devel/java-subversion: Makefile
        pkgsrc/devel/p5-subversion: Makefile
        pkgsrc/devel/py-subversion: Makefile
        pkgsrc/devel/ruby-subversion: Makefile
        pkgsrc/devel/subversion: Makefile Makefile.version distinfo
        pkgsrc/devel/subversion-base: Makefile
        pkgsrc/devel/subversion/patches: patch-Makefile.in patch-configure
        pkgsrc/www/ap2-subversion: Makefile

Log Message:
subversion: updated to 1.14.3

Version 1.14.3

User-visible changes:
 - Client-side bugfixes:
   * Fix svn:mergeinfo diff parser bug when parsing forward merges
   * Fix redirected URL handling with file externals

 - Server-side bugfixes:
   (none)

Developer-visible changes:
   * swig-rb: Fix uses of 'File.exist?', deprecated since Ruby 2.1
   * Build: Fix uses of deprecated Python APIs
   * Build: Retain ability to build SWIG Python 2 bindings
   * Fix reading WC lock status with svn_wc_status2_t
   * JavaHL: Add @Deprecated to silence compiler warnings
   * JavaHL: Fix crash in case of null message in getMessage
   * Fix build breakage of release tarballs by installed swig
   * Add regression test for issue 4711 "invalid xml file"
   * swig-py: Fix building with SWIG 4.1.0
   * Makefile.in: Fix cleaning of __pycache__ dirs and *.pyc
   * swig-py: Avoid deprecated options to SWIG >= 4.1.0
   * swig-py: Use sysconfig to allow building with Python 3.12
   * INSTALL: Document not to use SVN with APR 1.7.3 on Windows
   * Fix test suite broken by syntax error when --enable-sasl
   * swig-py: Improve error when no external diff
   * autogen.sh: Fix building when Python is not named "python"


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/devel/java-subversion/Makefile
cvs rdiff -u -r1.130 -r1.131 pkgsrc/devel/p5-subversion/Makefile
cvs rdiff -u -r1.103 -r1.104 pkgsrc/devel/py-subversion/Makefile
cvs rdiff -u -r1.91 -r1.92 pkgsrc/devel/ruby-subversion/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/devel/subversion/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/devel/subversion/Makefile.version
cvs rdiff -u -r1.119 -r1.120 pkgsrc/devel/subversion/distinfo
cvs rdiff -u -r1.139 -r1.140 pkgsrc/devel/subversion-base/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/subversion/patches/patch-Makefile.in
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/subversion/patches/patch-configure
cvs rdiff -u -r1.103 -r1.104 pkgsrc/www/ap2-subversion/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/java-subversion/Makefile
diff -u pkgsrc/devel/java-subversion/Makefile:1.69 pkgsrc/devel/java-subversion/Makefile:1.70
--- pkgsrc/devel/java-subversion/Makefile:1.69  Wed Nov  8 13:18:48 2023
+++ pkgsrc/devel/java-subversion/Makefile       Fri Dec 29 11:30:52 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.69 2023/11/08 13:18:48 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2023/12/29 11:30:52 adam Exp $
 
 PKGNAME=       java-subversion-${SVNVER}
-PKGREVISION=   7
 COMMENT=       Java bindings for Subversion
 
 MAKE_JOBS_SAFE=        no

Index: pkgsrc/devel/p5-subversion/Makefile
diff -u pkgsrc/devel/p5-subversion/Makefile:1.130 pkgsrc/devel/p5-subversion/Makefile:1.131
--- pkgsrc/devel/p5-subversion/Makefile:1.130   Wed Nov  8 13:18:58 2023
+++ pkgsrc/devel/p5-subversion/Makefile Fri Dec 29 11:30:52 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.130 2023/11/08 13:18:58 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2023/12/29 11:30:52 adam Exp $
 
 PKGNAME=       p5-subversion-${SVNVER}
-PKGREVISION=   8
 COMMENT=       Perl bindings for Subversion
 
 .include "../../devel/subversion/Makefile.common"

Index: pkgsrc/devel/py-subversion/Makefile
diff -u pkgsrc/devel/py-subversion/Makefile:1.103 pkgsrc/devel/py-subversion/Makefile:1.104
--- pkgsrc/devel/py-subversion/Makefile:1.103   Wed Nov  8 13:18:58 2023
+++ pkgsrc/devel/py-subversion/Makefile Fri Dec 29 11:30:53 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2023/11/08 13:18:58 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2023/12/29 11:30:53 adam Exp $
 
 PKGNAME=       ${PYPKGPREFIX}-subversion-${SVNVER}
-PKGREVISION=   7
 COMMENT=       Python bindings and tools for Subversion
 
 .include "../../devel/subversion/Makefile.common"
@@ -18,7 +17,7 @@ PY_PATCHPLIST=                YES
 REPLACE_PYTHON=                tools/hook-scripts/mailer/mailer.py
 PYTHON_SELF_CONFLICT=  YES
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27 312
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 BUILD_TARGET=          swig-py
 INSTALL_TARGET=                install-swig-py

Index: pkgsrc/devel/ruby-subversion/Makefile
diff -u pkgsrc/devel/ruby-subversion/Makefile:1.91 pkgsrc/devel/ruby-subversion/Makefile:1.92
--- pkgsrc/devel/ruby-subversion/Makefile:1.91  Wed Nov  8 13:18:59 2023
+++ pkgsrc/devel/ruby-subversion/Makefile       Fri Dec 29 11:30:53 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.91 2023/11/08 13:18:59 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2023/12/29 11:30:53 adam Exp $
 
 PKGNAME=       ${RUBY_PKGPREFIX}-subversion-${SVNVER}
-PKGREVISION=   7
 COMMENT=       Ruby bindings for Subversion
 
 .include "../../devel/subversion/Makefile.common"

Index: pkgsrc/devel/subversion/Makefile
diff -u pkgsrc/devel/subversion/Makefile:1.73 pkgsrc/devel/subversion/Makefile:1.74
--- pkgsrc/devel/subversion/Makefile:1.73       Tue Oct 24 22:08:58 2023
+++ pkgsrc/devel/subversion/Makefile    Fri Dec 29 11:30:53 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2023/10/24 22:08:58 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2023/12/29 11:30:53 adam Exp $
 
 PKGNAME=       subversion-${SVNVER}
-PKGREVISION=   5
 COMMENT=       Version control system, meta-package
 
 META_PACKAGE=  yes

Index: pkgsrc/devel/subversion/Makefile.version
diff -u pkgsrc/devel/subversion/Makefile.version:1.88 pkgsrc/devel/subversion/Makefile.version:1.89
--- pkgsrc/devel/subversion/Makefile.version:1.88       Tue Apr 12 16:24:28 2022
+++ pkgsrc/devel/subversion/Makefile.version    Fri Dec 29 11:30:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.88 2022/04/12 16:24:28 bsiegert Exp $
+# $NetBSD: Makefile.version,v 1.89 2023/12/29 11:30:53 adam Exp $
 
 # When updating subversion, all packages are updated at the same time
 # to have a consistent set of packages.  A particularly tricky aspect
@@ -7,5 +7,5 @@
 # changing the version.
 
 .if !defined(SVNVER)
-SVNVER=                1.14.2
+SVNVER=                1.14.3
 .endif

Index: pkgsrc/devel/subversion/distinfo
diff -u pkgsrc/devel/subversion/distinfo:1.119 pkgsrc/devel/subversion/distinfo:1.120
--- pkgsrc/devel/subversion/distinfo:1.119      Tue Apr 12 16:24:28 2022
+++ pkgsrc/devel/subversion/distinfo    Fri Dec 29 11:30:53 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.119 2022/04/12 16:24:28 bsiegert Exp $
+$NetBSD: distinfo,v 1.120 2023/12/29 11:30:53 adam Exp $
 
-BLAKE2s (subversion-1.14.2.tar.bz2) = efb49dfb51b3f6c51ac7fe41b3dc593efeef1f9c2fdfa51567ab3940627162ea
-SHA512 (subversion-1.14.2.tar.bz2) = 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
-Size (subversion-1.14.2.tar.bz2) = 8606570 bytes
-SHA1 (patch-Makefile.in) = 2df6c733d563c0bc7e0d1b4b6e6e00f82ea8c176
-SHA1 (patch-configure) = cca6c305c28005496df0913637a9eb778a846fc0
+BLAKE2s (subversion-1.14.3.tar.bz2) = 3340ce250ef1ac0ae2c42d8ca8a4f031ab46250aa62048bbfc3f48d51c4c5998
+SHA512 (subversion-1.14.3.tar.bz2) = 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41
+Size (subversion-1.14.3.tar.bz2) = 8569985 bytes
+SHA1 (patch-Makefile.in) = 378336a0908c28bf70b33833d23955ce0d562b12
+SHA1 (patch-configure) = c1c73ace0b28acb921189bd97b74459823a2b104
 SHA1 (patch-subversion_bindings_swig_perl_native_Makefile.PL.in) = 3fadde312693f2a304cd7e348c66cbd373c57854
 SHA1 (patch-tools_dev_benchmarks_large__dirs_create__bigdir.sh) = ff19087ff4d348fdcf904eb52406f6b717fe444a

Index: pkgsrc/devel/subversion-base/Makefile
diff -u pkgsrc/devel/subversion-base/Makefile:1.139 pkgsrc/devel/subversion-base/Makefile:1.140
--- pkgsrc/devel/subversion-base/Makefile:1.139 Wed Nov  8 13:19:00 2023
+++ pkgsrc/devel/subversion-base/Makefile       Fri Dec 29 11:30:53 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.139 2023/11/08 13:19:00 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2023/12/29 11:30:53 adam Exp $
 
 PKGNAME=       subversion-base-${SVNVER}
-PKGREVISION=   8
 COMMENT=       Version control system, base programs and libraries
 
 # on at least solaris, configure fails to figure out
@@ -14,6 +13,7 @@ USE_TOOLS+=           msgfmt msgmerge xgettext pk
 TOOLS_BROKEN+=         perl
 
 CONFIGURE_ARGS+=       --without-apxs
+TEST_TARGET=           check
 
 APU_OPTIONS=           PKG_BUILD_OPTIONS.apr-util
 BUILD_DEFS+=           ${APU_OPTIONS}

Index: pkgsrc/devel/subversion/patches/patch-Makefile.in
diff -u pkgsrc/devel/subversion/patches/patch-Makefile.in:1.2 pkgsrc/devel/subversion/patches/patch-Makefile.in:1.3
--- pkgsrc/devel/subversion/patches/patch-Makefile.in:1.2       Mon May 27 16:10:08 2019
+++ pkgsrc/devel/subversion/patches/patch-Makefile.in   Fri Dec 29 11:30:53 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile.in,v 1.2 2019/05/27 16:10:08 ryoon Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2023/12/29 11:30:53 adam Exp $
 
 Apply https://bugs.gentoo.org/show_bug.cgi?id=388607 for MAKE_JOBS_SAFE=yes
 
---- Makefile.in.orig   2019-01-22 13:55:54.000000000 +0000
+--- Makefile.in.orig   2022-11-16 04:00:03.000000000 +0000
 +++ Makefile.in
 @@ -96,7 +96,7 @@ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/sv
  toolsdir = @bindir@/svn-tools
@@ -13,7 +13,7 @@ Apply https://bugs.gentoo.org/show_bug.c
  
  javahl_javadir = @libdir@/svn-javahl
  javahl_javahdir = @libdir@/svn-javahl/include
-@@ -873,11 +873,11 @@ clean-swig-headers:
+@@ -880,11 +880,11 @@ clean-swig-headers:
  extraclean-swig-headers: clean-swig-headers
        $(EXTRACLEAN_SWIG_HEADERS)
  
@@ -22,8 +22,8 @@ Apply https://bugs.gentoo.org/show_bug.c
        ./config.status subversion/bindings/swig/perl/native/Makefile.PL
  
  $(SWIG_PL_DIR)/native/Makefile: libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile.PL
--      cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix)
-+      cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor
+-      cd $(SWIG_PL_DIR)/native; $(SWIG_PL_PERL) Makefile.PL PREFIX=$(prefix)
++      cd $(SWIG_PL_DIR)/native; $(SWIG_PL_PERL) Makefile.PL PREFIX=$(prefix) INSTALLDIRS=vendor
  
  # There is a "readlink -f" command on some systems for the same purpose,
  # but it's not as portable (e.g. Mac OS X doesn't have it).  These should

Index: pkgsrc/devel/subversion/patches/patch-configure
diff -u pkgsrc/devel/subversion/patches/patch-configure:1.7 pkgsrc/devel/subversion/patches/patch-configure:1.8
--- pkgsrc/devel/subversion/patches/patch-configure:1.7 Mon Jul 27 20:48:52 2020
+++ pkgsrc/devel/subversion/patches/patch-configure     Fri Dec 29 11:30:53 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.7 2020/07/27 20:48:52 adam Exp $
+$NetBSD: patch-configure,v 1.8 2023/12/29 11:30:53 adam Exp $
 
 Fix include paths for py3c.
 
---- configure.orig     2020-06-03 13:35:42.000000000 +0000
+--- configure.orig     2023-12-09 13:27:10.000000000 +0000
 +++ configure
-@@ -24336,7 +24336,7 @@ $as_echo "$as_me: WARNING: py3c cannot b
+@@ -24292,7 +24292,7 @@ $as_echo "$as_me: WARNING: py3c cannot b
        fi
  
        save_cppflags="$CPPFLAGS"
@@ -13,61 +13,7 @@ Fix include paths for py3c.
        for ac_header in py3c.h
  do :
    ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
-@@ -24346,7 +24346,7 @@ if test "x$ac_cv_header_py3c_h" = xyes; 
- _ACEOF
- 
-           py3c_found="yes"
--          SVN_PY3C_INCLUDES="-I$py3c_prefix/include"
-+          SVN_PY3C_INCLUDES="-I$py3c_prefix"
- 
- fi
- 
-@@ -24967,7 +24967,7 @@ $as_echo "$as_me: WARNING: py3c cannot b
-       fi
- 
-       save_cppflags="$CPPFLAGS"
--      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix/include"
-+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix"
-       for ac_header in py3c.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
-@@ -24977,7 +24977,7 @@ if test "x$ac_cv_header_py3c_h" = xyes; 
- _ACEOF
- 
-           py3c_found="yes"
--          SVN_PY3C_INCLUDES="-I$py3c_prefix/include"
-+          SVN_PY3C_INCLUDES="-I$py3c_prefix"
- 
- fi
- 
-@@ -25598,7 +25598,7 @@ $as_echo "$as_me: WARNING: py3c cannot b
-       fi
- 
-       save_cppflags="$CPPFLAGS"
--      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix/include"
-+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix"
-       for ac_header in py3c.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
-@@ -25608,7 +25608,7 @@ if test "x$ac_cv_header_py3c_h" = xyes; 
- _ACEOF
- 
-           py3c_found="yes"
--          SVN_PY3C_INCLUDES="-I$py3c_prefix/include"
-+          SVN_PY3C_INCLUDES="-I$py3c_prefix"
- 
- fi
- 
-@@ -26232,7 +26232,7 @@ $as_echo "$as_me: WARNING: py3c cannot b
-       fi
- 
-       save_cppflags="$CPPFLAGS"
--      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix/include"
-+      CPPFLAGS="$CPPFLAGS $ac_cv_python_includes -I$py3c_prefix"
-       for ac_header in py3c.h
- do :
-   ac_fn_c_check_header_mongrel "$LINENO" "py3c.h" "ac_cv_header_py3c_h" "$ac_includes_default"
-@@ -26242,7 +26242,7 @@ if test "x$ac_cv_header_py3c_h" = xyes; 
+@@ -24302,7 +24302,7 @@ if test "x$ac_cv_header_py3c_h" = xyes;
  _ACEOF
  
            py3c_found="yes"

Index: pkgsrc/www/ap2-subversion/Makefile
diff -u pkgsrc/www/ap2-subversion/Makefile:1.103 pkgsrc/www/ap2-subversion/Makefile:1.104
--- pkgsrc/www/ap2-subversion/Makefile:1.103    Wed Nov  8 13:21:16 2023
+++ pkgsrc/www/ap2-subversion/Makefile  Fri Dec 29 11:30:53 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.103 2023/11/08 13:21:16 wiz Exp $
+# $NetBSD: Makefile,v 1.104 2023/12/29 11:30:53 adam Exp $
 
 PKGNAME=       ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
-PKGREVISION=   8
 COMMENT=       WebDAV server (Apache module) for Subversion
 
 .include "../../devel/subversion/Makefile.common"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/security/py-cryptodome
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/security/py-cryptodome
Indexes:

Home | Main Index | Thread Index | Old Index