summaryrefslogtreecommitdiff
path: root/devel/subversion/patches
diff options
context:
space:
mode:
authorepg <epg>2003-06-18 13:26:25 +0000
committerepg <epg>2003-06-18 13:26:25 +0000
commit5fd378ccb53b191caddbe4a9d69d2bfc12c66f0f (patch)
treebc94cdd21d1cbcfdb1e3c101ee0e1a99487c50ca /devel/subversion/patches
parentdffae77fa23cf8c3b100100fb3f48735cc1b38dc (diff)
downloadpkgsrc-5fd378ccb53b191caddbe4a9d69d2bfc12c66f0f.tar.gz
Update to 0.24.1.
subversion-base no longer installs info files; drop texinfo.mk usage. Upstream change log: Version 0.24.1 (released 16 June 2003, revision 6249, branches/release-0.24.1) User-visible changes: * Fix bug in 'svn log'. Developer-visible changes: * none Version 0.24.0 (released 15 June 2003, revision 6234, branches/release-0.24.0) User-visible changes: * new 'svn diff [--old OLD] [--new NEW]' syntax (#1142) * new --relocate option for svn switch (#951) * new --version option for svnadmin and svnlook * new path-based authorization module for apache * make 'svn checkout' and not just 'svn update' resume a checkout * .svn directories now hidden on Windows * config variable 'store-password = no' now actually works * fix 'svn merge --dry-run' * fix 'properties hanging after a rename' issue (#1303) * fix odd behavior of 'svn up -r PREV filename' (#1304) * fix delete-tracking bug (#1348) * fix dump and load corner cases (#1290) * ra_dav server more resilient for foreign deltaV clients * numerous ra_svn changes - must update clients and servers * fix export over ra_svn (#1318) * fix ra_svn error transmission bug (#1146) * fix ra_svn corruption in tunnel mode (#1145) * make svnserve multi-threaded on non-fork platforms (now works on Windows) * remove svnserve -F and -S options * various memory use improvements (#1323) * various performance improvements for all protocols * various performance improvements for 'svnadmin dump' and svnlook * various subversion book updates (you have read the book right?) * more cvs2svn.py improvements (and more to follow) * new debugging script normalize-dump.py to normalize dump output Developer-visible changes: * path-based editor drivers * no more RA->do_checkout() * update python and java bindings * various windows build fixes
Diffstat (limited to 'devel/subversion/patches')
-rw-r--r--devel/subversion/patches/patch-aa33
-rw-r--r--devel/subversion/patches/patch-ad12
2 files changed, 27 insertions, 18 deletions
diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
index ac56a6f7c12..52ebcf5e151 100644
--- a/devel/subversion/patches/patch-aa
+++ b/devel/subversion/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
+$NetBSD: patch-aa,v 1.4 2003/06/18 13:26:26 epg Exp $
---- build-outputs.mk.orig Tue Apr 15 20:16:02 2003
+--- build-outputs.mk.orig Mon Jun 16 08:27:37 2003
+++ build-outputs.mk
@@ -109,10 +109,10 @@ libsvn_swig_java_OBJECTS = swigutil_java
subversion/bindings/swig/libsvn_swig_java-1.la: $(libsvn_swig_java_DEPS)
@@ -15,9 +15,16 @@ $NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
libsvn_test_DEPS = subversion/tests/svn_test_editor.lo subversion/tests/svn_tests_main.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
libsvn_test_OBJECTS = svn_test_editor.lo svn_tests_main.lo
-@@ -134,10 +134,10 @@ md5args_OBJECTS = md5args.o
- subversion/tests/libsvn_repos/md5args: $(md5args_DEPS)
- cd subversion/tests/libsvn_repos && $(LINK) -o md5args $(md5args_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+@@ -134,15 +134,15 @@ md5args_OBJECTS = md5args.o
+ subversion/tests/libsvn_repos/md5args$(EXEEXT): $(md5args_DEPS)
+ cd subversion/tests/libsvn_repos && $(LINK) -o md5args$(EXEEXT) $(md5args_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+
+-mod_authz_svn_DEPS = subversion/mod_authz_svn/mod_authz_svn.lo subversion/libsvn_subr/libsvn_subr-1.la
++mod_authz_svn_DEPS = subversion/mod_authz_svn/mod_authz_svn.lo
+ mod_authz_svn_OBJECTS = mod_authz_svn.lo
+ subversion/mod_authz_svn/mod_authz_svn.la: $(mod_authz_svn_DEPS)
+- cd subversion/mod_authz_svn && $(LINK_APACHE_MOD) -o mod_authz_svn.la $(mod_authz_svn_OBJECTS) ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
++ cd subversion/mod_authz_svn && $(LINK_APACHE_MOD) -o mod_authz_svn.la $(mod_authz_svn_OBJECTS) -lsvn_subr-1 $(LIBS)
-mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
+mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
@@ -28,7 +35,7 @@ $NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
path_test_DEPS = subversion/tests/libsvn_subr/path-test.o subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la
path_test_OBJECTS = path-test.o
-@@ -214,40 +214,40 @@ java_wc_OBJECTS = svn_wc.lo
+@@ -219,40 +219,40 @@ java_wc_OBJECTS = svn_wc.lo
subversion/bindings/swig/java/_wc.la: $(java_wc_DEPS)
cd subversion/bindings/swig/java && $(LINK_JAVA_WRAPPER) -o _wc.la $(java_wc_OBJECTS) ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/bindings/swig/libsvn_swig_java-1.la $(LIBS)
@@ -39,6 +46,13 @@ $NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
- cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(python_client_OBJECTS) ../../../../subversion/libsvn_client/libsvn_client-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+ cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(python_client_OBJECTS) -lsvn_client-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+-python_core_DEPS = subversion/bindings/swig/python/core.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/libsvn_swig_py-1.la
++python_core_DEPS = subversion/bindings/swig/python/core.lo subversion/bindings/swig/libsvn_swig_py-1.la
+ python_core_OBJECTS = core.lo
+ subversion/bindings/swig/python/_core.la: $(python_core_DEPS)
+- cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(python_core_OBJECTS) ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
++ cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(python_core_OBJECTS) -lsvn_subr-1 $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+
-python_delta_DEPS = subversion/bindings/swig/python/svn_delta.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/bindings/swig/libsvn_swig_py-1.la
+python_delta_DEPS = subversion/bindings/swig/python/svn_delta.lo subversion/bindings/swig/libsvn_swig_py-1.la
python_delta_OBJECTS = svn_delta.lo
@@ -67,13 +81,6 @@ $NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
- cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(python_repos_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+ cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(python_repos_OBJECTS) -lsvn_repos-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
--python_util_DEPS = subversion/bindings/swig/python/util.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/libsvn_swig_py-1.la
-+python_util_DEPS = subversion/bindings/swig/python/util.lo subversion/bindings/swig/libsvn_swig_py-1.la
- python_util_OBJECTS = util.lo
- subversion/bindings/swig/python/_util.la: $(python_util_DEPS)
-- cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _util.la $(python_util_OBJECTS) ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
-+ cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _util.la $(python_util_OBJECTS) -lsvn_subr-1 $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
-
-python_wc_DEPS = subversion/bindings/swig/python/svn_wc.lo subversion/libsvn_wc/libsvn_wc-1.la subversion/bindings/swig/libsvn_swig_py-1.la
+python_wc_DEPS = subversion/bindings/swig/python/svn_wc.lo subversion/bindings/swig/libsvn_swig_py-1.la
python_wc_OBJECTS = svn_wc.lo
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
index e477b361e83..b9ea196b42c 100644
--- a/devel/subversion/patches/patch-ad
+++ b/devel/subversion/patches/patch-ad
@@ -1,14 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2003/05/25 09:31:30 epg Exp $
+$NetBSD: patch-ad,v 1.4 2003/06/18 13:26:26 epg Exp $
---- Makefile.in.orig Wed Apr 16 00:51:46 2003
+--- Makefile.in.orig Mon Jun 16 08:19:41 2003
+++ Makefile.in
-@@ -70,7 +70,8 @@ swig_py_libdir = @libdir@
+@@ -72,8 +72,9 @@ swig_py_libdir = @libdir@
swig_java_libdir = @libdir@
### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/svn
-+# XXX NetBSD: take swig_pydir from the environment
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
++# XXX pkgsrc: take swig_pydir from the environment
+#swig_pydir = @libdir@/svn-python/svn
++swig_pydir_extra = ${swig_pydir}
swig_javadir = @libdir@/svn-java
### should search for these...