Attachment #161929 for bug #203713




# Created by: rooneg@electricjellyfish.net
# $FreeBSD$

PORTREVISION=	0

MAINTAINER=	lev@FreeBSD.org
COMMENT=	Version control system

CONFLICTS_INSTALL=	subversion-1.[^9].[0-9]* \
			subversion1[^9]-1.[^9].[0-9]*

USE_RC_SUBR=	svnserve


		FREEBSD_TEMPLATE\
		MAINTAINER_DEBUG\
		NLS		\
		P4_STYLE_MARKERS\
		SASL		\
		SERF		\
		STATIC		\

		TEST		\
		TOOLS

OPTIONS_DEFAULT=FREEBSD_TEMPLATE \
		FREEBSD_TEMPLATE \
		SERF TOOLS

FREEBSD_TEMPLATE_DESC=	FreeBSD Project log template
MAINTAINER_DEBUG_DESC=	Build debug version
P4_STYLE_MARKERS_DESC=	Perforce-style conflict markers
SERF_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
STATIC_DESC=		Build static version (no shared libs)
SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper (umask setter)

TOOLS_DESC=		Install several tools

# Patches required for use with the FreeBSD Project repository only
P4_STYLE_MARKERS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-3way-conflict-markers
FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper





# $FreeBSD$

PORTNAME?=	subversion
PORTVERSION=	1.9.2
PORTREVISION?=	0
CATEGORIES+=	devel
MASTER_SITES=	APACHE/subversion

CFLAGS+=	-DHAS_ORGANIZATION_NAME
.endif

.if !${PORT_OPTIONS:MMAINTAINER_DEBUG} && !${OPTIONS_FILE_SET:MMAINTAINER_DEBUG}
EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
.endif

.include <bsd.port.pre.mk>

pre-everything::

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (subversion18/subversion-1.8.14.tar.bz2) = 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f	1	SHA256 (subversion18/subversion-1.9.2.tar.bz2) = 023da881139b4514647b6f8a830a244071034efcaad8c8e98c6b92393122b4eb
2	SIZE (subversion18/subversion-1.8.14.tar.bz2) = 6850562	2	SIZE (subversion18/subversion-1.9.2.tar.bz2) = 7910994




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));
 




--- Makefile.in.orig	2014-02-10 08:04:51.000000000 +0400
+++ Makefile.in	2014-06-16 15:40:47.000000000 +0400
@@ -253,7 +253,7 @@
 LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir)
 
 INSTALL = @INSTALL@
-INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)
+INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) -s
 INSTALL_FSMOD_LIB = $(INSTALL_LIB)
 INSTALL_RAMOD_LIB = $(INSTALL_LIB)
 INSTALL_APR_MEMCACHE_LIB = $(INSTALL_LIB)
@@ -262,9 +262,9 @@
 INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
 INSTALL_KWALLET_LIB = $(INSTALL_LIB)
 INSTALL_SERF_LIB = $(INSTALL_LIB)
-INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
-INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
-INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
+INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -s
+INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL) -s
+INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL) -s
 INSTALL_INCLUDE = $(INSTALL) -m 644
 INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
 INSTALL_DATA = $(INSTALL) -m 644




--- build.conf.orig	2015-06-23 21:03:20.000000000 -0700
+++ build.conf	2015-10-11 20:45:56.129478000 -0700
@@ -422,7 +422,7 @@
 path = tools/server-side/mod_dontdothat
 nonlibs = mod_dav_svn apr aprutil
 libs = libsvn_subr xml libhttpd
-install = tools
+install = apache-mod
 msvc-libs = libhttpd.lib
 
 # The Subversion FSFS repository manipulation tool
 [svnfsfs]

Lines 141-147 Link Here

(-)files/extra-patch-fbsd-template (-1 / +1 lines)
141	that follows it. */	141	that follows it. */
142	truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,	142	truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
143	EDITOR_EOF_PREFIX);	143	EDITOR_EOF_PREFIX);
144	+ cleanmsg(NULL, (char*)log_msg_buf->data);	144	+ cleanmsg(&(log_msg_str->len), (char*)log_msg_str->data);
145		145
146	/* Make a string from a stringbuf, sharing the data allocation. */	146	/* Make a string from a stringbuf, sharing the data allocation. */
147	log_msg_str->data = log_msg_buf->data;	147	log_msg_str->data = log_msg_buf->data;

Lines 1-15 Link Here

(-)files/patch-build-outputs.mk (-8 / +10 lines)
1	--- build-outputs.mk.orig 2013-06-13 13:08:06.000000000 +0400	1	--- build-outputs.mk.orig 2015-09-18 06:18:36.000000000 -0700
2	+++ build-outputs.mk 2013-06-20 00:53:54.000000000 +0400	2	+++ build-outputs.mk 2015-10-11 20:16:27.911620000 -0700
3	@@ -1136,9 +1136,9 @@	3	@@ -1316,11 +1316,11 @@
4		4
5	install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/dev/fsfs-reorg$(EXEEXT) tools/server-side/fsfs-stats$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/client-side/svn-bench/svn-bench$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)	5	install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/dev/fsfs-access-map$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/dev/x509-parser$(EXEEXT)
6	$(MKDIR) $(DESTDIR)$(toolsdir)	6	$(MKDIR) $(DESTDIR)$(toolsdir)
7	- cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)	7	- cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
		8	+ cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff$(EXEEXT)
		9
8	- cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)	10	- cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
		11	+ cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff3$(EXEEXT)
		12
9	- cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/diff4$(EXEEXT)	13	- cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/diff4$(EXEEXT)
10	+ cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff$(EXEEXT)
11	+ cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff3$(EXEEXT)
12	+ cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff4$(EXEEXT)	14	+ cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff4$(EXEEXT)
		15
13	cd tools/dev ; $(INSTALL_TOOLS) fsfs-access-map$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-access-map$(EXEEXT)	16	cd tools/dev ; $(INSTALL_TOOLS) fsfs-access-map$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-access-map$(EXEEXT)
14	cd tools/dev ; $(INSTALL_TOOLS) fsfs-reorg$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-reorg$(EXEEXT)	17
15	cd tools/server-side ; $(INSTALL_TOOLS) fsfs-stats$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-stats$(EXEEXT)




--- configure.orig	2015-09-18 06:18:38.000000000 -0700
+++ configure	2015-10-11 20:21:04.704004000 -0700
@@ -20318,11 +20318,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"
@@ -20341,7 +20341,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'




%%DATADIR%%/bdb/svn-bdb-view.py
%%DATADIR%%/bdb/svnfs.py
%%DATADIR%%/bdb/whatis-rep.py
%%DATADIR%%/buildbot/master/README
%%DATADIR%%/buildbot/master/SVNMailNotifier.py
%%DATADIR%%/buildbot/master/master.cfg
%%DATADIR%%/buildbot/master/private-sample.py
%%DATADIR%%/buildbot/master/public_html/buildbot.css
%%DATADIR%%/buildbot/master/public_html/index.html
%%DATADIR%%/buildbot/master/public_html/robots.txt
%%DATADIR%%/buildbot/slaves/README
%%DATADIR%%/buildbot/slaves/bb-openbsd/svnbuild.sh
%%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
%%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck.sh
%%DATADIR%%/buildbot/slaves/bb-openbsd/svnclean.sh
%%DATADIR%%/buildbot/slaves/centos/svnbuild.sh
%%DATADIR%%/buildbot/slaves/centos/svncheck-bindings.sh
%%DATADIR%%/buildbot/slaves/centos/svncheck.sh
%%DATADIR%%/buildbot/slaves/centos/svnclean.sh
%%DATADIR%%/buildbot/slaves/centos/svnlog.sh
%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c
%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnbuild.sh
%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svncheck.sh

%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnclean.sh
%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnlog.sh
%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c
%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svnbuild.sh
%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svncheck.sh
%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svncleanup.sh
%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svnenv.sh
%%DATADIR%%/buildbot/slaves/svn-x64-centos/list-svn-deps.sh
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnbuild.sh
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck-bindings.sh
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck.sh
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnclean.sh
%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnlog.sh
%%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/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/svn-x64-macosx/mkramdisk.sh
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/rmramdisk.sh
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/setenv.sh
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnbuild.sh
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svncheck.sh
%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnclean.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/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-javahl.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%%/client-side/detach.py
%%DATADIR%%/client-side/mergeinfo-sanitizer.py
%%DATADIR%%/client-side/server-version.py
%%DATADIR%%/client-side/showchange.pl
%%DATADIR%%/client-side/svn-bench/cl.h
%%DATADIR%%/client-side/svn-bench/client_errors.h
%%DATADIR%%/client-side/svn-bench/help-cmd.c
%%DATADIR%%/client-side/svn-bench/notify.c
%%DATADIR%%/client-side/svn-bench/null-export-cmd.c
%%DATADIR%%/client-side/svn-bench/null-list-cmd.c
%%DATADIR%%/client-side/svn-bench/null-log-cmd.c
%%DATADIR%%/client-side/svn-bench/svn-bench.c
%%DATADIR%%/client-side/svn-bench/util.c
%%DATADIR%%/client-side/svn-graph.pl
%%DATADIR%%/client-side/svn-ssl-fingerprints.sh
%%DATADIR%%/client-side/svn-vendor.py
%%DATADIR%%/client-side/svn-viewspec.py
%%DATADIR%%/client-side/wcfind
%%DATADIR%%/dev/analyze-svnlogs.py
%%DATADIR%%/dev/aprerr.txt
%%DATADIR%%/dev/benchmarks/RepoPerf/ClearMemory.cpp
%%DATADIR%%/dev/benchmarks/RepoPerf/TimeWin.cpp
%%DATADIR%%/dev/benchmarks/RepoPerf/copy_repo.py
%%DATADIR%%/dev/benchmarks/RepoPerf/win_repo_bench.py
%%DATADIR%%/dev/benchmarks/large_dirs/create_bigdir.sh
%%DATADIR%%/dev/benchmarks/suite1/benchmark.py
%%DATADIR%%/dev/benchmarks/suite1/cronjob

%%DATADIR%%/dev/benchmarks/suite1/generate_charts
%%DATADIR%%/dev/benchmarks/suite1/run
%%DATADIR%%/dev/benchmarks/suite1/run.bat
%%DATADIR%%/dev/build-svn-deps-win.pl
%%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/fsfs-access-map.c
%%DATADIR%%/dev/fsfs-reorg.c
%%DATADIR%%/dev/gdb-py/README
%%DATADIR%%/dev/gdb-py/svndbg/__init__.py
%%DATADIR%%/dev/gdb-py/svndbg/printers.py

%%DATADIR%%/dev/wc-ng/gather-data.sh
%%DATADIR%%/dev/wc-ng/graph-data.py
%%DATADIR%%/dev/wc-ng/populate-pristine.py
%%DATADIR%%/dev/wc-ng/svn-wc-db-tester.c
%%DATADIR%%/dev/which-error.py
%%DATADIR%%/dev/windows-build/Makefile
%%DATADIR%%/dev/windows-build/README
%%DATADIR%%/dev/windows-build/document-version.pl
%%DATADIR%%/dev/x509-parser.c
%%DATADIR%%/diff/diff.c
%%DATADIR%%/diff/diff3.c
%%DATADIR%%/diff/diff4.c
%%DATADIR%%/dist/_gnupg.py
%%DATADIR%%/dist/backport.pl
%%DATADIR%%/dist/backport_accept.dump
%%DATADIR%%/dist/backport_branches.dump
%%DATADIR%%/dist/backport_indented_entry.dump
%%DATADIR%%/dist/backport_multirevisions.dump
%%DATADIR%%/dist/backport_tests.py
%%DATADIR%%/dist/backport_two_approveds.dump
%%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/make-deps-tarball.sh
%%DATADIR%%/dist/nightly.sh
%%DATADIR%%/dist/nominate.pl
%%DATADIR%%/dist/rat-excludes
%%DATADIR%%/dist/release.py
%%DATADIR%%/dist/templates/download.ezt

%%DATADIR%%/dist/templates/stable-news.ezt
%%DATADIR%%/dist/templates/stable-release-ann.ezt
%%DATADIR%%/dist/test.sh
%%DATADIR%%/examples/ExampleAuthn.java
%%DATADIR%%/examples/ExampleAuthnOld.java
%%DATADIR%%/examples/ExampleAuthnVeryOld.java
%%DATADIR%%/examples/SvnCLBrowse
%%DATADIR%%/examples/blame.py
%%DATADIR%%/examples/check-modified.py

%%DATADIR%%/po/l10n-report.py
%%DATADIR%%/po/po-update.sh
%%DATADIR%%/server-side/fsfs-reshard.py
%%DATADIR%%/server-side/fsfs-stats.c
%%DATADIR%%/server-side/mod_dontdothat/README
%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c
%%DATADIR%%/server-side/svn-backup-dumps.py
%%DATADIR%%/server-side/svn-populate-node-origins-index.c
%%DATADIR%%/server-side/svn-rep-sharing-stats.c
%%DATADIR%%/server-side/svn_server_log_parse.py
%%DATADIR%%/server-side/svnauthz.c
%%DATADIR%%/server-side/svnpredumpfilter.py

%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.debian
%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.freebsd
%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.solaris
%%DATADIR%%/server-side/svnpubsub/revprop-change-hook.py
%%DATADIR%%/server-side/svnpubsub/svnpubsub.tac
%%DATADIR%%/server-side/svnpubsub/svnpubsub/__init__.py
%%DATADIR%%/server-side/svnpubsub/svnpubsub/client.py
%%DATADIR%%/server-side/svnpubsub/svnpubsub/server.py
%%DATADIR%%/server-side/svnpubsub/svnpubsub/util.py
%%DATADIR%%/server-side/svnpubsub/svntweet.py
%%DATADIR%%/server-side/svnpubsub/svnwcsub.conf.example
%%DATADIR%%/server-side/svnpubsub/svnwcsub.py

Return to bug 203713

Lines 1-13 Link Here

(-)Makefile (-8 / +4 lines)
1	# Created by: rooneg@electricjellyfish.net	1	# Created by: rooneg@electricjellyfish.net
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTREVISION= 2	4	PORTREVISION= 0
5		5
6	MAINTAINER= lev@FreeBSD.org	6	MAINTAINER= lev@FreeBSD.org
7	COMMENT= Version control system	7	COMMENT= Version control system
8		8
9	CONFLICTS_INSTALL= subversion-1.[^8].[0-9]* \	9	CONFLICTS_INSTALL= subversion-1.[^9].[0-9]* \
10	subversion1[^8]-1.[^8].[0-9]*	10	subversion1[^9]-1.[^9].[0-9]*
11		11
12	USE_RC_SUBR= svnserve	12	USE_RC_SUBR= svnserve
13		13
Lines 19-25 Link Here
19	FREEBSD_TEMPLATE\	19	FREEBSD_TEMPLATE\
20	MAINTAINER_DEBUG\	20	MAINTAINER_DEBUG\
21	NLS \	21	NLS \
22	P4_STYLE_MARKERS\
23	SASL \	22	SASL \
24	SERF \	23	SERF \
25	STATIC \	24	STATIC \
Lines 27-39 Link Here
27	TEST \	26	TEST \
28	TOOLS	27	TOOLS
29		28
30	OPTIONS_DEFAULT=P4_STYLE_MARKERS \	29	OPTIONS_DEFAULT=FREEBSD_TEMPLATE \
31	FREEBSD_TEMPLATE \
32	SERF TOOLS	30	SERF TOOLS
33		31
34	FREEBSD_TEMPLATE_DESC= FreeBSD Project log template	32	FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
35	MAINTAINER_DEBUG_DESC= Build debug version	33	MAINTAINER_DEBUG_DESC= Build debug version
36	P4_STYLE_MARKERS_DESC= Perforce-style conflict markers
37	SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module	34	SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module
38	STATIC_DESC= Build static version (no shared libs)	35	STATIC_DESC= Build static version (no shared libs)
39	SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter)	36	SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter)
Lines 41-47 Link Here
41	TOOLS_DESC= Install several tools	38	TOOLS_DESC= Install several tools
42		39
43	# Patches required for use with the FreeBSD Project repository only	40	# Patches required for use with the FreeBSD Project repository only
44	P4_STYLE_MARKERS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-3way-conflict-markers
45	FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template	41	FREEBSD_TEMPLATE_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-fbsd-template
46	SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper	42	SVNSERVE_WRAPPER_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-svnserve-wrapper
47		43

Lines 2-8 Link Here

(-)Makefile.common (-5 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= subversion	4	PORTNAME?= subversion
5	PORTVERSION= 1.8.14	5	PORTVERSION= 1.9.2
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES+= devel	7	CATEGORIES+= devel
8	MASTER_SITES= APACHE/subversion	8	MASTER_SITES= APACHE/subversion
Lines 75-84 Link Here
75	CFLAGS+= -DHAS_ORGANIZATION_NAME	75	CFLAGS+= -DHAS_ORGANIZATION_NAME
76	.endif	76	.endif
77		77
78	.if !${PORT_OPTIONS:MMAINTAINER_DEBUG} && !${OPTIONS_FILE_SET:MMAINTAINER_DEBUG}
79	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in
80	.endif
81
82	.include <bsd.port.pre.mk>	78	.include <bsd.port.pre.mk>
83		79
84	pre-everything::	80	pre-everything::

Lines 1-12 Link Here

(-)files/extra-patch-3way-conflict-markers (-12 lines)
1	diff -ruN subversion/libsvn_wc/merge.c subversion/libsvn_wc/merge.c
2	--- subversion/libsvn_wc/merge.c 2011-08-06 19:15:44.000000000 +0400
3	+++ subversion/libsvn_wc/merge.c 2011-09-07 21:47:19.000000000 +0400
4	@@ -413,7 +413,7 @@
5	target_marker,
6	right_marker,
7	"=======", /* separator */
8	- svn_diff_conflict_display_modified_latest,
9	+ svn_diff_conflict_display_modified_original_latest,
10	pool));
11	SVN_ERR(svn_stream_close(ostream));
12

Lines 1-24 Link Here

(-)files/extra-patch-Makefile.in (-24 lines)
1	--- Makefile.in.orig 2014-02-10 08:04:51.000000000 +0400
2	+++ Makefile.in 2014-06-16 15:40:47.000000000 +0400
3	@@ -253,7 +253,7 @@
4	LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir)
5
6	INSTALL = @INSTALL@
7	-INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)
8	+INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) -s
9	INSTALL_FSMOD_LIB = $(INSTALL_LIB)
10	INSTALL_RAMOD_LIB = $(INSTALL_LIB)
11	INSTALL_APR_MEMCACHE_LIB = $(INSTALL_LIB)
12	@@ -262,9 +262,9 @@
13	INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
14	INSTALL_KWALLET_LIB = $(INSTALL_LIB)
15	INSTALL_SERF_LIB = $(INSTALL_LIB)
16	-INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
17	-INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
18	-INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
19	+INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -s
20	+INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL) -s
21	+INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL) -s
22	INSTALL_INCLUDE = $(INSTALL) -m 644
23	INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
24	INSTALL_DATA = $(INSTALL) -m 644

Lines 1-11 Link Here

(-)files/extra-patch-build.conf (-6 / +6 lines)
1	--- build.conf.orig 2014-02-10 08:04:51.000000000 +0400	1	--- build.conf.orig 2015-06-23 21:03:20.000000000 -0700
2	+++ build.conf 2014-06-15 19:45:52.000000000 +0400	2	+++ build.conf 2015-10-11 20:45:56.129478000 -0700
3	@@ -381,7 +381,7 @@	3	@@ -422,7 +422,7 @@
4	path = tools/server-side/mod_dontdothat	4	path = tools/server-side/mod_dontdothat
5	nonlibs = mod_dav_svn apr aprutil	5	nonlibs = mod_dav_svn apr aprutil
6	libs = libsvn_subr xml	6	libs = libsvn_subr xml libhttpd
7	-install = tools	7	-install = tools
8	+install = apache-mod	8	+install = apache-mod
9	msvc-libs = libhttpd.lib
10		9
11	# ----------------------------------------------------------------------------	10	# The Subversion FSFS repository manipulation tool
		11	[svnfsfs]

Lines 1-25 Link Here

(-)files/patch-configure (-15 / +15 lines)
1	--- configure.orig 2014-04-30 20:29:25.000000000 +0400	1	--- configure.orig 2015-09-18 06:18:38.000000000 -0700
2	+++ configure 2014-05-18 15:22:03.000000000 +0400	2	+++ configure 2015-10-11 20:21:04.704004000 -0700
3	@@ -19419,11 +19419,11 @@	3	@@ -20318,11 +20318,11 @@
4	SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"	4	SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
5	qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"	5	qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
6	SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"	6	SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
7	- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"	7	- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
8	+ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS"	8	+ CXXFLAGS="$SVN_KWALLET_INCLUDES $CXXFLAGS"
9	LIBS="$LIBS $SVN_KWALLET_LIBS"	9	LIBS="$LIBS $SVN_KWALLET_LIBS"
10	qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"	10	qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
11	kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"	11	kde_lib_suffix="`$KDE4_CONFIG --libsuffix`"
12	- LDFLAGS="$old_LDFLAGS `	12	- LDFLAGS="$old_LDFLAGS `
13	+ LDFLAGS="`	13	+ LDFLAGS="`
14	input_flags="$qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix"	14	input_flags="$qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix"
15	output_flags=""	15	output_flags=""
16	filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"	16	filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
17	@@ -19442,7 +19442,7 @@	17	@@ -20341,7 +20341,7 @@
18	if test -n "$output_flags"; then	18	if test -n "$output_flags"; then
19	printf "%s" "${output_flags# }"	19	printf "%s" "${output_flags# }"
20	fi	20	fi
21	-`"	21	-`"
22	+` $old_LDFLAGS"	22	+` $old_LDFLAGS"
23	ac_ext=cpp	23	ac_ext=cpp
24	ac_cpp='$CXXCPP $CPPFLAGS'	24	ac_cpp='$CXXCPP $CPPFLAGS'
25	ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'	25	ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'

Lines 149-171 Link Here

(-)pkg-plist (-26 / +40 lines)
149	%%DATADIR%%/bdb/svn-bdb-view.py	149	%%DATADIR%%/bdb/svn-bdb-view.py
150	%%DATADIR%%/bdb/svnfs.py	150	%%DATADIR%%/bdb/svnfs.py
151	%%DATADIR%%/bdb/whatis-rep.py	151	%%DATADIR%%/bdb/whatis-rep.py
152	%%DATADIR%%/buildbot/master/Feeder.py	152	%%DATADIR%%/buildbot/master/README
153	%%DATADIR%%/buildbot/master/SVNMailNotifier.py
154	%%DATADIR%%/buildbot/master/master.cfg
155	%%DATADIR%%/buildbot/master/private-sample.py
156	%%DATADIR%%/buildbot/master/public_html/buildbot.css
157	%%DATADIR%%/buildbot/master/public_html/index.html
158	%%DATADIR%%/buildbot/master/public_html/robots.txt
159	%%DATADIR%%/buildbot/slaves/README	153	%%DATADIR%%/buildbot/slaves/README
160	%%DATADIR%%/buildbot/slaves/bb-openbsd/svnbuild.sh	154	%%DATADIR%%/buildbot/slaves/bb-openbsd/svnbuild.sh
161	%%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck-bindings.sh	155	%%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
162	%%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck.sh	156	%%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck.sh
163	%%DATADIR%%/buildbot/slaves/bb-openbsd/svnclean.sh	157	%%DATADIR%%/buildbot/slaves/bb-openbsd/svnclean.sh
164	%%DATADIR%%/buildbot/slaves/centos/svnbuild.sh
165	%%DATADIR%%/buildbot/slaves/centos/svncheck-bindings.sh
166	%%DATADIR%%/buildbot/slaves/centos/svncheck.sh
167	%%DATADIR%%/buildbot/slaves/centos/svnclean.sh
168	%%DATADIR%%/buildbot/slaves/centos/svnlog.sh
169	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c	158	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c
170	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnbuild.sh	159	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnbuild.sh
171	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svncheck.sh	160	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svncheck.sh
Lines 172-177 Link Here
172	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnclean.sh	161	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnclean.sh
173	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnlog.sh	162	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnlog.sh
174	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c	163	%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c
		164	%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svnbuild.sh
		165	%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svncheck.sh
		166	%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svncleanup.sh
		167	%%DATADIR%%/buildbot/slaves/svn-sparc-solaris/svnenv.sh
		168	%%DATADIR%%/buildbot/slaves/svn-x64-centos/list-svn-deps.sh
		169	%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnbuild.sh
		170	%%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck-bindings.sh
		171	%%DATADIR%%/buildbot/slaves/svn-x64-centos/svncheck.sh
		172	%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnclean.sh
		173	%%DATADIR%%/buildbot/slaves/svn-x64-centos/svnlog.sh
175	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh	174	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh
176	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh	175	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh
177	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh	176	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
Lines 180-185 Link Here
180	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh	179	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svncheck.sh
181	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh	180	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnclean.sh
182	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh	181	%%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared/svnlog.sh
		182	%%DATADIR%%/buildbot/slaves/svn-x64-macosx/mkramdisk.sh
		183	%%DATADIR%%/buildbot/slaves/svn-x64-macosx/rmramdisk.sh
		184	%%DATADIR%%/buildbot/slaves/svn-x64-macosx/setenv.sh
		185	%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnbuild-bindings.sh
		186	%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnbuild.sh
		187	%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svncheck-bindings.sh
		188	%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svncheck.sh
		189	%%DATADIR%%/buildbot/slaves/svn-x64-macosx/svnclean.sh
183	%%DATADIR%%/buildbot/slaves/ubuntu-x64/svnbuild.sh	190	%%DATADIR%%/buildbot/slaves/ubuntu-x64/svnbuild.sh
184	%%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh	191	%%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck-bindings.sh
185	%%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck.sh	192	%%DATADIR%%/buildbot/slaves/ubuntu-x64/svncheck.sh
Lines 190-195 Link Here
190	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd	197	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-build-bindings.cmd
191	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-build.cmd	198	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-build.cmd
192	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd	199	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
		200	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-javahl.cmd
193	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-template.cmd	201	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-template.cmd
194	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-test.cmd	202	%%DATADIR%%/buildbot/slaves/win32-SharpSvn/svntest-test.cmd
195	%%DATADIR%%/buildbot/slaves/win32-xp-VS2005/config.bat	203	%%DATADIR%%/buildbot/slaves/win32-xp-VS2005/config.bat
Lines 209-230 Link Here
209	%%DATADIR%%/client-side/detach.py	217	%%DATADIR%%/client-side/detach.py
210	%%DATADIR%%/client-side/mergeinfo-sanitizer.py	218	%%DATADIR%%/client-side/mergeinfo-sanitizer.py
211	%%DATADIR%%/client-side/server-version.py	219	%%DATADIR%%/client-side/server-version.py
212	%%DATADIR%%/client-side/showchange.pl
213	%%DATADIR%%/client-side/svn-bench/cl.h
214	%%DATADIR%%/client-side/svn-bench/client_errors.h
215	%%DATADIR%%/client-side/svn-bench/help-cmd.c
216	%%DATADIR%%/client-side/svn-bench/notify.c
217	%%DATADIR%%/client-side/svn-bench/null-export-cmd.c
218	%%DATADIR%%/client-side/svn-bench/null-list-cmd.c
219	%%DATADIR%%/client-side/svn-bench/null-log-cmd.c
220	%%DATADIR%%/client-side/svn-bench/svn-bench.c
221	%%DATADIR%%/client-side/svn-bench/util.c
222	%%DATADIR%%/client-side/svn-graph.pl	220	%%DATADIR%%/client-side/svn-graph.pl
223	%%DATADIR%%/client-side/svn-ssl-fingerprints.sh	221	%%DATADIR%%/client-side/svn-ssl-fingerprints.sh
		222	%%DATADIR%%/client-side/svn-vendor.py
224	%%DATADIR%%/client-side/svn-viewspec.py	223	%%DATADIR%%/client-side/svn-viewspec.py
225	%%DATADIR%%/client-side/wcfind	224	%%DATADIR%%/client-side/wcfind
226	%%DATADIR%%/dev/analyze-svnlogs.py	225	%%DATADIR%%/dev/analyze-svnlogs.py
227	%%DATADIR%%/dev/aprerr.txt	226	%%DATADIR%%/dev/aprerr.txt
		227	%%DATADIR%%/dev/benchmarks/RepoPerf/ClearMemory.cpp
		228	%%DATADIR%%/dev/benchmarks/RepoPerf/TimeWin.cpp
		229	%%DATADIR%%/dev/benchmarks/RepoPerf/copy_repo.py
		230	%%DATADIR%%/dev/benchmarks/RepoPerf/win_repo_bench.py
228	%%DATADIR%%/dev/benchmarks/large_dirs/create_bigdir.sh	231	%%DATADIR%%/dev/benchmarks/large_dirs/create_bigdir.sh
229	%%DATADIR%%/dev/benchmarks/suite1/benchmark.py	232	%%DATADIR%%/dev/benchmarks/suite1/benchmark.py
230	%%DATADIR%%/dev/benchmarks/suite1/cronjob	233	%%DATADIR%%/dev/benchmarks/suite1/cronjob
Lines 232-237 Link Here
232	%%DATADIR%%/dev/benchmarks/suite1/generate_charts	235	%%DATADIR%%/dev/benchmarks/suite1/generate_charts
233	%%DATADIR%%/dev/benchmarks/suite1/run	236	%%DATADIR%%/dev/benchmarks/suite1/run
234	%%DATADIR%%/dev/benchmarks/suite1/run.bat	237	%%DATADIR%%/dev/benchmarks/suite1/run.bat
		238	%%DATADIR%%/dev/build-svn-deps-win.pl
235	%%DATADIR%%/dev/check-license.py	239	%%DATADIR%%/dev/check-license.py
236	%%DATADIR%%/dev/contribulyze.py	240	%%DATADIR%%/dev/contribulyze.py
237	%%DATADIR%%/dev/datecheck.py	241	%%DATADIR%%/dev/datecheck.py
Lines 238-244 Link Here
238	%%DATADIR%%/dev/find-bad-style.py	242	%%DATADIR%%/dev/find-bad-style.py
239	%%DATADIR%%/dev/find-unmoved-deprecated.sh	243	%%DATADIR%%/dev/find-unmoved-deprecated.sh
240	%%DATADIR%%/dev/fsfs-access-map.c	244	%%DATADIR%%/dev/fsfs-access-map.c
241	%%DATADIR%%/dev/fsfs-reorg.c
242	%%DATADIR%%/dev/gdb-py/README	245	%%DATADIR%%/dev/gdb-py/README
243	%%DATADIR%%/dev/gdb-py/svndbg/__init__.py	246	%%DATADIR%%/dev/gdb-py/svndbg/__init__.py
244	%%DATADIR%%/dev/gdb-py/svndbg/printers.py	247	%%DATADIR%%/dev/gdb-py/svndbg/printers.py
Lines 287-308 Link Here
287	%%DATADIR%%/dev/wc-ng/gather-data.sh	290	%%DATADIR%%/dev/wc-ng/gather-data.sh
288	%%DATADIR%%/dev/wc-ng/graph-data.py	291	%%DATADIR%%/dev/wc-ng/graph-data.py
289	%%DATADIR%%/dev/wc-ng/populate-pristine.py	292	%%DATADIR%%/dev/wc-ng/populate-pristine.py
		293	%%DATADIR%%/dev/wc-ng/svn-wc-db-tester.c
290	%%DATADIR%%/dev/which-error.py	294	%%DATADIR%%/dev/which-error.py
291	%%DATADIR%%/dev/windows-build/Makefile	295	%%DATADIR%%/dev/windows-build/Makefile
292	%%DATADIR%%/dev/windows-build/README	296	%%DATADIR%%/dev/windows-build/README
293	%%DATADIR%%/dev/windows-build/document-version.pl	297	%%DATADIR%%/dev/windows-build/document-version.pl
		298	%%DATADIR%%/dev/x509-parser.c
294	%%DATADIR%%/diff/diff.c	299	%%DATADIR%%/diff/diff.c
295	%%DATADIR%%/diff/diff3.c	300	%%DATADIR%%/diff/diff3.c
296	%%DATADIR%%/diff/diff4.c	301	%%DATADIR%%/diff/diff4.c
297	%%DATADIR%%/dist/_gnupg.py	302	%%DATADIR%%/dist/_gnupg.py
298	%%DATADIR%%/dist/backport.pl	303	%%DATADIR%%/dist/backport.pl
		304	%%DATADIR%%/dist/backport_accept.dump
		305	%%DATADIR%%/dist/backport_branches.dump
		306	%%DATADIR%%/dist/backport_indented_entry.dump
		307	%%DATADIR%%/dist/backport_multirevisions.dump
		308	%%DATADIR%%/dist/backport_tests.py
		309	%%DATADIR%%/dist/backport_two_approveds.dump
299	%%DATADIR%%/dist/checksums.py	310	%%DATADIR%%/dist/checksums.py
300	%%DATADIR%%/dist/collect_sigs.py	311	%%DATADIR%%/dist/collect_sigs.py
301	%%DATADIR%%/dist/dist.sh	312	%%DATADIR%%/dist/dist.sh
302	%%DATADIR%%/dist/download-release.sh	313	%%DATADIR%%/dist/download-release.sh
303	%%DATADIR%%/dist/extract-for-examination.sh	314	%%DATADIR%%/dist/extract-for-examination.sh
304	%%DATADIR%%/dist/make-deps-tarball.sh
305	%%DATADIR%%/dist/nightly.sh	315	%%DATADIR%%/dist/nightly.sh
		316	%%DATADIR%%/dist/nominate.pl
306	%%DATADIR%%/dist/rat-excludes	317	%%DATADIR%%/dist/rat-excludes
307	%%DATADIR%%/dist/release.py	318	%%DATADIR%%/dist/release.py
308	%%DATADIR%%/dist/templates/download.ezt	319	%%DATADIR%%/dist/templates/download.ezt
Lines 312-317 Link Here
312	%%DATADIR%%/dist/templates/stable-news.ezt	323	%%DATADIR%%/dist/templates/stable-news.ezt
313	%%DATADIR%%/dist/templates/stable-release-ann.ezt	324	%%DATADIR%%/dist/templates/stable-release-ann.ezt
314	%%DATADIR%%/dist/test.sh	325	%%DATADIR%%/dist/test.sh
		326	%%DATADIR%%/examples/ExampleAuthn.java
		327	%%DATADIR%%/examples/ExampleAuthnOld.java
		328	%%DATADIR%%/examples/ExampleAuthnVeryOld.java
315	%%DATADIR%%/examples/SvnCLBrowse	329	%%DATADIR%%/examples/SvnCLBrowse
316	%%DATADIR%%/examples/blame.py	330	%%DATADIR%%/examples/blame.py
317	%%DATADIR%%/examples/check-modified.py	331	%%DATADIR%%/examples/check-modified.py
Lines 357-368 Link Here
357	%%DATADIR%%/po/l10n-report.py	371	%%DATADIR%%/po/l10n-report.py
358	%%DATADIR%%/po/po-update.sh	372	%%DATADIR%%/po/po-update.sh
359	%%DATADIR%%/server-side/fsfs-reshard.py	373	%%DATADIR%%/server-side/fsfs-reshard.py
360	%%DATADIR%%/server-side/fsfs-stats.c
361	%%DATADIR%%/server-side/mod_dontdothat/README	374	%%DATADIR%%/server-side/mod_dontdothat/README
362	%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c	375	%%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c
363	%%DATADIR%%/server-side/svn-backup-dumps.py	376	%%DATADIR%%/server-side/svn-backup-dumps.py
364	%%DATADIR%%/server-side/svn-populate-node-origins-index.c	377	%%DATADIR%%/server-side/svn-populate-node-origins-index.c
365	%%DATADIR%%/server-side/svn-rep-sharing-stats.c
366	%%DATADIR%%/server-side/svn_server_log_parse.py	378	%%DATADIR%%/server-side/svn_server_log_parse.py
367	%%DATADIR%%/server-side/svnauthz.c	379	%%DATADIR%%/server-side/svnauthz.c
368	%%DATADIR%%/server-side/svnpredumpfilter.py	380	%%DATADIR%%/server-side/svnpredumpfilter.py
Lines 378-387 Link Here
378	%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.debian	390	%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.debian
379	%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.freebsd	391	%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.freebsd
380	%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.solaris	392	%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.solaris
		393	%%DATADIR%%/server-side/svnpubsub/revprop-change-hook.py
381	%%DATADIR%%/server-side/svnpubsub/svnpubsub.tac	394	%%DATADIR%%/server-side/svnpubsub/svnpubsub.tac
382	%%DATADIR%%/server-side/svnpubsub/svnpubsub/__init__.py	395	%%DATADIR%%/server-side/svnpubsub/svnpubsub/__init__.py
383	%%DATADIR%%/server-side/svnpubsub/svnpubsub/client.py	396	%%DATADIR%%/server-side/svnpubsub/svnpubsub/client.py
384	%%DATADIR%%/server-side/svnpubsub/svnpubsub/server.py	397	%%DATADIR%%/server-side/svnpubsub/svnpubsub/server.py
		398	%%DATADIR%%/server-side/svnpubsub/svnpubsub/util.py
385	%%DATADIR%%/server-side/svnpubsub/svntweet.py	399	%%DATADIR%%/server-side/svnpubsub/svntweet.py
386	%%DATADIR%%/server-side/svnpubsub/svnwcsub.conf.example	400	%%DATADIR%%/server-side/svnpubsub/svnwcsub.conf.example
387	%%DATADIR%%/server-side/svnpubsub/svnwcsub.py	401	%%DATADIR%%/server-side/svnpubsub/svnwcsub.py