diff -Nur subversion-1.6.17.orig/build/ltmain.sh subversion-1.6.17/build/ltmain.sh
--- subversion-1.6.17.orig/build/ltmain.sh 2011-05-23 17:51:35.000000000 -0400
+++ subversion-1.6.17/build/ltmain.sh 2011-11-22 18:52:43.000000000 -0500
@@ -2924,100 +2924,72 @@
fi
tmp_libs="$tmp_libs $deplib"
done
-
- if test "$link_all_deplibs" != no; then
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
- case $deplib in
- -L*) path="$deplib" ;;
- *.la)
- dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
- test "X$dir" = "X$deplib" && dir="."
- # We need an absolute path.
- case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
- *)
- absdir=`cd "$dir" && pwd`
- if test -z "$absdir"; then
- $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
- absdir="$dir"
- fi
- ;;
- esac
- if grep "^installed=no" $deplib > /dev/null; then
- path="$absdir/$objdir"
- else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -z "$libdir"; then
- $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
- exit $EXIT_FAILURE
- fi
- if test "$absdir" != "$libdir"; then
- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
- fi
- path="$absdir"
- fi
- depdepl=
- case $host in
- *-*-darwin*)
- # we do not want to link against static libs,
- # but need to link against shared
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
- depdepl=$tmp
- done
- if test -f "$deplibdir/$depdepl" ; then
- depdepl="$deplibdir/$depdepl"
- elif test -f "$path/$depdepl" ; then
- depdepl="$path/$depdepl"
- else
- # Can't find it, oh well...
- depdepl=
- fi
- # do not add paths which are already there
- case " $newlib_search_path " in
- *" $path "*) ;;
- *) newlib_search_path="$newlib_search_path $path";;
- esac
- fi
- path=""
- ;;
- *)
- path="-L$path"
- ;;
- esac
- ;;
- -l*)
- case $host in
- *-*-darwin*)
- # Again, we only want to link against shared libraries
- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
- for tmp in $newlib_search_path ; do
- if test -f "$tmp/lib$tmp_libs.dylib" ; then
- eval depdepl="$tmp/lib$tmp_libs.dylib"
- break
- fi
- done
- path=""
- ;;
- *) continue ;;
- esac
- ;;
- *) continue ;;
- esac
- case " $deplibs " in
- *" $path "*) ;;
- *) deplibs="$path $deplibs" ;;
- esac
- case " $deplibs " in
- *" $depdepl "*) ;;
- *) deplibs="$depdepl $deplibs" ;;
- esac
- done
- fi # link_all_deplibs != no
- fi # linkmode = lib
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+# func_dirname "$deplib" "" "."
+# dir="$func_dirname_result"
+ case "$deplib" in
+ */*) dir="${deplib%/*}" ;;
+ * ) dir="." ;;
+ esac
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+ absdir="$dir"
+ fi
+ ;;
+ esac
+ if grep "^installed=no" $deplib > /dev/null; then
+ case $host in
+ *-*-darwin*)
+ depdepl=
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+ if test -f "$absdir/$objdir/$depdepl" ; then
+ depdepl="$absdir/$objdir/$depdepl"
+ darwin_install_name=`otool -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -z "$darwin_install_name"; then
+ darwin_install_name=`otool64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ fi
+ compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+ linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+ path=
+ fi
+ fi
+ ;;
+ *)
+ path="-L$absdir/$objdir"
+ ;;
+ esac
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ test -z "$libdir" && \
+ $echo "\`$deplib' is not a valid libtool archive" 1>&2
+ test -z "$libdir" && exit 1
+ test "$absdir" != "$libdir" && \
+ $echo "\`$deplib' seems to be moved" 1>&2
+ path="-L$absdir"
+ fi
+ ;;
+ esac
+ case " $deplibs " in
+ *" $path "*) ;;
+ *) deplibs="$path $deplibs" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+ fi # linkmode = lib
done # for deplib in $libs
dependency_libs="$newdependency_libs"
if test "$pass" = dlpreopen; then
diff -Nur subversion-1.6.17.orig/build-outputs.mk subversion-1.6.17/build-outputs.mk
--- subversion-1.6.17.orig/build-outputs.mk 2011-05-26 14:49:18.000000000 -0400
+++ subversion-1.6.17/build-outputs.mk 2011-11-22 18:52:56.000000000 -0500
@@ -251,7 +251,7 @@
libsvn_fs_DEPS = $(SVN_FS_LIB_DEPS) subversion/libsvn_fs/access.lo subversion/libsvn_fs/fs-loader.lo subversion/libsvn_fs_util/libsvn_fs_util-1.la subversion/libsvn_subr/libsvn_subr-1.la
libsvn_fs_OBJECTS = access.lo fs-loader.lo
subversion/libsvn_fs/libsvn_fs-1.la: $(libsvn_fs_DEPS)
- cd subversion/libsvn_fs && $(LINK) -o libsvn_fs-1.la $(LT_NO_UNDEFINED) $(libsvn_fs_OBJECTS) ../../subversion/libsvn_fs_util/libsvn_fs_util-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_FS_LIB_LINK) $(SVN_APR_LIBS) $(LIBS)
+ cd subversion/libsvn_fs && $(LINK) -o libsvn_fs-1.la $(LT_NO_UNDEFINED) $(libsvn_fs_OBJECTS) ../../subversion/libsvn_fs_util/libsvn_fs_util-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_FS_LIB_LINK) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
libsvn_fs_base_PATH = subversion/libsvn_fs_base
libsvn_fs_base_DEPS = subversion/libsvn_fs_base/bdb/bdb-err.lo subversion/libsvn_fs_base/bdb/bdb_compat.lo subversion/libsvn_fs_base/bdb/changes-table.lo subversion/libsvn_fs_base/bdb/checksum-reps-table.lo subversion/libsvn_fs_base/bdb/copies-table.lo subversion/libsvn_fs_base/bdb/dbt.lo subversion/libsvn_fs_base/bdb/env.lo subversion/libsvn_fs_base/bdb/lock-tokens-table.lo subversion/libsvn_fs_base/bdb/locks-table.lo subversion/libsvn_fs_base/bdb/miscellaneous-table.lo subversion/libsvn_fs_base/bdb/node-origins-table.lo subversion/libsvn_fs_base/bdb/nodes-table.lo subversion/libsvn_fs_base/bdb/reps-table.lo subversion/libsvn_fs_base/bdb/rev-table.lo subversion/libsvn_fs_base/bdb/strings-table.lo subversion/libsvn_fs_base/bdb/txn-table.lo subversion/libsvn_fs_base/bdb/uuids-table.lo subversion/libsvn_fs_base/dag.lo subversion/libsvn_fs_base/err.lo subversion/libsvn_fs_base/fs.lo subversion/libsvn_fs_base/id.lo subversion/libsvn_fs_base/key-gen.lo subversion/libsvn_fs_base/lock.lo subversion/libsvn_fs_base/node-rev.lo subversion/libsvn_fs_base/reps-strings.lo subversion/libsvn_fs_base/revs-txns.lo subversion/libsvn_fs_base/trail.lo subversion/libsvn_fs_base/tree.lo subversion/libsvn_fs_base/util/fs_skels.lo subversion/libsvn_fs_base/uuid.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs_util/libsvn_fs_util-1.la
diff -Nur subversion-1.6.17.orig/fink/authz_svn.load subversion-1.6.17/fink/authz_svn.load
--- subversion-1.6.17.orig/fink/authz_svn.load 1969-12-31 19:00:00.000000000 -0500
+++ subversion-1.6.17/fink/authz_svn.load 2011-11-22 18:52:43.000000000 -0500
@@ -0,0 +1 @@
+LoadModule authz_svn_module @FINKPREFIX@/lib/apache2/modules/mod_authz_svn.so
diff -Nur subversion-1.6.17.orig/fink/dav_svn.conf subversion-1.6.17/fink/dav_svn.conf
--- subversion-1.6.17.orig/fink/dav_svn.conf 1969-12-31 19:00:00.000000000 -0500
+++ subversion-1.6.17/fink/dav_svn.conf 2011-11-22 18:52:43.000000000 -0500
@@ -0,0 +1,44 @@
+# dav_svn.conf - Example Subversion/Apache configuration
+#
+# For details and further options see the Apache user manual and
+# the Subversion book.
+
+# ...
+# URL controls how the repository appears to the outside world.
+# In this example clients access the repository as http://hostname/svn/
+
+
+ # Uncomment this to enable the repository,
+ # DAV svn
+
+ # Set this to the path to your repository
+ # SVNPath @FINKPREFIX@/var/svn
+
+ # The following allows for basic http authentication. Basic authentication
+ # should not be considered secure for any particularly rigorous definition of
+ # secure.
+
+ # to create a passwd file
+ # # rm -f @FINKPREFIX@/etc/apache2/dav_svn.passwd
+ # # htpasswd2 -c @FINKPREFIX@/etc/apache2/dav_svn.passwd dwhedon
+ # New password:
+ # Re-type new password:
+ # Adding password for user dwhedon
+ # #
+
+ # Uncomment the following 3 lines to enable Basic Authentication
+ # AuthType Basic
+ # AuthName "Subversion Repository"
+ # AuthUserFile @FINKPREFIX@/etc/apache2/dav_svn.passwd
+
+ # Uncomment the following line to enable Authz Authentication
+ # AuthzSVNAccessFile @FINKPREFIX@/etc/apache2/dav_svn.authz
+
+ # The following three lines allow anonymous read, but make
+ # committers authenticate themselves.
+
+ #
+ # Require valid-user
+ #
+
+
diff -Nur subversion-1.6.17.orig/fink/dav_svn.load subversion-1.6.17/fink/dav_svn.load
--- subversion-1.6.17.orig/fink/dav_svn.load 1969-12-31 19:00:00.000000000 -0500
+++ subversion-1.6.17/fink/dav_svn.load 2011-11-22 18:52:43.000000000 -0500
@@ -0,0 +1,2 @@
+LoadModule dav_svn_module @FINKPREFIX@/lib/apache2/modules/mod_dav_svn.so
+LoadModule authz_svn_module @FINKPREFIX@/lib/apache2/modules/mod_authz_svn.so
diff -Nur subversion-1.6.17.orig/fink/httpd.conf subversion-1.6.17/fink/httpd.conf
--- subversion-1.6.17.orig/fink/httpd.conf 1969-12-31 19:00:00.000000000 -0500
+++ subversion-1.6.17/fink/httpd.conf 2011-11-22 18:52:43.000000000 -0500
@@ -0,0 +1,35 @@
+ServerRoot "@FINKBUILD@/fink/apache2"
+LockFile @FINKBUILD@/fink/apache2/accept.lock
+PidFile @FINKBUILD@/fink/apache2/apache2.pid
+AcceptMutex flock
+ErrorLog @FINKBUILD@/fink/apache2/error.log
+Listen 127.0.0.1:52080
+ServerName localhost:52080
+TypesConfig @FINKPREFIX@/etc/apache2/mime.types
+AddDefaultCharset UTF-8
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+LoadModule dav_module @FINKPREFIX@/lib/apache2/modules/mod_dav.so
+LoadModule dav_svn_module @FINKPREFIX@/lib/apache2/modules/mod_dav_svn.so
+LoadModule authz_svn_module @FINKPREFIX@/lib/apache2/modules/mod_authz_svn.so
+
+ DAV svn
+ SVNParentPath @FINKBUILD@/subversion/tests/cmdline/svn-test-work/repositories
+ AuthzSVNAccessFile @FINKBUILD@/subversion/tests/cmdline/svn-test-work/authz
+ AuthType Basic
+ AuthName "Subversion Repository"
+ AuthUserFile @FINKBUILD@/tools/test-scripts/svntest/dav_svn.passwd
+ Require valid-user
+
+
+
+ DAV svn
+ SVNPath @FINKBUILD@/subversion/tests/cmdline/svn-test-work/local_tmp/repos
+ AuthzSVNAccessFile @FINKBUILD@/subversion/tests/cmdline/svn-test-work/authz
+ AuthType Basic
+ AuthName "Subversion Repository"
+ AuthUserFile @FINKBUILD@/tools/test-scripts/svntest/dav_svn.passwd
+ Require valid-user
+