Index: head/devel/p5-subversion/Makefile =================================================================== --- head/devel/p5-subversion/Makefile (revision 516608) +++ head/devel/p5-subversion/Makefile (revision 516609) @@ -1,40 +1,40 @@ # Created by: Autrijus Tang # $FreeBSD$ PKGNAMEPREFIX= p5- MAINTAINER= lev@FreeBSD.org COMMENT= Perl bindings for Version control system USES= perl5 USE_PERL5= build run -PORTREVISION_112= 0 +PORTREVISION_113= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= perl5 CONFIGURE_ARGS+= --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 Index: head/devel/py-subversion/Makefile =================================================================== --- head/devel/py-subversion/Makefile (revision 516608) +++ head/devel/py-subversion/Makefile (revision 516609) @@ -1,29 +1,29 @@ # Created by: thinker@branda.to # $FreeBSD$ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PORTREVISION= 0 MAINTAINER= lev@FreeBSD.org COMMENT= Python bindings for version control system USES+= python:2.7 USE_PYTHON= flavors py3kplist -PORTREVISION_112= 0 +PORTREVISION_113= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= python CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-py-lib swig-py check-swig-py INSTALL_TARGET= install-swig-py .include Index: head/devel/ruby-subversion/Makefile =================================================================== --- head/devel/ruby-subversion/Makefile (revision 516608) +++ head/devel/ruby-subversion/Makefile (revision 516609) @@ -1,27 +1,27 @@ # Created by: Hiroyuki Iwatsuki # $FreeBSD$ PKGNAMEPREFIX= ruby- MAINTAINER= lev@FreeBSD.org COMMENT= Ruby bindings for version control system USE_RUBY= yes -PORTREVISION_112= 0 +PORTREVISION_113= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CATEGORIES+= ruby CONFIGURE_ARGS+= --without-gnome-keyring \ --without-kwallet \ --with-apxs=no ALL_TARGET= swig-rb-lib swig-rb INSTALL_TARGET= install-swig-rb .include Index: head/devel/subversion/Makefile.addons =================================================================== --- head/devel/subversion/Makefile.addons (revision 516608) +++ head/devel/subversion/Makefile.addons (revision 516609) @@ -1,33 +1,33 @@ # Created by: lev@FreeBSD.org # $FreeBSD$ -WITH_SUBVERSION_VER?= 112 +WITH_SUBVERSION_VER?= 113 PKGDIR= ${.CURDIR} SVN_BUILD_ADDONS= yes -.if ${WITH_SUBVERSION_VER} == 112 +.if ${WITH_SUBVERSION_VER} == 113 CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ ${PORTNAME}-1.[^1][0-9].[0-9]* \ ${PORTNAME}-1.1[0-1].[0-9]* \ ${PORTNAME}-lts-1.[0-9][0-9].[0-9]* -PORTREVISION= ${PORTREVISION_112:U0} -PLIST_SUB+= SVN112="" SVNLTS="@comment " +PORTREVISION= ${PORTREVISION_113:U0} +PLIST_SUB+= SVN113="" SVNLTS="@comment " LIB_DEPENDS+= libsvn_client-1.so:devel/subversion OPTIONS_NAME= devel_subversion MASTERDIR= ${.CURDIR}/../../devel/subversion .include "${MASTERDIR}/Makefile.common" .elif ${WITH_SUBVERSION_VER} == LTS PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-lts CONFLICTS_BUILD+= ${PORTNAME}-1.[0-9].[0-9]* \ ${PORTNAME}-1.[0-9][0-9].[0-9]* PORTREVISION= ${PORTREVISION_LTS:U0} -PLIST_SUB+= SVN112="@comment " SVNLTS="" +PLIST_SUB+= SVN113="@comment " SVNLTS="" LIB_DEPENDS+= libsvn_client-1.so:devel/subversion-lts OPTIONS_NAME= devel_subversion-lts MASTERDIR= ${.CURDIR}/../../devel/subversion-lts .include "${MASTERDIR}/Makefile.common" .else -BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 112 (default) and LTS are supported +BROKEN= Wrong WITH_SUBVERSION_VER=${WITH_SUBVERSION_VER}, only 113 (default) and LTS are supported .endif Index: head/devel/subversion/Makefile.common =================================================================== --- head/devel/subversion/Makefile.common (revision 516608) +++ head/devel/subversion/Makefile.common (revision 516609) @@ -1,122 +1,122 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ PORTNAME?= subversion -PORTVERSION= 1.12.2 +PORTVERSION= 1.13.0 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 .if defined(SVN_BUILD_BINDINGS) BUILD_DEPENDS+= swig3.0:devel/swig30 CONFIGURE_ARGS+= --with-swig=${LOCALBASE}/bin/swig3.0 .endif # =============================================================== OPTIONS_SUB= yes BDB_CONFIGURE_ON= --enable-bdb6 BDB_CONFIGURE_OFF= --without-berkeley-db BDB_USES= bdb MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug 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 ${PORT_OPTIONS:MMAINTAINER_DEBUG} WITH_DEBUG= yes .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: head/devel/subversion/distinfo =================================================================== --- head/devel/subversion/distinfo (revision 516608) +++ head/devel/subversion/distinfo (revision 516609) @@ -1,3 +1,3 @@ -TIMESTAMP = 1563993314 -SHA256 (subversion-1.12.2.tar.bz2) = 3bd0b5c8e4c5175263dc9a92fd9aef94ce917e80af034f26fe5c45fde7e0f771 -SIZE (subversion-1.12.2.tar.bz2) = 8506584 +TIMESTAMP = 1572818775 +SHA256 (subversion-1.13.0.tar.bz2) = bc50ce2c3faa7b1ae9103c432017df98dfd989c4239f9f8270bb3a314ed9e5bd +SIZE (subversion-1.13.0.tar.bz2) = 8508122 Index: head/java/java-subversion/Makefile =================================================================== --- head/java/java-subversion/Makefile (revision 516608) +++ head/java/java-subversion/Makefile (revision 516609) @@ -1,48 +1,48 @@ # Created by: Lev Serebryakov # $FreeBSD$ PKGNAMEPREFIX= java- CATEGORIES= java MAINTAINER= lev@FreeBSD.org COMMENT= Java bindings for Version control system USES+= compiler USE_JAVA= yes JAVA_VERSION= 1.7+ JAVA_OS= native JAVA_BUILD= yes JAVA_RUN= yes -PORTREVISION_112= 0 +PORTREVISION_113= 0 PORTREVISION_LTS= 0 SVN_BUILD_BINDINGS= yes .include "${.CURDIR}/../../devel/subversion/Makefile.addons" CONFIGURE_ARGS+= --enable-javahl \ --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 Index: head/security/subversion-gnome-keyring/Makefile =================================================================== --- head/security/subversion-gnome-keyring/Makefile (revision 516608) +++ head/security/subversion-gnome-keyring/Makefile (revision 516609) @@ -1,25 +1,25 @@ # Created by: Autrijus Tang # $FreeBSD$ PKGNAMESUFFIX= -gnome-keyring CATEGORIES= security gnome MAINTAINER= lev@FreeBSD.org COMMENT= Gnome Keyring integration for Version control system -PORTREVISION_112= 0 +PORTREVISION_113= 0 PORTREVISION_LTS= 0 .include "${.CURDIR}/../../devel/subversion/Makefile.addons" LIB_DEPENDS+= libsecret-1.so:security/libsecret CONFIGURE_ARGS+= --with-gnome-keyring ALL_TARGET= gnome-keyring-lib INSTALL_TARGET= install-gnome-keyring-lib post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .include