Index: branches/2014Q4/devel/subversion17/Makefile =================================================================== --- branches/2014Q4/devel/subversion17/Makefile (revision 374772) +++ branches/2014Q4/devel/subversion17/Makefile (revision 374773) @@ -1,284 +1,284 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ MAINTAINER= ohauer@FreeBSD.org COMMENT= Version control system CONFLICTS_INSTALL= subversion-1.[^7].[0-9]* \ subversion1[^7]-1.[^7].[0-9]* USE_RC_SUBR= svnserve PORTDOCS= BUGS CHANGES COMMITTERS INSTALL README OPTIONS_DEFINE= \ BDB \ DOCS \ ENHANCED_KEYWORD\ FREEBSD_TEMPLATE\ GNOME_KEYRING \ KDE_KWALLET \ MAINTAINER_DEBUG\ MOD_DAV_SVN \ NLS \ NEON \ P4_STYLE_MARKERS\ SASL \ SERF \ STATIC \ SVNSERVE_WRAPPER\ TEST \ TOOLS OPTIONS_DEFAULT=P4_STYLE_MARKERS \ ENHANCED_KEYWORD \ FREEBSD_TEMPLATE \ NEON BDB_DESC= Berkeley DB (deprected in 1.8.x) ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support FREEBSD_TEMPLATE_DESC= FreeBSD Project log template GNOME_KEYRING_DESC= Build with GNOME Keyring auth support KDE_KWALLET_DESC= Build with KDE KWallet auth support MAINTAINER_DEBUG_DESC= Build debug version MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X NEON_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module P4_STYLE_MARKERS_DESC= Perforce-style conflict markers SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module STATIC_DESC= Build static version (no shared libs) SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter) TEST_DESC= Run subversion test suite TOOLS_DESC= Install several tools (svnauthz-validate and mod_dontdothat are among them) # Patches required for use with the FreeBSD Project repository only P4_STYLE_MARKERS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-3way-conflict-markers FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper ENHANCED_KEYWORD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-enhanced-keyword .include "Makefile.common" SVNREPOS?= /home/svn/repos SVNFSTYPE?= fsfs SUB_FILES= pkg-install .if !${PORT_OPTIONS:MMAINTAINER_DEBUG} EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in .endif .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} SUB_LIST+= SVNSERVE_BIN_EXT=".bin" .else SUB_LIST+= SVNSERVE_BIN_EXT="" .endif .if ${PORT_OPTIONS:MMOD_DAV_SVN} SUB_LIST+= MOD_DAV_SVN_INSTALL="YES" PLIST_SUB+= SED=${SED} SVNGROUP?= www SVNUSER?= www .else SUB_LIST+= MOD_DAV_SVN_INSTALL="NO" SVNGROUP?= svn SVNUSER?= svn .endif .if ${PORT_OPTIONS:MTEST} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 .endif .if ${PORT_OPTIONS:MSTATIC} . if ${PORT_OPTIONS:MNLS} USES+= gettext:build . 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 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} . if ${PORT_OPTIONS:MMOD_DAV_SVN} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} . endif . if ${PORT_OPTIONS:MGNOME_KEYRING} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! Gnome Keyring and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} . endif . if ${PORT_OPTIONS:MKDE_WALLET} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! KDE Wallet and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} . endif @${ECHO_MSG} "Static binaries will be built." .endif # STATIC @${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}" .if ${PORT_OPTIONS:MBDB} @${ECHO_MSG} "" @${ECHO_MSG} "!!! Berkeley DB backend is deprecated, please convert your repos to FS backend !!!" @${ECHO_MSG} "!!! After switching to FS backend subversion can be rebuild without BDB support !!!" @sleep 10 .endif pre-configure: .if ${PORT_OPTIONS:MBDB} @BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \ if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" ] ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4 or 5) support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"${OPT_NAME}' 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} @if ${GREP} -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "You can not build static subversion if your SQLite3 is built with ICU enabled."; \ ${ECHO_MSG} "Please, reinstall 'devel/sqlite3' port with disabled ICU support."; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ fi .endif post-configure: # 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: .if ${PORT_OPTIONS:MTOOLS} @${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS} .endif post-install: ${MKREPOS_TARGET} .if ${PORT_OPTIONS:MTOOLS} @${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/* + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* + -${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/svn-tools/* .endif @${MKDIR} ${STAGEDIR}${DATADIR} @(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' --exclude '*.bak' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - ) @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER} - @${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve + ${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve .endif .if ${PORT_OPTIONS:MMOD_DAV_SVN} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/*.so .endif .if !${PORT_OPTIONS:MSTATIC} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so .endif # =============================================================================== repository: _mkrepos _SVNGRPFILES= db locks locks/db.lock locks/db-logs.lock .if ${PORT_OPTIONS:MMOD_DAV_SVN} _SVNGRPFILES+= dav .endif 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} .if ${PORT_OPTIONS:MMOD_DAV_SVN} @${MKDIR} ${SVNREPOS}/dav .endif @${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} && python2 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) + (cd ${WRKSRC} && python2.7 ./gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc) ${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons .include Index: branches/2014Q4/devel/subversion17/Makefile.common =================================================================== --- branches/2014Q4/devel/subversion17/Makefile.common (revision 374772) +++ branches/2014Q4/devel/subversion17/Makefile.common (revision 374773) @@ -1,129 +1,129 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.7.18 +PORTVERSION= 1.7.19 PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion17 PKGNAMESUFFIX= 17 MASTER_SITE_SUBDIR= subversion USE_KDE4= # Used below if KWallet support is enabled GNU_CONFIGURE= yes USES+= tar:bzip2 pkgconfig libtool cpe LICENSE= APACHE20 CPE_VENDOR= apache CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^7].[0-9]* LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libexpat.so:${PORTSDIR}/textproc/expat2 CONFIGURE_ARGS+= --without-swig \ --with-ssl \ --with-sqlite=${LOCALBASE} \ --with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat .if defined(SVN_BUILD_BINDINGS) CONFLICTS_BUILD+= ${PORTNAME}-1.[^7].[0-9]* LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion17 OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_NAME= devel_subversion17 .endif # =============================================================== OPTIONS_SUB= yes BDB_CONFIGURE_OFF= --without-berkeley-db BDB_USE= BDB=42+ GNOME_KEYRING_CONFIGURE_OFF= --without-gnome-keyring GNOME_KEYRING_CONFIGURE_ON= --with-gnome-keyring GNOME_KEYRING_LIB_DEPENDS= libgcr.so:${PORTSDIR}/security/gnome-keyring KDE_KWALLET_CONFIGURE_OFF= --without-kwallet KDE_KWALLET_CONFIGURE_ON= --with-kwallet=${KDE4_PREFIX} KDE_KWALLET_USE= KDE4=kdelibs,runtime MAINTAINER_DEBUG_CFLAGS= -g MAINTAINER_DEBUG_CONFIGURE_ON= --enable-maintainer-mode --enable-debug MOD_DAV_SVN_CONFIGURE_OFF= --with-apxs=no MOD_DAV_SVN_CONFIGURE_ON= --with-apxs=${APXS} MOD_DAV_SVN_USE= APACHE=22+ NEON_CONFIGURE_OFF= --without-neon NEON_CONFIGURE_ON= --with-neon=${LOCALBASE} NEON_LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext SASL_CONFIGURE_OFF= --without-sasl SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} SASL_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 SERF_CONFIGURE_OFF= --without-serf SERF_CONFIGURE_ON= --with-serf=${LOCALBASE} SERF_LIB_DEPENDS= libserf-1.so:${PORTSDIR}/www/serf STATIC_CONFIGURE_ON= --enable-all-static # =============================================================== .include .if ${PORT_OPTIONS:MKDE_KWALLET} && !${PORT_OPTIONS:MNLS} IGNORE= KWallet requires OPTION NLS set to ON .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 .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) CFLAGS+= -DHAS_ORGANIZATION_NAME .endif .include pre-everything:: .if defined(SVN_BUILD_BINDINGS) .if ${PORT_OPTIONS:MSTATIC} @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${ECHO_MSG} "!!! bindings and static build are not compatible !!!" @${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" @${FALSE} .endif .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 defined(SVN_BUILD_BINDINGS) ${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} .endif .if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h .endif # shebangfix @${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \ | ${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/2014Q4/devel/subversion17/distinfo =================================================================== --- branches/2014Q4/devel/subversion17/distinfo (revision 374772) +++ branches/2014Q4/devel/subversion17/distinfo (revision 374773) @@ -1,2 +1,2 @@ -SHA256 (subversion17/subversion-1.7.18.tar.bz2) = f67381ce62b69bdb373e4c38ff84576677316904753536a78630603cacc5d91a -SIZE (subversion17/subversion-1.7.18.tar.bz2) = 6096031 +SHA256 (subversion17/subversion-1.7.19.tar.bz2) = 0059cd376ac6a14c80612ea99c4b0fed9dc2ff0ad05560d108a4c5625323cd5c +SIZE (subversion17/subversion-1.7.19.tar.bz2) = 6094560 Index: branches/2014Q4/devel/subversion17/pkg-plist =================================================================== --- branches/2014Q4/devel/subversion17/pkg-plist (revision 374772) +++ branches/2014Q4/devel/subversion17/pkg-plist (revision 374773) @@ -1,396 +1,396 @@ bin/svn %%TOOLS%%bin/svn-tools/diff %%TOOLS%%bin/svn-tools/diff3 %%TOOLS%%bin/svn-tools/diff4 %%TOOLS%%bin/svn-tools/svn-populate-node-origins-index %%TOOLS%%bin/svn-tools/svn-rep-sharing-stats %%TOOLS%%bin/svn-tools/svnauthz-validate %%TOOLS%%bin/svn-tools/svnmucc %%TOOLS%%bin/svn-tools/svnraisetreeconflict bin/svnadmin bin/svndumpfilter bin/svnlook bin/svnrdump bin/svnserve %%SVNSERVE_WRAPPER%%bin/svnserve.bin bin/svnsync bin/svnversion include/subversion-1/mod_authz_svn.h include/subversion-1/mod_dav_svn.h include/subversion-1/svn-revision.txt include/subversion-1/svn_auth.h include/subversion-1/svn_base64.h include/subversion-1/svn_cache_config.h include/subversion-1/svn_checksum.h include/subversion-1/svn_client.h include/subversion-1/svn_cmdline.h include/subversion-1/svn_compat.h include/subversion-1/svn_config.h include/subversion-1/svn_ctype.h include/subversion-1/svn_dav.h include/subversion-1/svn_delta.h include/subversion-1/svn_diff.h include/subversion-1/svn_dirent_uri.h include/subversion-1/svn_dso.h include/subversion-1/svn_error.h include/subversion-1/svn_error_codes.h include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_iter.h include/subversion-1/svn_md5.h include/subversion-1/svn_mergeinfo.h include/subversion-1/svn_nls.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h include/subversion-1/svn_props.h include/subversion-1/svn_quoprint.h include/subversion-1/svn_ra.h include/subversion-1/svn_ra_svn.h include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_user.h include/subversion-1/svn_utf.h include/subversion-1/svn_version.h include/subversion-1/svn_wc.h include/subversion-1/svn_xml.h %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a %%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so %%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0 %%NO_STATIC%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0.0.0 %%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a %%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so %%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0 %%NO_STATIC%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0.0.0 lib/libsvn_client-1.a %%NO_STATIC%%lib/libsvn_client-1.so %%NO_STATIC%%lib/libsvn_client-1.so.0 %%NO_STATIC%%lib/libsvn_client-1.so.0.0.0 lib/libsvn_delta-1.a %%NO_STATIC%%lib/libsvn_delta-1.so %%NO_STATIC%%lib/libsvn_delta-1.so.0 %%NO_STATIC%%lib/libsvn_delta-1.so.0.0.0 lib/libsvn_diff-1.a %%NO_STATIC%%lib/libsvn_diff-1.so %%NO_STATIC%%lib/libsvn_diff-1.so.0 %%NO_STATIC%%lib/libsvn_diff-1.so.0.0.0 lib/libsvn_fs-1.a %%NO_STATIC%%lib/libsvn_fs-1.so %%NO_STATIC%%lib/libsvn_fs-1.so.0 %%NO_STATIC%%lib/libsvn_fs-1.so.0.0.0 %%BDB%%lib/libsvn_fs_base-1.a %%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so %%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0 %%NO_STATIC%%%%BDB%%lib/libsvn_fs_base-1.so.0.0.0 lib/libsvn_fs_fs-1.a %%NO_STATIC%%lib/libsvn_fs_fs-1.so %%NO_STATIC%%lib/libsvn_fs_fs-1.so.0 %%NO_STATIC%%lib/libsvn_fs_fs-1.so.0.0.0 lib/libsvn_fs_util-1.a %%NO_STATIC%%lib/libsvn_fs_util-1.so %%NO_STATIC%%lib/libsvn_fs_util-1.so.0 %%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0 lib/libsvn_ra-1.a %%NO_STATIC%%lib/libsvn_ra-1.so %%NO_STATIC%%lib/libsvn_ra-1.so.0 %%NO_STATIC%%lib/libsvn_ra-1.so.0.0.0 lib/libsvn_ra_local-1.a %%NO_STATIC%%lib/libsvn_ra_local-1.so %%NO_STATIC%%lib/libsvn_ra_local-1.so.0 %%NO_STATIC%%lib/libsvn_ra_local-1.so.0.0.0 %%NEON%%lib/libsvn_ra_neon-1.a %%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so %%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0 %%NO_STATIC%%%%NEON%%lib/libsvn_ra_neon-1.so.0.0.0 %%SERF%%lib/libsvn_ra_serf-1.a %%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so %%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0 %%NO_STATIC%%%%SERF%%lib/libsvn_ra_serf-1.so.0.0.0 lib/libsvn_ra_svn-1.a %%NO_STATIC%%lib/libsvn_ra_svn-1.so %%NO_STATIC%%lib/libsvn_ra_svn-1.so.0 %%NO_STATIC%%lib/libsvn_ra_svn-1.so.0.0.0 lib/libsvn_repos-1.a %%NO_STATIC%%lib/libsvn_repos-1.so %%NO_STATIC%%lib/libsvn_repos-1.so.0 %%NO_STATIC%%lib/libsvn_repos-1.so.0.0.0 lib/libsvn_subr-1.a %%NO_STATIC%%lib/libsvn_subr-1.so %%NO_STATIC%%lib/libsvn_subr-1.so.0 %%NO_STATIC%%lib/libsvn_subr-1.so.0.0.0 lib/libsvn_wc-1.a %%NO_STATIC%%lib/libsvn_wc-1.so %%NO_STATIC%%lib/libsvn_wc-1.so.0 %%NO_STATIC%%lib/libsvn_wc-1.so.0.0.0 @comment enable modules in this order: dav_svn, authz_svn, dontdothat %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n dav_svn %D/%F %%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n authz_svn %D/%F -%%MOD_DAV_SVN%%%%TOOLS%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf -%%MOD_DAV_SVN%%%%TOOLS%%%%APACHEMODDIR%%/mod_dontdothat.so -%%MOD_DAV_SVN%%%%TOOLS%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F +%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf +%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F man/man1/svn.1.gz man/man1/svnadmin.1.gz man/man1/svndumpfilter.1.gz man/man1/svnlook.1.gz man/man1/svnrdump.1.gz man/man1/svnsync.1.gz man/man1/svnversion.1.gz man/man5/svnserve.conf.5.gz man/man8/svnserve.8.gz %%NLS%%share/locale/de/LC_MESSAGES/subversion.mo %%NLS%%share/locale/es/LC_MESSAGES/subversion.mo %%NLS%%share/locale/fr/LC_MESSAGES/subversion.mo %%NLS%%share/locale/it/LC_MESSAGES/subversion.mo %%NLS%%share/locale/ja/LC_MESSAGES/subversion.mo %%NLS%%share/locale/ko/LC_MESSAGES/subversion.mo %%NLS%%share/locale/nb/LC_MESSAGES/subversion.mo %%NLS%%share/locale/pl/LC_MESSAGES/subversion.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/subversion.mo %%NLS%%share/locale/sv/LC_MESSAGES/subversion.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/subversion.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/subversion.mo %%DATADIR%%/backup/hot-backup.py %%DATADIR%%/bdb/erase-all-text-data.py %%DATADIR%%/bdb/skel.py %%DATADIR%%/bdb/svn-bdb-view.py %%DATADIR%%/bdb/svnfs.py %%DATADIR%%/bdb/whatis-rep.py %%DATADIR%%/buildbot/master/Feeder.py %%DATADIR%%/buildbot/master/SVNMailNotifier.py %%DATADIR%%/buildbot/master/master.cfg %%DATADIR%%/buildbot/master/private-sample.py %%DATADIR%%/buildbot/master/public_html/buildbot.css %%DATADIR%%/buildbot/master/public_html/index.html %%DATADIR%%/buildbot/master/public_html/robots.txt %%DATADIR%%/buildbot/slaves/README %%DATADIR%%/buildbot/slaves/bb-openbsd/svnbuild.sh %%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck-bindings.sh %%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck.sh %%DATADIR%%/buildbot/slaves/bb-openbsd/svnclean.sh %%DATADIR%%/buildbot/slaves/centos/svnbuild.sh %%DATADIR%%/buildbot/slaves/centos/svncheck-bindings.sh %%DATADIR%%/buildbot/slaves/centos/svncheck.sh %%DATADIR%%/buildbot/slaves/centos/svnclean.sh %%DATADIR%%/buildbot/slaves/centos/svnlog.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnbuild.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svncheck.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnclean.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnlog.sh %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnlog.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnbuild.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svnbuild.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svnclean.sh %%DATADIR%%/buildbot/slaves/ubuntu-x64/svnlog.sh %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svn-config.cmd.template %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-bindings.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-build.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-template.cmd %%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-test.cmd %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/config.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/do_all.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svnbuild.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svncheck.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svnclean.bat %%DATADIR%%/buildbot/slaves/win32-xp-VS2005/svnlog.bat %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnbuild.bat %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svncheck.bat %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnclean.bat %%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnlog.bat %%DATADIR%%/client-side/bash_completion %%DATADIR%%/client-side/bash_completion_test %%DATADIR%%/client-side/change-svn-wc-format.py %%DATADIR%%/client-side/server-version.py %%DATADIR%%/client-side/showchange.pl %%DATADIR%%/client-side/svn-graph.pl %%DATADIR%%/client-side/svn-ssl-fingerprints.sh %%DATADIR%%/client-side/svn-viewspec.py %%DATADIR%%/client-side/svnmucc/svnmucc-test.py %%DATADIR%%/client-side/svnmucc/svnmucc.c %%DATADIR%%/client-side/wcfind %%DATADIR%%/dev/analyze-svnlogs.py %%DATADIR%%/dev/benchmarks/large_dirs/create_bigdir.sh %%DATADIR%%/dev/benchmarks/suite1/benchmark.py %%DATADIR%%/dev/benchmarks/suite1/cronjob %%DATADIR%%/dev/benchmarks/suite1/crontab.entry %%DATADIR%%/dev/benchmarks/suite1/run %%DATADIR%%/dev/benchmarks/suite1/run.bat %%DATADIR%%/dev/check-license.py %%DATADIR%%/dev/contribulyze.py %%DATADIR%%/dev/datecheck.py %%DATADIR%%/dev/find-bad-style.py %%DATADIR%%/dev/find-unmoved-deprecated.sh %%DATADIR%%/dev/gcov.patch %%DATADIR%%/dev/gen-javahl-errors.py %%DATADIR%%/dev/gen-py-errors.py %%DATADIR%%/dev/gen_junit_report.py %%DATADIR%%/dev/gnuify-changelog.pl %%DATADIR%%/dev/graph-dav-servers.py %%DATADIR%%/dev/iz/defect.dem %%DATADIR%%/dev/iz/ff2csv.command %%DATADIR%%/dev/iz/ff2csv.py %%DATADIR%%/dev/iz/find-fix.py %%DATADIR%%/dev/iz/run-queries.sh %%DATADIR%%/dev/lock-check.py %%DATADIR%%/dev/log_revnum_change_asf.py %%DATADIR%%/dev/min-includes.sh %%DATADIR%%/dev/mklog.py %%DATADIR%%/dev/mlpatch.py %%DATADIR%%/dev/normalize-dump.py %%DATADIR%%/dev/po-merge.py %%DATADIR%%/dev/prebuild-cleanup.sh %%DATADIR%%/dev/random-commits.py %%DATADIR%%/dev/scramble-tree.py %%DATADIR%%/dev/stress.pl %%DATADIR%%/dev/svn-dev.el %%DATADIR%%/dev/svn-dev.vim %%DATADIR%%/dev/svn-entries.el %%DATADIR%%/dev/svn-merge-revs.py %%DATADIR%%/dev/svnqlite3-dump %%DATADIR%%/dev/svnraisetreeconflict/main.c %%DATADIR%%/dev/trails.py %%DATADIR%%/dev/unix-build/Makefile.svn %%DATADIR%%/dev/unix-build/README %%DATADIR%%/dev/verify-history.py %%DATADIR%%/dev/warn-ignored-err.sh %%DATADIR%%/dev/wc-format.py %%DATADIR%%/dev/wc-ng/bump-to-19.py %%DATADIR%%/dev/wc-ng/count-progress.py %%DATADIR%%/dev/wc-ng/gather-data.sh %%DATADIR%%/dev/wc-ng/graph-data.py %%DATADIR%%/dev/wc-ng/populate-pristine.py %%DATADIR%%/dev/which-error.py %%DATADIR%%/dev/windows-build/Makefile %%DATADIR%%/dev/windows-build/README %%DATADIR%%/dev/windows-build/document-version.pl %%DATADIR%%/diff/diff.c %%DATADIR%%/diff/diff3.c %%DATADIR%%/diff/diff4.c %%DATADIR%%/dist/backport.pl %%DATADIR%%/dist/checksums.py %%DATADIR%%/dist/collect_sigs.py %%DATADIR%%/dist/dist.sh %%DATADIR%%/dist/download-release.sh %%DATADIR%%/dist/extract-for-examination.sh %%DATADIR%%/dist/getsigs.py %%DATADIR%%/dist/nightly.sh %%DATADIR%%/dist/rat-excludes %%DATADIR%%/dist/release.py %%DATADIR%%/dist/templates/nightly-candidates.ezt %%DATADIR%%/dist/templates/rc-candidates.ezt %%DATADIR%%/dist/templates/rc-news.ezt %%DATADIR%%/dist/templates/rc-release-ann.ezt %%DATADIR%%/dist/templates/stable-candidates.ezt %%DATADIR%%/dist/templates/stable-release-ann.ezt %%DATADIR%%/dist/test.sh %%DATADIR%%/examples/SvnCLBrowse %%DATADIR%%/examples/blame.py %%DATADIR%%/examples/check-modified.py %%DATADIR%%/examples/dumpprops.py %%DATADIR%%/examples/get-location-segments.py %%DATADIR%%/examples/getfile.py %%DATADIR%%/examples/getlocks_test.c %%DATADIR%%/examples/geturl.py %%DATADIR%%/examples/headrev.c %%DATADIR%%/examples/info.rb %%DATADIR%%/examples/minimal_client.c %%DATADIR%%/examples/putfile.py %%DATADIR%%/examples/revplist.py %%DATADIR%%/examples/svnlog2html.rb %%DATADIR%%/examples/svnlook.py %%DATADIR%%/examples/svnlook.rb %%DATADIR%%/examples/svnput.c %%DATADIR%%/examples/svnserve-sgid.c %%DATADIR%%/examples/svnshell.py %%DATADIR%%/examples/svnshell.rb %%DATADIR%%/examples/testwrite.c %%DATADIR%%/hook-scripts/commit-access-control.cfg.example %%DATADIR%%/hook-scripts/commit-access-control.pl %%DATADIR%%/hook-scripts/commit-email.rb %%DATADIR%%/hook-scripts/log-police.py %%DATADIR%%/hook-scripts/mailer/mailer.conf.example %%DATADIR%%/hook-scripts/mailer/mailer.py %%DATADIR%%/hook-scripts/mailer/tests/mailer-init.sh %%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.output %%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.sh %%DATADIR%%/hook-scripts/mailer/tests/mailer-tweak.py %%DATADIR%%/hook-scripts/mailer/tests/mailer.conf %%DATADIR%%/hook-scripts/svn2feed.py %%DATADIR%%/hook-scripts/svnperms.conf.example %%DATADIR%%/hook-scripts/svnperms.py %%DATADIR%%/hook-scripts/validate-extensions.py %%DATADIR%%/hook-scripts/verify-po.py %%DATADIR%%/po/l10n-report.py %%DATADIR%%/po/po-update.sh %%DATADIR%%/server-side/fsfs-reshard.py %%DATADIR%%/server-side/mod_dontdothat/README %%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c %%DATADIR%%/server-side/svn-backup-dumps.py %%DATADIR%%/server-side/svn-populate-node-origins-index.c %%DATADIR%%/server-side/svn-rep-sharing-stats.c %%DATADIR%%/server-side/svn_server_log_parse.py %%DATADIR%%/server-side/svnauthz-validate.c %%DATADIR%%/server-side/test_svn_server_log_parse.py %%DATADIR%%/xslt/svnindex.css %%DATADIR%%/xslt/svnindex.xsl %%TOOLS%%@dirrm bin/svn-tools @dirrm include/subversion-1 @dirrm %%DATADIR%%/backup @dirrm %%DATADIR%%/bdb @dirrm %%DATADIR%%/buildbot/master/public_html @dirrm %%DATADIR%%/buildbot/master @dirrm %%DATADIR%%/buildbot/slaves/bb-openbsd @dirrm %%DATADIR%%/buildbot/slaves/centos @dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1 @dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared @dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf @dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64 @dirrm %%DATADIR%%/buildbot/slaves/win32-SharpSvn @dirrm %%DATADIR%%/buildbot/slaves/win32-xp-VS2005 @dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32 @dirrm %%DATADIR%%/buildbot/slaves @dirrm %%DATADIR%%/buildbot @dirrm %%DATADIR%%/client-side/svnmucc @dirrm %%DATADIR%%/client-side @dirrm %%DATADIR%%/dev/benchmarks/large_dirs @dirrm %%DATADIR%%/dev/benchmarks/suite1 @dirrm %%DATADIR%%/dev/benchmarks @dirrm %%DATADIR%%/dev/iz @dirrm %%DATADIR%%/dev/svnraisetreeconflict @dirrm %%DATADIR%%/dev/unix-build @dirrm %%DATADIR%%/dev/wc-ng @dirrm %%DATADIR%%/dev/windows-build @dirrm %%DATADIR%%/dev @dirrm %%DATADIR%%/diff @dirrm %%DATADIR%%/dist/templates @dirrm %%DATADIR%%/dist @dirrm %%DATADIR%%/examples @dirrm %%DATADIR%%/hook-scripts/mailer/tests @dirrm %%DATADIR%%/hook-scripts/mailer @dirrm %%DATADIR%%/hook-scripts @dirrm %%DATADIR%%/po @dirrm %%DATADIR%%/server-side/mod_dontdothat @dirrm %%DATADIR%%/server-side @dirrm %%DATADIR%%/xslt @dirrm %%DATADIR%% Index: branches/2014Q4 =================================================================== --- branches/2014Q4 (revision 374772) +++ branches/2014Q4 (revision 374773) Property changes on: branches/2014Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r374769