kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update subversion to 1.7.0.

Browse source 
Make FreeBSD patches to be port's options and remove separated port.

  Rename patches to more sane names.

  Add devel/subversion16 port, for people, who need old version.

  Mark ports, which could not be built with subversion 1.7.x, as
  conflicting with new subversion.
This commit is contained in:
Lev A. Serebryakov 2011-10-16 14:31:47 +00:00
parent 86223ea636
commit 09a0319c83
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=283603
39 changed files with 2685 additions and 1344 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -2813,3 +2813,4 @@ www/ziproxy||2011-10-14|Vulnerable since 2010-06-15
www/asterisk-gui||2011-10-14|Depends on net/asterisk14, which is FORBIDDEN
databases/dbmetrix||2011-10-14|Depends on databases/mysql323-client, which is FORBIDDEN
databases/xmysqladmin||2011-10-14|Depends on databases/mysql323-client, which is FORBIDDEN
devel/subversion-freebsd||2011-10-16|Merged with devel/subversion

93
UPDATING
View file

@ -5,6 +5,99 @@ 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.
20111016:
AFFECTS: users of devel/subversion, devel/subversion-freebsd,
devel/p5-subversion, devel/py-subversion,
devel/ruby-subversion and java/subversion-java and
all dependand ports.
AUTHOR: Lev Serebryakov <lev@FreeBSD.org>
Subversion was updated to version 1.7.0 and port was reworked.
Now here is not "devel/subversion-freebsd" port. All FreeBSD-
specific patches are incorporated into main subversion port
as options, which are turned ON by default.
These options are:
P4_STYLE_MARKERS -- change conflict markers to P4 style,
established for FreeBSD projects.
This is not mandattory for working with
FreeBSD sources.
ENHANCED_KEYWORD -- Support for custom keywords, like
$ FreeBSD $ in sources.
This is MANDATORY for working with
FreeBSD sources.
FREEBSD_TEMPLATE -- Standard FreeBSD commit template.
It is RECOMMENDED for working with
FreeBSD sources.
Also, subversion 1.7.0 changes working copy format,
and one working copy could not be shared between
subversion 1.7.0 and 1.6.x. Please, think twice before
upgrade.
Additional port "devel/subversion16" was created to
support subversion 1.6.x. Subversion 1.7.x and 1.6.x
could not be installed simultaneously!
Binding ports could be build with Subversion 1.7.0 (Default)
or with Subversion 1.6.x. To buiuld bindings with subversion 1.6.x
you should set variable USE_SUBVERSION to "16".
There are several ways to upgrade, depends on what did you use
before and what you want to get after upgrade.
(a) You use devel/subversion without FreeBSD patches and, maybe,
some bindings. You want fresh'n'new subversion 1.7.0.
Please, run:
# cd /usr/ports/devel/subversion && make config
<deselect first three options, described above, if you want it>
# portupgrade -r devel/subversion
or
# portmaster -R -r subversion-1.6
(b) You use devel/subversion-freebsd and, maybe, some
bindings. You want fresh'n'new subversion 1.7.0, again
with FreeBSD patches.
Please, run:
# cd /usr/ports/devel/subversion && make config
<make sure, that first three options are selected>
# portupgrade -o devel/subversion devel/subversion-freebsd
# portupgrade -r devel/subversion
or
# portmaster -o devel/subversion devel/subversion-freebsd
# portmaster -R -r subversion-1.7
(c) You use devel/subversion without FreeBSD patches and, maybe,
some bindings. You want good old subversion 1.6.x, without
patches again.
Please, run:
# cd /usr/ports/devel/subversion16 && make config
<deselect first three options, described above, if you want it>
# portupgrade -o devel/subversion16 devel/subversion
# portupgrade -m "USE_SUBVERSION=16" -r devel/subversion16
or
# portmaster -o devel/subversion16 devel/subversion
# portmaster -m "USE_SUBVERSION=16" -R -r subversion-1.6
(d) You use devel/subversion-freebsd and, maybe, some bindings.
You want good old subversion 1.6.x, with FreeBSD patches.
Please, run:
# cd /usr/ports/devel/subversion16 && make config
<make sure, that first three options are selected>
# portupgrade -o devel/subversion16 devel/subversion-freebsd
# portupgrade -m "USE_SUBVERSION=16" -r devel/subversion16
or
# portmaster -o devel/subversion16 devel/subversion-freebsd
# portmaster -m "USE_SUBVERSION=16" -R -r subversion-1.6
20111005:
AFFECTS: users of lang/erlang
AUTHOR: Jimmy Olgeni <olgeni@FreeBSD.org>

6
devel/kdevelop/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= kdevelop
PORTVERSION= 3.5.4
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES?= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
@ -19,12 +19,14 @@ COMMENT= IDE for a wide variety of programming tasks
BUILD_DEPENDS= cervisia:${PORTSDIR}/devel/kdesdk3 \
dot:${PORTSDIR}/graphics/graphviz
LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion
LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion16
RUN_DEPENDS= ${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \
extractrc:${PORTSDIR}/devel/kdesdk3 \
gdb66:${PORTSDIR}/devel/gdb66 \
gmake:${PORTSDIR}/devel/gmake
CONFLICTS_BUILD=subversion-1.7.[0-9]*
.if defined(WITH_OPTIONAL_DEPENDS)
PAPERSIZE?= letter

24
devel/p5-subversion/Makefile
View file

@ -10,20 +10,24 @@ PKGNAMEPREFIX= p5-
MAINTAINER= lev@FreeBSD.org
COMMENT= Perl bindings for Version control system
.if defined(USE_SUBVERSION) && ${USE_SUBVERSION} == 16
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.else
MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif
PKGDIR= ${.CURDIR}
USE_PERL5= 5.8.0+
USE_PERL5= 5.8.0+
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= SVN::Base.3 \
SVN::Client.3 \
SVN::Core.3 \
SVN::Delta.3 \
SVN::Fs.3 \
SVN::Ra.3 \
SVN::Repos.3 \
SVN::Wc.3
MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
MAN3= SVN::Base.3 \
SVN::Client.3 \
SVN::Core.3 \
SVN::Delta.3 \
SVN::Fs.3 \
SVN::Ra.3 \
SVN::Repos.3 \
SVN::Wc.3
SVN_BUILD_BINDINGS=yes

5
devel/pecl-svn/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= svn
PORTVERSION= 1.0.1
PORTREVISION= 1
CATEGORIES= devel pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@ -17,7 +18,9 @@ DIST_SUBDIR= PECL
MAINTAINER= miwi@FreeBSD.org
COMMENT= A PECL extension to the libsvn library
LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion
LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion16
CONFLICTS_BUILD=subversion-1.7.[0-9]*
LICENSE= PHP301
USE_PHP= yes

4
devel/py-subversion/Makefile
View file

@ -10,7 +10,11 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= lev@FreeBSD.org
COMMENT= Python bindings for version control system
.if defined(USE_SUBVERSION) && ${USE_SUBVERSION} == 16
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.else
MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif
PKGDIR= ${.CURDIR}
USE_PYTHON= yes

6
devel/pysvn/Makefile
View file

@ -7,14 +7,16 @@
PORTNAME= pysvn
PORTVERSION= 1.7.5
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://pysvn.barrys-emacs.org/source_kits/
MAINTAINER= bra@fsn.hu
COMMENT= Python binding for Subversion
LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion
LIB_DEPENDS= svn_client-1:${PORTSDIR}/devel/subversion16
CONFLICTS_BUILD=subversion-1.7.[0-9]*
USE_PYTHON= yes
USE_PYDISTUTILS=yes

4
devel/ruby-subversion/Makefile
View file

@ -10,7 +10,11 @@ PKGNAMEPREFIX= ruby-
MAINTAINER= lev@FreeBSD.org
COMMENT= Ruby bindings for version control system
.if defined(USE_SUBVERSION) && ${USE_SUBVERSION} == 16
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.else
MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif
PKGDIR= ${.CURDIR}
CONFIGURE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS}

6
devel/subcommander/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= subcommander
PORTVERSION= 1.2.3
PORTREVISION= 9
PORTREVISION= 10
CATEGORIES= devel
MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/42385/
DISTNAME= Subcommander-${PORTVERSION}
@ -17,7 +17,9 @@ COMMENT= Qt based multiplatform subversion client, diff & merge tool
LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29 \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
svn_client-1.0:${PORTSDIR}/devel/subversion
svn_client-1.0:${PORTSDIR}/devel/subversion16
CONFLICTS_BUILD=subversion-1.7.[0-9]*
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

23
devel/subversion-freebsd/Makefile
View file

@ -1,23 +0,0 @@
# New ports collection makefile for: subversion-freebsd
# Date created: 29 May 2008
# Whom: dougb@FreeBSD.org
#
# $FreeBSD$
PORTREVISION?= 4
PKGNAMESUFFIX= -freebsd
COMMENT= Version control system with FreeBSD Project repo customizations
MASTERDIR= ${.CURDIR}/../subversion
DESCR= ${.CURDIR}/pkg-descr
# Patches required for use with the FreeBSD Project repository only
WITH_FREEBSD_SUBVERSION= yes
CONFLICTS?= subversion-[0-9]*
DISTINFO_FILE= ${MASTERDIR}/distinfo
.include "${MASTERDIR}/Makefile"

8
devel/subversion-freebsd/pkg-descr
View file

@ -1,8 +0,0 @@
Subversion is a version control system designed to be as similar to cvs(1)
as possible, while fixing many outstanding problems with cvs(1).
This version adds patches that at this time are specific to the needs of
the FreeBSD Project src repository. If you do not need to access that
repository you will want to use devel/subversion.
WWW: http://subversion.tigris.org/

95
devel/subversion/Makefile
View file

@ -7,32 +7,36 @@
MAINTAINER= lev@FreeBSD.org
COMMENT= Version control system
CONFLICTS?= subversion-devel-[0-9]* subversion-freebsd-[0-9]*
CONFLICTS_INSTALL= subversion-devel-[0-9]* subversion-freebsd-[0-9]*
USE_RC_SUBR= svnserve
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 svnversion.1
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 COPYING HACKING INSTALL README
TXT_DOCS= BUGS CHANGES COMMITTERS INSTALL README
OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
MOD_DONTDOTHAT "mod_dontdothat for Apache 2.X" off \
NEON "WebDAV/Delta-V repo access module (neon)" on \
SERF "WebDAV/Delta-V repo access module (serf)" off \
SASL "SASL2 authorization support" off \
BDB "Berkeley DB (4 or 5) repository backend" on \
ASVN "Build and install Archive SVN (asvn)" off \
OPTIONS= P4_STYLE_MARKERS "Perforce-style conflict markers" on \
ENHANCED_KEYWORD "Enhanced svn:keyword support" on \
FREEBSD_TEMPLATE "FreeBSD Project log template" on \
MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
NEON "WebDAV/Delta-V repo access module (neon)" on \
SERF "WebDAV/Delta-V repo access module (serf)" off \
SASL "SASL2 authorization support" off \
BDB "Berkeley DB (4 or 5) repository backend" on \
MAINTAINER_DEBUG "Build debug version" off \
SVNSERVE_WRAPPER "Enable svnserve wrapper" off \
SVNAUTHZ_VALIDATE "install svnauthz-validate" off \
STATIC "Build static version (no shared libs)" off \
GNOME_KEYRING "Build with GNOME Keyring auth support" off \
KDE_KWALLET "Build with KDE KWallet auth support" off \
BOOK "Install the Subversion Book" off
STATIC "Build static version (no shared libs)" off \
GNOME_KEYRING "Build with GNOME Keyring auth support" off \
KDE_KWALLET "Build with KDE KWallet auth support" off \
BOOK "Install the Subversion Book" off
# ASVN "Build and install Archive SVN (asvn)" off \
# MOD_DONTDOTHAT "mod_dontdothat for Apache 2.X" off \
.include "${.CURDIR}/../../devel/subversion/Makefile.common"
.include "Makefile.common"
SVNREPOS?= /home/svn/repos
SVNFSTYPE?= fsfs
@ -48,10 +52,21 @@ WITH_REPOSITORY_CREATION= yes
MKREPOS_TARGET= _mkrepos
.endif
# Patches required for use with the FreeBSD Project repository only
.if !defined(WITHOUT_P4_STYLE_MARKERS)
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers
.endif
.if !defined(WITHOUT_ENHANCED_KEYWORD)
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword
.endif
.if !defined(WITHOUT_FREEBSD_TEMPLATE)
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template
.endif
.if defined(WITH_SVNSERVE_WRAPPER)
PLIST_SUB+= SVNSERVE_WRAPPER=""
SUB_LIST+= SVNSERVE_BIN_EXT=".bin"
EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-svnserve-wrapper
.else
PLIST_SUB+= SVNSERVE_WRAPPER="@comment "
SUB_LIST+= SVNSERVE_BIN_EXT=""
@ -66,12 +81,12 @@ PLIST_SUB+= BOOK=""
PLIST_SUB+= BOOK="@comment "
.endif
.if defined(WITH_ASVN)
RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
PLIST_SUB+= ASVN=""
.else
#.if defined(WITH_ASVN)
#RUN_DEPENDS+= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
#PLIST_SUB+= ASVN=""
#.else
PLIST_SUB+= ASVN="@comment "
.endif
#.endif
SCRIPTS=
@ -107,12 +122,12 @@ pre-everything::
@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
.endif
@${ECHO_MSG} ""
.if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_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 defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_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 defined(WITH_SVNSERVE_WRAPPER)
@${ECHO_MSG} "svnserve wrapper enabled."
@${ECHO_MSG} ""
@ -149,10 +164,10 @@ pre-everything::
@${ECHO_MSG} "Subversion Book will be installed."
@${ECHO_MSG} ""
.endif
.if defined(WITH_ASVN)
@${ECHO_MSG} "asvn will be installed"
@${ECHO_MSG} ""
.endif
#.if defined(WITH_ASVN)
# @${ECHO_MSG} "asvn will be installed"
# @${ECHO_MSG} ""
#.endif
.if defined(WITH_STATIC)
@${ECHO_MSG} "Static binaries will be built."
.endif
@ -174,10 +189,10 @@ pre-configure:
.endif
post-build:
.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT)
cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c
.endif
#.if defined(WITH_MOD_DAV_SVN) && defined(WITH_MOD_DONTDOTHAT)
# cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
# ${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c
#.endif
.if defined(WITH_SVNAUTHZ_VALIDATE)
# place binary in ${WRKDIR}, else we install it twice
cd ${WRKSRC}/tools/server-side && \
@ -195,11 +210,11 @@ pre-install:
post-install: ${MKREPOS_TARGET}
.if defined(WITH_MOD_DAV_SVN)
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so
.if defined(WITH_MOD_DONTDOTHAT)
cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
${APXS} -i -n dontdothat mod_dontdothat.la
${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
.endif
#.if defined(WITH_MOD_DONTDOTHAT)
# cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
# ${APXS} -i -n dontdothat mod_dontdothat.la
# ${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
#.endif
.endif
.if defined(WITH_SVNAUTHZ_VALIDATE)
${INSTALL_PROGRAM} ${WRKSRC}/svnauthz-validate ${PREFIX}/bin

103
devel/subversion/Makefile.common
View file

@ -5,43 +5,41 @@
# $FreeBSD$
PORTNAME= subversion
PORTVERSION= 1.6.17
PORTREVISION?= 2
PORTVERSION= 1.7.0
PORTREVISION?= 0
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
http://svnbook.red-bean.com/en/1.5/:book
MASTER_SITES= ${MASTER_SITE_APACHE}:main \
http://svnbook.red-bean.com/en/1.6/:book
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
DIST_SUBDIR= subversion
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
# Patches required for use with the FreeBSD Project repository only
.if defined(WITH_FREEBSD_SUBVERSION)
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= lev
PATCHFILES+= svn_hacks_1.4.diff
.endif
DIST_SUBDIR= subversion17
MASTER_SITE_SUBDIR=subversion/:main
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
CONFIGURE_ARGS= --with-ssl
LICENSE= ASL
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.6.[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)
# Bindings ports should use the same, as main port
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
OPTIONS=
CONFLICTS_BUILD+= ${PORTNAME}-1.6.[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.pre.mk>
CONFIGURE_ARGS+= --without-swig
LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3
CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE}
.include <bsd.port.options.mk>
# Default is "on"
.if !defined(WITHOUT_NEON)
LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
@ -53,36 +51,36 @@ PLIST_SUB+= NEON="@comment "
.if defined(WITH_SASL)
LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
PLIST_SUB+= SASL=""
CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
PLIST_SUB+= SASL=""
.else
CONFIGURE_ARGS+= --without-sasl
PLIST_SUB+= SASL="@comment "
CONFIGURE_ARGS+=--without-sasl
PLIST_SUB+= SASL="@comment "
.endif
# Default is "on"
.if !defined(WITHOUT_BDB)
USE_BDB= 42+
PLIST_SUB+= BDB=""
USE_BDB= 42+
PLIST_SUB+= BDB=""
.else
CONFIGURE_ARGS+= --without-berkeley-db
PLIST_SUB+= BDB="@comment "
CONFIGURE_ARGS+=--without-berkeley-db
PLIST_SUB+= BDB="@comment "
.endif
.if defined(WITH_MOD_DAV_SVN)
WITH_APACHE= yes
CONFIGURE_ARGS+= --with-apxs=${APXS}
CONFIGURE_ARGS+=--with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
SVNGROUP?= www
SVNUSER?= www
.if defined(WITH_MOD_DONTDOTHAT)
PLIST_SUB+= MOD_DONTDOTHAT=""
.else
#.if defined(WITH_MOD_DONTDOTHAT)
#PLIST_SUB+= MOD_DONTDOTHAT=""
#.else
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
.endif
#.endif
.else
CONFIGURE_ARGS+= --with-apxs=no
CONFIGURE_ARGS+=--with-apxs=no
PLIST_SUB+= MOD_DAV_SVN="@comment "
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
SUB_LIST+= MOD_DAV_SVN_INSTALL="NO"
@ -119,27 +117,22 @@ PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment "
.if defined(WITH_SERF)
LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf
CONFIGURE_ARGS+= --with-serf=${LOCALBASE}
PLIST_SUB+= SERF=""
CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
PLIST_SUB+= SERF=""
.else
PLIST_SUB+= SERF="@comment "
PLIST_SUB+= SERF="@comment "
.endif
.if defined(SVN_BUILD_BINDINGS)
.if defined(WITH_FREEBSD_SUBVERSION)
LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
.else
LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
.endif
EXTRA_PATCHES+= ${PATCHDIR}/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in
.endif
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= WITHOUT_GETTEXT=""
USE_GETTEXT= yes
PLIST_SUB+= WITHOUT_GETTEXT=""
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= WITHOUT_GETTEXT="@comment "
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= WITHOUT_GETTEXT="@comment "
.endif
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
@ -147,8 +140,7 @@ CFLAGS+= -fpic -DPIC
.endif
.if defined(WITH_MAINTAINER_DEBUG)
CONFIGURE_ARGS+=--enable-maintainer-mode \
--enable-debug
CONFIGURE_ARGS+=--enable-maintainer-mode --enable-debug
CFLAGS+= -g
.endif
@ -177,10 +169,7 @@ CONFIGURE_ARGS+=--without-kwallet
PLIST_SUB+= KDE_KWALLET="@comment "
.endif
post-extract:
@${RM} -rf ${WRKSRC}/neon
@${RM} -rf ${WRKSRC}/apr
@${RM} -rf ${WRKSRC}/apr-util
.include <bsd.port.pre.mk>
post-patch:
.if ${PREFIX} != "/usr"

14
devel/subversion/distinfo
View file

@ -1,8 +1,6 @@
SHA256 (subversion/subversion-1.6.17.tar.bz2) = d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
SIZE (subversion/subversion-1.6.17.tar.bz2) = 5504298
SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
SIZE (subversion/svn-book-html.tar.bz2) = 406484
SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225
SIZE (subversion/svn-book.pdf) = 1671317
SHA256 (subversion/svn_hacks_1.4.diff) = 94ce0682d86aece56eee955b1af0595866faaddb9863390be4cbc2d32d791882
SIZE (subversion/svn_hacks_1.4.diff) = 18107
SHA256 (subversion17/subversion-1.7.0.tar.bz2) = 64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978
SIZE (subversion17/subversion-1.7.0.tar.bz2) = 5953297
SHA256 (subversion17/svn-book-html.tar.bz2) = 20bf6176536bf93f245e25200cfac814df05d8be0957f91c076bfd06a3127ce5
SIZE (subversion17/svn-book-html.tar.bz2) = 442279
SHA256 (subversion17/svn-book.pdf) = 99045f335db3b3b90dc689b1d4af067633c7aba0f42ea0f8a42cab8fa561eeb3
SIZE (subversion17/svn-book.pdf) = 1717958

11
devel/subversion/files/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in
View file

@ -1,11 +0,0 @@
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2008-02-03 00:14:22.000000000 +0300
+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-02-03 00:14:55.000000000 +0300
@@ -44,7 +44,7 @@
" -I$svnlib_builddir",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
+ LIBS => [join(' ', $ENV{'LDFLAGS'}, $apr_ldflags,
(map {$_ = abs_path($_); "-L$_"} @ldpaths),
@ldmodules, '-lsvn_swig_perl-1',
`$swig -perl -ldflags`)],

1928
devel/subversion/files/build-outputs.mk
View file

File diff suppressed because one or more lines are too long

12
devel/subversion/files/extra-patch-3way-conflict-markers Normal file
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));

384
devel/subversion/files/extra-patch-enhanced-keyword Normal file
View file

@ -0,0 +1,384 @@
diff -ruN subversion/include/svn_subst.h subversion/include/svn_subst.h
--- subversion/include/svn_subst.h 2011-05-12 21:30:02.000000000 +0400
+++ subversion/include/svn_subst.h 2011-09-07 21:47:19.000000000 +0400
@@ -127,16 +127,31 @@
* 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 @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.
+ * 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.3.
+ * @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);
+
+/** Similar to svn_subst_build_keywords3() except that it does not
+ * supply the repository location.
+ *
+ * @deprecated Provided for backward compatibility with the 1.3 API.
*/
svn_error_t *
svn_subst_build_keywords2(apr_hash_t **kw,
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 2011-09-07 21:47:19.000000000 +0400
@@ -137,12 +137,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 +161,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 +191,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 +235,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 +287,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-08-17 18:01:10.000000000 +0400
+++ subversion/libsvn_client/commit.c 2011-09-07 21:47:19.000000000 +0400
@@ -126,9 +126,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 2011-06-24 12:09:09.000000000 +0400
+++ subversion/libsvn_client/export.c 2011-09-07 21:47:19.000000000 +0400
@@ -274,6 +274,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 +297,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 +705,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 +827,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 +992,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 2011-09-07 21:47:19.000000000 +0400
@@ -135,8 +135,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 +148,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 +208,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 +233,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 +271,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 +311,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 +336,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 +361,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 +374,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 +385,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 +396,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 +406,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 +415,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 2011-09-07 21:47:19.000000000 +0400
@@ -313,10 +313,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 +341,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));

121
devel/subversion/files/extra-patch-fbsd-template Normal file
View file

@ -0,0 +1,121 @@
diff -ruN subversion/svn/util.c subversion/svn/util.c
--- subversion/svn/util.c 2011-06-28 21:10:44.000000000 +0400
+++ subversion/svn/util.c 2011-09-07 21:47:19.000000000 +0400
@@ -682,6 +682,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.
+ */
+
+#define NPREFIX 7
+char *prefixes[NPREFIX] = {
+ "PR:",
+ "Submitted by:",
+ "Reviewed by:",
+ "Approved by:",
+ "Obtained from:",
+ "MFC after:",
+ "Security:",
+};
+
+void
+cleanmsg(apr_size_t *l, char *s)
+{
+ int i;
+ char *pos;
+ char *kw;
+ char *p;
+ int empty;
+
+ for (i = 0; i < NPREFIX; 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 +758,26 @@
/* 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, 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, "> 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 +789,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 +910,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)
{

8
devel/subversion16/files/build-outputs.mk.patch → devel/subversion/files/extra-patch-svnserve-wrapper
View file

@ -1,9 +1,9 @@
--- build-outputs.mk.orig Fri Sep 8 03:22:07 2006
+++ build-outputs.mk Wed Sep 13 14:15:17 2006
@@ -670,7 +670,7 @@
cd subversion/svnadmin ; $(INSTALL_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(bindir)/svnadmin$(EXEEXT)
--- 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)

13
devel/subversion/files/patch-Makefile.in
View file

@ -1,13 +0,0 @@
--- Makefile.in.orig 2011-04-11 01:50:03.390898319 +0200
+++ Makefile.in 2011-04-11 01:51:34.081021527 +0200
@@ -110,8 +110,9 @@
LT_CXX_LIBADD = @LT_CXX_LIBADD@
INCLUDES = -I$(top_srcdir)/subversion/include -I$(top_builddir)/subversion \
+ @SVN_KWALLET_INCLUDES@ \
@SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@ @SVN_APR_MEMCACHE_INCLUDES@ \
- @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ @SVN_KWALLET_INCLUDES@ \
+ @SVN_DB_INCLUDES@ @SVN_GNOME_KEYRING_INCLUDES@ \
@SVN_NEON_INCLUDES@ @SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ \
@SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@

6
devel/subversion/files/patch-build--ltmain.sh
View file

@ -1,6 +1,6 @@
--- build/ltmain.sh.orig Fri May 20 21:41:54 2005
+++ build/ltmain.sh Wed May 25 14:38:21 2005
@@ -1492,7 +1492,7 @@
--- 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
;;

67
devel/subversion/files/patch-configure
View file

@ -1,35 +1,6 @@
--- configure.orig 2011-02-22 23:46:15.000000000 +0100
+++ configure 2011-04-11 01:48:37.781008487 +0200
@@ -21458,8 +21458,8 @@
fi
if test "$withval" = "yes"; then
- if test "$apu_db_version" != "4"; then
- as_fn_error "APR-UTIL wasn't linked against Berkeley DB 4,
+ if test "$apu_db_version" != "4" -a "$apu_db_version" != "5"; then
+ as_fn_error "APR-UTIL wasn't linked against Berkeley DB 4 or 5,
while the fs component is required. Reinstall
APR-UTIL with the appropiate options." "$LINENO" 5
fi
@@ -21467,7 +21467,7 @@
status=required
elif test "$apu_found" != "reconfig"; then
- if test "$apu_db_version" != 4; then
+ if test "$apu_db_version" != 4 -a "$apu_db_version" != "5"; then
as_fn_error "APR-UTIL was installed independently, it won't be
possible to use the specified Berkeley DB: $withval" "$LINENO" 5
fi
@@ -21513,7 +21513,7 @@
whether apr-util is linked against Berkeley DB
$db_version" >&2;}
status=try-link
- elif test "$apu_db_version" != "4"; then
+ elif test "$apu_db_version" != "4" -a "$apu_db_version" != "5"; then
status=skip
else
status=try-link
@@ -22490,10 +22490,10 @@
--- configure.orig 2011-08-26 19:03:02.000000000 +0400
+++ configure 2011-09-07 21:22:39.000000000 +0400
@@ -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"
@ -37,20 +8,28 @@
+ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS"
LIBS="$LIBS $SVN_KWALLET_LIBS"
qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
- LDFLAGS="$old_LDFLAGS $qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix`"
+ LDFLAGS="$qt_lib_dirs -L$kde_dir/lib`$kde4_config --libsuffix` $old_LDFLAGS"
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'
@@ -23801,7 +23801,10 @@
@@ -20714,6 +20714,9 @@
fi
if test "$RUBY" != "none"; then
- if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)'; then
+ if [ -z "$PTHREAD_LIBS" ]; then
+ PTHREAD_LIBS=-pthread
+ fi
+ if "$RUBY" -r mkmf -e 'with_ldflags("'"$PTHREAD_LIBS"'") { exit(have_func("rb_hash_foreach") ? 0 : 1) }'; then
# Extract the first word of "rdoc", so it can be a program name with args.
set dummy rdoc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ 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

123
devel/subversion/files/patch-contrib--client-side--asvn
View file

@ -1,123 +0,0 @@
--- contrib/client-side/asvn.orig 2008-01-28 03:24:25.000000000 +0300
+++ contrib/client-side/asvn 2009-04-29 15:41:48.000000000 +0400
@@ -42,7 +42,7 @@
# $LastChangedBy: blair $
# $LastChangedRevision: 29065 $
-SVN=/usr/bin/svn
+SVN=/usr/local/bin/svn
ACTION=""
DEV_PROP="dir:devices"
SYM_PROP="dir:symlinks"
@@ -52,7 +52,7 @@
TMPFILE2=/tmp/asvn.tmp2.$$
PCWD=`/bin/pwd`
SKIPSVN='\( -name .svn -prune -false \)'
-PRINTDETAILS="-printf \"file='%p' mode=%m user=%u(%U) group=%g(%G)\n\""
+PRINTDETAILS="-printf \"file='%p' mode=%m user=(%U) group=(%G)\n\""
trap cleanup 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
@@ -64,7 +64,8 @@
function basedirname()
{
refname="$1"
- dir="`dirname \"$2\"`"
+ shift
+ dir="`dirname \"$*\"`"
ref="`expr \"$dir\" : \"$refname/\(.*\)\"`"
if [ -z "$ref" ]
then
@@ -111,7 +112,7 @@
function recorddirinfo
{
- eval "find $PCWD $SKIPSVN -o \( -type d ! -name .svn -print \)" |while read dirlist
+ eval "gfind \"$PCWD\" $SKIPSVN -o \( -type d ! -name .svn -print \)" |while read dirlist
do
updatedirsymlinks $1 "$dirlist"
updatedirdevices $1 "$dirlist"
@@ -132,7 +133,7 @@
#
# Obtain the list of devices in this directory
#
- find "$dir" \( \( -type b -o -type c -o -type p \) -print \) -o -type d ! -name "`basename \"$dir\"`" -prune | while read file
+ gfind "$dir" \( \( -type b -o -type c -o -type p \) -print \) -o -type d ! -name "`basename \"$dir\"`" -prune | while read file
do
echo -n `find "$file" -printf "file='%f' mode=%m user=%u(%U) group=%g(%G)"`
[ -b "$file" ] && echo -n ' type=b'
@@ -200,10 +201,10 @@
grep -q "$info" $TMPFILE && continue # This line still matches
file="`expr \"$info\" : \"file='\(.*\)' \"`"
mode=`expr "$info" : ".*' mode=\([0-9]*\) "`
- user=`expr "$info" : ".* user=\([^(]*\)("`
- uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "`
- group=`expr "$info" : ".* group=\([^(]*\)("`
- gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "`
+# user=`expr "$info" : ".* user=\([^(]*\)("`
+ uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\)"`
+# group=`expr "$info" : ".* group=\([^(]*\)("`
+ gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\)"`
type=`expr "$info" : ".* type=\(.\)"`
major=`expr "$info" : ".* major=\([0-9]*\)"`
minor=`expr "$info" : ".* minor=\([0-9]*\)"`
@@ -213,7 +214,8 @@
#
rm -f "$dir/$file"
mknod --mode=$mode "$dir/$file" $type $major $minor
- chown $user:$group "$dir/$file"
+# chown $user:$group "$dir/$file"
+ chown $uid:$gid "$dir/$file"
addignorefile "$dir/$file"
done
fi
@@ -234,7 +236,7 @@
#
# Obtain the list of symlinks in this directory
#
- find "$dir" \( -type l -printf "file='%f' dest='%l'\n" \) -o -type d ! -name "`basename \"$dir\"`" -prune |
+ gfind "$dir" \( -type l -printf "file='%f' dest='%l'\n" \) -o -type d ! -name "`basename \"$dir\"`" -prune |
sort >$TMPFILE
#
@@ -320,7 +322,7 @@
# Find all the directories and files
cp /dev/null $TMPFILE
- eval "find $PCWD $SKIPSVN -o \( \( -type d ! -name .svn \) -o -type f \) $PRINTDETAILS" | while read info
+ eval "gfind \"$PCWD\" $SKIPSVN -o \( \( -type d ! -name .svn \) -o -type f \) $PRINTDETAILS" | while read info
do
device=`expr "$info" : "file='\(.*\)' mode"`
info=`expr "$info" : "file='.*' \(mode.*\)"`
@@ -343,15 +345,16 @@
else
info=`$SVN propget $FILE_PROP "$dir/$file"`
mode=`expr "$info" : "mode=\([0-9]*\) "`
- user=`expr "$info" : ".* user=\([^(]*\)("`
- uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "`
- group=`expr "$info" : ".* group=\([^(]*\)("`
- gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "`
- if [ "$user" = "" -o "$group" = "" -o "$mode" = "" ]
+# user=`expr "$info" : ".* user=\([^(]*\)("`
+ uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\)"`
+# group=`expr "$info" : ".* group=\([^(]*\)("`
+ gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\)"`
+ if [ "$uid" = "" -o "$gid" = "" -o "$mode" = "" ]
then
echo "property $FILE_PROP not set for $dir/$file"
else
- chown $user:$group "$dir/$file"
+# chown $user:$group "$dir/$file"
+ chown $uid:$gid "$dir/$file"
chmod $mode "$dir/$file"
fi
fi
@@ -391,7 +394,7 @@
[ "$ACTION" = "pre" ] && pre_checkin $@
-$SVN $@
+$SVN "$@"
[ $? = 0 -a "$ACTION" = "post" ] && post_checkout $@

0
devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Base.pm → devel/subversion/files/patch-subversion--bindings--swig--perl--native--Base.pm
View file

28
devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in → devel/subversion/files/patch-subversion--bindings--swig--perl--native--Makefile.PL.in
View file

@ -1,13 +1,16 @@
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig Sat Oct 15 00:45:33 2005
+++ subversion/bindings/swig/perl/native/Makefile.PL.in Wed Nov 2 21:58:44 2005
@@ -1,4 +1,5 @@
-#!/usr/bin/perl
--- 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';
@@ -15,6 +16,11 @@
@@ -36,6 +37,11 @@
my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
my $swig_builddir = "${svnlib_builddir}/bindings/swig";
@ -17,19 +20,22 @@
+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig";
+
my @modules = qw/client delta fs ra repos wc/;
my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs",
map {"$svnlib_builddir/libsvn_$_/.libs"} (@modules, qw/diff subr
@@ -45,8 +51,7 @@
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,
(map {$_ = abs_path($_); "-L$_"} @ldpaths),
- 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" }
);
@@ -61,6 +66,7 @@
@@ -85,6 +90,7 @@
"\$(INST_LIBDIR)/$_.pm") }
map { perlish $_ }
('base', 'core', @modules)},

154
devel/subversion/pkg-plist
View file

@ -3,6 +3,7 @@ bin/svn
bin/svnadmin
bin/svndumpfilter
bin/svnlook
bin/svnrdump
bin/svnserve
bin/svnsync
%%ASVN%%bin/asvn
@ -14,6 +15,7 @@ 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
@ -124,8 +126,6 @@ lib/libsvn_wc-1.la
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/COMMITTERS
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/HACKING
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch01dia1.png
@ -142,6 +142,7 @@ lib/libsvn_wc-1.la
%%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
@ -160,31 +161,55 @@ lib/libsvn_wc-1.la
%%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%%/README
%%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/slaves/README
%%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/osx10.4-gcc4.0.1-ia32/svnbuild.sh
%%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh
%%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh
%%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh
%%DATADIR%%/buildbot/slaves/ubuntu-x64/mount-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/ubuntu-x64/unmount-ramdrive.c
%%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
@ -202,15 +227,32 @@ lib/libsvn_wc-1.la
%%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/.libs/svnmucc
%%DATADIR%%/client-side/svnmucc/.libs/svnmucc.o
%%DATADIR%%/client-side/svnmucc/svnmucc
%%DATADIR%%/client-side/svnmucc/svnmucc-test.py
%%DATADIR%%/client-side/svnmucc/svnmucc.c
%%DATADIR%%/client-side/svnmucc/svnmucc.lo
%%DATADIR%%/client-side/svnmucc/svnmucc.o
%%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
@ -219,7 +261,9 @@ lib/libsvn_wc-1.la
%%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
@ -231,26 +275,63 @@ lib/libsvn_wc-1.la
%%DATADIR%%/dev/svn-dev.vim
%%DATADIR%%/dev/svn-entries.el
%%DATADIR%%/dev/svn-merge-revs.py
%%DATADIR%%/dev/svnqlite3-dump
%%DATADIR%%/dev/svnraisetreeconflict/.libs/main.o
%%DATADIR%%/dev/svnraisetreeconflict/.libs/svnraisetreeconflict
%%DATADIR%%/dev/svnraisetreeconflict/main.c
%%DATADIR%%/dev/svnraisetreeconflict/main.lo
%%DATADIR%%/dev/svnraisetreeconflict/main.o
%%DATADIR%%/dev/svnraisetreeconflict/svnraisetreeconflict
%%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/.libs/diff
%%DATADIR%%/diff/.libs/diff.o
%%DATADIR%%/diff/.libs/diff3
%%DATADIR%%/diff/.libs/diff3.o
%%DATADIR%%/diff/.libs/diff4
%%DATADIR%%/diff/.libs/diff4.o
%%DATADIR%%/diff/diff
%%DATADIR%%/diff/diff.c
%%DATADIR%%/diff/diff.lo
%%DATADIR%%/diff/diff.o
%%DATADIR%%/diff/diff3
%%DATADIR%%/diff/diff3.c
%%DATADIR%%/diff/diff3.lo
%%DATADIR%%/diff/diff3.o
%%DATADIR%%/diff/diff4
%%DATADIR%%/diff/diff4.c
%%DATADIR%%/dist/construct-rolling-environment.sh
%%DATADIR%%/diff/diff4.lo
%%DATADIR%%/diff/diff4.o
%%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/gen_nightly_ann.py
%%DATADIR%%/dist/getsigs.py
%%DATADIR%%/dist/nightly.sh
%%DATADIR%%/dist/post-to-tigris.py
%%DATADIR%%/dist/roll.sh
%%DATADIR%%/dist/sample-rc-warning-index.html
%%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%%/dist/write-announcement.py
%%DATADIR%%/examples/SvnCLBrowse
%%DATADIR%%/examples/blame.py
%%DATADIR%%/examples/check-modified.py
%%DATADIR%%/examples/dumpprops.py
@ -262,6 +343,7 @@ lib/libsvn_wc-1.la
%%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
@ -270,7 +352,6 @@ lib/libsvn_wc-1.la
%%DATADIR%%/examples/svnshell.py
%%DATADIR%%/examples/svnshell.rb
%%DATADIR%%/examples/testwrite.c
%%DATADIR%%/hook-scripts/README
%%DATADIR%%/hook-scripts/commit-access-control.cfg.example
%%DATADIR%%/hook-scripts/commit-access-control.pl
%%DATADIR%%/hook-scripts/commit-email.rb
@ -285,14 +366,31 @@ lib/libsvn_wc-1.la
%%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/.libs/svn-populate-node-origins-index
%%DATADIR%%/server-side/.libs/svn-populate-node-origins-index.o
%%DATADIR%%/server-side/.libs/svn-rep-sharing-stats
%%DATADIR%%/server-side/.libs/svn-rep-sharing-stats.o
%%DATADIR%%/server-side/.libs/svnauthz-validate
%%DATADIR%%/server-side/.libs/svnauthz-validate.o
%%DATADIR%%/server-side/fsfs-reshard.py
%%DATADIR%%/server-side/svn-backup-dumps.py
%%DATADIR%%/server-side/svn-populate-node-origins-index
%%DATADIR%%/server-side/svn-populate-node-origins-index.c
%%DATADIR%%/server-side/svn-populate-node-origins-index.lo
%%DATADIR%%/server-side/svn-populate-node-origins-index.o
%%DATADIR%%/server-side/svn-rep-sharing-stats
%%DATADIR%%/server-side/svn-rep-sharing-stats.c
%%DATADIR%%/server-side/svn-rep-sharing-stats.lo
%%DATADIR%%/server-side/svn-rep-sharing-stats.o
%%DATADIR%%/server-side/svn_server_log_parse.py
%%DATADIR%%/server-side/svnauthz-validate
%%DATADIR%%/server-side/svnauthz-validate.c
%%DATADIR%%/server-side/svnauthz-validate.lo
%%DATADIR%%/server-side/svnauthz-validate.o
%%DATADIR%%/server-side/test_svn_server_log_parse.py
%%DATADIR%%/xslt/svnindex.css
%%DATADIR%%/xslt/svnindex.xsl
@ -307,24 +405,42 @@ lib/libsvn_wc-1.la
%%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/osx10.4-gcc4.0.1-ia32
@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/.libs
@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/.libs
@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/.libs
@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/.libs
@dirrm %%DATADIR%%/server-side
@dirrm %%DATADIR%%/xslt
@dirrm %%DATADIR%%

25
devel/subversion16/Makefile
View file

@ -7,17 +7,21 @@
MAINTAINER= lev@FreeBSD.org
COMMENT= Version control system
CONFLICTS?= subversion-devel-[0-9]* subversion-freebsd-[0-9]*
CONFLICTS_INSTALL= subversion-devel-[0-9]* subversion-freebsd-[0-9]*
USE_RC_SUBR= svnserve
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 svnversion.1
MAN1= svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 \
svnversion.1
MAN5= svnserve.conf.5
MAN8= svnserve.8
TXT_DOCS= BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
OPTIONS= P4_STYLE_MARKERS "Perforce-style conflict markers" on \
ENHANCED_KEYWORD "Enhanced svn:keyword support" on \
FREEBSD_TEMPLATE "FreeBSD Project log template" on \
MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
MOD_DONTDOTHAT "mod_dontdothat for Apache 2.X" off \
NEON "WebDAV/Delta-V repo access module (neon)" on \
SERF "WebDAV/Delta-V repo access module (serf)" off \
@ -32,7 +36,7 @@ OPTIONS= MOD_DAV_SVN "mod_dav_svn module for Apache 2.X" off \
KDE_KWALLET "Build with KDE KWallet auth support" off \
BOOK "Install the Subversion Book" off
.include "${.CURDIR}/../../devel/subversion/Makefile.common"
.include "Makefile.common"
SVNREPOS?= /home/svn/repos
SVNFSTYPE?= fsfs
@ -48,10 +52,21 @@ WITH_REPOSITORY_CREATION= yes
MKREPOS_TARGET= _mkrepos
.endif
# Patches required for use with the FreeBSD Project repository only
.if !defined(WITHOUT_P4_STYLE_MARKERS)
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers
.endif
.if !defined(WITHOUT_ENHANCED_KEYWORD)
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-enhanced-keyword
.endif
.if !defined(WITHOUT_FREEBSD_TEMPLATE)
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template
.endif
.if defined(WITH_SVNSERVE_WRAPPER)
PLIST_SUB+= SVNSERVE_WRAPPER=""
SUB_LIST+= SVNSERVE_BIN_EXT=".bin"
EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-svnserve-wrapper
.else
PLIST_SUB+= SVNSERVE_WRAPPER="@comment "
SUB_LIST+= SVNSERVE_BIN_EXT=""

91
devel/subversion16/Makefile.common
View file

@ -6,7 +6,7 @@
PORTNAME= subversion
PORTVERSION= 1.6.17
PORTREVISION?= 2
PORTREVISION?= 4
CATEGORIES+= devel
MASTER_SITES= http://subversion.tigris.org/downloads/:main \
http://svnbook.red-bean.com/en/1.5/:book
@ -14,34 +14,34 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
DIST_SUBDIR= subversion
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
# Patches required for use with the FreeBSD Project repository only
.if defined(WITH_FREEBSD_SUBVERSION)
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR= lev
PATCHFILES+= svn_hacks_1.4.diff
.endif
MAKE_JOBS_SAFE= yes
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
CONFIGURE_ARGS= --with-ssl
LICENSE= ASL
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.7.[0-9]*
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}16${PKGNAMESUFFIX}
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)
# Bindings ports should use the same, as main port
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options
# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
CONFLICTS_BUILD+= ${PORTNAME}-1.7.[0-9]*
LIB_DEPENDS+= svn_client-1.0:${PORTSDIR}/devel/subversion16
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}16/options
OPTIONS= # Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
OPTIONS=
.endif
.include <bsd.port.pre.mk>
CONFIGURE_ARGS+= --without-swig
LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3
CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE}
.include <bsd.port.options.mk>
# Default is "on"
.if !defined(WITHOUT_NEON)
LIB_DEPENDS+= neon.27:${PORTSDIR}/www/neon29
@ -53,25 +53,25 @@ PLIST_SUB+= NEON="@comment "
.if defined(WITH_SASL)
LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2
CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
PLIST_SUB+= SASL=""
CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
PLIST_SUB+= SASL=""
.else
CONFIGURE_ARGS+= --without-sasl
PLIST_SUB+= SASL="@comment "
CONFIGURE_ARGS+=--without-sasl
PLIST_SUB+= SASL="@comment "
.endif
# Default is "on"
.if !defined(WITHOUT_BDB)
USE_BDB= 42+
PLIST_SUB+= BDB=""
USE_BDB= 42+
PLIST_SUB+= BDB=""
.else
CONFIGURE_ARGS+= --without-berkeley-db
PLIST_SUB+= BDB="@comment "
CONFIGURE_ARGS+=--without-berkeley-db
PLIST_SUB+= BDB="@comment "
.endif
.if defined(WITH_MOD_DAV_SVN)
WITH_APACHE= yes
CONFIGURE_ARGS+= --with-apxs=${APXS}
CONFIGURE_ARGS+=--with-apxs=${APXS}
PLIST_SUB+= MOD_DAV_SVN=""
SUB_LIST+= MOD_DAV_SVN_INSTALL="YES"
SVNGROUP?= www
@ -82,7 +82,7 @@ PLIST_SUB+= MOD_DONTDOTHAT=""
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
.endif
.else
CONFIGURE_ARGS+= --with-apxs=no
CONFIGURE_ARGS+=--with-apxs=no
PLIST_SUB+= MOD_DAV_SVN="@comment "
PLIST_SUB+= MOD_DONTDOTHAT="@comment "
SUB_LIST+= MOD_DAV_SVN_INSTALL="NO"
@ -91,7 +91,7 @@ SVNUSER?= svn
.endif
.if defined(WITH_APACHE)
USE_APACHE= 20+
USE_APACHE= 2.0+
.include "${PORTSDIR}/Mk/bsd.apache.mk"
.if ${APACHE_VERSION} > 20
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr1
@ -119,27 +119,18 @@ PLIST_SUB+= SVNAUTHZ_VALIDATE="@comment "
.if defined(WITH_SERF)
LIB_DEPENDS+= serf-0.0:${PORTSDIR}/www/serf
CONFIGURE_ARGS+= --with-serf=${LOCALBASE}
PLIST_SUB+= SERF=""
CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
PLIST_SUB+= SERF=""
.else
PLIST_SUB+= SERF="@comment "
.endif
.if defined(SVN_BUILD_BINDINGS)
.if defined(WITH_FREEBSD_SUBVERSION)
LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion-freebsd
.else
LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion
.endif
EXTRA_PATCHES+= ${PATCHDIR}/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in
PLIST_SUB+= SERF="@comment "
.endif
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
PLIST_SUB+= WITHOUT_GETTEXT=""
USE_GETTEXT= yes
PLIST_SUB+= WITHOUT_GETTEXT=""
.else
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= WITHOUT_GETTEXT="@comment "
CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= WITHOUT_GETTEXT="@comment "
.endif
.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
@ -147,8 +138,7 @@ CFLAGS+= -fpic -DPIC
.endif
.if defined(WITH_MAINTAINER_DEBUG)
CONFIGURE_ARGS+=--enable-maintainer-mode \
--enable-debug
CONFIGURE_ARGS+=--enable-maintainer-mode --enable-debug
CFLAGS+= -g
.endif
@ -177,10 +167,7 @@ CONFIGURE_ARGS+=--without-kwallet
PLIST_SUB+= KDE_KWALLET="@comment "
.endif
post-extract:
@${RM} -rf ${WRKSRC}/neon
@${RM} -rf ${WRKSRC}/apr
@${RM} -rf ${WRKSRC}/apr-util
.include <bsd.port.pre.mk>
post-patch:
.if ${PREFIX} != "/usr"

2
devel/subversion16/distinfo
View file

@ -4,5 +4,3 @@ SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543
SIZE (subversion/svn-book-html.tar.bz2) = 406484
SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225
SIZE (subversion/svn-book.pdf) = 1671317
SHA256 (subversion/svn_hacks_1.4.diff) = 94ce0682d86aece56eee955b1af0595866faaddb9863390be4cbc2d32d791882
SIZE (subversion/svn_hacks_1.4.diff) = 18107

11
devel/subversion16/files/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in
View file

@ -1,11 +0,0 @@
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2008-02-03 00:14:22.000000000 +0300
+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-02-03 00:14:55.000000000 +0300
@@ -44,7 +44,7 @@
" -I$svnlib_builddir",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
- LIBS => [join(' ', $apr_ldflags,
+ LIBS => [join(' ', $ENV{'LDFLAGS'}, $apr_ldflags,
(map {$_ = abs_path($_); "-L$_"} @ldpaths),
@ldmodules, '-lsvn_swig_perl-1',
`$swig -perl -ldflags`)],

166
devel/subversion16/files/build-outputs.mk
View file

File diff suppressed because one or more lines are too long

12
devel/subversion16/files/extra-patch-3way-conflict-markers Normal file
View file

@ -0,0 +1,12 @@
diff -ruN subversion/libsvn_wc/merge.c subversion/libsvn_wc/merge.c
--- subversion/libsvn_wc/merge.c 2009-02-16 23:35:25.000000000 +0300
+++ subversion/libsvn_wc/merge.c 2009-04-03 22:11:01.307500000 +0400
@@ -369,7 +369,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));

336
devel/subversion16/files/extra-patch-enhanced-keyword Normal file
View file

@ -0,0 +1,336 @@
diff -ruN subversion/include/svn_subst.h subversion/include/svn_subst.h
--- subversion/include/svn_subst.h 2009-01-26 14:30:42.000000000 +0300
+++ subversion/include/svn_subst.h 2009-04-03 21:49:30.541875000 +0400
@@ -122,16 +122,31 @@
* 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 @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.
+ * 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.3.
+ * @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);
+
+/** Similar to svn_subst_build_keywords3() except that it does not
+ * supply the repository location.
+ *
+ * @deprecated Provided for backward compatibility with the 1.3 API.
*/
svn_error_t *
svn_subst_build_keywords2(apr_hash_t **kw,
diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
--- subversion/libsvn_client/cat.c 2009-02-13 23:37:02.000000000 +0300
+++ subversion/libsvn_client/cat.c 2009-04-03 21:49:30.557500000 +0400
@@ -127,10 +127,10 @@
author = entry->cmt_author;
}
- SVN_ERR(svn_subst_build_keywords2
+ SVN_ERR(svn_subst_build_keywords3
(&kw, keywords->data,
apr_psprintf(pool, fmt, entry->cmt_rev),
- entry->url, tm, author, pool));
+ entry->url, entry->repos, tm, author, pool));
}
/* Our API contract says that OUTPUT will not be closed. The two paths
@@ -160,6 +160,7 @@
svn_string_t *keywords;
apr_hash_t *props;
const char *url;
+ const char *repos_root_url;
svn_stream_t *output = out;
/* ### Inconsistent default revision logic in this command. */
@@ -198,6 +199,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));
/* Make sure the object isn't a directory. */
SVN_ERR(svn_ra_check_path(ra_session, "", rev, &url_kind, pool));
@@ -242,10 +245,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 2009-02-13 18:32:52.000000000 +0300
+++ subversion/libsvn_client/commit.c 2009-04-03 21:49:30.557500000 +0400
@@ -118,9 +118,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 2009-01-26 14:30:42.000000000 +0300
+++ subversion/libsvn_client/export.c 2009-04-03 21:49:30.557500000 +0400
@@ -197,10 +197,10 @@
author = entry->cmt_author;
}
- SVN_ERR(svn_subst_build_keywords2
+ SVN_ERR(svn_subst_build_keywords3
(&kw, keywords->data,
apr_psprintf(pool, fmt, entry->cmt_rev),
- entry->url, tm, author, pool));
+ entry->url, entry->repos, tm, author, pool));
}
/* For atomicity, we translate to a tmp file and then rename the tmp file
@@ -509,6 +509,7 @@
/* Any keyword vals to be substituted */
const char *revision;
const char *url;
+ const char *repos;
const char *author;
apr_time_t date;
@@ -625,6 +626,7 @@
fb->edit_baton = eb;
fb->path = full_path;
fb->url = full_url;
+ fb->repos = eb->root_url;
fb->pool = pool;
*baton = fb;
@@ -790,8 +792,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_translate3
diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
--- subversion/libsvn_subr/subst.c 2009-01-26 14:30:42.000000000 +0300
+++ subversion/libsvn_subr/subst.c 2009-04-03 21:50:34.276250000 +0400
@@ -127,8 +127,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.
@@ -137,12 +140,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;
int n;
for (;;)
@@ -196,6 +201,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);
@@ -204,6 +226,9 @@
if (url)
svn_stringbuf_appendcstr(value, url);
break;
+ case '_': /* '%_' => a space */
+ svn_stringbuf_appendbytes(value, " ", 1);
+ break;
case '%': /* '%%' => a literal % */
svn_stringbuf_appendbytes(value, cur, 1);
break;
@@ -239,8 +264,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
@@ -279,6 +304,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);
@@ -289,6 +329,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))
@@ -296,7 +354,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,
@@ -309,7 +367,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,
@@ -320,7 +378,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,
@@ -331,7 +389,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,
@@ -341,7 +399,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);
@@ -350,7 +408,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 2009-02-16 09:25:05.000000000 +0300
+++ subversion/libsvn_wc/translate.c 2009-04-03 21:49:30.541875000 +0400
@@ -284,11 +284,12 @@
SVN_ERR(svn_wc__entry_versioned(&entry, path, adm_access, FALSE, pool));
- SVN_ERR(svn_subst_build_keywords2(keywords,
+ SVN_ERR(svn_subst_build_keywords3(keywords,
list,
apr_psprintf(pool, "%ld",
entry->cmt_rev),
entry->url,
+ entry->repos,
entry->cmt_date,
entry->cmt_author,
pool));

121
devel/subversion16/files/extra-patch-fbsd-template Normal file
View file

@ -0,0 +1,121 @@
diff -ruN subversion/svn/util.c subversion/svn/util.c
--- subversion/svn/util.c 2009-02-13 19:28:37.000000000 +0300
+++ subversion/svn/util.c 2009-04-03 21:49:30.541875000 +0400
@@ -639,6 +639,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.
+ */
+
+#define NPREFIX 7
+char *prefixes[NPREFIX] = {
+ "PR:",
+ "Submitted by:",
+ "Reviewed by:",
+ "Approved by:",
+ "Obtained from:",
+ "MFC after:",
+ "Security:",
+};
+
+void
+cleanmsg(apr_size_t *l, char *s)
+{
+ int i;
+ char *pos;
+ char *kw;
+ char *p;
+ int empty;
+
+ for (i = 0; i < NPREFIX; 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 *
@@ -654,8 +715,26 @@
/* 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, 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, "> Empty fields above will be automatically removed." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
*tmp_file = NULL;
if (lmb->message)
@@ -667,6 +746,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;
@@ -786,6 +866,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)
{

0
devel/subversion/files/build-outputs.mk.patch → devel/subversion16/files/extra-patch-svnserve-wrapper
View file

0
devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Base.pm → devel/subversion16/files/patch-subversion--bindings--swig--perl--natives--Base.pm
View file

13
devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in → devel/subversion16/files/patch-subversion--bindings--swig--perl--natives--Makefle.PL.in
View file

@ -1,5 +1,5 @@
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig Sat Oct 15 00:45:33 2005
+++ subversion/bindings/swig/perl/native/Makefile.PL.in Wed Nov 2 21:58:44 2005
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2010-11-24 23:42:16.000000000 +0300
+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2011-09-19 12:52:25.000000000 +0400
@@ -1,4 +1,5 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
@ -19,9 +19,12 @@
my @modules = qw/client delta fs ra repos wc/;
my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs",
map {"$svnlib_builddir/libsvn_$_/.libs"} (@modules, qw/diff subr
@@ -45,8 +51,7 @@
@@ -50,10 +56,9 @@
" -I$svnlib_builddir",
" -I$swig_srcdir -g"),
OBJECT => q/$(O_FILES)/,
LIBS => [join(' ', $apr_ldflags,
- LIBS => [join(' ', $apr_ldflags,
+ LIBS => [join(' ', $ENV{'LDFLAGS'}, $apr_ldflags,
(map {$_ = abs_path($_); "-L$_"} @ldpaths),
- @ldmodules, '-lsvn_swig_perl-1',
- `$swig -perl -ldflags`)],
@ -29,7 +32,7 @@
test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
);
@@ -61,6 +66,7 @@
@@ -68,6 +73,7 @@
"\$(INST_LIBDIR)/$_.pm") }
map { perlish $_ }
('base', 'core', @modules)},

5
java/subversion-java/Makefile
View file

@ -6,13 +6,16 @@
#
PKGNAMESUFFIX= -java
PORTREVISION= 3
CATEGORIES= java
MAINTAINER= lev@FreeBSD.org
COMMENT= Java bindings for Version control system
.if defined(USE_SUBVERSION) && ${USE_SUBVERSION} == 16
MASTERDIR= ${.CURDIR}/../../devel/subversion16
.else
MASTERDIR= ${.CURDIR}/../../devel/subversion
.endif
PKGDIR= ${.CURDIR}
USE_JAVA= yes