Date: Sun, 27 Jun 2010 00:26:48 +0200 (CEST) From: olli hauer <ohauer@gmx.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ohauer@gmx.de Subject: ports/148173: [patch] port devel/subversion update to 1.6.12 and rename rotten patchfiles Message-ID: <20100626222649.06325201F2@u18-124.dsl.vianetworks.de> Resent-Message-ID: <201006262230.o5QMU46G063216@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148173 >Category: ports >Synopsis: [patch] port devel/subversion update to 1.6.12 and rename rotten patchfiles >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: Sat Jun 26 22:30:03 UTC 2010 >Closed-Date: >Last-Modified: >Originator: olli hauer <ohauer@gmx.de> >Release: >Organization: >Environment: FreeBSD 7.3-RELEASE i386 >Description: - update subversion to from 1.6.11 to 1.6.12 - rename patch files, so new version off patches can be created with command 'make makepatch'. Main reason see: http://wiki.freebsd.org/PortsLongtermTargets section "Not using :: in patchfile name" patch-subversion::bindings::swig::perl::natives::Makefle.PL.in ==> patch-subversion__bindings__swig__perl__native__Makefile.PL.in patch-subversion::bindings::swig::perl::natives::Base.pm ==> patch-subversion__bindings__swig__perl__native__Base.pm patch-contrib--client-side--asvn ==> patch-contrib__client-side__asvn patch-build--ltmain.sh ==> patch-build__ltmain.sh build-outputs.mk.patch ==> extra-patch-build-outputs.mk.patch bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in ==> extra-patch-subversion__bindings__swig__perl__native__Makefile.PL.in @Philip M. Gollucci I take you to Cc because your mail to the subversion.devel list ;) >How-To-Repeat: >Fix: --- patch_subversion-1.6.12.txt begins here --- Index: Makefile.common =================================================================== --- Makefile.common (revision 4) +++ Makefile.common (working copy) @@ -5,8 +5,8 @@ # $FreeBSD: ports/devel/subversion/Makefile.common,v 1.36 2010/06/03 02:49:22 pgollucci Exp $ PORTNAME= subversion -PORTVERSION= 1.6.11 -PORTREVISION?= 3 +PORTVERSION= 1.6.12 +#PORTREVISION?= 3 CATEGORIES+= devel MASTER_SITES= http://subversion.tigris.org/downloads/:main \ http://svnbook.red-bean.com/en/1.5/:book @@ -135,7 +135,7 @@ .else LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion .endif -EXTRA_PATCHES+= ${PATCHDIR}/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-subversion__bindings__swig__perl__native__Makefile.PL.in .endif .if !defined(WITHOUT_NLS) Index: Makefile =================================================================== --- Makefile (revision 4) +++ Makefile (working copy) @@ -50,7 +50,7 @@ .if defined(WITH_SVNSERVE_WRAPPER) PLIST_SUB+= SVNSERVE_WRAPPER="" SUB_LIST+= SVNSERVE_BIN_EXT=".bin" -EXTRA_PATCHES= ${PATCHDIR}/build-outputs.mk.patch +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-build-outputs.mk.patch .else PLIST_SUB+= SVNSERVE_WRAPPER="@comment " SUB_LIST+= SVNSERVE_BIN_EXT="" Index: distinfo =================================================================== --- distinfo (revision 4) +++ distinfo (working copy) @@ -1,6 +1,6 @@ -MD5 (subversion/subversion-1.6.11.tar.bz2) = 75419159b50661092c4137449940b5cc -SHA256 (subversion/subversion-1.6.11.tar.bz2) = 64bd000ae30470d343c0725758bdd8288143393308eedc511c7826bb6731e59c -SIZE (subversion/subversion-1.6.11.tar.bz2) = 5486069 +MD5 (subversion/subversion-1.6.12.tar.bz2) = a4b1d0d7f3a4587c59da9c1acf9dedd0 +SHA256 (subversion/subversion-1.6.12.tar.bz2) = 8ebf17fb173ff9c482a72deaaf756c3ca595c99da15fc8f1f8f4310609284c8f +SIZE (subversion/subversion-1.6.12.tar.bz2) = 5476628 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb SIZE (subversion/svn-book-html.tar.bz2) = 406484 Index: files/patch-subversion__bindings__swig__perl__native__Makefile.PL.in =================================================================== --- files/patch-subversion__bindings__swig__perl__native__Makefile.PL.in (revision 0) +++ files/patch-subversion__bindings__swig__perl__native__Makefile.PL.in (revision 5) @@ -0,0 +1,39 @@ +--- 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 $_ } Property changes on: files/patch-subversion__bindings__swig__perl__native__Makefile.PL.in ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Index: files/extra-patch-build-outputs.mk.patch =================================================================== --- files/extra-patch-build-outputs.mk.patch (revision 0) +++ files/extra-patch-build-outputs.mk.patch (revision 5) @@ -0,0 +1,11 @@ +--- build-outputs.mk.orig Fri Sep 8 03:22:07 2006 ++++ build-outputs.mk Wed Sep 13 14:15:17 2006 +@@ -670,7 +670,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/svnsync ; $(INSTALL_BIN) svnsync$(EXEEXT) $(DESTDIR)$(bindir)/svnsync$(EXEEXT) + cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT) + Index: files/extra-patch-subversion__bindings__swig__perl__native__Makefile.PL.in =================================================================== --- files/extra-patch-subversion__bindings__swig__perl__native__Makefile.PL.in (revision 0) +++ files/extra-patch-subversion__bindings__swig__perl__native__Makefile.PL.in (revision 5) @@ -0,0 +1,11 @@ +--- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2008-02-03 00:14:22.000000000 +0300 ++++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-02-03 00:14:55.000000000 +0300 +@@ -44,7 +44,7 @@ + " -I$svnlib_builddir", + " -I$swig_srcdir -g"), + OBJECT => q/$(O_FILES)/, +- LIBS => [join(' ', $apr_ldflags, ++ LIBS => [join(' ', $ENV{'LDFLAGS'}, $apr_ldflags, + (map {$_ = abs_path($_); "-L$_"} @ldpaths), + @ldmodules, '-lsvn_swig_perl-1', + `$swig -perl -ldflags`)], Property changes on: files/extra-patch-subversion__bindings__swig__perl__native__Makefile.PL.in ___________________________________________________________________ Added: svn:mime-type + text/plain Index: files/patch-contrib__client-side__asvn =================================================================== --- files/patch-contrib__client-side__asvn (revision 0) +++ files/patch-contrib__client-side__asvn (revision 5) @@ -0,0 +1,123 @@ +--- contrib/client-side/asvn.orig 2008-01-28 03:24:25.000000000 +0300 ++++ contrib/client-side/asvn 2009-04-29 15:41:48.000000000 +0400 +@@ -42,7 +42,7 @@ + # $LastChangedBy: blair $ + # $LastChangedRevision: 29065 $ + +-SVN=/usr/bin/svn ++SVN=/usr/local/bin/svn + ACTION="" + DEV_PROP="dir:devices" + SYM_PROP="dir:symlinks" +@@ -52,7 +52,7 @@ + TMPFILE2=/tmp/asvn.tmp2.$$ + PCWD=`/bin/pwd` + SKIPSVN='\( -name .svn -prune -false \)' +-PRINTDETAILS="-printf \"file='%p' mode=%m user=%u(%U) group=%g(%G)\n\"" ++PRINTDETAILS="-printf \"file='%p' mode=%m user=(%U) group=(%G)\n\"" + + trap cleanup 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 + +@@ -64,7 +64,8 @@ + function basedirname() + { + refname="$1" +- dir="`dirname \"$2\"`" ++ shift ++ dir="`dirname \"$*\"`" + ref="`expr \"$dir\" : \"$refname/\(.*\)\"`" + if [ -z "$ref" ] + then +@@ -111,7 +112,7 @@ + + function recorddirinfo + { +- eval "find $PCWD $SKIPSVN -o \( -type d ! -name .svn -print \)" |while read dirlist ++ eval "gfind \"$PCWD\" $SKIPSVN -o \( -type d ! -name .svn -print \)" |while read dirlist + do + updatedirsymlinks $1 "$dirlist" + updatedirdevices $1 "$dirlist" +@@ -132,7 +133,7 @@ + # + # Obtain the list of devices in this directory + # +- find "$dir" \( \( -type b -o -type c -o -type p \) -print \) -o -type d ! -name "`basename \"$dir\"`" -prune | while read file ++ gfind "$dir" \( \( -type b -o -type c -o -type p \) -print \) -o -type d ! -name "`basename \"$dir\"`" -prune | while read file + do + echo -n `find "$file" -printf "file='%f' mode=%m user=%u(%U) group=%g(%G)"` + [ -b "$file" ] && echo -n ' type=b' +@@ -200,10 +201,10 @@ + grep -q "$info" $TMPFILE && continue # This line still matches + file="`expr \"$info\" : \"file='\(.*\)' \"`" + mode=`expr "$info" : ".*' mode=\([0-9]*\) "` +- user=`expr "$info" : ".* user=\([^(]*\)("` +- uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "` +- group=`expr "$info" : ".* group=\([^(]*\)("` +- gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "` ++# user=`expr "$info" : ".* user=\([^(]*\)("` ++ uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\)"` ++# group=`expr "$info" : ".* group=\([^(]*\)("` ++ gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\)"` + type=`expr "$info" : ".* type=\(.\)"` + major=`expr "$info" : ".* major=\([0-9]*\)"` + minor=`expr "$info" : ".* minor=\([0-9]*\)"` +@@ -213,7 +214,8 @@ + # + rm -f "$dir/$file" + mknod --mode=$mode "$dir/$file" $type $major $minor +- chown $user:$group "$dir/$file" ++# chown $user:$group "$dir/$file" ++ chown $uid:$gid "$dir/$file" + addignorefile "$dir/$file" + done + fi +@@ -234,7 +236,7 @@ + # + # Obtain the list of symlinks in this directory + # +- find "$dir" \( -type l -printf "file='%f' dest='%l'\n" \) -o -type d ! -name "`basename \"$dir\"`" -prune | ++ gfind "$dir" \( -type l -printf "file='%f' dest='%l'\n" \) -o -type d ! -name "`basename \"$dir\"`" -prune | + sort >$TMPFILE + + # +@@ -320,7 +322,7 @@ + # Find all the directories and files + cp /dev/null $TMPFILE + +- eval "find $PCWD $SKIPSVN -o \( \( -type d ! -name .svn \) -o -type f \) $PRINTDETAILS" | while read info ++ eval "gfind \"$PCWD\" $SKIPSVN -o \( \( -type d ! -name .svn \) -o -type f \) $PRINTDETAILS" | while read info + do + device=`expr "$info" : "file='\(.*\)' mode"` + info=`expr "$info" : "file='.*' \(mode.*\)"` +@@ -343,15 +345,16 @@ + else + info=`$SVN propget $FILE_PROP "$dir/$file"` + mode=`expr "$info" : "mode=\([0-9]*\) "` +- user=`expr "$info" : ".* user=\([^(]*\)("` +- uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "` +- group=`expr "$info" : ".* group=\([^(]*\)("` +- gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "` +- if [ "$user" = "" -o "$group" = "" -o "$mode" = "" ] ++# user=`expr "$info" : ".* user=\([^(]*\)("` ++ uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\)"` ++# group=`expr "$info" : ".* group=\([^(]*\)("` ++ gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\)"` ++ if [ "$uid" = "" -o "$gid" = "" -o "$mode" = "" ] + then + echo "property $FILE_PROP not set for $dir/$file" + else +- chown $user:$group "$dir/$file" ++# chown $user:$group "$dir/$file" ++ chown $uid:$gid "$dir/$file" + chmod $mode "$dir/$file" + fi + fi +@@ -391,7 +394,7 @@ + + [ "$ACTION" = "pre" ] && pre_checkin $@ + +-$SVN $@ ++$SVN "$@" + + [ $? = 0 -a "$ACTION" = "post" ] && post_checkout $@ + Index: files/patch-build__ltmain.sh =================================================================== --- files/patch-build__ltmain.sh (revision 0) +++ files/patch-build__ltmain.sh (revision 5) @@ -0,0 +1,11 @@ +--- ./build/ltmain.sh.orig 2010-03-31 20:37:12.000000000 +0200 ++++ ./build/ltmain.sh 2010-06-26 22:53:58.000000000 +0200 +@@ -1607,7 +1607,7 @@ + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) ++ *-*-openbsd* | *-*-freebsd4* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; Property changes on: files/patch-build__ltmain.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Added: svn:eol-style + native Index: files/patch-subversion__bindings__swig__perl__native__Base.pm =================================================================== --- files/patch-subversion__bindings__swig__perl__native__Base.pm (revision 0) +++ files/patch-subversion__bindings__swig__perl__native__Base.pm (revision 5) @@ -0,0 +1,10 @@ +--- subversion/bindings/swig/perl/native/Base.pm.orig 2004-10-20 10:46:59.000000000 +0400 ++++ subversion/bindings/swig/perl/native/Base.pm 2004-11-05 11:43:35.578125000 +0300 +@@ -60,6 +60,7 @@ + package SVN::_$pkg; + require DynaLoader; + bootstrap SVN::_$pkg; ++sub dl_load_flags { 0x01 } + 1; + ' or die $@; + }; Property changes on: files/patch-subversion__bindings__swig__perl__native__Base.pm ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + text/plain Added: svn:eol-style + native Index: files/build-outputs.mk.patch =================================================================== --- files/build-outputs.mk.patch (revision 4) +++ files/build-outputs.mk.patch (working copy) @@ -1,11 +0,0 @@ ---- build-outputs.mk.orig Fri Sep 8 03:22:07 2006 -+++ build-outputs.mk Wed Sep 13 14:15:17 2006 -@@ -670,7 +670,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/svnsync ; $(INSTALL_BIN) svnsync$(EXEEXT) $(DESTDIR)$(bindir)/svnsync$(EXEEXT) - cd subversion/svnversion ; $(INSTALL_BIN) svnversion$(EXEEXT) $(DESTDIR)$(bindir)/svnversion$(EXEEXT) - Index: files/patch-build--ltmain.sh =================================================================== --- files/patch-build--ltmain.sh (revision 4) +++ files/patch-build--ltmain.sh (working copy) @@ -1,11 +0,0 @@ ---- build/ltmain.sh.orig Fri May 20 21:41:54 2005 -+++ build/ltmain.sh Wed May 25 14:38:21 2005 -@@ -1492,7 +1492,7 @@ - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) -+ *-*-openbsd* | *-*-freebsd4* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; Index: files/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in =================================================================== --- files/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in (revision 4) +++ files/bindings-patch-subversion--bindings--swig--perl--native--Makefile.PL.in (working copy) @@ -1,11 +0,0 @@ ---- subversion/bindings/swig/perl/native/Makefile.PL.in.orig 2008-02-03 00:14:22.000000000 +0300 -+++ subversion/bindings/swig/perl/native/Makefile.PL.in 2008-02-03 00:14:55.000000000 +0300 -@@ -44,7 +44,7 @@ - " -I$svnlib_builddir", - " -I$swig_srcdir -g"), - OBJECT => q/$(O_FILES)/, -- LIBS => [join(' ', $apr_ldflags, -+ LIBS => [join(' ', $ENV{'LDFLAGS'}, $apr_ldflags, - (map {$_ = abs_path($_); "-L$_"} @ldpaths), - @ldmodules, '-lsvn_swig_perl-1', - `$swig -perl -ldflags`)], Index: files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in =================================================================== --- files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in (revision 4) +++ files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in (working copy) @@ -1,39 +0,0 @@ ---- 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 $_ } Index: files/patch-contrib--client-side--asvn =================================================================== --- files/patch-contrib--client-side--asvn (revision 4) +++ files/patch-contrib--client-side--asvn (working copy) @@ -1,123 +0,0 @@ ---- contrib/client-side/asvn.orig 2008-01-28 03:24:25.000000000 +0300 -+++ contrib/client-side/asvn 2009-04-29 15:41:48.000000000 +0400 -@@ -42,7 +42,7 @@ - # $LastChangedBy: blair $ - # $LastChangedRevision: 29065 $ - --SVN=/usr/bin/svn -+SVN=/usr/local/bin/svn - ACTION="" - DEV_PROP="dir:devices" - SYM_PROP="dir:symlinks" -@@ -52,7 +52,7 @@ - TMPFILE2=/tmp/asvn.tmp2.$$ - PCWD=`/bin/pwd` - SKIPSVN='\( -name .svn -prune -false \)' --PRINTDETAILS="-printf \"file='%p' mode=%m user=%u(%U) group=%g(%G)\n\"" -+PRINTDETAILS="-printf \"file='%p' mode=%m user=(%U) group=(%G)\n\"" - - trap cleanup 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 - -@@ -64,7 +64,8 @@ - function basedirname() - { - refname="$1" -- dir="`dirname \"$2\"`" -+ shift -+ dir="`dirname \"$*\"`" - ref="`expr \"$dir\" : \"$refname/\(.*\)\"`" - if [ -z "$ref" ] - then -@@ -111,7 +112,7 @@ - - function recorddirinfo - { -- eval "find $PCWD $SKIPSVN -o \( -type d ! -name .svn -print \)" |while read dirlist -+ eval "gfind \"$PCWD\" $SKIPSVN -o \( -type d ! -name .svn -print \)" |while read dirlist - do - updatedirsymlinks $1 "$dirlist" - updatedirdevices $1 "$dirlist" -@@ -132,7 +133,7 @@ - # - # Obtain the list of devices in this directory - # -- find "$dir" \( \( -type b -o -type c -o -type p \) -print \) -o -type d ! -name "`basename \"$dir\"`" -prune | while read file -+ gfind "$dir" \( \( -type b -o -type c -o -type p \) -print \) -o -type d ! -name "`basename \"$dir\"`" -prune | while read file - do - echo -n `find "$file" -printf "file='%f' mode=%m user=%u(%U) group=%g(%G)"` - [ -b "$file" ] && echo -n ' type=b' -@@ -200,10 +201,10 @@ - grep -q "$info" $TMPFILE && continue # This line still matches - file="`expr \"$info\" : \"file='\(.*\)' \"`" - mode=`expr "$info" : ".*' mode=\([0-9]*\) "` -- user=`expr "$info" : ".* user=\([^(]*\)("` -- uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "` -- group=`expr "$info" : ".* group=\([^(]*\)("` -- gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "` -+# user=`expr "$info" : ".* user=\([^(]*\)("` -+ uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\)"` -+# group=`expr "$info" : ".* group=\([^(]*\)("` -+ gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\)"` - type=`expr "$info" : ".* type=\(.\)"` - major=`expr "$info" : ".* major=\([0-9]*\)"` - minor=`expr "$info" : ".* minor=\([0-9]*\)"` -@@ -213,7 +214,8 @@ - # - rm -f "$dir/$file" - mknod --mode=$mode "$dir/$file" $type $major $minor -- chown $user:$group "$dir/$file" -+# chown $user:$group "$dir/$file" -+ chown $uid:$gid "$dir/$file" - addignorefile "$dir/$file" - done - fi -@@ -234,7 +236,7 @@ - # - # Obtain the list of symlinks in this directory - # -- find "$dir" \( -type l -printf "file='%f' dest='%l'\n" \) -o -type d ! -name "`basename \"$dir\"`" -prune | -+ gfind "$dir" \( -type l -printf "file='%f' dest='%l'\n" \) -o -type d ! -name "`basename \"$dir\"`" -prune | - sort >$TMPFILE - - # -@@ -320,7 +322,7 @@ - # Find all the directories and files - cp /dev/null $TMPFILE - -- eval "find $PCWD $SKIPSVN -o \( \( -type d ! -name .svn \) -o -type f \) $PRINTDETAILS" | while read info -+ eval "gfind \"$PCWD\" $SKIPSVN -o \( \( -type d ! -name .svn \) -o -type f \) $PRINTDETAILS" | while read info - do - device=`expr "$info" : "file='\(.*\)' mode"` - info=`expr "$info" : "file='.*' \(mode.*\)"` -@@ -343,15 +345,16 @@ - else - info=`$SVN propget $FILE_PROP "$dir/$file"` - mode=`expr "$info" : "mode=\([0-9]*\) "` -- user=`expr "$info" : ".* user=\([^(]*\)("` -- uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "` -- group=`expr "$info" : ".* group=\([^(]*\)("` -- gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "` -- if [ "$user" = "" -o "$group" = "" -o "$mode" = "" ] -+# user=`expr "$info" : ".* user=\([^(]*\)("` -+ uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\)"` -+# group=`expr "$info" : ".* group=\([^(]*\)("` -+ gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\)"` -+ if [ "$uid" = "" -o "$gid" = "" -o "$mode" = "" ] - then - echo "property $FILE_PROP not set for $dir/$file" - else -- chown $user:$group "$dir/$file" -+# chown $user:$group "$dir/$file" -+ chown $uid:$gid "$dir/$file" - chmod $mode "$dir/$file" - fi - fi -@@ -391,7 +394,7 @@ - - [ "$ACTION" = "pre" ] && pre_checkin $@ - --$SVN $@ -+$SVN "$@" - - [ $? = 0 -a "$ACTION" = "post" ] && post_checkout $@ - Index: files/patch-subversion::bindings::swig::perl::natives::Base.pm =================================================================== --- files/patch-subversion::bindings::swig::perl::natives::Base.pm (revision 4) +++ files/patch-subversion::bindings::swig::perl::natives::Base.pm (working copy) @@ -1,10 +0,0 @@ ---- subversion/bindings/swig/perl/native/Base.pm.orig 2004-10-20 10:46:59.000000000 +0400 -+++ subversion/bindings/swig/perl/native/Base.pm 2004-11-05 11:43:35.578125000 +0300 -@@ -60,6 +60,7 @@ - package SVN::_$pkg; - require DynaLoader; - bootstrap SVN::_$pkg; -+sub dl_load_flags { 0x01 } - 1; - ' or die $@; - }; --- patch_subversion-1.6.12.txt ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100626222649.06325201F2>