Update devel/subversion to 1.9.2.
PR: 203713 Submitted by: Peter Wemm <peter@FreeBSD.org>
This commit is contained in:
Lev A. Serebryakov
parent
8839ec2c75
commit
3535651a1b
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=399335
17
UPDATING
17
UPDATING
@ -5,6 +5,23 @@ 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.
|
||||
|
||||
20151015:
|
||||
AFFECTS: users of devel/subversion, its bindings and www/mod_dav_svn
|
||||
AUTHOR: lev@FreeBSD.org
|
||||
|
||||
The subversion upgdate to 1.9 branch introduces new "old" subversion
|
||||
port devel/subversion18.
|
||||
|
||||
If you don't want to update your subversion installation, run
|
||||
|
||||
pkg set -o devel/subversion:devel/subversion18
|
||||
|
||||
and add
|
||||
|
||||
WITH_SUBVERSION_VER=18
|
||||
|
||||
to your /etc/make.conf
|
||||
|
||||
20151013:
|
||||
AFFECTS: users of security/sshguard-ipfw
|
||||
AUTHOR: feld@FreeBSD.org
|
||||
|
||||
@ -10,6 +10,8 @@ COMMENT= Perl bindings for Version control system
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion16
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion17
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion18
|
||||
.else
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion
|
||||
.endif
|
||||
|
||||
@ -10,6 +10,8 @@ COMMENT= Python bindings for version control system
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion16
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion17
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion18
|
||||
.else
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion
|
||||
.endif
|
||||
|
||||
@ -11,6 +11,8 @@ MASTERDIR= ${.CURDIR}/../../devel/subversion16
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
|
||||
BROKEN= does not build with subversion17
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion17
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion18
|
||||
.else
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion
|
||||
.endif
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
# Created by: rooneg@electricjellyfish.net
|
||||
# $FreeBSD$
|
||||
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 0
|
||||
|
||||
MAINTAINER= lev@FreeBSD.org
|
||||
COMMENT= Version control system
|
||||
|
||||
CONFLICTS_INSTALL= subversion-1.[^8].[0-9]* \
|
||||
subversion1[^8]-1.[^8].[0-9]*
|
||||
CONFLICTS_INSTALL= subversion-1.[^9].[0-9]* \
|
||||
subversion1[^9]-1.[^9].[0-9]*
|
||||
|
||||
USE_RC_SUBR= svnserve
|
||||
|
||||
@ -19,7 +19,6 @@ OPTIONS_DEFINE= \
|
||||
FREEBSD_TEMPLATE\
|
||||
MAINTAINER_DEBUG\
|
||||
NLS \
|
||||
P4_STYLE_MARKERS\
|
||||
SASL \
|
||||
SERF \
|
||||
STATIC \
|
||||
@ -27,13 +26,11 @@ OPTIONS_DEFINE= \
|
||||
TEST \
|
||||
TOOLS
|
||||
|
||||
OPTIONS_DEFAULT=P4_STYLE_MARKERS \
|
||||
FREEBSD_TEMPLATE \
|
||||
OPTIONS_DEFAULT=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)
|
||||
@ -41,7 +38,6 @@ TEST_DESC= Run subversion test suite
|
||||
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
|
||||
|
||||
@ -126,7 +122,7 @@ pre-configure:
|
||||
if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" -a "$${BDB_VERSION}" != "6" ] ; then \
|
||||
${ECHO_MSG} "" ; \
|
||||
${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4, 5 or 6) support to use subversion with it." ; \
|
||||
${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"${OPT_NAME}' and try again." ; \
|
||||
${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"BDB' and try again." ; \
|
||||
${ECHO_MSG} "" ; \
|
||||
${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
|
||||
${ECHO_MSG} "" ; \
|
||||
@ -226,7 +222,7 @@ _mkrepos: .USE
|
||||
|
||||
svn-build-outputs-hack:
|
||||
(cd ${WRKSRC} && ${PATCH} ${PATCH_DIST_ARGS} -p0 < ${PATCHDIR}/extra-patch-build.conf)
|
||||
(cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
|
||||
(cd ${WRKSRC} && python2 gen-make.py --release --installed-libs libsvn_client,libsvn_delta,libsvn_diff,libsvn_fs,libsvn_fs_x,libsvn_ra,libsvn_repos,libsvn_subr,libsvn_wc)
|
||||
${MV} ${WRKSRC}/build-outputs.mk ${FILESDIR}/build-outputs.mk.addons
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME?= subversion
|
||||
PORTVERSION= 1.8.14
|
||||
PORTVERSION= 1.9.2
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES+= devel
|
||||
MASTER_SITES= APACHE/subversion
|
||||
DIST_SUBDIR= subversion18
|
||||
DIST_SUBDIR= subversion19
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
USES+= cpe libtool pkgconfig shebangfix tar:bzip2
|
||||
@ -18,7 +18,7 @@ LICENSE= APACHE20
|
||||
|
||||
CPE_VENDOR= apache
|
||||
|
||||
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^8].[0-9]*
|
||||
CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^9].[0-9]*
|
||||
|
||||
LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \
|
||||
libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
|
||||
@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --without-swig \
|
||||
--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
|
||||
|
||||
.if defined(SVN_BUILD_ADDONS)
|
||||
CONFLICTS_BUILD+= ${PORTNAME}-1.[^8].[0-9]*
|
||||
CONFLICTS_BUILD+= ${PORTNAME}-1.[^9].[0-9]*
|
||||
LIB_DEPENDS+= libsvn_client-1.so:${PORTSDIR}/devel/subversion
|
||||
OPTIONS_NAME= devel_subversion
|
||||
.endif
|
||||
@ -75,10 +75,6 @@ OPTIONS_FILE_SET?=""
|
||||
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::
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (subversion18/subversion-1.8.14.tar.bz2) = 7f3883cdfcad4174e06dd94d6e3e8ec91856823268eebe60c924be76f5229a1f
|
||||
SIZE (subversion18/subversion-1.8.14.tar.bz2) = 6850562
|
||||
SHA256 (subversion19/subversion-1.9.2.tar.bz2) = 023da881139b4514647b6f8a830a244071034efcaad8c8e98c6b92393122b4eb
|
||||
SIZE (subversion19/subversion-1.9.2.tar.bz2) = 7910994
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,12 +0,0 @@
|
||||
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));
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
--- 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
|
||||
@ -1,11 +1,11 @@
|
||||
--- build.conf.orig 2014-02-10 08:04:51.000000000 +0400
|
||||
+++ build.conf 2014-06-15 19:45:52.000000000 +0400
|
||||
@@ -381,7 +381,7 @@
|
||||
--- build.conf.orig 2015-06-24 07:03:20.000000000 +0300
|
||||
+++ build.conf 2015-10-15 01:22:08.204721000 +0300
|
||||
@@ -422,7 +422,7 @@
|
||||
path = tools/server-side/mod_dontdothat
|
||||
nonlibs = mod_dav_svn apr aprutil
|
||||
libs = libsvn_subr xml
|
||||
libs = libsvn_subr xml libhttpd
|
||||
-install = tools
|
||||
+install = apache-mod
|
||||
msvc-libs = libhttpd.lib
|
||||
|
||||
# ----------------------------------------------------------------------------
|
||||
# The Subversion FSFS repository manipulation tool
|
||||
[svnfsfs]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- subversion/svn/util.c.orig 2013-07-10 06:00:05.000000000 +0200
|
||||
+++ subversion/svn/util.c 2015-07-30 13:00:04.642537000 +0200
|
||||
@@ -66,6 +69,9 @@
|
||||
--- subversion/svn/util.c.orig 2015-02-28 13:37:27.000000000 +0300
|
||||
+++ subversion/svn/util.c 2015-10-15 01:23:05.532340287 +0300
|
||||
@@ -66,6 +66,9 @@
|
||||
#include "private/svn_client_private.h"
|
||||
#include "private/svn_cmdline_private.h"
|
||||
#include "private/svn_string_private.h"
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
|
||||
|
||||
@@ -322,6 +328,70 @@ truncate_buffer_at_prefix(apr_size_t *ne
|
||||
@@ -331,6 +334,70 @@
|
||||
}
|
||||
|
||||
|
||||
@ -81,7 +81,7 @@
|
||||
#define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")
|
||||
|
||||
svn_error_t *
|
||||
@@ -334,11 +404,54 @@ svn_cl__get_log_message(const char **log
|
||||
@@ -343,11 +410,54 @@
|
||||
svn_stringbuf_t *default_msg = NULL;
|
||||
struct log_msg_baton *lmb = baton;
|
||||
svn_stringbuf_t *message = NULL;
|
||||
@ -137,15 +137,15 @@
|
||||
|
||||
*tmp_file = NULL;
|
||||
if (lmb->message)
|
||||
@@ -350,6 +463,7 @@ svn_cl__get_log_message(const char **log
|
||||
that follows it. */
|
||||
truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
|
||||
@@ -362,6 +472,7 @@
|
||||
/* Strip off the EOF marker text and the junk that follows it. */
|
||||
truncate_buffer_at_prefix(&(log_msg_str->len), (char *)log_msg_str->data,
|
||||
EDITOR_EOF_PREFIX);
|
||||
+ cleanmsg(NULL, (char*)log_msg_buf->data);
|
||||
+ cleanmsg(NULL, (char*)log_msg_str->data);
|
||||
|
||||
/* Make a string from a stringbuf, sharing the data allocation. */
|
||||
log_msg_str->data = log_msg_buf->data;
|
||||
@@ -470,6 +584,13 @@ svn_cl__get_log_message(const char **log
|
||||
*log_msg = log_msg_str->data;
|
||||
return SVN_NO_ERROR;
|
||||
@@ -472,6 +583,13 @@
|
||||
if (message)
|
||||
truncate_buffer_at_prefix(&message->len, message->data,
|
||||
EDITOR_EOF_PREFIX);
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
--- build-outputs.mk.orig 2011-09-07 23:20:51.000000000 +0400
|
||||
+++ build-outputs.mk 2011-09-07 23:21:37.000000000 +0400
|
||||
@@ -887,7 +887,7 @@
|
||||
cd subversion/svndumpfilter ; $(INSTALL_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(bindir)/svndumpfilter$(EXEEXT)
|
||||
cd subversion/svnlook ; $(INSTALL_BIN) svnlook$(EXEEXT) $(DESTDIR)$(bindir)/svnlook$(EXEEXT)
|
||||
--- build-outputs.mk.orig 2015-10-15 01:24:35.493881000 +0300
|
||||
+++ build-outputs.mk 2015-10-15 01:24:47.968766000 +0300
|
||||
@@ -1115,7 +1115,7 @@
|
||||
|
||||
cd subversion/svnrdump ; $(INSTALL_BIN) svnrdump$(EXEEXT) $(DESTDIR)$(bindir)/svnrdump$(EXEEXT)
|
||||
|
||||
- cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve$(EXEEXT)
|
||||
+ cd subversion/svnserve ; $(INSTALL_BIN) svnserve$(EXEEXT) $(DESTDIR)$(bindir)/svnserve.bin$(EXEEXT)
|
||||
|
||||
cd subversion/svnsync ; $(INSTALL_BIN) svnsync$(EXEEXT) $(DESTDIR)$(bindir)/svnsync$(EXEEXT)
|
||||
cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT)
|
||||
|
||||
|
||||
|
||||
@ -1,14 +1,11 @@
|
||||
========================================================================
|
||||
This patch is required to build SVN Apache modules with staging support
|
||||
========================================================================
|
||||
--- ./Makefile.in.orig 2013-10-21 21:12:04.000000000 +0200
|
||||
+++ ./Makefile.in 2013-10-21 21:13:30.000000000 +0200
|
||||
@@ -85,7 +85,7 @@
|
||||
--- Makefile.in.orig 2015-09-18 15:56:29.000000000 +0300
|
||||
+++ Makefile.in 2015-10-15 01:29:59.889146000 +0300
|
||||
@@ -86,7 +86,7 @@
|
||||
swig_pydir_extra = @libdir@/svn-python/svn
|
||||
swig_pldir = @libdir@/svn-perl
|
||||
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
|
||||
-toolsdir = @bindir@/svn-tools
|
||||
+toolsdir = @bindir@
|
||||
|
||||
javahl_javadir = @libdir@/svn-javahl
|
||||
javahl_javahdir = @libdir@/svn-javahl/include
|
||||
# where to install pkg-config files
|
||||
pkgconfig_dir = $(datadir)/pkgconfig
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
--- build-outputs.mk.orig 2013-06-13 13:08:06.000000000 +0400
|
||||
+++ build-outputs.mk 2013-06-20 00:53:54.000000000 +0400
|
||||
@@ -1136,9 +1136,9 @@
|
||||
--- build-outputs.mk.orig 2015-10-15 01:24:35.493881000 +0300
|
||||
+++ build-outputs.mk 2015-10-15 01:25:35.653321000 +0300
|
||||
@@ -1316,11 +1316,11 @@
|
||||
|
||||
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)
|
||||
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)
|
||||
$(MKDIR) $(DESTDIR)$(toolsdir)
|
||||
- cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
|
||||
- cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
|
||||
- cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/diff4$(EXEEXT)
|
||||
+ cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff$(EXEEXT)
|
||||
|
||||
- cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
|
||||
+ cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff3$(EXEEXT)
|
||||
|
||||
- cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/diff4$(EXEEXT)
|
||||
+ cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/svndiff4$(EXEEXT)
|
||||
|
||||
cd tools/dev ; $(INSTALL_TOOLS) fsfs-access-map$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-access-map$(EXEEXT)
|
||||
cd tools/dev ; $(INSTALL_TOOLS) fsfs-reorg$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-reorg$(EXEEXT)
|
||||
cd tools/server-side ; $(INSTALL_TOOLS) fsfs-stats$(EXEEXT) $(DESTDIR)$(toolsdir)/fsfs-stats$(EXEEXT)
|
||||
|
||||
|
||||
@ -1,25 +1,25 @@
|
||||
--- configure.orig 2014-04-30 20:29:25.000000000 +0400
|
||||
+++ configure 2014-05-18 15:22:03.000000000 +0400
|
||||
@@ -19419,11 +19419,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="`
|
||||
--- configure.orig 2015-09-18 16:18:38.000000000 +0300
|
||||
+++ configure 2015-10-15 01:27:20.438627000 +0300
|
||||
@@ -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"
|
||||
@@ -19442,7 +19442,7 @@
|
||||
@@ -20341,7 +20341,7 @@
|
||||
if test -n "$output_flags"; then
|
||||
printf "%s" "${output_flags# }"
|
||||
fi
|
||||
-`"
|
||||
+` $old_LDFLAGS"
|
||||
ac_ext=cpp
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,5 @@
|
||||
--- subversion/bindings/swig/perl/native/Base.pm.orig 2004-10-20 10:46:59.000000000 +0400
|
||||
+++ subversion/bindings/swig/perl/native/Base.pm 2004-11-05 11:43:35.578125000 +0300
|
||||
--- subversion/bindings/swig/perl/native/Base.pm.orig 2012-12-02 18:57:14.000000000 +0400
|
||||
+++ subversion/bindings/swig/perl/native/Base.pm 2015-10-15 01:30:46.451308089 +0300
|
||||
@@ -60,6 +60,7 @@
|
||||
package SVN::_$pkg;
|
||||
require DynaLoader;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- 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
|
||||
--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2014-01-17 08:54:43.000000000 +0400
|
||||
+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2015-10-15 01:31:03.842306478 +0300
|
||||
@@ -19,7 +19,8 @@
|
||||
# under the License.
|
||||
#
|
||||
@ -22,7 +22,7 @@
|
||||
my @modules = qw/client delta fs ra repos wc/;
|
||||
my @ldpaths = (abs_path($swig_builddir) . "/perl/libsvn_swig_perl/.libs",
|
||||
map { abs_path($svnlib_builddir) . "/libsvn_$_/.libs" }
|
||||
@@ -67,10 +73,9 @@
|
||||
@@ -86,10 +92,9 @@
|
||||
" -I$svnlib_builddir",
|
||||
" -I$swig_srcdir -g"),
|
||||
OBJECT => q/$(O_FILES)/,
|
||||
@ -35,7 +35,7 @@
|
||||
test => { TESTS => "$swig_srcdir/perl/native/t/*.t" }
|
||||
);
|
||||
|
||||
@@ -85,6 +90,7 @@
|
||||
@@ -104,6 +109,7 @@
|
||||
"\$(INST_LIBDIR)/$_.pm") }
|
||||
map { perlish $_ }
|
||||
('base', 'core', @modules)},
|
||||
|
||||
@ -1,10 +1,7 @@
|
||||
%%TOOLS%%bin/fsfs-access-map
|
||||
%%TOOLS%%bin/fsfs-reorg
|
||||
%%TOOLS%%bin/fsfs-stats
|
||||
bin/svn
|
||||
%%TOOLS%%bin/svn-bench
|
||||
%%TOOLS%%bin/svnbench
|
||||
%%TOOLS%%bin/svn-populate-node-origins-index
|
||||
%%TOOLS%%bin/svn-rep-sharing-stats
|
||||
bin/svnadmin
|
||||
%%TOOLS%%bin/svnauthz
|
||||
%%TOOLS%%bin/svnauthz-validate
|
||||
@ -12,6 +9,7 @@ bin/svnadmin
|
||||
%%TOOLS%%bin/svndiff3
|
||||
%%TOOLS%%bin/svndiff4
|
||||
bin/svndumpfilter
|
||||
bin/svnfsfs
|
||||
bin/svnlook
|
||||
bin/svnmucc
|
||||
%%TOOLS%%bin/svnraisetreeconflict
|
||||
@ -21,6 +19,7 @@ bin/svnrdump
|
||||
%%SVNSERVE_WRAPPER%%@sample bin/svnserve.sample
|
||||
bin/svnsync
|
||||
bin/svnversion
|
||||
%%TOOLS%%bin/x509-parser
|
||||
include/subversion-1/mod_authz_svn.h
|
||||
include/subversion-1/mod_dav_svn.h
|
||||
include/subversion-1/svn-revision.txt
|
||||
@ -64,6 +63,7 @@ include/subversion-1/svn_user.h
|
||||
include/subversion-1/svn_utf.h
|
||||
include/subversion-1/svn_version.h
|
||||
include/subversion-1/svn_wc.h
|
||||
include/subversion-1/svn_x509.h
|
||||
include/subversion-1/svn_xml.h
|
||||
lib/libsvn_client-1.a
|
||||
%%NO_STATIC%%lib/libsvn_client-1.so
|
||||
@ -93,6 +93,10 @@ lib/libsvn_fs_util-1.a
|
||||
%%NO_STATIC%%lib/libsvn_fs_util-1.so
|
||||
%%NO_STATIC%%lib/libsvn_fs_util-1.so.0
|
||||
%%NO_STATIC%%lib/libsvn_fs_util-1.so.0.0.0
|
||||
lib/libsvn_fs_x-1.a
|
||||
%%NO_STATIC%%lib/libsvn_fs_x-1.so
|
||||
%%NO_STATIC%%lib/libsvn_fs_x-1.so.0
|
||||
%%NO_STATIC%%lib/libsvn_fs_x-1.so.0.0.0
|
||||
lib/libsvn_ra-1.a
|
||||
%%NO_STATIC%%lib/libsvn_ra-1.so
|
||||
%%NO_STATIC%%lib/libsvn_ra-1.so.0
|
||||
@ -143,35 +147,48 @@ man/man8/svnserve.8.gz
|
||||
%%NLS%%share/locale/sv/LC_MESSAGES/subversion.mo
|
||||
%%NLS%%share/locale/zh_CN/LC_MESSAGES/subversion.mo
|
||||
%%NLS%%share/locale/zh_TW/LC_MESSAGES/subversion.mo
|
||||
share/pkgconfig/libsvn_client.pc
|
||||
share/pkgconfig/libsvn_delta.pc
|
||||
share/pkgconfig/libsvn_diff.pc
|
||||
share/pkgconfig/libsvn_fs.pc
|
||||
share/pkgconfig/libsvn_fs_fs.pc
|
||||
share/pkgconfig/libsvn_fs_util.pc
|
||||
share/pkgconfig/libsvn_fs_x.pc
|
||||
share/pkgconfig/libsvn_ra.pc
|
||||
share/pkgconfig/libsvn_ra_local.pc
|
||||
share/pkgconfig/libsvn_ra_serf.pc
|
||||
share/pkgconfig/libsvn_ra_svn.pc
|
||||
share/pkgconfig/libsvn_repos.pc
|
||||
share/pkgconfig/libsvn_subr.pc
|
||||
share/pkgconfig/libsvn_wc.pc
|
||||
%%DATADIR%%/backup/hot-backup.py
|
||||
%%DATADIR%%/bdb/erase-all-text-data.py
|
||||
%%DATADIR%%/bdb/skel.py
|
||||
%%DATADIR%%/bdb/svn-bdb-view.py
|
||||
%%DATADIR%%/bdb/svnfs.py
|
||||
%%DATADIR%%/bdb/whatis-rep.py
|
||||
%%DATADIR%%/buildbot/master/Feeder.py
|
||||
%%DATADIR%%/buildbot/master/SVNMailNotifier.py
|
||||
%%DATADIR%%/buildbot/master/master.cfg
|
||||
%%DATADIR%%/buildbot/master/private-sample.py
|
||||
%%DATADIR%%/buildbot/master/public_html/buildbot.css
|
||||
%%DATADIR%%/buildbot/master/public_html/index.html
|
||||
%%DATADIR%%/buildbot/master/public_html/robots.txt
|
||||
%%DATADIR%%/buildbot/master/README
|
||||
%%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
|
||||
@ -180,6 +197,14 @@ man/man8/svnserve.8.gz
|
||||
%%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
|
||||
@ -190,6 +215,7 @@ man/man8/svnserve.8.gz
|
||||
%%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
|
||||
@ -209,22 +235,17 @@ man/man8/svnserve.8.gz
|
||||
%%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
|
||||
@ -232,13 +253,13 @@ man/man8/svnserve.8.gz
|
||||
%%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
|
||||
@ -287,22 +308,30 @@ man/man8/svnserve.8.gz
|
||||
%%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
|
||||
@ -312,6 +341,9 @@ man/man8/svnserve.8.gz
|
||||
%%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
|
||||
@ -357,12 +389,10 @@ man/man8/svnserve.8.gz
|
||||
%%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
|
||||
@ -378,10 +408,12 @@ man/man8/svnserve.8.gz
|
||||
%%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
|
||||
|
||||
@ -11,6 +11,8 @@ COMMENT= Java bindings for Version control system
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion16
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion17
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion18
|
||||
.else
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion
|
||||
.endif
|
||||
|
||||
@ -7,7 +7,17 @@ CATEGORIES= security gnome
|
||||
MAINTAINER= lev@FreeBSD.org
|
||||
COMMENT= Gnome KWyring integration for Version control system
|
||||
|
||||
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
|
||||
BROKEN= does not build with subversion16
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion16
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
|
||||
BROKEN= does not build with subversion17
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion17
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion18
|
||||
.else
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion
|
||||
.endif
|
||||
PKGDIR= ${.CURDIR}
|
||||
|
||||
SVN_BUILD_ADDONS= yes
|
||||
|
||||
@ -2,13 +2,23 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PKGNAMESUFFIX= -kwallet
|
||||
PORTREVISION= 2
|
||||
CATEGORIES= security kde
|
||||
|
||||
MAINTAINER= lev@FreeBSD.org
|
||||
COMMENT= KDE KWallet integration for Version control system
|
||||
|
||||
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
|
||||
BROKEN= does not build with subversion16
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion16
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
|
||||
BROKEN= does not build with subversion17
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion17
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
|
||||
PORTREVISION= 2
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion18
|
||||
.else
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion
|
||||
.endif
|
||||
PKGDIR= ${.CURDIR}
|
||||
|
||||
SVN_BUILD_ADDONS= yes
|
||||
|
||||
@ -9,7 +9,17 @@ CATEGORIES= www
|
||||
MAINTAINER= lev@FreeBSD.org
|
||||
COMMENT= Apache module for subversion serving.
|
||||
|
||||
.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 16
|
||||
BROKEN= does not build with subversion16
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion16
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 17
|
||||
BROKEN= does not build with subversion17
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion17
|
||||
.elif defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion18
|
||||
.else
|
||||
MASTERDIR= ${.CURDIR}/../../devel/subversion
|
||||
.endif
|
||||
PKGDIR= ${.CURDIR}
|
||||
|
||||
SVN_BUILD_ADDONS= yes
|
||||
|
||||
Loading…
Reference in New Issue
Block a user