diff options
Diffstat (limited to 'devel')
36 files changed, 616 insertions, 608 deletions
diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile index 0b095c1a01b7..c35ccc4fdfed 100644 --- a/devel/subversion-devel/Makefile +++ b/devel/subversion-devel/Makefile @@ -5,10 +5,11 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.2.3 -PORTREVISION?= 3 +DISTVERSION= 1.3.0-rc2 +PORTREVISION?= 0 CATEGORIES= devel -MASTER_SITES= http://subversion.tigris.org/tarballs/ +MASTER_SITES= http://lolut.utbm.info/pub/subversion-1.3.0/rc2/ +#MASTER_SITES= http://subversion.tigris.org/tarballs/ MAINTAINER= lev@freebsd.org COMMENT= Version control system @@ -84,8 +85,7 @@ PLIST_SUB+= WITHOUT_BDB="" .if ${PERL_LEVEL} < 500800 IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif -SWIG_BINDINGS+= perl -DEPENDS_ARGS+= WANT_SWIG_PERL=yes +SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} @@ -104,8 +104,7 @@ PLIST_SUB+= WITH_PERL="@comment " .if defined(WITH_PYTHON) USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" -SWIG_BINDINGS+= python -DEPENDS_ARGS+= WANT_SWIG_PYTHON=yes +SWIG_BINDINGS+= yes PLIST_SUB+= WITH_PYTHON="" .else PLIST_SUB+= WITH_PYTHON="@comment " @@ -114,8 +113,7 @@ PLIST_SUB+= WITH_PYTHON="@comment " .if defined(WITH_RUBY) USE_RUBY= yes .include "${PORTSDIR}/Mk/bsd.ruby.mk" -SWIG_BINDINGS+= ruby -DEPENDS_ARGS+= WANT_SWIG_RUBY=yes +SWIG_BINDINGS+= yes PLIST_SUB+= WITH_RUBY="" .else PLIST_SUB+= WITH_RUBY="@comment " @@ -138,12 +136,7 @@ PLIST_SUB+= WITH_JAVA="@comment " BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer" .endif -.if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" -BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 -DEPENDS_ARGS+= SWIG_LANGUAGES="" -CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ - --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} -.else +.if !defined(SWIG_BINDINGS) CONFIGURE_ARGS+= --without-swig --disable-swig-bindings .endif @@ -163,10 +156,12 @@ APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} .if ${APACHE2_PORT} == "www/apache21" +PLIST_SUB+= APACHEDIR="apache21" APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config .else +PLIST_SUB+= APACHEDIR="apache2" APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config @@ -252,7 +247,7 @@ pre-extract: @${ECHO_MSG} "Build with Java (JavaHL) bindings." .else @${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA." - @${ECHO_MSG} "You should have apr builded with threads for Java support!" + @${ECHO_MSG} "You should have apr built with threads for Java support!" .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DAV_SVN) @@ -282,6 +277,10 @@ pre-extract: .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group." @${ECHO_MSG} "Make sure that all committers are its members." + @${ECHO_MSG} "" + @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'." + @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." + @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @@ -291,11 +290,6 @@ pre-extract: @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" - @${ECHO_MSG} "" - @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'." - @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." - @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE" - @${ECHO_MSG} "" .endif @${ECHO_MSG} "" .if !defined(NOPORTDOCS) && defined(WITH_BOOK) @@ -334,7 +328,7 @@ pre-configure: ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \ + ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo index dbecde5fa16e..8cab11e29582 100644 --- a/devel/subversion-devel/distinfo +++ b/devel/subversion-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (subversion-1.2.3.tar.bz2) = a14bc6590241b6e5c2ff2b354cc184a1 -SIZE (subversion-1.2.3.tar.bz2) = 7238176 +MD5 (subversion-1.3.0-rc2.tar.bz2) = 70a155ac00fdb71949f8fec761a8acca +SIZE (subversion-1.3.0-rc2.tar.bz2) = 6781191 diff --git a/devel/subversion-devel/files/patch-build--ac-macros--neon.m4 b/devel/subversion-devel/files/patch-build--ac-macros--neon.m4 new file mode 100644 index 000000000000..eb1660263b85 --- /dev/null +++ b/devel/subversion-devel/files/patch-build--ac-macros--neon.m4 @@ -0,0 +1,17 @@ +--- build/ac-macros/neon.m4.orig Sat Nov 5 16:12:58 2005 ++++ build/ac-macros/neon.m4 Sat Nov 5 16:13:14 2005 +@@ -1,4 +1,4 @@ +-dnl SVN_LIB_NEON(wanted_regex, latest_working_ver, url) ++ dnl SVN_LIB_NEON(wanted_regex, latest_working_ver, url) + dnl + dnl Search for a suitable version of neon. wanted_regex is a + dnl regular expression used in a Bourne shell switch/case statement +@@ -132,7 +132,7 @@ + if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] + svn_lib_neon="yes" + break diff --git a/devel/subversion-devel/files/patch-configure b/devel/subversion-devel/files/patch-configure new file mode 100644 index 000000000000..e7eb781d38be --- /dev/null +++ b/devel/subversion-devel/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Nov 5 16:13:58 2005 ++++ configure Sat Nov 5 16:14:12 2005 +@@ -19933,7 +19933,7 @@ + if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'` +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`" + svn_lib_neon="yes" + break diff --git a/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg b/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg new file mode 100644 index 000000000000..a5d22e3a076b --- /dev/null +++ b/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_perl_external_runtime.swg.orig Sat Nov 5 16:48:10 2005 ++++ subversion/bindings/swig/proxy/swig_perl_external_runtime.swg Sat Nov 5 16:49:08 2005 +@@ -945,13 +945,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg b/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg new file mode 100644 index 000000000000..b55a3cf20ee6 --- /dev/null +++ b/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_python_external_runtime.swg.orig Sat Nov 5 17:05:24 2005 ++++ subversion/bindings/swig/proxy/swig_python_external_runtime.swg Sat Nov 5 17:05:38 2005 +@@ -1310,13 +1310,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg b/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg new file mode 100644 index 000000000000..f3ab75f1e85f --- /dev/null +++ b/devel/subversion-devel/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg.orig Sat Nov 5 17:05:55 2005 ++++ subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg Sat Nov 5 17:06:07 2005 +@@ -757,13 +757,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in index 197fe4d55431..d26dc6f84b53 100644 --- a/devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in +++ b/devel/subversion-devel/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in @@ -1,121 +1,39 @@ -*** subversion/bindings/swig/perl/native/Makefile.PL.in.orig Mon Mar 21 01:12:33 2005 ---- subversion/bindings/swig/perl/native/Makefile.PL.in Sun Apr 10 12:31:37 2005 -*************** -*** 1,4 **** -! #!/usr/bin/perl - use ExtUtils::MakeMaker; - use Config; - use Cwd 'abs_path'; ---- 1,5 ---- -! #!/usr/bin/perl -w -! use strict; - use ExtUtils::MakeMaker; - use Config; - use Cwd 'abs_path'; -*************** -*** 15,20 **** ---- 16,27 ---- - my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; - my $swig_builddir = "${svnlib_builddir}/bindings/swig"; - -+ my $top_builddir = '../../../../..'; -+ my $top_srcdir = '@top_srcdir@'; -+ my $svnlib_srcdir = "${top_srcdir}/subversion"; -+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; -+ -+ - my $swig_version = @SWIG_VERSION@; - my $swig = '@SWIG@'; - -*************** -*** 48,55 **** - OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), -! @ldmodules, '-lsvn_swig_perl-1', -! `$swig -perl -ldflags`)], - test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } - ); - ---- 55,61 ---- - OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), -! @ldmodules, '-lsvn_swig_perl-1')], - test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } - ); - -*************** -*** 64,69 **** ---- 70,76 ---- - "\$(INST_LIBDIR)/$_.pm") } - map { perlish $_ } - ('base', 'core', @modules)}, -+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a", - MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" => - "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") } - map { perlish $_ } -*************** -*** 88,107 **** - my $module_c_files = join (' ',map { "svn_$_.c"} @modules); - my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules); - -! my $flags; - if ($swig_version >= 103024) { - $flags = '-noproxy'; - } elsif ($swig_version >= 103020) { - $flags = '-noruntime -noproxy'; - } else { - $flags = '-c'; - } - -! my $swig_command = "$swig $flags -nopm -perl " . - "-I$swig_srcdir " . - "-I$swig_srcdir/perl/libsvn_swig_perl". - " -I$svnlib_srcdir/include" . -! $apr_cflags; - - my $swig_modules_command = join ('', - map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ". ---- 95,118 ---- - my $module_c_files = join (' ',map { "svn_$_.c"} @modules); - my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules); - -! my ($flags, $flags_runtime); - if ($swig_version >= 103024) { - $flags = '-noproxy'; -+ $flags_runtime = '-noproxy'; - } elsif ($swig_version >= 103020) { - $flags = '-noruntime -noproxy'; -+ $flags_runtime = '-runtime -noproxy'; - } else { - $flags = '-c'; - } - -! my ($swig_command, $swig_command_runtime) = -! map { "$swig $_ -nopm -perl " . - "-I$swig_srcdir " . - "-I$swig_srcdir/perl/libsvn_swig_perl". - " -I$svnlib_srcdir/include" . -! $apr_cflags } -! ($flags, $flags_runtime); - - my $swig_modules_command = join ('', - map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ". -*************** -*** 139,145 **** - $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ - - core.c :: $swig_srcdir/core.i -! \t$swig_command -o core.c $swig_srcdir/core.i - - $swig_modules_command - ---- 150,156 ---- - $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ - - core.c :: $swig_srcdir/core.i -! \t$swig_command_runtime -o core.c $swig_srcdir/core.i - - $swig_modules_command - +--- 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 ++#!/usr/bin/perl -w ++use strict; + use ExtUtils::MakeMaker; + use Config; + use Cwd 'abs_path'; +@@ -15,6 +16,11 @@ + my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; + my $swig_builddir = "${svnlib_builddir}/bindings/swig"; + ++my $top_builddir = '../../../../..'; ++my $top_srcdir = '@top_srcdir@'; ++my $svnlib_srcdir = "${top_srcdir}/subversion"; ++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; ++ + my @modules = qw/client delta fs ra repos wc/; + my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs", + map {"$svnlib_builddir/libsvn_$_/.libs"} (@modules, qw/diff subr +@@ -45,8 +51,7 @@ + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {$_ = abs_path($_); "-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 @@ + "\$(INST_LIBDIR)/$_.pm") } + map { perlish $_ } + ('base', 'core', @modules)}, ++ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a", + MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" => + "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") } + map { perlish $_ } diff --git a/devel/subversion-devel/pkg-plist b/devel/subversion-devel/pkg-plist index ac3222406f6b..cc2fa9bc5c56 100644 --- a/devel/subversion-devel/pkg-plist +++ b/devel/subversion-devel/pkg-plist @@ -23,6 +23,7 @@ include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_md5.h +include/subversion-1/svn_nls.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h @@ -34,7 +35,6 @@ include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h -include/subversion-1/svn_test.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_utf.h @@ -103,11 +103,12 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/client-side/server-vsn.py %%DATADIR%%/client-side/showchange.pl %%DATADIR%%/client-side/svn-graph.pl -%%DATADIR%%/cvs2svn/README %%DATADIR%%/dev/check-license.py %%DATADIR%%/dev/datecheck.py +%%DATADIR%%/dev/contribulyze.py %%DATADIR%%/dev/find-textfiles.sh %%DATADIR%%/dev/gcov.patch +%%DATADIR%%/dev/getsigs.pl %%DATADIR%%/dev/gnuify-changelog.pl %%DATADIR%%/dev/iz/defect.dem %%DATADIR%%/dev/iz/ff2csv.command @@ -124,8 +125,13 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/dev/stress.pl %%DATADIR%%/dev/svn-dev.el %%DATADIR%%/dev/svn-dev.vim +%%DATADIR%%/dev/svn-merge-revs.py %%DATADIR%%/dev/trails.py %%DATADIR%%/dev/verify-history.py +%%DATADIR%%/dev/which-error.py +%%DATADIR%%/diff/diff.c +%%DATADIR%%/diff/diff3.c +%%DATADIR%%/diff/diff4.c %%DATADIR%%/examples/blame.py %%DATADIR%%/examples/check-modified.py %%DATADIR%%/examples/dumpprops.py @@ -160,6 +166,8 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/po/svn-po-status-report.sh %%DATADIR%%/po/svn-po-status-run.sh %%DATADIR%%/test-scripts/svntest/README +%%DATADIR%%/test-scripts/svntest/dav_svn.passwd +%%DATADIR%%/test-scripts/svntest/mod_dav_svn.conf %%DATADIR%%/test-scripts/svntest/svntest-bindings.sh %%DATADIR%%/test-scripts/svntest/svntest-bindings-generic.sh %%DATADIR%%/test-scripts/svntest/svntest-check-configuration.sh @@ -173,10 +181,10 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/test-scripts/svntest/svntest.sh %%DATADIR%%/xslt/svnindex.css %%DATADIR%%/xslt/svnindex.xsl -%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so -%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so +%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_dav_svn.so +%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_authz_svn.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so %%WITH_JAVA%%lib/libsvnjavahl-1.a %%WITH_JAVA%%lib/libsvnjavahl-1.so %%WITH_JAVA%%lib/libsvnjavahl-1.so.0 @@ -288,9 +296,9 @@ lib/libsvn_wc-1.so.0 @dirrm %%DATADIR%%/backup @dirrm %%DATADIR%%/bdb @dirrm %%DATADIR%%/client-side -@dirrm %%DATADIR%%/cvs2svn @dirrm %%DATADIR%%/dev/iz @dirrm %%DATADIR%%/dev +@dirrm %%DATADIR%%/diff @dirrm %%DATADIR%%/examples @dirrm %%DATADIR%%/hook-scripts/mailer/tests @dirrm %%DATADIR%%/hook-scripts/mailer diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile index 0b095c1a01b7..c35ccc4fdfed 100644 --- a/devel/subversion-freebsd/Makefile +++ b/devel/subversion-freebsd/Makefile @@ -5,10 +5,11 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.2.3 -PORTREVISION?= 3 +DISTVERSION= 1.3.0-rc2 +PORTREVISION?= 0 CATEGORIES= devel -MASTER_SITES= http://subversion.tigris.org/tarballs/ +MASTER_SITES= http://lolut.utbm.info/pub/subversion-1.3.0/rc2/ +#MASTER_SITES= http://subversion.tigris.org/tarballs/ MAINTAINER= lev@freebsd.org COMMENT= Version control system @@ -84,8 +85,7 @@ PLIST_SUB+= WITHOUT_BDB="" .if ${PERL_LEVEL} < 500800 IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif -SWIG_BINDINGS+= perl -DEPENDS_ARGS+= WANT_SWIG_PERL=yes +SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} @@ -104,8 +104,7 @@ PLIST_SUB+= WITH_PERL="@comment " .if defined(WITH_PYTHON) USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" -SWIG_BINDINGS+= python -DEPENDS_ARGS+= WANT_SWIG_PYTHON=yes +SWIG_BINDINGS+= yes PLIST_SUB+= WITH_PYTHON="" .else PLIST_SUB+= WITH_PYTHON="@comment " @@ -114,8 +113,7 @@ PLIST_SUB+= WITH_PYTHON="@comment " .if defined(WITH_RUBY) USE_RUBY= yes .include "${PORTSDIR}/Mk/bsd.ruby.mk" -SWIG_BINDINGS+= ruby -DEPENDS_ARGS+= WANT_SWIG_RUBY=yes +SWIG_BINDINGS+= yes PLIST_SUB+= WITH_RUBY="" .else PLIST_SUB+= WITH_RUBY="@comment " @@ -138,12 +136,7 @@ PLIST_SUB+= WITH_JAVA="@comment " BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer" .endif -.if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" -BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 -DEPENDS_ARGS+= SWIG_LANGUAGES="" -CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ - --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} -.else +.if !defined(SWIG_BINDINGS) CONFIGURE_ARGS+= --without-swig --disable-swig-bindings .endif @@ -163,10 +156,12 @@ APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} .if ${APACHE2_PORT} == "www/apache21" +PLIST_SUB+= APACHEDIR="apache21" APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config .else +PLIST_SUB+= APACHEDIR="apache2" APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config @@ -252,7 +247,7 @@ pre-extract: @${ECHO_MSG} "Build with Java (JavaHL) bindings." .else @${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA." - @${ECHO_MSG} "You should have apr builded with threads for Java support!" + @${ECHO_MSG} "You should have apr built with threads for Java support!" .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DAV_SVN) @@ -282,6 +277,10 @@ pre-extract: .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group." @${ECHO_MSG} "Make sure that all committers are its members." + @${ECHO_MSG} "" + @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'." + @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." + @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @@ -291,11 +290,6 @@ pre-extract: @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" - @${ECHO_MSG} "" - @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'." - @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." - @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE" - @${ECHO_MSG} "" .endif @${ECHO_MSG} "" .if !defined(NOPORTDOCS) && defined(WITH_BOOK) @@ -334,7 +328,7 @@ pre-configure: ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \ + ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo index dbecde5fa16e..8cab11e29582 100644 --- a/devel/subversion-freebsd/distinfo +++ b/devel/subversion-freebsd/distinfo @@ -1,2 +1,2 @@ -MD5 (subversion-1.2.3.tar.bz2) = a14bc6590241b6e5c2ff2b354cc184a1 -SIZE (subversion-1.2.3.tar.bz2) = 7238176 +MD5 (subversion-1.3.0-rc2.tar.bz2) = 70a155ac00fdb71949f8fec761a8acca +SIZE (subversion-1.3.0-rc2.tar.bz2) = 6781191 diff --git a/devel/subversion-freebsd/files/patch-build--ac-macros--neon.m4 b/devel/subversion-freebsd/files/patch-build--ac-macros--neon.m4 new file mode 100644 index 000000000000..eb1660263b85 --- /dev/null +++ b/devel/subversion-freebsd/files/patch-build--ac-macros--neon.m4 @@ -0,0 +1,17 @@ +--- build/ac-macros/neon.m4.orig Sat Nov 5 16:12:58 2005 ++++ build/ac-macros/neon.m4 Sat Nov 5 16:13:14 2005 +@@ -1,4 +1,4 @@ +-dnl SVN_LIB_NEON(wanted_regex, latest_working_ver, url) ++ dnl SVN_LIB_NEON(wanted_regex, latest_working_ver, url) + dnl + dnl Search for a suitable version of neon. wanted_regex is a + dnl regular expression used in a Bourne shell switch/case statement +@@ -132,7 +132,7 @@ + if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] + svn_lib_neon="yes" + break diff --git a/devel/subversion-freebsd/files/patch-configure b/devel/subversion-freebsd/files/patch-configure new file mode 100644 index 000000000000..e7eb781d38be --- /dev/null +++ b/devel/subversion-freebsd/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Nov 5 16:13:58 2005 ++++ configure Sat Nov 5 16:14:12 2005 +@@ -19933,7 +19933,7 @@ + if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'` +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`" + svn_lib_neon="yes" + break diff --git a/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg b/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg new file mode 100644 index 000000000000..a5d22e3a076b --- /dev/null +++ b/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_perl_external_runtime.swg.orig Sat Nov 5 16:48:10 2005 ++++ subversion/bindings/swig/proxy/swig_perl_external_runtime.swg Sat Nov 5 16:49:08 2005 +@@ -945,13 +945,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg b/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg new file mode 100644 index 000000000000..b55a3cf20ee6 --- /dev/null +++ b/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_python_external_runtime.swg.orig Sat Nov 5 17:05:24 2005 ++++ subversion/bindings/swig/proxy/swig_python_external_runtime.swg Sat Nov 5 17:05:38 2005 +@@ -1310,13 +1310,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg b/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg new file mode 100644 index 000000000000..f3ab75f1e85f --- /dev/null +++ b/devel/subversion-freebsd/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg.orig Sat Nov 5 17:05:55 2005 ++++ subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg Sat Nov 5 17:06:07 2005 +@@ -757,13 +757,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in index 197fe4d55431..d26dc6f84b53 100644 --- a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in +++ b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in @@ -1,121 +1,39 @@ -*** subversion/bindings/swig/perl/native/Makefile.PL.in.orig Mon Mar 21 01:12:33 2005 ---- subversion/bindings/swig/perl/native/Makefile.PL.in Sun Apr 10 12:31:37 2005 -*************** -*** 1,4 **** -! #!/usr/bin/perl - use ExtUtils::MakeMaker; - use Config; - use Cwd 'abs_path'; ---- 1,5 ---- -! #!/usr/bin/perl -w -! use strict; - use ExtUtils::MakeMaker; - use Config; - use Cwd 'abs_path'; -*************** -*** 15,20 **** ---- 16,27 ---- - my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; - my $swig_builddir = "${svnlib_builddir}/bindings/swig"; - -+ my $top_builddir = '../../../../..'; -+ my $top_srcdir = '@top_srcdir@'; -+ my $svnlib_srcdir = "${top_srcdir}/subversion"; -+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; -+ -+ - my $swig_version = @SWIG_VERSION@; - my $swig = '@SWIG@'; - -*************** -*** 48,55 **** - OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), -! @ldmodules, '-lsvn_swig_perl-1', -! `$swig -perl -ldflags`)], - test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } - ); - ---- 55,61 ---- - OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), -! @ldmodules, '-lsvn_swig_perl-1')], - test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } - ); - -*************** -*** 64,69 **** ---- 70,76 ---- - "\$(INST_LIBDIR)/$_.pm") } - map { perlish $_ } - ('base', 'core', @modules)}, -+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a", - MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" => - "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") } - map { perlish $_ } -*************** -*** 88,107 **** - my $module_c_files = join (' ',map { "svn_$_.c"} @modules); - my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules); - -! my $flags; - if ($swig_version >= 103024) { - $flags = '-noproxy'; - } elsif ($swig_version >= 103020) { - $flags = '-noruntime -noproxy'; - } else { - $flags = '-c'; - } - -! my $swig_command = "$swig $flags -nopm -perl " . - "-I$swig_srcdir " . - "-I$swig_srcdir/perl/libsvn_swig_perl". - " -I$svnlib_srcdir/include" . -! $apr_cflags; - - my $swig_modules_command = join ('', - map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ". ---- 95,118 ---- - my $module_c_files = join (' ',map { "svn_$_.c"} @modules); - my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules); - -! my ($flags, $flags_runtime); - if ($swig_version >= 103024) { - $flags = '-noproxy'; -+ $flags_runtime = '-noproxy'; - } elsif ($swig_version >= 103020) { - $flags = '-noruntime -noproxy'; -+ $flags_runtime = '-runtime -noproxy'; - } else { - $flags = '-c'; - } - -! my ($swig_command, $swig_command_runtime) = -! map { "$swig $_ -nopm -perl " . - "-I$swig_srcdir " . - "-I$swig_srcdir/perl/libsvn_swig_perl". - " -I$svnlib_srcdir/include" . -! $apr_cflags } -! ($flags, $flags_runtime); - - my $swig_modules_command = join ('', - map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ". -*************** -*** 139,145 **** - $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ - - core.c :: $swig_srcdir/core.i -! \t$swig_command -o core.c $swig_srcdir/core.i - - $swig_modules_command - ---- 150,156 ---- - $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ - - core.c :: $swig_srcdir/core.i -! \t$swig_command_runtime -o core.c $swig_srcdir/core.i - - $swig_modules_command - +--- 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 ++#!/usr/bin/perl -w ++use strict; + use ExtUtils::MakeMaker; + use Config; + use Cwd 'abs_path'; +@@ -15,6 +16,11 @@ + my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; + my $swig_builddir = "${svnlib_builddir}/bindings/swig"; + ++my $top_builddir = '../../../../..'; ++my $top_srcdir = '@top_srcdir@'; ++my $svnlib_srcdir = "${top_srcdir}/subversion"; ++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; ++ + my @modules = qw/client delta fs ra repos wc/; + my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs", + map {"$svnlib_builddir/libsvn_$_/.libs"} (@modules, qw/diff subr +@@ -45,8 +51,7 @@ + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {$_ = abs_path($_); "-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 @@ + "\$(INST_LIBDIR)/$_.pm") } + map { perlish $_ } + ('base', 'core', @modules)}, ++ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a", + MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" => + "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") } + map { perlish $_ } diff --git a/devel/subversion-freebsd/pkg-plist b/devel/subversion-freebsd/pkg-plist index ac3222406f6b..cc2fa9bc5c56 100644 --- a/devel/subversion-freebsd/pkg-plist +++ b/devel/subversion-freebsd/pkg-plist @@ -23,6 +23,7 @@ include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_md5.h +include/subversion-1/svn_nls.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h @@ -34,7 +35,6 @@ include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h -include/subversion-1/svn_test.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_utf.h @@ -103,11 +103,12 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/client-side/server-vsn.py %%DATADIR%%/client-side/showchange.pl %%DATADIR%%/client-side/svn-graph.pl -%%DATADIR%%/cvs2svn/README %%DATADIR%%/dev/check-license.py %%DATADIR%%/dev/datecheck.py +%%DATADIR%%/dev/contribulyze.py %%DATADIR%%/dev/find-textfiles.sh %%DATADIR%%/dev/gcov.patch +%%DATADIR%%/dev/getsigs.pl %%DATADIR%%/dev/gnuify-changelog.pl %%DATADIR%%/dev/iz/defect.dem %%DATADIR%%/dev/iz/ff2csv.command @@ -124,8 +125,13 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/dev/stress.pl %%DATADIR%%/dev/svn-dev.el %%DATADIR%%/dev/svn-dev.vim +%%DATADIR%%/dev/svn-merge-revs.py %%DATADIR%%/dev/trails.py %%DATADIR%%/dev/verify-history.py +%%DATADIR%%/dev/which-error.py +%%DATADIR%%/diff/diff.c +%%DATADIR%%/diff/diff3.c +%%DATADIR%%/diff/diff4.c %%DATADIR%%/examples/blame.py %%DATADIR%%/examples/check-modified.py %%DATADIR%%/examples/dumpprops.py @@ -160,6 +166,8 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/po/svn-po-status-report.sh %%DATADIR%%/po/svn-po-status-run.sh %%DATADIR%%/test-scripts/svntest/README +%%DATADIR%%/test-scripts/svntest/dav_svn.passwd +%%DATADIR%%/test-scripts/svntest/mod_dav_svn.conf %%DATADIR%%/test-scripts/svntest/svntest-bindings.sh %%DATADIR%%/test-scripts/svntest/svntest-bindings-generic.sh %%DATADIR%%/test-scripts/svntest/svntest-check-configuration.sh @@ -173,10 +181,10 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/test-scripts/svntest/svntest.sh %%DATADIR%%/xslt/svnindex.css %%DATADIR%%/xslt/svnindex.xsl -%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so -%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so +%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_dav_svn.so +%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_authz_svn.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so %%WITH_JAVA%%lib/libsvnjavahl-1.a %%WITH_JAVA%%lib/libsvnjavahl-1.so %%WITH_JAVA%%lib/libsvnjavahl-1.so.0 @@ -288,9 +296,9 @@ lib/libsvn_wc-1.so.0 @dirrm %%DATADIR%%/backup @dirrm %%DATADIR%%/bdb @dirrm %%DATADIR%%/client-side -@dirrm %%DATADIR%%/cvs2svn @dirrm %%DATADIR%%/dev/iz @dirrm %%DATADIR%%/dev +@dirrm %%DATADIR%%/diff @dirrm %%DATADIR%%/examples @dirrm %%DATADIR%%/hook-scripts/mailer/tests @dirrm %%DATADIR%%/hook-scripts/mailer diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 0b095c1a01b7..c35ccc4fdfed 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -5,10 +5,11 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.2.3 -PORTREVISION?= 3 +DISTVERSION= 1.3.0-rc2 +PORTREVISION?= 0 CATEGORIES= devel -MASTER_SITES= http://subversion.tigris.org/tarballs/ +MASTER_SITES= http://lolut.utbm.info/pub/subversion-1.3.0/rc2/ +#MASTER_SITES= http://subversion.tigris.org/tarballs/ MAINTAINER= lev@freebsd.org COMMENT= Version control system @@ -84,8 +85,7 @@ PLIST_SUB+= WITHOUT_BDB="" .if ${PERL_LEVEL} < 500800 IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif -SWIG_BINDINGS+= perl -DEPENDS_ARGS+= WANT_SWIG_PERL=yes +SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} @@ -104,8 +104,7 @@ PLIST_SUB+= WITH_PERL="@comment " .if defined(WITH_PYTHON) USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" -SWIG_BINDINGS+= python -DEPENDS_ARGS+= WANT_SWIG_PYTHON=yes +SWIG_BINDINGS+= yes PLIST_SUB+= WITH_PYTHON="" .else PLIST_SUB+= WITH_PYTHON="@comment " @@ -114,8 +113,7 @@ PLIST_SUB+= WITH_PYTHON="@comment " .if defined(WITH_RUBY) USE_RUBY= yes .include "${PORTSDIR}/Mk/bsd.ruby.mk" -SWIG_BINDINGS+= ruby -DEPENDS_ARGS+= WANT_SWIG_RUBY=yes +SWIG_BINDINGS+= yes PLIST_SUB+= WITH_RUBY="" .else PLIST_SUB+= WITH_RUBY="@comment " @@ -138,12 +136,7 @@ PLIST_SUB+= WITH_JAVA="@comment " BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer" .endif -.if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" -BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 -DEPENDS_ARGS+= SWIG_LANGUAGES="" -CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ - --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} -.else +.if !defined(SWIG_BINDINGS) CONFIGURE_ARGS+= --without-swig --disable-swig-bindings .endif @@ -163,10 +156,12 @@ APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} .if ${APACHE2_PORT} == "www/apache21" +PLIST_SUB+= APACHEDIR="apache21" APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config .else +PLIST_SUB+= APACHEDIR="apache2" APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config @@ -252,7 +247,7 @@ pre-extract: @${ECHO_MSG} "Build with Java (JavaHL) bindings." .else @${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA." - @${ECHO_MSG} "You should have apr builded with threads for Java support!" + @${ECHO_MSG} "You should have apr built with threads for Java support!" .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DAV_SVN) @@ -282,6 +277,10 @@ pre-extract: .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group." @${ECHO_MSG} "Make sure that all committers are its members." + @${ECHO_MSG} "" + @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'." + @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." + @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @@ -291,11 +290,6 @@ pre-extract: @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" - @${ECHO_MSG} "" - @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'." - @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." - @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE" - @${ECHO_MSG} "" .endif @${ECHO_MSG} "" .if !defined(NOPORTDOCS) && defined(WITH_BOOK) @@ -334,7 +328,7 @@ pre-configure: ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \ + ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo index dbecde5fa16e..8cab11e29582 100644 --- a/devel/subversion/distinfo +++ b/devel/subversion/distinfo @@ -1,2 +1,2 @@ -MD5 (subversion-1.2.3.tar.bz2) = a14bc6590241b6e5c2ff2b354cc184a1 -SIZE (subversion-1.2.3.tar.bz2) = 7238176 +MD5 (subversion-1.3.0-rc2.tar.bz2) = 70a155ac00fdb71949f8fec761a8acca +SIZE (subversion-1.3.0-rc2.tar.bz2) = 6781191 diff --git a/devel/subversion/files/patch-build--ac-macros--neon.m4 b/devel/subversion/files/patch-build--ac-macros--neon.m4 new file mode 100644 index 000000000000..eb1660263b85 --- /dev/null +++ b/devel/subversion/files/patch-build--ac-macros--neon.m4 @@ -0,0 +1,17 @@ +--- build/ac-macros/neon.m4.orig Sat Nov 5 16:12:58 2005 ++++ build/ac-macros/neon.m4 Sat Nov 5 16:13:14 2005 +@@ -1,4 +1,4 @@ +-dnl SVN_LIB_NEON(wanted_regex, latest_working_ver, url) ++ dnl SVN_LIB_NEON(wanted_regex, latest_working_ver, url) + dnl + dnl Search for a suitable version of neon. wanted_regex is a + dnl regular expression used in a Bourne shell switch/case statement +@@ -132,7 +132,7 @@ + if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] + svn_lib_neon="yes" + break diff --git a/devel/subversion/files/patch-configure b/devel/subversion/files/patch-configure new file mode 100644 index 000000000000..e7eb781d38be --- /dev/null +++ b/devel/subversion/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Nov 5 16:13:58 2005 ++++ configure Sat Nov 5 16:14:12 2005 +@@ -19933,7 +19933,7 @@ + if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'` +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`" + svn_lib_neon="yes" + break diff --git a/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg b/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg new file mode 100644 index 000000000000..a5d22e3a076b --- /dev/null +++ b/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_perl_external_runtime.swg.orig Sat Nov 5 16:48:10 2005 ++++ subversion/bindings/swig/proxy/swig_perl_external_runtime.swg Sat Nov 5 16:49:08 2005 +@@ -945,13 +945,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg b/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg new file mode 100644 index 000000000000..b55a3cf20ee6 --- /dev/null +++ b/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_python_external_runtime.swg.orig Sat Nov 5 17:05:24 2005 ++++ subversion/bindings/swig/proxy/swig_python_external_runtime.swg Sat Nov 5 17:05:38 2005 +@@ -1310,13 +1310,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg b/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg new file mode 100644 index 000000000000..f3ab75f1e85f --- /dev/null +++ b/devel/subversion/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg.orig Sat Nov 5 17:05:55 2005 ++++ subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg Sat Nov 5 17:06:07 2005 +@@ -757,13 +757,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in index 197fe4d55431..d26dc6f84b53 100644 --- a/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in +++ b/devel/subversion/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in @@ -1,121 +1,39 @@ -*** subversion/bindings/swig/perl/native/Makefile.PL.in.orig Mon Mar 21 01:12:33 2005 ---- subversion/bindings/swig/perl/native/Makefile.PL.in Sun Apr 10 12:31:37 2005 -*************** -*** 1,4 **** -! #!/usr/bin/perl - use ExtUtils::MakeMaker; - use Config; - use Cwd 'abs_path'; ---- 1,5 ---- -! #!/usr/bin/perl -w -! use strict; - use ExtUtils::MakeMaker; - use Config; - use Cwd 'abs_path'; -*************** -*** 15,20 **** ---- 16,27 ---- - my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; - my $swig_builddir = "${svnlib_builddir}/bindings/swig"; - -+ my $top_builddir = '../../../../..'; -+ my $top_srcdir = '@top_srcdir@'; -+ my $svnlib_srcdir = "${top_srcdir}/subversion"; -+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; -+ -+ - my $swig_version = @SWIG_VERSION@; - my $swig = '@SWIG@'; - -*************** -*** 48,55 **** - OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), -! @ldmodules, '-lsvn_swig_perl-1', -! `$swig -perl -ldflags`)], - test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } - ); - ---- 55,61 ---- - OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), -! @ldmodules, '-lsvn_swig_perl-1')], - test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } - ); - -*************** -*** 64,69 **** ---- 70,76 ---- - "\$(INST_LIBDIR)/$_.pm") } - map { perlish $_ } - ('base', 'core', @modules)}, -+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a", - MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" => - "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") } - map { perlish $_ } -*************** -*** 88,107 **** - my $module_c_files = join (' ',map { "svn_$_.c"} @modules); - my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules); - -! my $flags; - if ($swig_version >= 103024) { - $flags = '-noproxy'; - } elsif ($swig_version >= 103020) { - $flags = '-noruntime -noproxy'; - } else { - $flags = '-c'; - } - -! my $swig_command = "$swig $flags -nopm -perl " . - "-I$swig_srcdir " . - "-I$swig_srcdir/perl/libsvn_swig_perl". - " -I$svnlib_srcdir/include" . -! $apr_cflags; - - my $swig_modules_command = join ('', - map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ". ---- 95,118 ---- - my $module_c_files = join (' ',map { "svn_$_.c"} @modules); - my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules); - -! my ($flags, $flags_runtime); - if ($swig_version >= 103024) { - $flags = '-noproxy'; -+ $flags_runtime = '-noproxy'; - } elsif ($swig_version >= 103020) { - $flags = '-noruntime -noproxy'; -+ $flags_runtime = '-runtime -noproxy'; - } else { - $flags = '-c'; - } - -! my ($swig_command, $swig_command_runtime) = -! map { "$swig $_ -nopm -perl " . - "-I$swig_srcdir " . - "-I$swig_srcdir/perl/libsvn_swig_perl". - " -I$svnlib_srcdir/include" . -! $apr_cflags } -! ($flags, $flags_runtime); - - my $swig_modules_command = join ('', - map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ". -*************** -*** 139,145 **** - $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ - - core.c :: $swig_srcdir/core.i -! \t$swig_command -o core.c $swig_srcdir/core.i - - $swig_modules_command - ---- 150,156 ---- - $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ - - core.c :: $swig_srcdir/core.i -! \t$swig_command_runtime -o core.c $swig_srcdir/core.i - - $swig_modules_command - +--- 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 ++#!/usr/bin/perl -w ++use strict; + use ExtUtils::MakeMaker; + use Config; + use Cwd 'abs_path'; +@@ -15,6 +16,11 @@ + my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; + my $swig_builddir = "${svnlib_builddir}/bindings/swig"; + ++my $top_builddir = '../../../../..'; ++my $top_srcdir = '@top_srcdir@'; ++my $svnlib_srcdir = "${top_srcdir}/subversion"; ++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; ++ + my @modules = qw/client delta fs ra repos wc/; + my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs", + map {"$svnlib_builddir/libsvn_$_/.libs"} (@modules, qw/diff subr +@@ -45,8 +51,7 @@ + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {$_ = abs_path($_); "-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 @@ + "\$(INST_LIBDIR)/$_.pm") } + map { perlish $_ } + ('base', 'core', @modules)}, ++ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a", + MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" => + "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") } + map { perlish $_ } diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist index ac3222406f6b..cc2fa9bc5c56 100644 --- a/devel/subversion/pkg-plist +++ b/devel/subversion/pkg-plist @@ -23,6 +23,7 @@ include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_md5.h +include/subversion-1/svn_nls.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h @@ -34,7 +35,6 @@ include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h -include/subversion-1/svn_test.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_utf.h @@ -103,11 +103,12 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/client-side/server-vsn.py %%DATADIR%%/client-side/showchange.pl %%DATADIR%%/client-side/svn-graph.pl -%%DATADIR%%/cvs2svn/README %%DATADIR%%/dev/check-license.py %%DATADIR%%/dev/datecheck.py +%%DATADIR%%/dev/contribulyze.py %%DATADIR%%/dev/find-textfiles.sh %%DATADIR%%/dev/gcov.patch +%%DATADIR%%/dev/getsigs.pl %%DATADIR%%/dev/gnuify-changelog.pl %%DATADIR%%/dev/iz/defect.dem %%DATADIR%%/dev/iz/ff2csv.command @@ -124,8 +125,13 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/dev/stress.pl %%DATADIR%%/dev/svn-dev.el %%DATADIR%%/dev/svn-dev.vim +%%DATADIR%%/dev/svn-merge-revs.py %%DATADIR%%/dev/trails.py %%DATADIR%%/dev/verify-history.py +%%DATADIR%%/dev/which-error.py +%%DATADIR%%/diff/diff.c +%%DATADIR%%/diff/diff3.c +%%DATADIR%%/diff/diff4.c %%DATADIR%%/examples/blame.py %%DATADIR%%/examples/check-modified.py %%DATADIR%%/examples/dumpprops.py @@ -160,6 +166,8 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/po/svn-po-status-report.sh %%DATADIR%%/po/svn-po-status-run.sh %%DATADIR%%/test-scripts/svntest/README +%%DATADIR%%/test-scripts/svntest/dav_svn.passwd +%%DATADIR%%/test-scripts/svntest/mod_dav_svn.conf %%DATADIR%%/test-scripts/svntest/svntest-bindings.sh %%DATADIR%%/test-scripts/svntest/svntest-bindings-generic.sh %%DATADIR%%/test-scripts/svntest/svntest-check-configuration.sh @@ -173,10 +181,10 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/test-scripts/svntest/svntest.sh %%DATADIR%%/xslt/svnindex.css %%DATADIR%%/xslt/svnindex.xsl -%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so -%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so +%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_dav_svn.so +%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_authz_svn.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so %%WITH_JAVA%%lib/libsvnjavahl-1.a %%WITH_JAVA%%lib/libsvnjavahl-1.so %%WITH_JAVA%%lib/libsvnjavahl-1.so.0 @@ -288,9 +296,9 @@ lib/libsvn_wc-1.so.0 @dirrm %%DATADIR%%/backup @dirrm %%DATADIR%%/bdb @dirrm %%DATADIR%%/client-side -@dirrm %%DATADIR%%/cvs2svn @dirrm %%DATADIR%%/dev/iz @dirrm %%DATADIR%%/dev +@dirrm %%DATADIR%%/diff @dirrm %%DATADIR%%/examples @dirrm %%DATADIR%%/hook-scripts/mailer/tests @dirrm %%DATADIR%%/hook-scripts/mailer diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile index 0b095c1a01b7..c35ccc4fdfed 100644 --- a/devel/subversion16/Makefile +++ b/devel/subversion16/Makefile @@ -5,10 +5,11 @@ # $FreeBSD$ PORTNAME= subversion -PORTVERSION= 1.2.3 -PORTREVISION?= 3 +DISTVERSION= 1.3.0-rc2 +PORTREVISION?= 0 CATEGORIES= devel -MASTER_SITES= http://subversion.tigris.org/tarballs/ +MASTER_SITES= http://lolut.utbm.info/pub/subversion-1.3.0/rc2/ +#MASTER_SITES= http://subversion.tigris.org/tarballs/ MAINTAINER= lev@freebsd.org COMMENT= Version control system @@ -84,8 +85,7 @@ PLIST_SUB+= WITHOUT_BDB="" .if ${PERL_LEVEL} < 500800 IGNORE= "Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again" .endif -SWIG_BINDINGS+= perl -DEPENDS_ARGS+= WANT_SWIG_PERL=yes +SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} @@ -104,8 +104,7 @@ PLIST_SUB+= WITH_PERL="@comment " .if defined(WITH_PYTHON) USE_PYTHON= yes .include "${PORTSDIR}/Mk/bsd.python.mk" -SWIG_BINDINGS+= python -DEPENDS_ARGS+= WANT_SWIG_PYTHON=yes +SWIG_BINDINGS+= yes PLIST_SUB+= WITH_PYTHON="" .else PLIST_SUB+= WITH_PYTHON="@comment " @@ -114,8 +113,7 @@ PLIST_SUB+= WITH_PYTHON="@comment " .if defined(WITH_RUBY) USE_RUBY= yes .include "${PORTSDIR}/Mk/bsd.ruby.mk" -SWIG_BINDINGS+= ruby -DEPENDS_ARGS+= WANT_SWIG_RUBY=yes +SWIG_BINDINGS+= yes PLIST_SUB+= WITH_RUBY="" .else PLIST_SUB+= WITH_RUBY="@comment " @@ -138,12 +136,7 @@ PLIST_SUB+= WITH_JAVA="@comment " BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer" .endif -.if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != "" -BUILD_DEPENDS+= swig1.3:${PORTSDIR}/devel/swig13 -DEPENDS_ARGS+= SWIG_LANGUAGES="" -CONFIGURE_ARGS+= --with-swig=${LOCALBASE} \ - --enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g} -.else +.if !defined(SWIG_BINDINGS) CONFIGURE_ARGS+= --without-swig --disable-swig-bindings .endif @@ -163,10 +156,12 @@ APACHE2_PORT?= www/apache2 BUILD_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} RUN_DEPENDS+= ${APXS}:${PORTSDIR}/${APACHE2_PORT} .if ${APACHE2_PORT} == "www/apache21" +PLIST_SUB+= APACHEDIR="apache21" APR_APU_DIR= ${LOCALBASE}/bin APR_CONFIG= apr-1-config APU_CONFIG= apu-1-config .else +PLIST_SUB+= APACHEDIR="apache2" APR_APU_DIR= ${LOCALBASE}/lib/apache2 APR_CONFIG= apr-config APU_CONFIG= apu-config @@ -252,7 +247,7 @@ pre-extract: @${ECHO_MSG} "Build with Java (JavaHL) bindings." .else @${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA." - @${ECHO_MSG} "You should have apr builded with threads for Java support!" + @${ECHO_MSG} "You should have apr built with threads for Java support!" .endif @${ECHO_MSG} "" .if defined(WITH_MOD_DAV_SVN) @@ -282,6 +277,10 @@ pre-extract: .if defined(WITH_REPOSITORY_CREATION) @${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group." @${ECHO_MSG} "Make sure that all committers are its members." + @${ECHO_MSG} "" + @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'." + @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." + @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE." .else @${ECHO_MSG} "You can have the repository created for you by defining" @${ECHO_MSG} "WITH_REPOSITORY_CREATION." @@ -291,11 +290,6 @@ pre-extract: @${ECHO_MSG} "* this group is the group id of the db/ and locks/" @${ECHO_MSG} " subdirectories of your repository" @${ECHO_MSG} "* the above subdirectories are writable by this group" - @${ECHO_MSG} "" - @${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'." - @${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'." - @${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE" - @${ECHO_MSG} "" .endif @${ECHO_MSG} "" .if !defined(NOPORTDOCS) && defined(WITH_BOOK) @@ -334,7 +328,7 @@ pre-configure: ${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \ ${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \ + ${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be available." ; \ ${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \ ${ECHO_MSG} "" ; \ ${FALSE} ; \ diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo index dbecde5fa16e..8cab11e29582 100644 --- a/devel/subversion16/distinfo +++ b/devel/subversion16/distinfo @@ -1,2 +1,2 @@ -MD5 (subversion-1.2.3.tar.bz2) = a14bc6590241b6e5c2ff2b354cc184a1 -SIZE (subversion-1.2.3.tar.bz2) = 7238176 +MD5 (subversion-1.3.0-rc2.tar.bz2) = 70a155ac00fdb71949f8fec761a8acca +SIZE (subversion-1.3.0-rc2.tar.bz2) = 6781191 diff --git a/devel/subversion16/files/patch-build--ac-macros--neon.m4 b/devel/subversion16/files/patch-build--ac-macros--neon.m4 new file mode 100644 index 000000000000..eb1660263b85 --- /dev/null +++ b/devel/subversion16/files/patch-build--ac-macros--neon.m4 @@ -0,0 +1,17 @@ +--- build/ac-macros/neon.m4.orig Sat Nov 5 16:12:58 2005 ++++ build/ac-macros/neon.m4 Sat Nov 5 16:13:14 2005 +@@ -1,4 +1,4 @@ +-dnl SVN_LIB_NEON(wanted_regex, latest_working_ver, url) ++ dnl SVN_LIB_NEON(wanted_regex, latest_working_ver, url) + dnl + dnl Search for a suitable version of neon. wanted_regex is a + dnl regular expression used in a Bourne shell switch/case statement +@@ -132,7 +132,7 @@ + if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`] +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"] + svn_lib_neon="yes" + break diff --git a/devel/subversion16/files/patch-configure b/devel/subversion16/files/patch-configure new file mode 100644 index 000000000000..e7eb781d38be --- /dev/null +++ b/devel/subversion16/files/patch-configure @@ -0,0 +1,11 @@ +--- configure.orig Sat Nov 5 16:13:58 2005 ++++ configure Sat Nov 5 16:14:12 2005 +@@ -19933,7 +19933,7 @@ + if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then + svn_allowed_neon_on_system="yes" + SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'` +- NEON_LIBS=`$neon_config --la-file` ++ NEON_LIBS=`$neon_config --libs` + CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`" + svn_lib_neon="yes" + break diff --git a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg new file mode 100644 index 000000000000..a5d22e3a076b --- /dev/null +++ b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_perl_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_perl_external_runtime.swg.orig Sat Nov 5 16:48:10 2005 ++++ subversion/bindings/swig/proxy/swig_perl_external_runtime.swg Sat Nov 5 16:49:08 2005 +@@ -945,13 +945,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg new file mode 100644 index 000000000000..b55a3cf20ee6 --- /dev/null +++ b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_python_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_python_external_runtime.swg.orig Sat Nov 5 17:05:24 2005 ++++ subversion/bindings/swig/proxy/swig_python_external_runtime.swg Sat Nov 5 17:05:38 2005 +@@ -1310,13 +1310,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg new file mode 100644 index 000000000000..f3ab75f1e85f --- /dev/null +++ b/devel/subversion16/files/patch-subversion--bindings--swig--proxy--swig_ruby_external_runtime.swg @@ -0,0 +1,18 @@ +--- subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg.orig Sat Nov 5 17:05:55 2005 ++++ subversion/bindings/swig/proxy/swig_ruby_external_runtime.swg Sat Nov 5 17:06:07 2005 +@@ -757,13 +757,13 @@ + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_TypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_TypeQueryModule(module, module, name); + } + + SWIGRUNTIMEINLINE swig_type_info * + SWIG_MangledTypeQuery(const char *name) { +- swig_module_info *module = SWIG_GetModule(); ++ swig_module_info *module = SWIG_GetModule(NULL); + return SWIG_MangledTypeQueryModule(module, module, name); + } + diff --git a/devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in b/devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in index 197fe4d55431..d26dc6f84b53 100644 --- a/devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in +++ b/devel/subversion16/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in @@ -1,121 +1,39 @@ -*** subversion/bindings/swig/perl/native/Makefile.PL.in.orig Mon Mar 21 01:12:33 2005 ---- subversion/bindings/swig/perl/native/Makefile.PL.in Sun Apr 10 12:31:37 2005 -*************** -*** 1,4 **** -! #!/usr/bin/perl - use ExtUtils::MakeMaker; - use Config; - use Cwd 'abs_path'; ---- 1,5 ---- -! #!/usr/bin/perl -w -! use strict; - use ExtUtils::MakeMaker; - use Config; - use Cwd 'abs_path'; -*************** -*** 15,20 **** ---- 16,27 ---- - my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; - my $swig_builddir = "${svnlib_builddir}/bindings/swig"; - -+ my $top_builddir = '../../../../..'; -+ my $top_srcdir = '@top_srcdir@'; -+ my $svnlib_srcdir = "${top_srcdir}/subversion"; -+ my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; -+ -+ - my $swig_version = @SWIG_VERSION@; - my $swig = '@SWIG@'; - -*************** -*** 48,55 **** - OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), -! @ldmodules, '-lsvn_swig_perl-1', -! `$swig -perl -ldflags`)], - test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } - ); - ---- 55,61 ---- - OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), -! @ldmodules, '-lsvn_swig_perl-1')], - test => { TESTS => "$swig_srcdir/perl/native/t/*.t" } - ); - -*************** -*** 64,69 **** ---- 70,76 ---- - "\$(INST_LIBDIR)/$_.pm") } - map { perlish $_ } - ('base', 'core', @modules)}, -+ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a", - MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" => - "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") } - map { perlish $_ } -*************** -*** 88,107 **** - my $module_c_files = join (' ',map { "svn_$_.c"} @modules); - my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules); - -! my $flags; - if ($swig_version >= 103024) { - $flags = '-noproxy'; - } elsif ($swig_version >= 103020) { - $flags = '-noruntime -noproxy'; - } else { - $flags = '-c'; - } - -! my $swig_command = "$swig $flags -nopm -perl " . - "-I$swig_srcdir " . - "-I$swig_srcdir/perl/libsvn_swig_perl". - " -I$svnlib_srcdir/include" . -! $apr_cflags; - - my $swig_modules_command = join ('', - map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ". ---- 95,118 ---- - my $module_c_files = join (' ',map { "svn_$_.c"} @modules); - my $module_make_commands = join ('',map {"\t\$(MAKE) -f Makefile.$_\n"} @modules); - -! my ($flags, $flags_runtime); - if ($swig_version >= 103024) { - $flags = '-noproxy'; -+ $flags_runtime = '-noproxy'; - } elsif ($swig_version >= 103020) { - $flags = '-noruntime -noproxy'; -+ $flags_runtime = '-runtime -noproxy'; - } else { - $flags = '-c'; - } - -! my ($swig_command, $swig_command_runtime) = -! map { "$swig $_ -nopm -perl " . - "-I$swig_srcdir " . - "-I$swig_srcdir/perl/libsvn_swig_perl". - " -I$svnlib_srcdir/include" . -! $apr_cflags } -! ($flags, $flags_runtime); - - my $swig_modules_command = join ('', - map {"\nsvn_$_.c : $swig_srcdir/svn_$_.i ". -*************** -*** 139,145 **** - $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ - - core.c :: $swig_srcdir/core.i -! \t$swig_command -o core.c $swig_srcdir/core.i - - $swig_modules_command - ---- 150,156 ---- - $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ - - core.c :: $swig_srcdir/core.i -! \t$swig_command_runtime -o core.c $swig_srcdir/core.i - - $swig_modules_command - +--- 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 ++#!/usr/bin/perl -w ++use strict; + use ExtUtils::MakeMaker; + use Config; + use Cwd 'abs_path'; +@@ -15,6 +16,11 @@ + my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; + my $swig_builddir = "${svnlib_builddir}/bindings/swig"; + ++my $top_builddir = '../../../../..'; ++my $top_srcdir = '@top_srcdir@'; ++my $svnlib_srcdir = "${top_srcdir}/subversion"; ++my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; ++ + my @modules = qw/client delta fs ra repos wc/; + my @ldpaths = ("$swig_builddir/perl/libsvn_swig_perl/.libs", + map {"$svnlib_builddir/libsvn_$_/.libs"} (@modules, qw/diff subr +@@ -45,8 +51,7 @@ + OBJECT => q/$(O_FILES)/, + LIBS => [join(' ', $apr_ldflags, + (map {$_ = abs_path($_); "-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 @@ + "\$(INST_LIBDIR)/$_.pm") } + map { perlish $_ } + ('base', 'core', @modules)}, ++ LDFROM => '$(O_FILES) '."../libsvn_swig_perl/.libs/libsvn_swig_perl-1.a", + MAN3PODS => {map { ("$swig_srcdir/perl/native/$_.pm" => + "\$(INST_MAN3DIR)/SVN::$_.\$(MAN3EXT)") } + map { perlish $_ } diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist index ac3222406f6b..cc2fa9bc5c56 100644 --- a/devel/subversion16/pkg-plist +++ b/devel/subversion16/pkg-plist @@ -23,6 +23,7 @@ include/subversion-1/svn_fs.h include/subversion-1/svn_hash.h include/subversion-1/svn_io.h include/subversion-1/svn_md5.h +include/subversion-1/svn_nls.h include/subversion-1/svn_opt.h include/subversion-1/svn_path.h include/subversion-1/svn_pools.h @@ -34,7 +35,6 @@ include/subversion-1/svn_repos.h include/subversion-1/svn_sorts.h include/subversion-1/svn_string.h include/subversion-1/svn_subst.h -include/subversion-1/svn_test.h include/subversion-1/svn_time.h include/subversion-1/svn_types.h include/subversion-1/svn_utf.h @@ -103,11 +103,12 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/client-side/server-vsn.py %%DATADIR%%/client-side/showchange.pl %%DATADIR%%/client-side/svn-graph.pl -%%DATADIR%%/cvs2svn/README %%DATADIR%%/dev/check-license.py %%DATADIR%%/dev/datecheck.py +%%DATADIR%%/dev/contribulyze.py %%DATADIR%%/dev/find-textfiles.sh %%DATADIR%%/dev/gcov.patch +%%DATADIR%%/dev/getsigs.pl %%DATADIR%%/dev/gnuify-changelog.pl %%DATADIR%%/dev/iz/defect.dem %%DATADIR%%/dev/iz/ff2csv.command @@ -124,8 +125,13 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/dev/stress.pl %%DATADIR%%/dev/svn-dev.el %%DATADIR%%/dev/svn-dev.vim +%%DATADIR%%/dev/svn-merge-revs.py %%DATADIR%%/dev/trails.py %%DATADIR%%/dev/verify-history.py +%%DATADIR%%/dev/which-error.py +%%DATADIR%%/diff/diff.c +%%DATADIR%%/diff/diff3.c +%%DATADIR%%/diff/diff4.c %%DATADIR%%/examples/blame.py %%DATADIR%%/examples/check-modified.py %%DATADIR%%/examples/dumpprops.py @@ -160,6 +166,8 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/po/svn-po-status-report.sh %%DATADIR%%/po/svn-po-status-run.sh %%DATADIR%%/test-scripts/svntest/README +%%DATADIR%%/test-scripts/svntest/dav_svn.passwd +%%DATADIR%%/test-scripts/svntest/mod_dav_svn.conf %%DATADIR%%/test-scripts/svntest/svntest-bindings.sh %%DATADIR%%/test-scripts/svntest/svntest-bindings-generic.sh %%DATADIR%%/test-scripts/svntest/svntest-check-configuration.sh @@ -173,10 +181,10 @@ lib/libsvn_wc-1.so.0 %%DATADIR%%/test-scripts/svntest/svntest.sh %%DATADIR%%/xslt/svnindex.css %%DATADIR%%/xslt/svnindex.xsl -%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so -%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so -%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so +%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_dav_svn.so +%%MOD_DAV_SVN%%libexec/%%APACHEDIR%%/mod_authz_svn.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so +%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/%%APACHEDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so %%WITH_JAVA%%lib/libsvnjavahl-1.a %%WITH_JAVA%%lib/libsvnjavahl-1.so %%WITH_JAVA%%lib/libsvnjavahl-1.so.0 @@ -288,9 +296,9 @@ lib/libsvn_wc-1.so.0 @dirrm %%DATADIR%%/backup @dirrm %%DATADIR%%/bdb @dirrm %%DATADIR%%/client-side -@dirrm %%DATADIR%%/cvs2svn @dirrm %%DATADIR%%/dev/iz @dirrm %%DATADIR%%/dev +@dirrm %%DATADIR%%/diff @dirrm %%DATADIR%%/examples @dirrm %%DATADIR%%/hook-scripts/mailer/tests @dirrm %%DATADIR%%/hook-scripts/mailer |