aboutsummaryrefslogtreecommitdiff
path: root/devel/subversion-freebsd/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/subversion-freebsd/files')
-rw-r--r--devel/subversion-freebsd/files/build-outputs.mk.patch11
-rw-r--r--devel/subversion-freebsd/files/patch-build--ac-macros--neon.m417
-rw-r--r--devel/subversion-freebsd/files/patch-build--ltmain.sh11
-rw-r--r--devel/subversion-freebsd/files/patch-configure29
-rw-r--r--devel/subversion-freebsd/files/patch-contrib--client-side--asvn267
-rw-r--r--devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Base.pm10
-rw-r--r--devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in39
-rw-r--r--devel/subversion-freebsd/files/svnserve.sh.in35
-rw-r--r--devel/subversion-freebsd/files/svnserve.wrapper9
9 files changed, 0 insertions, 428 deletions
diff --git a/devel/subversion-freebsd/files/build-outputs.mk.patch b/devel/subversion-freebsd/files/build-outputs.mk.patch
deleted file mode 100644
index 60a73547df27..000000000000
--- a/devel/subversion-freebsd/files/build-outputs.mk.patch
+++ /dev/null
@@ -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)
-
diff --git a/devel/subversion-freebsd/files/patch-build--ac-macros--neon.m4 b/devel/subversion-freebsd/files/patch-build--ac-macros--neon.m4
deleted file mode 100644
index eb1660263b85..000000000000
--- a/devel/subversion-freebsd/files/patch-build--ac-macros--neon.m4
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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-build--ltmain.sh b/devel/subversion-freebsd/files/patch-build--ltmain.sh
deleted file mode 100644
index 1e37810f843c..000000000000
--- a/devel/subversion-freebsd/files/patch-build--ltmain.sh
+++ /dev/null
@@ -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
- ;;
diff --git a/devel/subversion-freebsd/files/patch-configure b/devel/subversion-freebsd/files/patch-configure
deleted file mode 100644
index 00585c90f32f..000000000000
--- a/devel/subversion-freebsd/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig Thu Jan 18 01:17:34 2007
-+++ configure Sat Mar 17 10:48:49 2007
-@@ -3942,7 +3942,7 @@
-
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- # Check whether --enable-neon-version-check or --disable-neon-version-check was given.
-@@ -4004,7 +4004,7 @@
- test "$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
-@@ -4345,7 +4345,7 @@
- test "$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-contrib--client-side--asvn b/devel/subversion-freebsd/files/patch-contrib--client-side--asvn
deleted file mode 100644
index c8be147d7d77..000000000000
--- a/devel/subversion-freebsd/files/patch-contrib--client-side--asvn
+++ /dev/null
@@ -1,267 +0,0 @@
---- contrib/client-side/asvn.orig Tue Jun 15 06:02:44 2004
-+++ contrib/client-side/asvn Mon Sep 11 17:07:04 2006
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #-------------------------------------------------------------------------
- # Author: Ross Mark (rossm@controllingedge.com.au)
- # Date: Tue Mar 11 10:02:57 EST 2003
-@@ -46,7 +46,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
-
-@@ -58,7 +58,8 @@
- function basedirname()
- {
- refname="$1"
-- dir="`dirname $2`"
-+ shift
-+ dir="`dirname \"$*\"`"
- ref=`expr "$dir" : "$refname/\(.*\)"`
- if [ -z "$ref" ]
- then
-@@ -105,10 +106,10 @@
-
- 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
-+ updatedirsymlinks $1 "$dirlist"
-+ updatedirdevices $1 "$dirlist"
- done
- }
-
-@@ -126,15 +127,15 @@
- #
- # 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'
-- [ -c $file ] && echo -n ' type=c'
-- [ -p $file ] && echo ' type=p'
-- if [ -b $file -o -c $file ]
-+ echo -n `gfind "$file" -printf "file='%f' mode=%m user=%u(%U) group=%g(%G)"`
-+ [ -b "$file" ] && echo -n ' type=b'
-+ [ -c "$file" ] && echo -n ' type=c'
-+ [ -p "$file" ] && echo ' type=p'
-+ if [ -b "$file" -o -c "$file" ]
- then
-- ls -l $file |
-+ ls -l "$file" |
- sed -e 's/^[-lcpbrdwxXstugoTS]* *[0-9] [^ ]* *[^ ]* *\([0-9]*\), *\([0-9]*\) .*/ major=\1 minor=\2/'
- fi
- # In this case file is the full path.
-@@ -145,7 +146,7 @@
- #
- # Obtain the currently defined devices
- #
-- $SVN propget $DEV_PROP $dir >$TMPFILE1
-+ $SVN propget $DEV_PROP "$dir" >$TMPFILE1
-
- #
- # If the two list are the same then there is nothing to do.
-@@ -161,7 +162,7 @@
- if [ "$CHECKIN" = "true" ]
- then
- # Add the current devices to the property
-- $SVN propset $DEV_PROP $dir -F $TMPFILE
-+ $SVN propset $DEV_PROP "$dir" -F $TMPFILE
- else
- # Delete all the unwanted devices ie not in TMPFILE1
- cat $TMPFILE |while read line
-@@ -169,8 +170,8 @@
- file=`expr "$line" : "file='\(.*\)' mode"`
- if ! grep -q "file='$file'" $TMPFILE1
- then
-- rm $file
-- deleteignorefile $file
-+ rm "$file"
-+ deleteignorefile "$file"
- fi
- done
- fi
-@@ -178,7 +179,7 @@
- # There are no devices in this directory
- if [ "$CHECKIN" = "true" ]
- then
-- $SVN propdel $DEV_PROP $dir
-+ $SVN propdel $DEV_PROP "$dir"
- fi
- fi
-
-@@ -194,10 +195,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]*\)"`
-@@ -205,10 +206,11 @@
- # This file is either missing or wrong
- # Delete the old and create it anew.
- #
-- rm -f $dir/$file
-- mknod --mode=$mode $dir/$file $type $major $minor
-- chown $user:$group $dir/$file
-- addignorefile $dir/$file
-+ rm -f "$dir/$file"
-+ mknod --mode=$mode "$dir/$file" $type $major $minor
-+# chown $user:$group $dir/$file
-+ chown $uid:$gid "$dir/$file"
-+ addignorefile "$dir/$file"
- done
- fi
- }
-@@ -228,7 +230,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
-
- #
-@@ -243,7 +245,7 @@
- #
- # Obtain the currently defined symlinks
- #
-- $SVN propget $SYM_PROP $dir >$TMPFILE1
-+ $SVN propget $SYM_PROP "$dir" >$TMPFILE1
-
- #
- # If the two list are the same then there is nothing to do.
-@@ -259,7 +261,7 @@
- if [ "$CHECKIN" = "true" ]
- then
- # Add the current symlinks to the property
-- $SVN propset $SYM_PROP $dir -F $TMPFILE
-+ $SVN propset $SYM_PROP "$dir" -F $TMPFILE
- else
- # Delete all the unwanted symlinks
- cat $TMPFILE |while read line
-@@ -268,8 +270,8 @@
- efile="`echo $file |sed -e 's!\([\[\(\$]\)!\\\\\1!g'`"
- if ! grep -q "file='$efile'" $TMPFILE1
- then
-- rm $dir/$file
-- deleteignorefile $dir/$file
-+ rm "$dir/$file"
-+ deleteignorefile "$dir/$file"
- fi
- done
- fi
-@@ -277,7 +279,7 @@
- # There are no symlinks in this directory
- if [ "$CHECKIN" = "true" ]
- then
-- $SVN propdel $SYM_PROP $dir
-+ $SVN propdel $SYM_PROP "$dir"
- fi
- fi
-
-@@ -294,10 +296,10 @@
-
- if [ -L $dir/$file ]
- then
-- [ "`find $dir/$file -printf '%l'`" = "$dest" ] && continue
-+ [ "`gfind \"$dir/$file\" -printf '%l'`" = "$dest" ] && continue
- fi
-- rm -f $dir/$file
-- ln -s $dest $dir/$file
-+ rm -f "$dir/$file"
-+ ln -s $dest "$dir/$file"
- done
- fi
- }
-@@ -313,37 +315,39 @@
-
- # 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.*\)"`
-+# echo DEBUG: device vale $device
- if [ "$PCWD" = "$device" ]
- then
- dir="."
- file=""
- else
-- dir="`basedirname $PCWD $device`"
-- file="`basename $device`"
-+ dir="`basedirname \"$PCWD\" $device`"
-+ file=`basename "$device"`
- fi
- # see if the properties have changed.
-- if [ "`$SVN propget $FILE_PROP $dir/$file`" != "$info" ]
-+ if [ "`$SVN propget $FILE_PROP \"$dir/$file\"`" != "$info" ]
- then
- if [ "$CHECKIN" = "true" ]
- then
-- $SVN propset $FILE_PROP "$info" $dir/$file
-+ $SVN propset $FILE_PROP "$info" "$dir/$file"
- 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
-- chmod $mode $dir/$file
-+# chown $user:$group $dir/$file
-+ chown $uid:$gid "$dir/$file"
-+ chmod $mode "$dir/$file"
- fi
- fi
- fi
-@@ -364,8 +368,9 @@
- if [ "$CHDIR" = "true" ]
- then
- shift $(($# -1))
-- cd $1
-- PCWD="$PCWD/$1"
-+ WD=`echo $1 | sed "s/\/$//" | awk -F "/" '{print $(NF)}' `
-+ cd $WD
-+ PCWD="$PCWD/$WD"
- fi
- recorddirinfo
- recordpermissions
-@@ -382,7 +387,7 @@
-
- [ "$ACTION" = "pre" ] && pre_checkin $@
-
--$SVN $@
-+$SVN "$@"
-
- [ $? = 0 -a "$ACTION" = "post" ] && post_checkout $@
-
diff --git a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Base.pm b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Base.pm
deleted file mode 100644
index 143db2f1ce38..000000000000
--- a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Base.pm
+++ /dev/null
@@ -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 $@;
- };
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
deleted file mode 100644
index d26dc6f84b53..000000000000
--- a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::perl::natives::Makefle.PL.in
+++ /dev/null
@@ -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 $_ }
diff --git a/devel/subversion-freebsd/files/svnserve.sh.in b/devel/subversion-freebsd/files/svnserve.sh.in
deleted file mode 100644
index 62d349a1c2ec..000000000000
--- a/devel/subversion-freebsd/files/svnserve.sh.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# svnserve.sh for rc.d usage (c) 2005 Thomas E. Spanjaard.
-# $Id$
-
-# PROVIDE: svnserve
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable SVNServe:
-#
-# svnserve_enable="YES"
-# # optional
-# svnserve_flags="-d --listen-port=3690"
-# svnserve_data="/usr/local/repositories"
-# svnserve_user="svn"
-# svnserve_group="svn"
-
-. "%%RC_SUBR%%"
-
-# Set some defaults
-svnserve_enable=${svnserve_enable:-"NO"}
-svnserve_flags=${svnserve_flags:-"-d --listen-port=3690"}
-svnserve_data=${svnserve_data:-"%%PREFIX%%/repositories"}
-svnserve_user=${svnserve_user:-"svn"}
-svnserve_group=${svnserve_group:-"svn"}
-
-name=svnserve
-rcvar=`set_rcvar`
-load_rc_config $name
-command=%%PREFIX%%/bin/svnserve
-command_args="-r ${svnserve_data}"
-
-run_rc_command "$1"
diff --git a/devel/subversion-freebsd/files/svnserve.wrapper b/devel/subversion-freebsd/files/svnserve.wrapper
deleted file mode 100644
index 92fffc384652..000000000000
--- a/devel/subversion-freebsd/files/svnserve.wrapper
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-SVNSERVE=$(dirname $(realpath $0))/svnserve.bin
-
-umask 002
-$SVNSERVE "$@"
-