From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 25 18:30:25 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A3C4B16A4CE for ; Mon, 25 Oct 2004 18:30:25 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6469B43D46 for ; Mon, 25 Oct 2004 18:30:25 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i9PIUPYU034310 for ; Mon, 25 Oct 2004 18:30:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i9PIUPGq034307; Mon, 25 Oct 2004 18:30:25 GMT (envelope-from gnats) Resent-Date: Mon, 25 Oct 2004 18:30:25 GMT Resent-Message-Id: <200410251830.i9PIUPGq034307@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Bruce A. Mah" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECF5C16A4D0 for ; Mon, 25 Oct 2004 18:25:25 +0000 (GMT) Received: from a.mail.sonic.net (a.mail.sonic.net [64.142.16.245]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A38443D31 for ; Mon, 25 Oct 2004 18:25:25 +0000 (GMT) (envelope-from bmah@tomcat.kitchenlab.org) Received: from tomcat.kitchenlab.org (adsl-64-142-31-107.sonic.net [64.142.31.107]) by a.mail.sonic.net (8.12.11/8.12.11) with ESMTP id i9PIPOnC022363 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Mon, 25 Oct 2004 11:25:25 -0700 Received: from tomcat.kitchenlab.org (localhost.kitchenlab.org [127.0.0.1]) by tomcat.kitchenlab.org (8.13.1/8.13.1) with ESMTP id i9PIPOml040894 for ; Mon, 25 Oct 2004 11:25:24 -0700 (PDT) (envelope-from bmah@tomcat.kitchenlab.org) Received: (from bmah@localhost) by tomcat.kitchenlab.org (8.13.1/8.13.1/Submit) id i9PIPODU040893; Mon, 25 Oct 2004 11:25:24 -0700 (PDT) (envelope-from bmah) Message-Id: <200410251825.i9PIPODU040893@tomcat.kitchenlab.org> Date: Mon, 25 Oct 2004 11:25:24 -0700 (PDT) From: "Bruce A. Mah" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/73135: [PATCH] Partial update of devel/subversion to 1.1.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: "Bruce A. Mah" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Oct 2004 18:30:25 -0000 >Number: 73135 >Category: ports >Synopsis: [PATCH] Partial update of devel/subversion to 1.1.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Oct 25 18:30:24 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Bruce A. Mah >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD tomcat.kitchenlab.org 5.3-STABLE FreeBSD 5.3-STABLE #0: Fri Oct 22 21:12:42 PDT 2004 root@tomcat.kitchenlab.org:/usr/obj/usr/src/sys/NIMITZ5 i386 >Description: >How-To-Repeat: >Fix: The attached patch is a partial update of devel/subversion to the recently-released 1.1.1. It fixes (I think) the apr detection bug mentioned in ports/73015. One caveat is that I managed to break (or "not successfully update") the Perl bindings in this update. I would hazard a guess that the patch in ports/72665, which appears to address this issue, could be combined with this patch to produce something workable. I've tested WITH_PYTHON, WITH_MOD_DAV_SVN, WITH_SVNSERVE_WRAPPER, WITH_BOOK_HTML, and any options that are dependencies of these. --- subversion.patch begins here --- 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 () { -@@ -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 --- subversion.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: