Index: branches/2021Q1/devel/subversion/Makefile.common =================================================================== --- branches/2021Q1/devel/subversion/Makefile.common (revision 564883) +++ branches/2021Q1/devel/subversion/Makefile.common (revision 564884) @@ -1,115 +1,115 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.14.0 +PORTVERSION= 1.14.1 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= APACHE/subversion GNU_CONFIGURE= yes USES+= cpe libtool pathfix pkgconfig shebangfix tar:bzip2 SHEBANG_FILES= tools/server-side/svnpubsub/rc.d/svnpubsub.solaris \ tools/server-side/svnpubsub/rc.d/svnwcsub.solaris LICENSE= APACHE20 CPE_VENDOR= apache CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[0-9].[0-9]* \ ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^1][0-9].[0-9]* LIB_DEPENDS+= libapr-1.so:devel/apr1 \ libsqlite3.so:databases/sqlite3 \ libexpat.so:textproc/expat2 \ libutf8proc.so:textproc/utf8proc \ liblz4.so:archivers/liblz4 CONFIGURE_ARGS+= --without-swig \ --with-sqlite=${LOCALBASE} \ --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat # =============================================================== OPTIONS_SUB= yes BDB_CONFIGURE_ON= --enable-bdb6 BDB_CONFIGURE_OFF= --without-berkeley-db BDB_USES= bdb NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext SASL_CONFIGURE_OFF= --without-sasl SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SERF_CONFIGURE_OFF= --without-serf SERF_CONFIGURE_ON= --with-serf SERF_LIB_DEPENDS= libserf-1.so:www/serf GPG_AGENT_CONFIGURE_OFF= --without-gpg-agent GPG_AGENT_CONFIGURE_ON= --with-gpg-agent GPG_AGENT_BUILD_DEPENDS= gpg-agent:security/gnupg GPG_AGENT_RUN_DEPENDS= gpg-agent:security/gnupg STATIC_CONFIGURE_ON= --enable-all-static PKG_CONFIG="${LOCALBASE}/bin/pkg-config --static" # =============================================================== .include .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-maintainer-mode --enable-debug .endif APR_CONFIG= ${LOCALBASE}/bin/apr-1-config APU_CONFIG= ${LOCALBASE}/bin/apu-1-config CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG} .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fpic -DPIC .endif OPTIONS_FILE_UNSET?="" OPTIONS_FILE_SET?="" .if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION) CFLAGS+= -DHAS_ORGANIZATION_NAME .endif .include pre-everything:: .if defined(SVN_BUILD_ADDONS) .if ${PORT_OPTIONS:MSTATIC} || ${OPTIONS_FILE_SET:MSTATIC} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! addons (bindings, mod_dav_svn, etc). and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .endif .endif pre-patch: .if defined(SVN_BUILD_ADDONS) @${CP} ${FILESDIR}/build-outputs.mk.addons ${WRKSRC}/build-outputs.mk .endif post-patch: .if ${PREFIX} != "/usr" @${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_file.c @${REINPLACE_CMD} "s#/etc/subversion#${ETCDIR}#g" ${WRKSRC}/subversion/libsvn_subr/config_impl.h .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 # shebangfix @${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \ -e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \ '1s|#\!/bin/b|#\!/usr/local/bin/b|' \ -e '1s|#\!/bin/env|#\!/usr/bin/env|' \ -e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|' # remove all .bak files to clean the stage @${FIND} ${WRKSRC} -name '*.bak' -delete Index: branches/2021Q1/devel/subversion/distinfo =================================================================== --- branches/2021Q1/devel/subversion/distinfo (revision 564883) +++ branches/2021Q1/devel/subversion/distinfo (revision 564884) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590841247 -SHA256 (subversion-1.14.0.tar.bz2) = 6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102 -SIZE (subversion-1.14.0.tar.bz2) = 8497531 +TIMESTAMP = 1612972241 +SHA256 (subversion-1.14.1.tar.bz2) = 2c5da93c255d2e5569fa91d92457fdb65396b0666fad4fd59b22e154d986e1a9 +SIZE (subversion-1.14.1.tar.bz2) = 8504612 Index: branches/2021Q1/devel/subversion/files/patch-configure =================================================================== --- branches/2021Q1/devel/subversion/files/patch-configure (revision 564883) +++ branches/2021Q1/devel/subversion/files/patch-configure (nonexistent) @@ -1,310 +0,0 @@ ---- configure.orig 2020-05-20 12:21:55 UTC -+++ configure -@@ -24462,46 +24462,52 @@ $as_echo "$ac_cv_python_libs" >&6; } - fi - `" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5 -+ if test "$SWIG" = "none"; then -+ SWIG_PY_ERRMSG="" -+ else -+ # Look more closely at the SWIG and Python versions to -+ # determine SWIG_PY_OPTS. We can skip this if we already -+ # have the SWIG-generated files. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5 - $as_echo_n "checking for Python >= 3... " >&6; } - if ${ac_cv_python_is_py3+:} false; then : - $as_echo_n "(cached) " >&6 - else - -- ac_cv_python_is_py3="no" -- $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \ -- ac_cv_python_is_py3="yes" -+ ac_cv_python_is_py3="no" -+ $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \ -+ ac_cv_python_is_py3="yes" - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_is_py3" >&5 - $as_echo "$ac_cv_python_is_py3" >&6; } - -- if test "$ac_cv_python_is_py3" = "yes"; then -- if test "$SWIG_VERSION" -ge "300010"; then -- SWIG_PY_ERRMSG="" -- else -- SWIG_PY_ERRMSG="SWIG version is not suitable" -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5 -+ if test "$ac_cv_python_is_py3" = "yes"; then -+ if test "$SWIG_VERSION" -ge "300010"; then -+ SWIG_PY_ERRMSG="" -+ else -+ SWIG_PY_ERRMSG="SWIG version is not suitable" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5 - $as_echo "$as_me: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&2;} -- fi -- if test "$SWIG_VERSION" -lt "400000"; then -- SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" -+ fi -+ if test "$SWIG_VERSION" -lt "400000"; then -+ SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" -+ else -+ SWIG_PY_OPTS="-python -py3 -nofastunpack" -+ fi - else -- SWIG_PY_OPTS="-python -py3 -nofastunpack" -- fi -- else -- if test "$SWIG_VERSION" -lt "400000"; then -- SWIG_PY_OPTS="-python -classic" -- SWIG_PY_ERRMSG="" -- else -- SWIG_PY_OPTS="-python -nofastunpack" -- SWIG_PY_ERRMSG="SWIG version is not suitable" -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5 -+ if test "$SWIG_VERSION" -lt "400000"; then -+ SWIG_PY_OPTS="-python -classic" -+ SWIG_PY_ERRMSG="" -+ else -+ SWIG_PY_OPTS="-python -nofastunpack" -+ SWIG_PY_ERRMSG="SWIG version is not suitable" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5 - $as_echo "$as_me: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&2;} -+ fi - fi - fi - fi -- - fi - fi - -@@ -25093,46 +25099,52 @@ $as_echo "$ac_cv_python_libs" >&6; } - fi - `" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5 -+ if test "$SWIG" = "none"; then -+ SWIG_PY_ERRMSG="" -+ else -+ # Look more closely at the SWIG and Python versions to -+ # determine SWIG_PY_OPTS. We can skip this if we already -+ # have the SWIG-generated files. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5 - $as_echo_n "checking for Python >= 3... " >&6; } - if ${ac_cv_python_is_py3+:} false; then : - $as_echo_n "(cached) " >&6 - else - -- ac_cv_python_is_py3="no" -- $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \ -- ac_cv_python_is_py3="yes" -+ ac_cv_python_is_py3="no" -+ $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \ -+ ac_cv_python_is_py3="yes" - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_is_py3" >&5 - $as_echo "$ac_cv_python_is_py3" >&6; } - -- if test "$ac_cv_python_is_py3" = "yes"; then -- if test "$SWIG_VERSION" -ge "300010"; then -- SWIG_PY_ERRMSG="" -- else -- SWIG_PY_ERRMSG="SWIG version is not suitable" -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5 -+ if test "$ac_cv_python_is_py3" = "yes"; then -+ if test "$SWIG_VERSION" -ge "300010"; then -+ SWIG_PY_ERRMSG="" -+ else -+ SWIG_PY_ERRMSG="SWIG version is not suitable" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5 - $as_echo "$as_me: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&2;} -- fi -- if test "$SWIG_VERSION" -lt "400000"; then -- SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" -+ fi -+ if test "$SWIG_VERSION" -lt "400000"; then -+ SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" -+ else -+ SWIG_PY_OPTS="-python -py3 -nofastunpack" -+ fi - else -- SWIG_PY_OPTS="-python -py3 -nofastunpack" -- fi -- else -- if test "$SWIG_VERSION" -lt "400000"; then -- SWIG_PY_OPTS="-python -classic" -- SWIG_PY_ERRMSG="" -- else -- SWIG_PY_OPTS="-python -nofastunpack" -- SWIG_PY_ERRMSG="SWIG version is not suitable" -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5 -+ if test "$SWIG_VERSION" -lt "400000"; then -+ SWIG_PY_OPTS="-python -classic" -+ SWIG_PY_ERRMSG="" -+ else -+ SWIG_PY_OPTS="-python -nofastunpack" -+ SWIG_PY_ERRMSG="SWIG version is not suitable" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5 - $as_echo "$as_me: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&2;} -+ fi - fi - fi - fi -- - fi - fi - -@@ -25724,46 +25736,52 @@ $as_echo "$ac_cv_python_libs" >&6; } - fi - `" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5 -+ if test "$SWIG" = "none"; then -+ SWIG_PY_ERRMSG="" -+ else -+ # Look more closely at the SWIG and Python versions to -+ # determine SWIG_PY_OPTS. We can skip this if we already -+ # have the SWIG-generated files. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5 - $as_echo_n "checking for Python >= 3... " >&6; } - if ${ac_cv_python_is_py3+:} false; then : - $as_echo_n "(cached) " >&6 - else - -- ac_cv_python_is_py3="no" -- $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \ -- ac_cv_python_is_py3="yes" -+ ac_cv_python_is_py3="no" -+ $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \ -+ ac_cv_python_is_py3="yes" - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_is_py3" >&5 - $as_echo "$ac_cv_python_is_py3" >&6; } - -- if test "$ac_cv_python_is_py3" = "yes"; then -- if test "$SWIG_VERSION" -ge "300010"; then -- SWIG_PY_ERRMSG="" -- else -- SWIG_PY_ERRMSG="SWIG version is not suitable" -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5 -+ if test "$ac_cv_python_is_py3" = "yes"; then -+ if test "$SWIG_VERSION" -ge "300010"; then -+ SWIG_PY_ERRMSG="" -+ else -+ SWIG_PY_ERRMSG="SWIG version is not suitable" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5 - $as_echo "$as_me: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&2;} -- fi -- if test "$SWIG_VERSION" -lt "400000"; then -- SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" -+ fi -+ if test "$SWIG_VERSION" -lt "400000"; then -+ SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" -+ else -+ SWIG_PY_OPTS="-python -py3 -nofastunpack" -+ fi - else -- SWIG_PY_OPTS="-python -py3 -nofastunpack" -- fi -- else -- if test "$SWIG_VERSION" -lt "400000"; then -- SWIG_PY_OPTS="-python -classic" -- SWIG_PY_ERRMSG="" -- else -- SWIG_PY_OPTS="-python -nofastunpack" -- SWIG_PY_ERRMSG="SWIG version is not suitable" -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5 -+ if test "$SWIG_VERSION" -lt "400000"; then -+ SWIG_PY_OPTS="-python -classic" -+ SWIG_PY_ERRMSG="" -+ else -+ SWIG_PY_OPTS="-python -nofastunpack" -+ SWIG_PY_ERRMSG="SWIG version is not suitable" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5 - $as_echo "$as_me: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&2;} -+ fi - fi - fi - fi -- - fi - fi - -@@ -26358,46 +26376,52 @@ $as_echo "$ac_cv_python_libs" >&6; } - fi - `" - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5 -+ if test "$SWIG" = "none"; then -+ SWIG_PY_ERRMSG="" -+ else -+ # Look more closely at the SWIG and Python versions to -+ # determine SWIG_PY_OPTS. We can skip this if we already -+ # have the SWIG-generated files. -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Python >= 3" >&5 - $as_echo_n "checking for Python >= 3... " >&6; } - if ${ac_cv_python_is_py3+:} false; then : - $as_echo_n "(cached) " >&6 - else - -- ac_cv_python_is_py3="no" -- $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \ -- ac_cv_python_is_py3="yes" -+ ac_cv_python_is_py3="no" -+ $PYTHON -c 'import sys; sys.exit(0x3000000 > sys.hexversion)' && \ -+ ac_cv_python_is_py3="yes" - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_is_py3" >&5 - $as_echo "$ac_cv_python_is_py3" >&6; } - -- if test "$ac_cv_python_is_py3" = "yes"; then -- if test "$SWIG_VERSION" -ge "300010"; then -- SWIG_PY_ERRMSG="" -- else -- SWIG_PY_ERRMSG="SWIG version is not suitable" -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5 -+ if test "$ac_cv_python_is_py3" = "yes"; then -+ if test "$SWIG_VERSION" -ge "300010"; then -+ SWIG_PY_ERRMSG="" -+ else -+ SWIG_PY_ERRMSG="SWIG version is not suitable" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&5 - $as_echo "$as_me: WARNING: Subversion Python bindings for Python 3 require SWIG 3.0.10 or newer" >&2;} -- fi -- if test "$SWIG_VERSION" -lt "400000"; then -- SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" -+ fi -+ if test "$SWIG_VERSION" -lt "400000"; then -+ SWIG_PY_OPTS="-python -py3 -nofastunpack -modern" -+ else -+ SWIG_PY_OPTS="-python -py3 -nofastunpack" -+ fi - else -- SWIG_PY_OPTS="-python -py3 -nofastunpack" -- fi -- else -- if test "$SWIG_VERSION" -lt "400000"; then -- SWIG_PY_OPTS="-python -classic" -- SWIG_PY_ERRMSG="" -- else -- SWIG_PY_OPTS="-python -nofastunpack" -- SWIG_PY_ERRMSG="SWIG version is not suitable" -- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5 -+ if test "$SWIG_VERSION" -lt "400000"; then -+ SWIG_PY_OPTS="-python -classic" -+ SWIG_PY_ERRMSG="" -+ else -+ SWIG_PY_OPTS="-python -nofastunpack" -+ SWIG_PY_ERRMSG="SWIG version is not suitable" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&5 - $as_echo "$as_me: WARNING: Subversion Python bindings for Python 2 require 1.3.24 <= SWIG < 4.0.0" >&2;} -+ fi - fi - fi - fi -- - fi - fi - Property changes on: branches/2021Q1/devel/subversion/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 564883) +++ branches/2021Q1 (revision 564884) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r564876