FreeBSD Bugzilla – Attachment 47759 Details for
Bug 73135
[PATCH] Partial update of devel/subversion to 1.1.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
subversion.patch
subversion.patch (text/plain), 10.16 KB, created by
Bruce A. Mah
on 2004-10-25 19:30:24 UTC
(
hide
)
Description:
subversion.patch
Filename:
MIME Type:
Creator:
Bruce A. Mah
Created:
2004-10-25 19:30:24 UTC
Size:
10.16 KB
patch
obsolete
>Index: distinfo >=================================================================== >--- distinfo (.../vendor/current) (revision 681) >+++ distinfo (.../trunk) (revision 681) >@@ -1,2 +1,2 @@ >-MD5 (subversion-1.0.8.tar.bz2) = b2378b7d9d00653249877531a61ef1db >-SIZE (subversion-1.0.8.tar.bz2) = 5978990 >+MD5 (subversion-1.1.1.tar.bz2) = a180c3fe91680389c210c99def54d9e0 >+SIZE (subversion-1.1.1.tar.bz2) = 6768086 >Index: files/patch-subversion::bindings::swig::perl::native::Makefile.PL.in >=================================================================== >--- files/patch-subversion::bindings::swig::perl::native::Makefile.PL.in (.../vendor/current) (revision 0) >+++ files/patch-subversion::bindings::swig::perl::native::Makefile.PL.in (.../trunk) (revision 681) >@@ -0,0 +1,11 @@ >+--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig Tue Sep 14 09:32:08 2004 >++++ subversion/bindings/swig/perl/native/Makefile.PL.in Thu Sep 30 07:11:47 2004 >+@@ -41,7 +41,7 @@ >+ >+ my %config = ( >+ ABSTRACT => 'Perl bindings for Subversion', >+- INC => join(' ',$apr_cflags, $apu_cflags, >++ INC => join(' ', $ENV{'CCFLAGS'} || '', $apr_cflags, $apu_cflags, >+ " -I$swig_srcdir/perl/libsvn_swig_perl", >+ " -I$svnlib_srcdir/include", >+ " -I$swig_srcdir -g"), >Index: files/build-outputs.mk.patch >=================================================================== >--- files/build-outputs.mk.patch (.../vendor/current) (revision 681) >+++ files/build-outputs.mk.patch (.../trunk) (revision 681) >@@ -1,11 +1,11 @@ >---- build-outputs.mk.orig Wed Oct 8 16:01:40 2003 >-+++ build-outputs.mk Wed Oct 8 16:02:00 2003 >-@@ -447,7 +447,7 @@ >- cd subversion/svnadmin ; $(INSTALL_FS_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnadmin$(EXEEXT) >- cd subversion/svndumpfilter ; $(INSTALL_FS_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(fs_bindir)/svndumpfilter$(EXEEXT) >- cd subversion/svnlook ; $(INSTALL_FS_BIN) svnlook$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnlook$(EXEEXT) >-- cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve$(EXEEXT) >-+ cd subversion/svnserve ; $(INSTALL_FS_BIN) svnserve$(EXEEXT) $(DESTDIR)$(fs_bindir)/svnserve.bin$(EXEEXT) >+--- build-outputs.mk.orig Wed Sep 29 14:23:34 2004 >++++ build-outputs.mk Thu Sep 30 09:41:25 2004 >+@@ -500,7 +500,7 @@ >+ cd subversion/svnadmin ; $(INSTALL_BIN) svnadmin$(EXEEXT) $(DESTDIR)$(bindir)/svnadmin$(EXEEXT) >+ cd subversion/svndumpfilter ; $(INSTALL_BIN) svndumpfilter$(EXEEXT) $(DESTDIR)$(bindir)/svndumpfilter$(EXEEXT) >+ cd subversion/svnlook ; $(INSTALL_BIN) svnlook$(EXEEXT) $(DESTDIR)$(bindir)/svnlook$(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/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT) > >- install-fs-lib: subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra_local/libsvn_ra_local-1.la >- $(MKDIR) $(DESTDIR)$(fs_libdir) >+ install-contrib: contrib/client-side/svn-push/svn-push$(EXEEXT) install-lib install-fsmod-lib >Index: files/patch-subversion::bindings::swig::perl::Makefile.PL >=================================================================== >--- files/patch-subversion::bindings::swig::perl::Makefile.PL (.../vendor/current) (revision 681) >+++ files/patch-subversion::bindings::swig::perl::Makefile.PL (.../trunk) (revision 681) >@@ -1,11 +0,0 @@ >---- subversion/bindings/swig/perl/Makefile.PL.orig Sat Jan 24 20:46:46 2004 >-+++ subversion/bindings/swig/perl/Makefile.PL Sat Jan 31 21:40:23 2004 >-@@ -41,7 +41,7 @@ >- >- my %config = ( >- ABSTRACT => 'Perl bindings for Subversion', >-- CCFLAGS => join(' ', $apr_cflags, $apu_cflags, >-+ CCFLAGS => join(' ', $ENV{'CCFLAGS'} || '', $apr_cflags, $apu_cflags, >- `$perl_path -MExtUtils::Embed -e ccopts`, >- ' -I.. -I../../../include -g'), >- OBJECT => q/$(O_FILES)/, >Index: files/patch-svnperl-noruntime >=================================================================== >--- files/patch-svnperl-noruntime (.../vendor/current) (revision 681) >+++ files/patch-svnperl-noruntime (.../trunk) (revision 681) >@@ -1,82 +0,0 @@ >---- subversion/bindings/swig/perl/Base.pm (revision 10173) >-+++ subversion/bindings/swig/perl/Base.pm (revision 10174) >-@@ -60,6 +60,7 @@ sub import { >- package SVN::_$pkg; >- require DynaLoader; >- bootstrap SVN::_$pkg; >-+sub dl_load_flags { 0x01 } >- 1; >- ' or die $@; >- }; >---- subversion/bindings/swig/perl/Makefile.PL (revision 10173) >-+++ subversion/bindings/swig/perl/Makefile.PL (revision 10174) >-@@ -1,4 +1,5 @@ >--#!/usr/bin/perl >-+#!/usr/bin/perl -w >-+use strict; >- use ExtUtils::MakeMaker; >- use Cwd 'abs_path'; >- use Config; >-@@ -8,6 +9,12 @@ if ($^O ne 'VMS') { >- $perl_path .= $Config{_exe} unless $perl_path =~ m/$Config{_exe}$/i; >- } >- >-+my $top_builddir = '../../../..'; >-+my $top_srcdir = '@top_srcdir@'; >-+my $svnlib_srcdir = "${top_srcdir}/subversion"; >-+my $swig_srcdir = "${svnlib_srcdir}/bindings/swig"; >-+ >-+ >- my $swig_version; >- open TOPMAKE, "<../../../../Makefile"; >- while (<TOPMAKE>) { >-@@ -50,8 +57,7 @@ my %config = ( >- OBJECT => q/$(O_FILES)/, >- LIBS => [join(' ', $apr_ldflags, >- (map {$_ = abs_path($_); "-L$_"} @ldpaths), >-- @ldmodules, '-lsvn_swig_perl-1', >-- `swig -perl -ldflags`)], >-+ @ldmodules)], >- ); >- >- sub perlish { >-@@ -64,6 +70,7 @@ WriteMakefile(%config, NAME => 'SVN::_Co >- PM => {map { ("$_.pm" => "\$(INST_LIBDIR)/$_.pm") } >- map { perlish $_ } >- ('base', 'core', @modules)}, >-+ LDFROM => '$(O_FILES) '."../.libs/libsvn_swig_perl-1.a", >- clean => { FILES => "*.hi *.c *.bs". >- join(' Makefile.','',@modules) } >- ); >-@@ -84,15 +91,19 @@ sub MY::postamble { >- my $module_c_files = join (' ',map { "svn_$_.c"} @modules); >- my $module_make_commands = join ('',map {"\tmake -f Makefile.$_\n"} @modules); >- >-- my $flags; >-+ my ($flags, $flags_runtime); >- if ($swig_version >= 103020) { >- $flags = '-noruntime -noproxy'; >-+ $flags_runtime = '-runtime -noproxy'; >- } else { >-+ # XXX: prehaps deprecated >- $flags = '-c'; >- } >- >-- my $swig_command = "swig $flags -nopm -perl " . >-- "-I.. -I../../../include $apr_cflags"; >-+ my ($swig_command, $swig_command_runtime) = >-+ map {"swig $_ -nopm -perl " . >-+ "-I.. -I../../../include $apr_cflags" } >-+ ($flags, $flags_runtime); >- >- my $swig_modules_command = join ('', >- map {"\nsvn_$_.c : ../svn_$_.i ". >-@@ -127,7 +138,7 @@ modules :: $module_c_files >- $module_make_commands\t\$(NOECHO) \$(TOUCH) \$\@ >- >- core.c :: ../core.i >--\t$swig_command -module SVN::_Core -o core.c ../core.i >-+\t$swig_command_runtime -module SVN::_Core -o core.c ../core.i >- >- $swig_modules_command >- >Index: pkg-plist >=================================================================== >--- pkg-plist (.../vendor/current) (revision 681) >+++ pkg-plist (.../trunk) (revision 681) >@@ -52,6 +52,12 @@ > lib/libsvn_fs-1.a > lib/libsvn_fs-1.so > lib/libsvn_fs-1.so.0 >+lib/libsvn_fs_base-1.a >+lib/libsvn_fs_base-1.so >+lib/libsvn_fs_base-1.so.0 >+lib/libsvn_fs_fs-1.a >+lib/libsvn_fs_fs-1.so >+lib/libsvn_fs_fs-1.so.0 > lib/libsvn_ra-1.a > lib/libsvn_ra-1.so > lib/libsvn_ra-1.so.0 >@@ -73,9 +79,15 @@ > lib/libsvn_wc-1.a > lib/libsvn_wc-1.so > lib/libsvn_wc-1.so.0 >-%%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.a >+share/locale/de/LC_MESSAGES/subversion.mo >+share/locale/es/LC_MESSAGES/subversion.mo >+share/locale/ja/LC_MESSAGES/subversion.mo >+share/locale/nb/LC_MESSAGES/subversion.mo >+share/locale/pl/LC_MESSAGES/subversion.mo >+share/locale/pt_BR/LC_MESSAGES/subversion.mo >+share/locale/sv/LC_MESSAGES/subversion.mo >+share/locale/zh_TW/LC_MESSAGES/subversion.mo > %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so >-%%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.a > %%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 >Index: Makefile >=================================================================== >--- Makefile (.../vendor/current) (revision 681) >+++ Makefile (.../trunk) (revision 681) >@@ -5,7 +5,7 @@ > # $FreeBSD: ports/devel/subversion/Makefile,v 1.70 2004/10/15 21:41:09 pav Exp $ > > PORTNAME= subversion >-PORTVERSION= 1.0.8 >+PORTVERSION= 1.1.1 > CATEGORIES= devel > MASTER_SITES= http://subversion.tigris.org/tarballs/ > >@@ -108,6 +108,7 @@ > CONFIGURE_ARGS+=--with-apr=${LOCALBASE}/lib/apache2/apr-config \ > --with-apr-util=${LOCALBASE}/lib/apache2/apu-config > APR_APU_DIR= ${LOCALBASE}/lib/apache2 >+APR_CONFIG= apr-config > APR_PORT= www/apache2 > OPT_NAME= WITH_BERKELEYDB=(db4|db41|db42) > .else >@@ -115,6 +116,7 @@ > CONFIGURE_ARGS+=--with-apr=${LOCALBASE} \ > --with-apr-util=${LOCALBASE} > APR_APU_DIR= ${LOCALBASE}/bin >+APR_CONFIG= apr-1-config > APR_PORT= devel/apr > OPT_NAME= APR_UTIL_WITH_BERKELEY_DB=yes > .endif >@@ -225,17 +227,17 @@ > @${REINPLACE_CMD} "s#^LIBTOOL =.*#LIBTOOL = ${LIBTOOL}#" ${WRKSRC}/Makefile.in > > pre-configure: >- @if [ ! -x ${APR_APU_DIR}/apr-config -o ! -x ${APR_APU_DIR}/apu-config ] ; then \ >+ @if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APR_CONFIG} ] ; then \ > ${ECHO_MSG} "" ; \ >- ${ECHO_MSG} 'You select to use`'"${APR_PORT}' for apr library." ; \ >+ ${ECHO_MSG} 'You selected to use `'"${APR_PORT}' for apr library." ; \ > ${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \ > ${ECHO_MSG} "" ; \ > ${FALSE} ; \ > fi >- @if [ `${APR_APU_DIR}/apu-config --db-version` != "4" ] ; then \ >+ @if [ `${APR_APU_DIR}/${APR_CONFIG} --db-version` != "4" ] ; then \ > ${ECHO_MSG} "" ; \ > ${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} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \ > ${ECHO_MSG} "" ; \ > ${FALSE} ; \ > fi
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 73135
: 47759