- restore subversion-1.7.x as subversion17

I will take the port

  OK per PM by Lev@
This commit is contained in:
Olli Hauer 2013-06-19 21:13:34 +00:00
parent 747a2e993f
commit a47ccee2ae
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=321328
25 changed files with 4603 additions and 5 deletions

View File

@ -5,6 +5,21 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20130619:
AFFECTS: users of devel/subversion
AUTHOR: ohauer@FreeBSD.org
devel/subversion has been upgraded from 1.7.10 to 1.8.0
subversion-1.7.x is available as devel/subversion17
To stay on subversion-1.7.x use the following command
# pkg set -o devel/subversion:devel/subversion17
or
# portmaster -o devel/subversion17 devel/subversion
20130614:
AFFECTS: users who set port options in make.conf
AUTHOR: tijl@FreeBSD.org

View File

@ -4306,6 +4306,7 @@
SUBDIR += subversion
SUBDIR += subversion-static
SUBDIR += subversion16
SUBDIR += subversion17
SUBDIR += subversive
SUBDIR += sunterlib
SUBDIR += svk

View File

@ -1,9 +1,5 @@
# New ports collection makefile for: subversion-perl
# Date Created: 6 February 2004
# Whom: Autrijus Tang <autrijus@autrijus.org>
#
# Created By: Autrijus Tang <autrijus@autrijus.org>
# $FreeBSD$
#
PKGNAMEPREFIX= p5-
@ -12,6 +8,8 @@ COMMENT= Perl bindings for Version control system
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
MASTERDIR= ${.CURDIR}/../../devel/subversion17
.else
MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif

View File

@ -12,6 +12,8 @@ COMMENT= Python bindings for version control system
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
MASTERDIR= ${.CURDIR}/../../devel/subversion17
.else
MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif

View File

@ -8,6 +8,8 @@ COMMENT= Ruby bindings for version control system
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.else
MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif

364
devel/subversion17/Makefile Normal file
View File

@ -0,0 +1,364 @@
# Created by: rooneg@electricjellyfish.net
# $FreeBSD$
MAINTAINER= ohauer@FreeBSD.org
COMMENT= Version control system
CONFLICTS_INSTALL= subversion-1.[6|8].[0-9]*
USE_RC_SUBR= svnserve
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnrdump.1 \
svnsync.1 svnversion.1
MAN5= svnserve.conf.5
MAN8= svnserve.8
TXT_DOCS= BUGS CHANGES COMMITTERS INSTALL README
OPTIONS_DEFINE= P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE \
MOD_DAV_SVN MOD_DONTDOTHAT SVNAUTHZ_VALIDATE \
NEON SERF \
SASL BDB \
MAINTAINER_DEBUG \
SVNSERVE_WRAPPER SVNMUCC \
STATIC \
GNOME_KEYRING KDE_KWALLET \
BOOK TEST
OPTIONS_DEFAULT=P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON
P4_STYLE_MARKERS_DESC= Perforce-style conflict markers
ENHANCED_KEYWORD_DESC= Enhanced svn:keyword support
FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X
MOD_DONTDOTHAT_DESC= mod_dontdothat for Apache 2.X
NEON_DESC= WebDAV/Delta-V repo access module (neon)
SERF_DESC= WebDAV/Delta-V repo access module (serf)
MAINTAINER_DEBUG_DESC= Build debug version
SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper
SVNMUCC_DESC= Install Multiple URL Command Client
SVNAUTHZ_VALIDATE_DESC= install svnauthz-validate
STATIC_DESC= Build static version (no shared libs)
GNOME_KEYRING_DESC= Build with GNOME Keyring auth support
KDE_KWALLET_DESC= Build with KDE KWallet auth support
BOOK_DESC= Install the Subversion Book
TEST_DESC= Run subversion test suite
.include "Makefile.common"
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
SVNREPOS?= /home/svn/repos
SVNFSTYPE?= fsfs
SUB_FILES= pkg-install \
pkg-deinstall
BOOK_VERSION= 4304
.if make(repository)
WITH_REPOSITORY_CREATION= yes
.endif
.if defined(WITH_REPOSITORY_CREATION)
MKREPOS_TARGET= _mkrepos
.endif
# Patches required for use with the FreeBSD Project repository only
.if ${PORT_OPTIONS:MP4_STYLE_MARKERS}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers
.endif
.if ${PORT_OPTIONS:MENHANCED_KEYWORD}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword
.endif
.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template
.endif
.if empty(PORT_OPTIONS:MMAINTAINER_DEBUG)
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in
.endif
.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
PLIST_SUB+= SVNSERVE_WRAPPER=""
SUB_LIST+= SVNSERVE_BIN_EXT=".bin"
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-svnserve-wrapper
.else
PLIST_SUB+= SVNSERVE_WRAPPER="@comment "
SUB_LIST+= SVNSERVE_BIN_EXT=""
.endif
.if ${PORT_OPTIONS:MSVNMUCC}
PLIST_SUB+= SVNMUCC=""
.else
PLIST_SUB+= SVNMUCC="@comment "
.endif
.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK}
BOOK_HTML= svn-book-html-r${BOOK_VERSION}.tar.bz2
BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf
DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book
PLIST_SUB+= BOOK=""
.else
PLIST_SUB+= BOOK="@comment "
.endif
# testsuite will fail until PR156076 is committed
.if ${PORT_OPTIONS:MTEST}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
.endif
#.if ${PORT_OPTIONS:MASVN}
#RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils
#PLIST_SUB+= ASVN=""
#.else
PLIST_SUB+= ASVN="@comment "
#.endif
SCRIPTS=
SCRIPTS_DATA=
.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/lib!:C!(\.[0-9]+)?:!.a:!}
BUILD_DEPENDS+= ${OLD_LIB_DEPENDS}
LIB_DEPENDS=
.endif
pre-everything::
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MNEON}
@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
.else
@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
.endif
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MBDB}
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled."
.else
@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend disabled."
.endif
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
@${ECHO_MSG} "Build debug version."
@${ECHO_MSG} ""
.endif
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
.else
@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
.endif
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && ${PORT_OPTIONS:MMOD_DAV_SVN}
@${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled."
.else
@${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X"
.endif
@${ECHO_MSG} ""
.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
@${ECHO_MSG} "svnserve wrapper enabled."
@${ECHO_MSG} ""
.endif
.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
@${ECHO_MSG} "svnauthz-validate enabled."
@${ECHO_MSG} ""
.endif
.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 !defined(NOPORTDOCS) && ${PORT_OPTIONS:MBOOK}
@${ECHO_MSG} "Subversion Book will be installed."
@${ECHO_MSG} ""
.endif
#.if ${PORT_OPTIONS:MASVN}
# @${ECHO_MSG} "asvn will be installed"
# @${ECHO_MSG} ""
#.endif
.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:MSVNAUTHZ_VALIDATE}
@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@${ECHO_MSG} "!!! svnauthz_validate 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
@${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" ] ; then \
${ECHO_MSG} "" ; \
${ECHO_MSG} 'You should build `'"${APR_PORT}' with Berkeley DB (4 or 5) support to use subversion with it." ; \
${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' 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
# takes a long time, and will fail but gives maintainer a good oversight
.if ${PORT_OPTIONS:MTEST}
test:
-@make check -C ${WRKSRC}
.endif
pre-install:
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
# activate dav_module now in pkg-install to prevent double activation.
# workaround for apxs bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47397
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
.endif
post-install: ${MKREPOS_TARGET}
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so
.if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
.endif
.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
${LIBTOOL} --mode=install ${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/tools/server-side/svnauthz-validate ${PREFIX}/bin
.endif
@${MKDIR} ${DATADIR}
cd ${WRKSRC}/tools ; \
${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' --exclude='*.slo' -cf - * | ${TAR} -C ${DATADIR} -xf -
# ugly hack to remove libtool scripts ...
@${GREP} -R ${WRKSRC} ${DATADIR} | ${CUT} -d\: -f 1 | ${XARGS} ${RM} -f
@${CHMOD} -R a-st,o+rX ${DATADIR}
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
for f in ${TXT_DOCS}; do \
${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \
done
.if ${PORT_OPTIONS:MBOOK}
${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR}
${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}/svn-book.pdf
.endif
.endif
.if ${PORT_OPTIONS:MASVN}
${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
.endif
.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
.endif
.if ${PORT_OPTIONS:MSVNMUCC}
. if ${PORT_OPTIONS:MSTATIC}
@${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/svnmucc ${PREFIX}/bin
. else
@${INSTALL} ${WRKSRC}/tools/client-side/svnmucc/.libs/svnmucc ${PREFIX}/bin
. endif
.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} && ./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
.include <bsd.port.post.mk>

View File

@ -0,0 +1,203 @@
# Created by: rooneg@electricjellyfish.net
# $FreeBSD$
PORTNAME= subversion
PORTVERSION= 1.7.10
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \
${MASTER_SITE_LOCAL:S/$/:book/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:main
DIST_SUBDIR= subversion17
MASTER_SITE_SUBDIR= subversion/:main \
lev/:book
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
LICENSE= AL2
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|8].[0-9]*
LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 \
expat:${PORTSDIR}/textproc/expat2
CONFIGURE_ARGS+= --with-ssl \
--without-swig \
--with-sqlite=${LOCALBASE} \
--with-expat=/usr/local/include:/usr/local/lib:expat
.if defined(SVN_BUILD_BINDINGS)
CONFLICTS_BUILD+= ${PORTNAME}-1.[6|8].[0-9]*
LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
.endif
.include <bsd.port.options.mk>
# Default is "on"
.if ${PORT_OPTIONS:MNEON}
LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
PLIST_SUB+= NEON=""
.else
CONFIGURE_ARGS+=--without-neon
PLIST_SUB+= NEON="@comment "
.endif
.if ${PORT_OPTIONS:MSASL}
LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
PLIST_SUB+= SASL=""
.else
CONFIGURE_ARGS+=--without-sasl
PLIST_SUB+= SASL="@comment "
.endif
# Default is "on"
.if ${PORT_OPTIONS:MBDB}
USE_BDB= 42+
PLIST_SUB+= BDB=""
.else
CONFIGURE_ARGS+=--without-berkeley-db
PLIST_SUB+= BDB="@comment "
.endif
.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && empty(PORT_OPTIONS:MMOD_DAV_SVN)
IGNORE= to build mod_dontdothat option mod_dav_svn is required
.endif
.if ${PORT_OPTIONS:MMOD_DAV_SVN}
WITH_APACHE= yes
CONFIGURE_ARGS+=--with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
SVNGROUP?= www
SVNUSER?= www
.if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
PLIST_SUB+= MOD_DONTDOTHAT=""
.else
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
.endif
.else
CONFIGURE_ARGS+=--with-apxs=no
PLIST_SUB+= MOD_DAV_SVN="@comment "
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
SUB_LIST+= MOD_DAV_SVN_INSTALL="NO"
SVNGROUP?= svn
SVNUSER?= svn
.endif
.if defined(WITH_APACHE)
USE_APACHE= 22+
.include "${PORTSDIR}/Mk/bsd.apache.mk"
.if ${APACHE_VERSION} > 20
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG= ${LOCALBASE}/bin/apu-1-config
.else
IGNORE= please update to apache22
.endif
.else
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
APR_CONFIG= ${LOCALBASE}/bin/apr-1-config
APU_CONFIG= ${LOCALBASE}/bin/apu-1-config
.endif
CONFIGURE_ARGS+= --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
APR_INCLUDE_DIR!= ${APR_CONFIG} --includedir
PLIST_SUB+= SVNAUTHZ_VALIDATE=""
.else
PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment "
.endif
.if ${PORT_OPTIONS:MSERF}
LIB_DEPENDS+= serf-1:${PORTSDIR}/www/serf
CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
PLIST_SUB+= SERF=""
.else
CONFIGURE_ARGS+=--without-serf
PLIST_SUB+= SERF="@comment "
.endif
.if defined(SVN_BUILD_BINDINGS)
LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
.endif
# KWallet requires NLS to be enabled.
.if ${PORT_OPTIONS:MNLS} || ${PORT_OPTIONS:MKDE_KWALLET}
USES+= gettext
PLIST_SUB+= WITHOUT_GETTEXT=""
.else
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= WITHOUT_GETTEXT="@comment "
.endif
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
CFLAGS+= -fpic -DPIC
.endif
.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
CONFIGURE_ARGS+=--enable-maintainer-mode --enable-debug
CFLAGS+= -g
.endif
.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION)
CFLAGS+= -DHAS_ORGANIZATION_NAME
.endif
.if ${PORT_OPTIONS:MSTATIC}
CONFIGURE_ARGS+=--enable-all-static
PLIST_SUB+= DYNAMIC_ENABLED="@comment "
.else
PLIST_SUB+= DYNAMIC_ENABLED=""
.endif
.if ${PORT_OPTIONS:MGNOME_KEYRING}
LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
CONFIGURE_ARGS+=--with-gnome-keyring
PLIST_SUB+= GNOME_KEYRING=""
.else
CONFIGURE_ARGS+=--without-gnome-keyring
PLIST_SUB+= GNOME_KEYRING="@comment "
.endif
.if ${PORT_OPTIONS:MKDE_KWALLET}
USE_KDE4= kdelibs runtime
CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX}
PLIST_SUB+= KDE_KWALLET=""
.else
CONFIGURE_ARGS+=--without-kwallet
PLIST_SUB+= KDE_KWALLET="@comment "
.endif
.include <bsd.port.pre.mk>
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
@${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${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

View File

@ -0,0 +1,6 @@
SHA256 (subversion17/subversion-1.7.10.tar.bz2) = c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7
SIZE (subversion17/subversion-1.7.10.tar.bz2) = 5952121
SHA256 (subversion17/svn-book-html-r4304.tar.bz2) = a63d958b1ae70daf2ac93a53ece70a0ba0f8f7de7af3f74a665fe44b8f50ca14
SIZE (subversion17/svn-book-html-r4304.tar.bz2) = 467806
SHA256 (subversion17/svn-book-r4304.pdf) = 1b2cada79db8268fd6cd55fac4e5ee04c1e2977bbc587fa1098bd3613b9689b2
SIZE (subversion17/svn-book-r4304.pdf) = 1921443

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,12 @@
diff -ruN subversion/libsvn_wc/merge.c subversion/libsvn_wc/merge.c
--- subversion/libsvn_wc/merge.c 2011-08-06 19:15:44.000000000 +0400
+++ subversion/libsvn_wc/merge.c 2011-09-07 21:47:19.000000000 +0400
@@ -413,7 +413,7 @@
target_marker,
right_marker,
"=======", /* separator */
- svn_diff_conflict_display_modified_latest,
+ svn_diff_conflict_display_modified_original_latest,
pool));
SVN_ERR(svn_stream_close(ostream));

View File

@ -0,0 +1,11 @@
--- Makefile.in.orig 2012-09-14 18:34:40.000000000 +0400
+++ Makefile.in 2011-07-16 15:50:53.000000000 +0400
@@ -251,7 +251,7 @@
INSTALL_KWALLET_LIB = $(INSTALL_LIB)
INSTALL_NEON_LIB = $(INSTALL_LIB)
INSTALL_SERF_LIB = $(INSTALL_LIB)
-INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
+INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -s
INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
INSTALL_INCLUDE = $(INSTALL) -m 644

View File

@ -0,0 +1,457 @@
diff -ruN subversion/include/private/svn_subst_private.h subversion/include/private/svn_subst_private.h
--- subversion/include/private/svn_subst_private.h 1970-01-01 03:00:00.000000000 +0300
+++ subversion/include/private/svn_subst_private.h 2012-04-02 18:49:12.000000000 +0400
@@ -0,0 +1,68 @@
+/**
+ * @copyright
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file svn_subst_private.h
+ * @brief Non-public subst utility functions.
+ */
+
+
+#ifndef SVN_SUBST_PRIVATE_H
+#define SVN_SUBST_PRIVATE_H
+
+#include "svn_subst.h" /* for svn_boolean_t, svn_error_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * Set @a *kw to a new keywords hash filled with the appropriate contents
+ * given a @a keywords_string (the contents of the svn:keywords
+ * property for the file in question), the revision @a rev, the @a url,
+ * the url of the root of the @a repos, the @a date the file was committed
+ * on, and the @a author of the last commit. Any of these can be @c NULL
+ * to indicate that the information is not present, or @c 0 for @a date.
+ *
+ * Hash keys are of type <tt>const char *</tt>.
+ * Hash values are of type <tt>svn_string_t *</tt>.
+ *
+ * All memory is allocated out of @a pool.
+ *
+ * @since New in 1.6
+ */
+svn_error_t *
+svn_subst_build_keywords3(apr_hash_t **kw,
+ const char *keywords_string,
+ const char *rev,
+ const char *url,
+ const char *repos,
+ apr_time_t date,
+ const char *author,
+ apr_pool_t *pool);
+
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_SUBST_PRIVATE_H */
diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
--- subversion/libsvn_client/cat.c 2011-08-18 18:05:35.000000000 +0400
+++ subversion/libsvn_client/cat.c 2012-04-02 18:46:56.000000000 +0400
@@ -40,6 +40,7 @@
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
+#include "private/svn_subst_private.h"
/*** Code. ***/
@@ -137,12 +138,15 @@
const char *rev_str;
const char *author;
const char *url;
+ const char *repos;
SVN_ERR(svn_wc__node_get_changed_info(&changed_rev, NULL, &author, wc_ctx,
local_abspath, scratch_pool,
scratch_pool));
SVN_ERR(svn_wc__node_get_url(&url, wc_ctx, local_abspath, scratch_pool,
scratch_pool));
+ SVN_ERR(svn_wc__node_get_repos_info(&repos, NULL, wc_ctx, local_abspath,
+ scratch_pool, scratch_pool));
if (local_mod)
{
@@ -158,8 +162,8 @@
rev_str = apr_psprintf(scratch_pool, "%ld", changed_rev);
}
- SVN_ERR(svn_subst_build_keywords2(&kw, keywords->data, rev_str, url, tm,
- author, scratch_pool));
+ SVN_ERR(svn_subst_build_keywords3(&kw, keywords->data, rev_str, url,
+ repos, tm, author, scratch_pool));
}
/* Wrap the output stream if translation is needed. */
@@ -188,6 +192,7 @@
svn_string_t *keywords;
apr_hash_t *props;
const char *url;
+ const char *repos_root_url;
svn_stream_t *output = out;
svn_error_t *err;
@@ -231,6 +236,8 @@
&url, path_or_url, NULL,
peg_revision,
revision, ctx, pool));
+ /* Find the repos root URL */
+ SVN_ERR(svn_ra_get_repos_root2(ra_session, &repos_root_url, pool));
/* Grab some properties we need to know in order to figure out if anything
special needs to be done with this file. */
@@ -281,10 +288,11 @@
if (cmt_date)
SVN_ERR(svn_time_from_cstring(&when, cmt_date->data, pool));
- SVN_ERR(svn_subst_build_keywords2
+ SVN_ERR(svn_subst_build_keywords3
(&kw, keywords->data,
cmt_rev->data,
url,
+ repos_root_url,
when,
cmt_author ? cmt_author->data : NULL,
pool));
diff -ruN subversion/libsvn_client/commit.c subversion/libsvn_client/commit.c
--- subversion/libsvn_client/commit.c 2011-11-28 21:04:12.000000000 +0400
+++ subversion/libsvn_client/commit.c 2012-04-02 18:46:52.000000000 +0400
@@ -50,6 +50,7 @@
#include "client.h"
#include "private/svn_wc_private.h"
#include "private/svn_magic.h"
+#include "private/svn_subst_private.h"
#include "svn_private_config.h"
@@ -126,9 +127,9 @@
}
if (keywords_val)
- SVN_ERR(svn_subst_build_keywords2(&keywords, keywords_val->data,
+ SVN_ERR(svn_subst_build_keywords3(&keywords, keywords_val->data,
APR_STRINGIFY(SVN_INVALID_REVNUM),
- "", 0, "", pool));
+ "", "", 0, "", pool));
else
keywords = NULL;
diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
--- subversion/libsvn_client/export.c 2012-02-10 08:00:30.000000000 +0400
+++ subversion/libsvn_client/export.c 2012-04-02 18:46:47.000000000 +0400
@@ -43,6 +43,7 @@
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
+#include "private/svn_subst_private.h"
/*** Code. ***/
@@ -274,6 +275,7 @@
svn_revnum_t changed_rev;
const char *suffix;
const char *url;
+ const char *repos;
const char *author;
SVN_ERR(svn_wc__node_get_changed_info(&changed_rev, NULL, &author,
@@ -296,11 +298,13 @@
SVN_ERR(svn_wc__node_get_url(&url, wc_ctx, from_abspath,
scratch_pool, scratch_pool));
+ SVN_ERR(svn_wc__node_get_repos_info(&repos, NULL, wc_ctx, from_abspath,
+ scratch_pool, scratch_pool));
- SVN_ERR(svn_subst_build_keywords2
+ SVN_ERR(svn_subst_build_keywords3
(&kw, keywords->data,
apr_psprintf(scratch_pool, "%ld%s", changed_rev, suffix),
- url, tm, author, scratch_pool));
+ url, repos, tm, author, scratch_pool));
}
/* For atomicity, we translate to a tmp file and then rename the tmp file
@@ -702,6 +706,7 @@
/* Any keyword vals to be substituted */
const char *revision;
const char *url;
+ const char *repos;
const char *author;
apr_time_t date;
@@ -823,6 +828,7 @@
fb->edit_baton = eb;
fb->path = full_path;
fb->url = full_url;
+ fb->repos = eb->root_url;
fb->pool = pool;
*baton = fb;
@@ -987,8 +993,8 @@
}
if (fb->keywords_val)
- SVN_ERR(svn_subst_build_keywords2(&final_kw, fb->keywords_val->data,
- fb->revision, fb->url, fb->date,
+ SVN_ERR(svn_subst_build_keywords3(&final_kw, fb->keywords_val->data,
+ fb->revision, fb->url, fb->repos, fb->date,
fb->author, pool));
SVN_ERR(svn_subst_copy_and_translate4(fb->tmppath, fb->path,
diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
--- subversion/libsvn_subr/subst.c 2011-07-29 21:28:11.000000000 +0400
+++ subversion/libsvn_subr/subst.c 2012-04-02 18:47:06.000000000 +0400
@@ -49,6 +49,7 @@
#include "svn_private_config.h"
#include "private/svn_string_private.h"
+#include "private/svn_subst_private.h"
/**
* The textual elements of a detranslated special file. One of these
@@ -135,8 +136,11 @@
* %b basename of the URL of this file
* %d short format of date of this revision
* %D long format of date of this revision
+ * %P path relative to root of repos
* %r number of this revision
+ * %R root url of repository
* %u URL of this file
+ * %_ a space
* %% a literal %
*
* All memory is allocated out of @a pool.
@@ -145,12 +149,14 @@
keyword_printf(const char *fmt,
const char *rev,
const char *url,
+ const char *repos,
apr_time_t date,
const char *author,
apr_pool_t *pool)
{
svn_stringbuf_t *value = svn_stringbuf_ncreate("", 0, pool);
const char *cur;
+ const char *relative;
size_t n;
for (;;)
@@ -203,6 +209,23 @@
svn_stringbuf_appendcstr(value,
svn_time_to_human_cstring(date, pool));
break;
+ case 'P': /* relative path of this file */
+ relative = url;
+ if (relative && repos)
+ {
+ int len = strlen(repos);
+
+ if (strncmp(repos, relative, len) == 0
+ && relative[len] == '/')
+ relative += len + 1;
+ }
+ if (relative)
+ svn_stringbuf_appendcstr(value, relative);
+ break;
+ case 'R': /* root of repos */
+ if (repos)
+ svn_stringbuf_appendcstr(value, repos);
+ break;
case 'r': /* number of this revision */
if (rev)
svn_stringbuf_appendcstr(value, rev);
@@ -211,6 +234,9 @@
if (url)
svn_stringbuf_appendcstr(value, url);
break;
+ case '_': /* '%_' => a space */
+ svn_stringbuf_appendbytes(value, " ", 1);
+ break;
case '%': /* '%%' => a literal % */
svn_stringbuf_appendbyte(value, *cur);
break;
@@ -246,8 +272,8 @@
apr_hash_t *kwhash;
const svn_string_t *val;
- SVN_ERR(svn_subst_build_keywords2(&kwhash, keywords_val, rev,
- url, date, author, pool));
+ SVN_ERR(svn_subst_build_keywords3(&kwhash, keywords_val, rev,
+ url, "", date, author, pool));
/* The behaviour of pre-1.3 svn_subst_build_keywords, which we are
* replicating here, is to write to a slot in the svn_subst_keywords_t
@@ -286,6 +312,21 @@
const char *author,
apr_pool_t *pool)
{
+ SVN_ERR(svn_subst_build_keywords3(kw, keywords_val, rev,
+ url, "", date, author, pool));
+ return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_subst_build_keywords3(apr_hash_t **kw,
+ const char *keywords_val,
+ const char *rev,
+ const char *url,
+ const char *repos,
+ apr_time_t date,
+ const char *author,
+ apr_pool_t *pool)
+{
apr_array_header_t *keyword_tokens;
int i;
*kw = apr_hash_make(pool);
@@ -296,6 +337,24 @@
for (i = 0; i < keyword_tokens->nelts; ++i)
{
const char *keyword = APR_ARRAY_IDX(keyword_tokens, i, const char *);
+ apr_array_header_t *keyword_tokens2;
+
+ keyword_tokens2 = svn_cstring_split(keyword, "=", TRUE /* chop */, pool);
+ if (keyword_tokens2->nelts == 2)
+ {
+ svn_string_t *custom_val;
+ const char *custom_expand;
+
+ keyword = APR_ARRAY_IDX(keyword_tokens2, 0, const char*);
+ custom_expand = APR_ARRAY_IDX(keyword_tokens2, 1, const char*);
+ if (! strcmp(custom_expand, "%H"))
+ custom_expand = "%P %r %d %a";
+ else if (! strcmp(custom_expand, "%I"))
+ custom_expand = "%b %r %d %a";
+ custom_val = keyword_printf(custom_expand, rev, url, repos, date, author, pool);
+ apr_hash_set(*kw, keyword, APR_HASH_KEY_STRING, custom_val);
+ return SVN_NO_ERROR;
+ }
if ((! strcmp(keyword, SVN_KEYWORD_REVISION_LONG))
|| (! strcmp(keyword, SVN_KEYWORD_REVISION_MEDIUM))
@@ -303,7 +362,7 @@
{
svn_string_t *revision_val;
- revision_val = keyword_printf("%r", rev, url, date, author, pool);
+ revision_val = keyword_printf("%r", rev, url, repos, date, author, pool);
apr_hash_set(*kw, SVN_KEYWORD_REVISION_LONG,
APR_HASH_KEY_STRING, revision_val);
apr_hash_set(*kw, SVN_KEYWORD_REVISION_MEDIUM,
@@ -316,7 +375,7 @@
{
svn_string_t *date_val;
- date_val = keyword_printf("%D", rev, url, date, author, pool);
+ date_val = keyword_printf("%D", rev, url, repos, date, author, pool);
apr_hash_set(*kw, SVN_KEYWORD_DATE_LONG,
APR_HASH_KEY_STRING, date_val);
apr_hash_set(*kw, SVN_KEYWORD_DATE_SHORT,
@@ -327,7 +386,7 @@
{
svn_string_t *author_val;
- author_val = keyword_printf("%a", rev, url, date, author, pool);
+ author_val = keyword_printf("%a", rev, url, repos, date, author, pool);
apr_hash_set(*kw, SVN_KEYWORD_AUTHOR_LONG,
APR_HASH_KEY_STRING, author_val);
apr_hash_set(*kw, SVN_KEYWORD_AUTHOR_SHORT,
@@ -338,7 +397,7 @@
{
svn_string_t *url_val;
- url_val = keyword_printf("%u", rev, url, date, author, pool);
+ url_val = keyword_printf("%u", rev, url, repos, date, author, pool);
apr_hash_set(*kw, SVN_KEYWORD_URL_LONG,
APR_HASH_KEY_STRING, url_val);
apr_hash_set(*kw, SVN_KEYWORD_URL_SHORT,
@@ -348,7 +407,7 @@
{
svn_string_t *id_val;
- id_val = keyword_printf("%b %r %d %a", rev, url, date, author,
+ id_val = keyword_printf("%b %r %d %a", rev, url, repos, date, author,
pool);
apr_hash_set(*kw, SVN_KEYWORD_ID,
APR_HASH_KEY_STRING, id_val);
@@ -357,7 +416,7 @@
{
svn_string_t *header_val;
- header_val = keyword_printf("%u %r %d %a", rev, url, date, author,
+ header_val = keyword_printf("%u %r %d %a", rev, url, repos, date, author,
pool);
apr_hash_set(*kw, SVN_KEYWORD_HEADER,
APR_HASH_KEY_STRING, header_val);
diff -ruN subversion/libsvn_wc/translate.c subversion/libsvn_wc/translate.c
--- subversion/libsvn_wc/translate.c 2011-07-07 15:29:08.000000000 +0400
+++ subversion/libsvn_wc/translate.c 2012-04-02 18:47:00.000000000 +0400
@@ -46,6 +46,7 @@
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
+#include "private/svn_subst_private.h"
@@ -313,10 +314,10 @@
apr_time_t changed_date;
const char *changed_author;
const char *url;
+ const char *repos_root_url;
if (! for_normalization)
{
- const char *repos_root_url;
const char *repos_relpath;
SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, &repos_relpath,
@@ -341,13 +342,23 @@
changed_rev = SVN_INVALID_REVNUM;
changed_date = 0;
changed_author = "";
+
+ SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, NULL,
+ &repos_root_url, NULL, NULL,
+ NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL,
+ db, local_abspath,
+ scratch_pool, scratch_pool));
}
- SVN_ERR(svn_subst_build_keywords2(keywords,
+ SVN_ERR(svn_subst_build_keywords3(keywords,
keyword_list,
apr_psprintf(scratch_pool, "%ld",
changed_rev),
url,
+ repos_root_url,
changed_date,
changed_author,
result_pool));

View File

@ -0,0 +1,136 @@
--- subversion/svn/util.c.orig 2011-10-20 07:01:47.000000000 -0700
+++ subversion/svn/util.c 2013-04-09 23:14:37.817293627 -0700
@@ -63,6 +63,9 @@
#include "private/svn_opt_private.h"
#include "private/svn_client_private.h"
#include "private/svn_string_private.h"
+#ifdef HAS_ORGANIZATION_NAME
+#include "freebsd-organization.h"
+#endif
@@ -682,6 +685,67 @@
}
+/*
+ * Since we're adding freebsd-specific tokens to the log message,
+ * clean out any leftovers to avoid accidently sending them to other
+ * projects that won't be expecting them.
+ */
+
+static const char *prefixes[] = {
+ "PR:",
+ "Submitted by:",
+ "Reviewed by:",
+ "Approved by:",
+ "Obtained from:",
+ "MFC after:",
+ "Security:",
+ "Sponsored by:"
+};
+
+void
+cleanmsg(apr_size_t *l, char *s)
+{
+ int i;
+ char *pos;
+ char *kw;
+ char *p;
+ int empty;
+
+ for (i = 0; i < sizeof(prefixes) / sizeof(prefixes[0]); i++) {
+ pos = s;
+ while ((kw = strstr(pos, prefixes[i])) != NULL) {
+ /* Check to see if keyword is at start of line (or buffer) */
+ if (!(kw == s || kw[-1] == '\r' || kw[-1] == '\n')) {
+ pos = kw + 1;
+ continue;
+ }
+ p = kw + strlen(prefixes[i]);
+ empty = 1;
+ while (1) {
+ if (*p == ' ' || *p == '\t') {
+ p++;
+ continue;
+ }
+ if (*p == '\0' || *p == '\r' || *p == '\n')
+ break;
+ empty = 0;
+ break;
+ }
+ if (empty && (*p == '\r' || *p == '\n')) {
+ memmove(kw, p + 1, strlen(p + 1) + 1);
+ if (l)
+ *l -= (p + 1 - kw);
+ } else if (empty) {
+ *kw = '\0';
+ if (l)
+ *l -= (p - kw);
+ } else {
+ pos = p;
+ }
+ }
+ }
+}
+
#define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")
svn_error_t *
@@ -697,8 +761,32 @@
/* Set default message. */
default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t"
+#ifdef HAS_ORGANIZATION_NAME
+ ORGANIZATION_NAME
+#endif
+ APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX);
- svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above: 76 columns --|" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> PR: If a GNATS PR is affected by the change." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Submitted by: If someone else sent in the change." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
*tmp_file = NULL;
if (lmb->message)
@@ -710,6 +798,7 @@
that follows it. */
truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
EDITOR_EOF_PREFIX);
+ cleanmsg(NULL, (char*)log_msg_buf->data);
/* Make a string from a stringbuf, sharing the data allocation. */
log_msg_str->data = log_msg_buf->data;
@@ -830,6 +919,13 @@
if (message)
truncate_buffer_at_prefix(&message->len, message->data,
EDITOR_EOF_PREFIX);
+ /*
+ * Since we're adding freebsd-specific tokens to the log message,
+ * clean out any leftovers to avoid accidently sending them to other
+ * projects that won't be expecting them.
+ */
+ if (message)
+ cleanmsg(&message->len, message->data);
if (message)
{

View File

@ -0,0 +1,11 @@
--- build-outputs.mk.orig 2011-09-07 23:20:51.000000000 +0400
+++ build-outputs.mk 2011-09-07 23:21:37.000000000 +0400
@@ -887,7 +887,7 @@
cd subversion/svndumpfilter ; $(INSTALL_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(bindir)/svndumpfilter$(EXEEXT)
cd subversion/svnlook ; $(INSTALL_BIN) svnlook$(EXEEXT) $(DESTDIR)$(bindir)/svnlook$(EXEEXT)
cd subversion/svnrdump ; $(INSTALL_BIN) svnrdump$(EXEEXT) $(DESTDIR)$(bindir)/svnrdump$(EXEEXT)
- cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve$(EXEEXT)
+ cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve.bin$(EXEEXT)
cd subversion/svnsync ; $(INSTALL_BIN) svnsync$(EXEEXT) $(DESTDIR)$(bindir)/svnsync$(EXEEXT)
cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT)

View File

@ -0,0 +1,11 @@
--- build/ltmain.sh.orig 2011-08-26 19:01:42.000000000 +0400
+++ build/ltmain.sh 2011-09-08 00:11:05.000000000 +0400
@@ -5597,7 +5597,7 @@
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd4* | *-*-dragonfly*)
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
;;

View File

@ -0,0 +1,44 @@
--- configure.orig 2011-11-29 20:16:31.000000000 +0400
+++ configure 2011-12-05 23:43:08.000000000 +0400
@@ -4326,7 +4326,7 @@
# ==== Libraries, for which we may have source to build ======================
-APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."
+APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."
do_subdir_config="yes"
@@ -19106,11 +19106,11 @@
SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
+ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS"
LIBS="$LIBS $SVN_KWALLET_LIBS"
qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
- LDFLAGS="$old_LDFLAGS `
+ LDFLAGS="`
input_flags="$qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix"
output_flags=""
filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
@@ -19129,7 +19129,7 @@
if test -n "$output_flags"; then
printf "%s" "${output_flags# }"
fi
-`"
+` $old_LDFLAGS"
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -20762,6 +20762,9 @@
fi
if test "$RUBY" != "none"; then
+ if [ -z "$PTHREAD_LIBS" ]; then
+ PTHREAD_LIBS=-pthread
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking rb_hash_foreach" >&5
$as_echo_n "checking rb_hash_foreach... " >&6; }
if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)' >/dev/null; then

View File

@ -0,0 +1,11 @@
--- configure.ac.orig 2011-08-17 17:01:30.000000000 +0400
+++ configure.ac 2011-12-05 23:43:19.000000000 +0400
@@ -92,7 +92,7 @@
dnl them. Only .7 and later can guarantee repository
dnl integrity with FSFS.
-APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."]
+APR_VER_REGEXES=["0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."]
SVN_LIB_APR($APR_VER_REGEXES)

View File

@ -0,0 +1,10 @@
--- subversion/bindings/swig/perl/native/Base.pm.orig 2004-10-20 10:46:59.000000000 +0400
+++ subversion/bindings/swig/perl/native/Base.pm 2004-11-05 11:43:35.578125000 +0300
@@ -60,6 +60,7 @@
package SVN::_$pkg;
require DynaLoader;
bootstrap SVN::_$pkg;
+sub dl_load_flags { 0x01 }
1;
' or die $@;
};

View File

@ -0,0 +1,45 @@
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2011-07-16 15:47:59.000000000 +0400
+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2011-09-08 00:18:02.000000000 +0400
@@ -19,7 +19,8 @@
# under the License.
#
#
-
+#!/usr/bin/perl -w
+use strict;
use ExtUtils::MakeMaker;
use Config;
use Cwd 'abs_path';
@@ -36,6 +37,11 @@
my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
my $swig_builddir = "${svnlib_builddir}/bindings/swig";
+my $top_builddir = '../../../../..';
+my $top_srcdir = '@top_srcdir@';
+my $svnlib_srcdir = "${top_srcdir}/subversion";
+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+
my @modules = qw/client delta fs ra repos wc/;
my @ldpaths = (abs_path($swig_builddir) . "/perl/libsvn_swig_perl/.libs",
map { abs_path($svnlib_builddir) . "/libsvn_$_/.libs" }
@@ -67,10 +73,9 @@
" -I$svnlib_builddir",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
+ LIBS => [join(' ', $ENV{'LDFLAGS'}, $apr_ldflags,
(map {"-L$_"} @ldpaths),
- @ldmodules, '-lsvn_swig_perl-1',
- `$swig -perl -ldflags`)],
+ @ldmodules, '-lsvn_swig_perl-1')],
test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
);
@@ -85,6 +90,7 @@
"\$(INST_LIBDIR)/$_.pm") }
map { perlish $_ }
('base', 'core', @modules)},
+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a",
MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" =>
"\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") }
map { perlish $_ }

View File

@ -0,0 +1,72 @@
#!/bin/sh
#
# Try to de-activate mod_dav_svn in the installed httpd.conf and warn
# if this fails.
#
# $FreeBSD: /tmp/pcvs/ports/devel/subversion/files/pkg-deinstall.in,v 1.2 2012-02-14 16:06:21 lev Exp $
#
if [ "%%MOD_DAV_SVN_INSTALL%%" != "YES" ] ; then
exit 0
fi
if [ "$2" != "POST-DEINSTALL" ]; then
exit 0
fi
TMPDIR=${TMPDIR:=/tmp}
PKG_TMPDIR=${PKG_TMPDIR:=${TMPDIR}}
apxscmd=${PKG_PREFIX}/sbin/apxs
tmpdir=${PKG_TMPDIR}/deinstmod_dav_svn.$$
if [ ! -x ${apxscmd} ]; then
echo Can\'t find the apxs program: ${apxscmd}.
exit 1
fi
confdir=`${apxscmd} -q SYSCONFDIR`
if [ ! -d "${confdir}" ]; then
echo Can\'t find Apache conf dir: ${confdir}
exit 1
fi
if [ -f "${confdir}/httpd.conf" ]; then
conffile=httpd.conf
fi
if [ -f "${confdir}/httpd.conf.default" ]; then
conffile="${conffile} httpd.conf.default"
fi
if [ -z "${conffile}" ]; then
echo Can\'t find either of ${confdir}/httpd.conf or
echo ${confdir}/httpd.conf.default.
exit 1
fi
if ! mkdir ${tmpdir}; then
echo Can\'t create temporary directory: ${tmpdir}
exit 1
fi
for i in ${conffile}; do
echo -n Removing dav_svn_module, authz_svn_module and dontdothat_module from $i in config dir: ${confdir}...
awk '{if (!/LoadModule[[:blank:]]+dav_svn_module/ &&
!/LoadModule[[:blank:]]+authz_svn_module/ &&
!/LoadModule[[:blank:]]+dontdothat_module/ )
print $0}' < "${confdir}/$i" > "${tmpdir}/$i"
AWKRC=$?
diff "${confdir}/$i" "${tmpdir}/$i" | grep "^[<>]" | sed -e 's/#//g' | grep -Evq "^<[[:blank:]]+LoadModule"
GREPRC=$?
# last grep should not find anything
if [ "x${AWKRC}" = "x0" -a "x${GREPRC}" = "x1" ] ; then
echo " Ok"
cat "${tmpdir}/$i" > "${confdir}/$i"
else
echo " Error! Please, remove these modules manually"
fi
done
rm -rf "${tmpdir}"
exit 0

View File

@ -0,0 +1,57 @@
#!/bin/sh
#
# Date created: 18 Apr 2010
# Whom: ohauer@gmx.de
#
# Try to activate mod_dav.so in httpd.conf only if the module is not already active.
# This script is a workaround for apxs bug:
# https://issues.apache.org/bugzilla/show_bug.cgi?id=47397
#
# $FreeBSD$
#
if [ "%%MOD_DAV_SVN_INSTALL%%" != "YES" ] ; then
exit 0
fi
if [ "$2" != "PRE-INSTALL" ]; then
exit 0
fi
APXSCMD=${PKG_PREFIX}/sbin/apxs
if [ ! -x ${APXSCMD} ]; then
echo Can\'t find the apxs program: ${APXSCMD}.
exit 1
fi
SYSCONFDIR=`${APXSCMD} -q SYSCONFDIR`
LIBEXECDIR=`${APXSCMD} -q LIBEXECDIR`
if [ ! -d "${SYSCONFDIR}" ]; then
echo Can\'t find Apache conf dir: ${SYSCONFDIR}
exit 1
fi
if [ -f "${SYSCONFDIR}/httpd.conf" ]; then
CONFFILE=httpd.conf
fi
if [ -z "${CONFFILE}" ]; then
echo "Can\'t find ${SYSCONFDIR}/${CONFFILE}"
exit 1
fi
# use only 'egrep -e' else the check works not correct
if [ ! -n "`egrep -e '^LoadModule[[:blank:]]+dav_module' ${SYSCONFDIR}/${CONFFILE}`" ]; then
if [ -f ${LIBEXECDIR}/mod_dav.so ]; then
${APXSCMD} -e -S LIBEXECDIR=${LIBEXECDIR} -a -n dav ${LIBEXECDIR}/mod_dav.so
else
echo "cannot find ${LIBEXECDIR}/mod_dav.so"
exit 1
fi
else
echo "dav_module already active in ${SYSCONFDIR}/${CONFFILE}"
fi
exit 0

View File

@ -0,0 +1,40 @@
#!/bin/sh
#
# svnserve.sh for rc.d usage (c) 2005 Thomas E. Spanjaard.
# $Id$
# PROVIDE: svnserve
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: shutdown
#
# Add the following line to /etc/rc.conf to enable SVNServe:
#
# svnserve_enable="YES"
# # optional
# svnserve_flags="-d --listen-port=3690 --listen-host 0.0.0.0"
# svnserve_data="/usr/local/repositories"
# svnserve_user="svn"
# svnserve_group="svn"
#
# Note:
# svnserve bind per default at the ipv6 address!
# If you want svnserve binding at ipv4 address, you have
# to use option 'svnserve_flags' with --listen-host parameter
. /etc/rc.subr
# Set some defaults
svnserve_enable=${svnserve_enable:-"NO"}
svnserve_flags=${svnserve_flags:-"-d --listen-port=3690 --listen-host 0.0.0.0"}
svnserve_data=${svnserve_data:-"/home/svn/repos"}
svnserve_user=${svnserve_user:-"svn"}
svnserve_group=${svnserve_group:-"svn"}
name=svnserve
rcvar=svnserve_enable
load_rc_config $name
command=%%PREFIX%%/bin/svnserve%%SVNSERVE_BIN_EXT%%
command_args="-r ${svnserve_data}"
run_rc_command "$1"

View File

@ -0,0 +1,9 @@
#!/bin/sh
#
# $FreeBSD$
SVNSERVE=$(dirname $(realpath $0))/svnserve.bin
umask 002
$SVNSERVE "$@"

View File

@ -0,0 +1,4 @@
Subversion is a version control system designed to be as similar to cvs(1)
as possible, while fixing many outstanding problems with cvs(1).
WWW: http://subversion.apache.org/

View File

@ -0,0 +1,407 @@
@comment $FreeBSD$
bin/svn
bin/svnadmin
bin/svndumpfilter
bin/svnlook
bin/svnrdump
bin/svnserve
bin/svnsync
%%ASVN%%bin/asvn
%%SVNAUTHZ_VALIDATE%%bin/svnauthz-validate
%%SVNSERVE_WRAPPER%%bin/svnserve.bin
%%SVNMUCC%%bin/svnmucc
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
@dirrm include/subversion-1
%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a
%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la
%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
%%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so.0
%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.a
%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.la
%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so
%%DYNAMIC_ENABLED%%%%KDE_KWALLET%%lib/libsvn_auth_kwallet-1.so.0
lib/libsvn_client-1.a
lib/libsvn_client-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0
lib/libsvn_delta-1.a
lib/libsvn_delta-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0
lib/libsvn_diff-1.a
lib/libsvn_diff-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0
lib/libsvn_fs-1.a
lib/libsvn_fs-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0
%%BDB%%lib/libsvn_fs_base-1.a
%%BDB%%lib/libsvn_fs_base-1.la
%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so
%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0
lib/libsvn_fs_fs-1.a
lib/libsvn_fs_fs-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0
lib/libsvn_fs_util-1.a
lib/libsvn_fs_util-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0
lib/libsvn_ra-1.a
lib/libsvn_ra-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0
%%NEON%%lib/libsvn_ra_neon-1.a
%%NEON%%lib/libsvn_ra_neon-1.la
%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so
%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0
lib/libsvn_ra_local-1.a
lib/libsvn_ra_local-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0
lib/libsvn_ra_svn-1.a
lib/libsvn_ra_svn-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0
lib/libsvn_repos-1.a
lib/libsvn_repos-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0
%%SERF%%lib/libsvn_ra_serf-1.a
%%SERF%%lib/libsvn_ra_serf-1.la
%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so
%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0
lib/libsvn_subr-1.a
lib/libsvn_subr-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0
lib/libsvn_wc-1.a
lib/libsvn_wc-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/COMMITTERS
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch01dia1.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia1.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia2.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia3.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia4.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia5.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia6.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia7.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia1.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia2.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia3.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia4.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch08dia1.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch08dia2.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/draft.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/note.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/tip.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/warning.png
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/styles.css
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/svn-book.html
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book.pdf
%%WITHOUT_GETTEXT%%share/locale/de/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/es/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/fr/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/it/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/ja/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/ko/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/nb/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/pl/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/pt_BR/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/sv/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%share/locale/zh_CN/LC_MESSAGES/subversion.mo
%%WITHOUT_GETTEXT%%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/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/master/SVNMailNotifier.py
%%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/README
%%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.c
%%DATADIR%%/client-side/svnmucc/svnmucc-test.py
%%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/document-version.pl
%%DATADIR%%/dev/windows-build/Makefile
%%DATADIR%%/dev/windows-build/README
%%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/blame.py
%%DATADIR%%/examples/check-modified.py
%%DATADIR%%/examples/dumpprops.py
%%DATADIR%%/examples/info.rb
%%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/minimal_client.c
%%DATADIR%%/examples/putfile.py
%%DATADIR%%/examples/revplist.py
%%DATADIR%%/examples/SvnCLBrowse
%%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/mod_dontdothat/README
%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c
%%DATADIR%%/server-side/fsfs-reshard.py
%%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
%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so
%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so
%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n authz_svn libexec/%%APACHEDIR%%/mod_authz_svn.so
%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dontdothat.so
%%MOD_DONTDOTHAT%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dontdothat libexec/%%APACHEDIR%%/mod_dontdothat.so
%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images
%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@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%%