git: 00b7792f81c8 - main - devel/subversion: and devel/subversion-lts update to latest release 1.14.3.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Lev A. Serebryakov <lev_at_FreeBSD.org>
Date: Mon, 08 Jan 2024 17:01:39 UTC
The branch main has been updated by lev:

URL: https://cgit.FreeBSD.org/ports/commit/?id=00b7792f81c8d022411553ccbcb50707777dbf81

commit 00b7792f81c8d022411553ccbcb50707777dbf81
Author:     Lev A. Serebryakov <lev@FreeBSD.org>
AuthorDate: 2024-01-08 17:01:28 +0000
Commit:     Lev A. Serebryakov <lev@FreeBSD.org>
CommitDate: 2024-01-08 17:01:28 +0000

    devel/subversion: and devel/subversion-lts update to latest release 1.14.3.
    
    Thank you, Yasuhito FUTATSUKI.
---
 devel/p5-subversion/Makefile                 |  5 ++++-
 devel/py-subversion/Makefile                 |  5 ++++-
 devel/ruby-subversion/Makefile               |  5 ++++-
 devel/subversion-lts/Makefile                |  5 ++++-
 devel/subversion-lts/Makefile.common         | 13 +++----------
 devel/subversion-lts/distinfo                |  6 +++---
 devel/subversion-lts/files/patch-Makefile.in | 17 -----------------
 devel/subversion/Makefile                    |  5 ++++-
 devel/subversion/Makefile.common             | 13 +++----------
 devel/subversion/distinfo                    |  6 +++---
 devel/subversion/files/patch-Makefile.in     | 17 -----------------
 java/java-subversion/Makefile                |  3 +++
 12 files changed, 35 insertions(+), 65 deletions(-)

diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index f723b719848e..f7d513fbb368 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -18,7 +18,10 @@ MAKE_JOBS_UNSAFE=	yes
 
 CATEGORIES+=	perl5
 
-CONFIGURE_ARGS+=	--without-gnome-keyring \
+CONFIGURE_ARGS+=	--with-swig-perl=${PERL} \
+			--without-swig-python \
+			--without-swig-ruby \
+			--without-gnome-keyring \
 			--without-kwallet \
 			--with-apxs=no
 
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index 747075535925..1bfaa2340d31 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -21,7 +21,10 @@ SVN_BUILD_BINDINGS=	yes
 
 CATEGORIES+=	python
 
-CONFIGURE_ARGS+=	--without-gnome-keyring \
+CONFIGURE_ARGS+=	--with-swig-python=${PYTHON_CMD} \
+			--without-swig-perl \
+			--without-swig-ruby \
+			--without-gnome-keyring \
 			--without-kwallet \
 			--with-apxs=no
 
diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index b7ec897663cb..0a26a981871b 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -15,7 +15,10 @@ SVN_BUILD_BINDINGS=	yes
 
 CATEGORIES+=	ruby
 
-CONFIGURE_ARGS+=	--without-gnome-keyring \
+CONFIGURE_ARGS+=	--with-swig-ruby=${RUBY} \
+			--without-swig-perl \
+			--without-swig-python \
+			--without-gnome-keyring \
 			--without-kwallet \
 			--with-apxs=no
 
diff --git a/devel/subversion-lts/Makefile b/devel/subversion-lts/Makefile
index 7ba02d80b87c..0b887b6a517c 100644
--- a/devel/subversion-lts/Makefile
+++ b/devel/subversion-lts/Makefile
@@ -45,7 +45,10 @@ SVNFSTYPE?=	fsfs
 SVNGROUP?=	svn
 SVNUSER?=	svn
 
-CONFIGURE_ARGS+=	--without-gnome-keyring \
+CONFIGURE_ARGS+=	--without-swig-perl \
+			--without-swig-python \
+			--without-swig-ruby \
+			--without-gnome-keyring \
 			--without-kwallet \
 			--with-apxs=no
 
diff --git a/devel/subversion-lts/Makefile.common b/devel/subversion-lts/Makefile.common
index e316905687e8..c3c337a03829 100644
--- a/devel/subversion-lts/Makefile.common
+++ b/devel/subversion-lts/Makefile.common
@@ -1,5 +1,5 @@
 PORTNAME?=	subversion
-PORTVERSION=	1.14.2
+PORTVERSION=	1.14.3
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
@@ -22,8 +22,7 @@ LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libutf8proc.so:textproc/utf8proc \
 			liblz4.so:archivers/liblz4
 
-CONFIGURE_ARGS+=	--without-swig \
-			--with-sqlite=${LOCALBASE} \
+CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE} \
 			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 # ===============================================================
@@ -70,10 +69,6 @@ CFLAGS+=	-fpic -DPIC
 OPTIONS_FILE_UNSET?=""
 OPTIONS_FILE_SET?=""
 
-.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
-CFLAGS+=	-DHAS_ORGANIZATION_NAME
-.endif
-
 .include <bsd.port.pre.mk>
 
 pre-everything::
@@ -98,9 +93,7 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
-.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
-	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
-.endif
+	@${REINPLACE_CMD} "s#^toolsdir =.*#toolsdir = @bindir@#" ${WRKSRC}/Makefile.in
 # shebangfix
 	@${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \
 		-e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/devel/subversion-lts/distinfo b/devel/subversion-lts/distinfo
index 128d62aad5a1..93a2daa895bd 100644
--- a/devel/subversion-lts/distinfo
+++ b/devel/subversion-lts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649858194
-SHA256 (subversion-1.14.2.tar.bz2) = c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
-SIZE (subversion-1.14.2.tar.bz2) = 8606570
+TIMESTAMP = 1704180448
+SHA256 (subversion-1.14.3.tar.bz2) = 949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440
+SIZE (subversion-1.14.3.tar.bz2) = 8569985
diff --git a/devel/subversion-lts/files/patch-Makefile.in b/devel/subversion-lts/files/patch-Makefile.in
deleted file mode 100644
index 43b1cbdb13a9..000000000000
--- a/devel/subversion-lts/files/patch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	2020-05-31 20:53:15 UTC
-+++ Makefile.in
-@@ -89,11 +89,11 @@ swig_pl_libdir = @libdir@
- swig_rb_libdir = @libdir@
- 
- ### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/libsvn
--swig_pydir_extra = @libdir@/svn-python/svn
-+swig_pydir = /usr/local/lib/python3.8/site-packages/libsvn
-+swig_pydir_extra = /usr/local/lib/python3.8/site-packages/svn
- swig_pldir = @libdir@/svn-perl
- swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
--toolsdir = @bindir@/svn-tools
-+toolsdir = @bindir@
- 
- # where to install pkg-config files
- pkgconfig_dir = $(prefix)/libdata/pkgconfig
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index f0b3692af577..7974e2151ae3 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -44,7 +44,10 @@ SVNFSTYPE?=	fsfs
 SVNGROUP?=	svn
 SVNUSER?=	svn
 
-CONFIGURE_ARGS+=	--without-gnome-keyring \
+CONFIGURE_ARGS+=	--without-swig-perl \
+			--without-swig-python \
+			--without-swig-ruby \
+			--without-gnome-keyring \
 			--without-kwallet \
 			--with-apxs=no
 
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 265fbe014e06..f6c11d1d00cb 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,5 +1,5 @@
 PORTNAME?=	subversion
-PORTVERSION=	1.14.2
+PORTVERSION=	1.14.3
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	APACHE/subversion
@@ -22,8 +22,7 @@ LIB_DEPENDS+=		libapr-1.so:devel/apr1 \
 			libutf8proc.so:textproc/utf8proc \
 			liblz4.so:archivers/liblz4
 
-CONFIGURE_ARGS+=	--without-swig \
-			--with-sqlite=${LOCALBASE} \
+CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE} \
 			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 # ===============================================================
@@ -70,10 +69,6 @@ CFLAGS+=	-fpic -DPIC
 OPTIONS_FILE_UNSET?=""
 OPTIONS_FILE_SET?=""
 
-.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
-CFLAGS+=	-DHAS_ORGANIZATION_NAME
-.endif
-
 .include <bsd.port.pre.mk>
 
 pre-everything::
@@ -98,9 +93,7 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
-.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
-	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
-.endif
+	@${REINPLACE_CMD} "s#^toolsdir =.*#toolsdir = @bindir@#" ${WRKSRC}/Makefile.in
 # shebangfix
 	@${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \
 		-e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 128d62aad5a1..93a2daa895bd 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649858194
-SHA256 (subversion-1.14.2.tar.bz2) = c9130e8d0b75728a66f0e7038fc77052e671830d785b5616aad53b4810d3cc28
-SIZE (subversion-1.14.2.tar.bz2) = 8606570
+TIMESTAMP = 1704180448
+SHA256 (subversion-1.14.3.tar.bz2) = 949efd451a09435f7e8573574c71c7b71b194d844890fa49cd61d2262ea1a440
+SIZE (subversion-1.14.3.tar.bz2) = 8569985
diff --git a/devel/subversion/files/patch-Makefile.in b/devel/subversion/files/patch-Makefile.in
deleted file mode 100644
index 43b1cbdb13a9..000000000000
--- a/devel/subversion/files/patch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	2020-05-31 20:53:15 UTC
-+++ Makefile.in
-@@ -89,11 +89,11 @@ swig_pl_libdir = @libdir@
- swig_rb_libdir = @libdir@
- 
- ### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/libsvn
--swig_pydir_extra = @libdir@/svn-python/svn
-+swig_pydir = /usr/local/lib/python3.8/site-packages/libsvn
-+swig_pydir_extra = /usr/local/lib/python3.8/site-packages/svn
- swig_pldir = @libdir@/svn-perl
- swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
--toolsdir = @bindir@/svn-tools
-+toolsdir = @bindir@
- 
- # where to install pkg-config files
- pkgconfig_dir = $(prefix)/libdata/pkgconfig
diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile
index eae4c956ce11..3e889502c0e1 100644
--- a/java/java-subversion/Makefile
+++ b/java/java-subversion/Makefile
@@ -20,6 +20,9 @@ SVN_BUILD_BINDINGS=	yes
 .include "${.CURDIR}/../../devel/subversion/Makefile.addons"
 
 CONFIGURE_ARGS+=	--enable-javahl \
+			--without-swig-perl \
+			--without-siwg-python \
+			--without-swig-ruby \
 			--with-jdk=${JAVA_HOME} \
 			--with-jikes=no \
 			--without-gnome-keyring \