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 @@ -1,40 +1,43 @@ PKGNAMEPREFIX= p5- MAINTAINER= lev@FreeBSD.org COMMENT= Perl bindings for Version control system WWW= https://subversion.apache.org/ USES= perl5 USE_PERL5= build run PORTREVISION_114= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes MAKE_JOBS_UNSAFE= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" 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 ALL_TARGET= swig-pl-lib swig-pl INSTALL_TARGET= install-swig-pl pre-install: ${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Client/_Client.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Core/_Core.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Delta/_Delta.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Fs/_Fs.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Ra/_Ra.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Repos/_Repos.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SVN/_Wc/_Wc.so .include 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 @@ -1,31 +1,34 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= lev@FreeBSD.org COMMENT= Python bindings for version control system WWW= https://subversion.apache.org/ BUILD_DEPENDS= ${LOCALBASE}/include/py3c.h:devel/py3c USES= python USE_PYTHON= flavors py3kplist # There is bug in python bindings Makefile MAKE_JOBS_UNSAFE=yes PORTREVISION_114= 2 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" 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 ALL_TARGET= swig-py check-swig-py INSTALL_TARGET= install-swig-py .include 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 @@ -1,31 +1,34 @@ PKGNAMEPREFIX= ruby- MAINTAINER= lev@FreeBSD.org COMMENT= Ruby bindings for version control system WWW= https://subversion.apache.org/ USES+= compiler:c11 ruby PORTREVISION_114= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" 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 ALL_TARGET= swig-rb-lib swig-rb INSTALL_TARGET= install-swig-rb CFLAGS+= -fdeclspec .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=int-conversion -Wno-error=incompatible-function-pointer-types .endif .include 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 @@ -1,232 +1,235 @@ PORTREVISION= 0 PKGNAMESUFFIX= -lts MAINTAINER= lev@FreeBSD.org COMMENT= Version control system, long-term-support version WWW= https://subversion.apache.org/ CONFLICTS_INSTALL= subversion USE_RC_SUBR= svnserve PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ DOCS \ GPG_AGENT \ NLS \ SASL \ SERF \ STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS GPG_AGENT_DESC= Enable GPG agent password store SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= No shared libs (disables SVN integration) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper USES+= shebangfix python:env python_OLD_CMD+= "/bin/env python" SHEBANG_REGEX= ./tools/.* .include "Makefile.common" SVNREPOS?= /home/svn/repos 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 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} SUB_LIST+= SVNSERVE_BIN_EXT=".bin" PLIST_SUB+= NO_SVNSERVE_WRAPPER="@comment " SVNSERVE_EXT= .bin .else SUB_LIST+= SVNSERVE_BIN_EXT="" PLIST_SUB+= NO_SVNSERVE_WRAPPER="" SVNSERVE_EXT= .endif .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .endif .if ${PORT_OPTIONS:MSTATIC} . if ${PORT_OPTIONS:MNLS} USES+= gettext-tools . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes . endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= .endif .if make(repository) WITH_REPOSITORY_CREATION= yes .endif .if defined(WITH_REPOSITORY_CREATION) MKREPOS_TARGET= _mkrepos .endif BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \ svnrdump svnserve${SVNSERVE_EXT} svnsync svnversion TOOLS_TO_STRIP= fsfs-access-map svn-mergeinfo-normalizer \ svn-populate-node-origins-index svnauthz \ svnauthz-validate svnconflict svndiff svndiff3 \ svndiff4 svnmover svnraisetreeconflict x509-parser pre-everything:: @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group." @${ECHO_MSG} "Make sure that all committers are its members." @${ECHO_MSG} "" @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'." @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @${ECHO_MSG} "" @${ECHO_MSG} "Make sure that:" @${ECHO_MSG} "* all your svn users are members of a common group" @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" .endif @${ECHO_MSG} "" .if ${PORT_OPTIONS:MSTATIC} @${ECHO_MSG} "Static binaries will be built." .endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: .if ${PORT_OPTIONS:MBDB} @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" -a "$${BDB_VERSION}" != "18" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif .if ${PORT_OPTIONS:MSTATIC} LIBS_SQLITE3!= pkgconf --libs --static sqlite3 LIBS+= ${LIBS_SQLITE3} # for work with ICU LIBS+= -lc++ -lm .endif post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless @${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h # ugly hack: save tools directory so we don't have to cleanup before installing @${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples @${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples # takes a long time, and will fail but gives maintainer a good oversight .if ${PORT_OPTIONS:MTEST} test: build -@make check -C ${WRKSRC} .endif post-build-TOOLS-on: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} post-install: ${MKREPOS_TARGET} for F in ${BINS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-STATIC-off: -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so post-install-SVNSERVE_WRAPPER-on: @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample post-install-TOOLS-on: @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} for F in ${TOOLS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done # =============================================================================== repository: _mkrepos _SVNGRPFILES= db locks locks/db.lock locks/db-logs.lock SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,} _mkrepos: .USE .if !exists(${SVNREPOS}) .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \ else \ if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \ then \ ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \ else \ ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi @if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \ else \ if /usr/sbin/pw useradd ${SVNUSER} -h -; \ then \ ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \ else \ ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi .endif @${MKDIR} ${SVNREPOS} @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES} @${CHMOD} g+w ${SVNGRPFILES} @for i in ${SVNREPOS}/db/* ; do \ i=$${i##*/}; \ case $$i in \ DB_CONFIG|fs-type|uuid) ;; \ *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \ ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \ ;; \ esac; \ done .endif .endif svn-build-outputs-hack: (cd ${WRKSRC} && python gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include 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,112 +1,105 @@ PORTNAME?= subversion -PORTVERSION= 1.14.2 +PORTVERSION= 1.14.3 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} \ +CONFIGURE_ARGS+= --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" 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 + @${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 \ '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 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 @@ -1,231 +1,234 @@ PORTREVISION= 4 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system WWW= https://subversion.apache.org/ CONFLICTS_INSTALL= subversion-lts USE_RC_SUBR= svnserve PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ DOCS \ GPG_AGENT \ NLS \ SASL \ SERF \ STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS OPTIONS_DEFAULT=GPG_AGENT SERF TOOLS GPG_AGENT_DESC= Enable GPG agent password store SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= No shared libs (disables SVN integration) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper USES+= shebangfix python:env python_OLD_CMD+= "/bin/env python" SHEBANG_REGEX= ./tools/.* .include "Makefile.common" SVNREPOS?= /home/svn/repos 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 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} SUB_LIST+= SVNSERVE_BIN_EXT=".bin" PLIST_SUB+= NO_SVNSERVE_WRAPPER="@comment " SVNSERVE_EXT= .bin .else SUB_LIST+= SVNSERVE_BIN_EXT="" PLIST_SUB+= NO_SVNSERVE_WRAPPER="" SVNSERVE_EXT= .endif .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .endif .if ${PORT_OPTIONS:MSTATIC} . if ${PORT_OPTIONS:MNLS} USES+= gettext-tools . endif . if ${PORT_OPTIONS:MBDB} BDB_BUILD_DEPENDS= yes . endif OLD_LIB_DEPENDS:= ${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!} BUILD_DEPENDS+= ${OLD_LIB_DEPENDS} LIB_DEPENDS= .endif .if make(repository) WITH_REPOSITORY_CREATION= yes .endif .if defined(WITH_REPOSITORY_CREATION) MKREPOS_TARGET= _mkrepos .endif BINS_TO_STRIP= svn svnadmin svnbench svndumpfilter svnfsfs svnlook svnmucc \ svnrdump svnserve${SVNSERVE_EXT} svnsync svnversion TOOLS_TO_STRIP= fsfs-access-map svn-mergeinfo-normalizer \ svn-populate-node-origins-index svnauthz \ svnauthz-validate svnconflict svndiff svndiff3 \ svndiff4 svnmover svnraisetreeconflict x509-parser pre-everything:: @${ECHO_MSG} "" .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group." @${ECHO_MSG} "Make sure that all committers are its members." @${ECHO_MSG} "" @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with user '${SVNUSER}' and group '${SVNGROUP}'." @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @${ECHO_MSG} "" @${ECHO_MSG} "Make sure that:" @${ECHO_MSG} "* all your svn users are members of a common group" @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" .endif @${ECHO_MSG} "" .if ${PORT_OPTIONS:MSTATIC} @${ECHO_MSG} "Static binaries will be built." .endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" pre-configure: .if ${PORT_OPTIONS:MBDB} @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" -a "$${BDB_VERSION}" != "18" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5, 6 or 18) support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif .if ${PORT_OPTIONS:MSTATIC} LIBS_SQLITE3!= pkgconf --libs --static sqlite3 LIBS+= ${LIBS_SQLITE3} # for work with ICU LIBS+= -lc++ -lm .endif post-configure: # Enable GNOME Keyring / KWallet support in main code, as it is harmless @${REINPLACE_CMD} -E 's%.*#undef SVN_HAVE_(GNOME_KEYRING|KWALLET).*%#define SVN_HAVE_\1 1%' ${WRKSRC}/subversion/svn_private_config.h # ugly hack: save tools directory so we don't have to cleanup before installing @${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples @${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples # takes a long time, and will fail but gives maintainer a good oversight .if ${PORT_OPTIONS:MTEST} test: build -@make check -C ${WRKSRC} .endif post-build-TOOLS-on: @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} post-install: ${MKREPOS_TARGET} for F in ${BINS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done @${MKDIR} ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-STATIC-off: -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so post-install-SVNSERVE_WRAPPER-on: @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample post-install-TOOLS-on: @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} for F in ${TOOLS_TO_STRIP} ; do \ ${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/$${F}" ; \ done # =============================================================================== repository: _mkrepos _SVNGRPFILES= db locks locks/db.lock locks/db-logs.lock SVNGRPFILES= ${_SVNGRPFILES:S,^,${SVNREPOS}/,} _mkrepos: .USE .if !exists(${SVNREPOS}) .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @if /usr/sbin/pw groupshow "${SVNGROUP}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a group \"${SVNGROUP}\", so I will use it."; \ else \ if /usr/sbin/pw groupadd ${SVNGROUP} -h -; \ then \ ${ECHO_MSG} "Added group \"${SVNGROUP}\"."; \ else \ ${ECHO_MSG} "Adding group \"${SVNGROUP}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi @if /usr/sbin/pw usershow "${SVNUSER}" >/dev/null 2>&1; then \ ${ECHO_MSG} "You already have a user \"${SVNUSER}\", so I will use it."; \ else \ if /usr/sbin/pw useradd ${SVNUSER} -h -; \ then \ ${ECHO_MSG} "Added user \"${SVNUSER}\"."; \ else \ ${ECHO_MSG} "Adding user \"${SVNUSER}\" failed..."; \ ${ECHO_MSG} "Please create it, and try again."; \ ${FALSE}; \ fi; \ fi .endif @${MKDIR} ${SVNREPOS} @${PREFIX}/bin/svnadmin create --fs-type ${SVNFSTYPE} ${SVNREPOS} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} @${CHOWN} ${SVNUSER}:${SVNGROUP} ${SVNGRPFILES} @${CHMOD} g+w ${SVNGRPFILES} @for i in ${SVNREPOS}/db/* ; do \ i=$${i##*/}; \ case $$i in \ DB_CONFIG|fs-type|uuid) ;; \ *) ${CHOWN} -R ${SVNUSER}:${SVNGROUP} ${SVNREPOS}/db/$$i; \ ${CHMOD} -R g+w ${SVNREPOS}/db/$$i; \ ;; \ esac; \ done .endif .endif svn-build-outputs-hack: (cd ${WRKSRC} && python gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include 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,112 +1,105 @@ PORTNAME?= subversion -PORTVERSION= 1.14.2 +PORTVERSION= 1.14.3 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} \ +CONFIGURE_ARGS+= --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" 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 + @${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 \ '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 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 @@ -1,44 +1,47 @@ PKGNAMEPREFIX= java- CATEGORIES= java MAINTAINER= lev@FreeBSD.org COMMENT= Java bindings for Version control system WWW= https://subversion.apache.org/ USES= compiler USE_JAVA= yes JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes PORTREVISION_114= 0 PORTREVISION_LTS= 0 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 \ --without-kwallet \ --with-apxs=no MAKE_JOBS_UNSAFE= yes ALL_TARGET= javahl INSTALL_TARGET= install-javahl post-configure: .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} "s#^LT_CXX_LIBADD = .*#LT_CXX_LIBADD =#" ${WRKSRC}/Makefile .else @${DO_NADA} .endif pre-build: @${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes .include