update to subversion 1.4.2

maintainer didn't have time
also tested by simon.
This commit is contained in:
steven 2006-12-21 08:58:04 +00:00
parent 03890dcf21
commit 8961d3c03c
6 changed files with 32 additions and 46 deletions

View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.27 2006/12/01 14:10:05 steven Exp $ # $OpenBSD: Makefile,v 1.28 2006/12/21 08:58:04 steven Exp $
COMMENT-main= "subversion revision control system" COMMENT-main= "subversion revision control system"
COMMENT-perl= "perl interface to subversion" COMMENT-perl= "perl interface to subversion"
COMMENT-python= "python interface to subversion" COMMENT-python= "python interface to subversion"
COMMENT-ruby= "ruby interface to subversion" COMMENT-ruby= "ruby interface to subversion"
VERSION= 1.4.0 VERSION= 1.4.2
DISTNAME= subversion-${VERSION} DISTNAME= subversion-${VERSION}
PKGNAME= ${DISTNAME}p1 PKGNAME= ${DISTNAME}
PKGNAME-main= ${DISTNAME}p1 PKGNAME-main= ${DISTNAME}
PKGNAME-perl= p5-SVN-${VERSION}p1 PKGNAME-perl= p5-SVN-${VERSION}
PKGNAME-python= py-subversion-${VERSION}p0 PKGNAME-python= py-subversion-${VERSION}
PKGNAME-ruby= ruby-subversion-${VERSION} PKGNAME-ruby= ruby-subversion-${VERSION}
SO_VERSION= 1.0 SO_VERSION= 1.0
@ -85,7 +85,7 @@ LIB_DEPENDS-ruby+= ${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversio
. endfor . endfor
MODULES+= lang/ruby MODULES+= lang/ruby
BUILD_DEPENDS= ::lang/python/${PYTHON_VER} \ BUILD_DEPENDS= :python-${PYTHON_VER}*:lang/python/${PYTHON_VER} \
::devel/swig ::devel/swig
.endif .endif
@ -120,8 +120,8 @@ pre-build:
.if !${FLAVOR:L:Mno_bindings} .if !${FLAVOR:L:Mno_bindings}
REGRESS_DEPENDS+= ::devel/p5-IO-String \ REGRESS_DEPENDS+= ::devel/p5-IO-String \
::devel/subversion,-python \ :${PKGNAME-python}:devel/subversion,-python \
::devel/subversion,-ruby :${PKGNAME-ruby}:devel/subversion,-ruby
post-build: post-build:
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ @cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \

View File

@ -1,4 +1,4 @@
MD5 (subversion-1.4.0.tar.gz) = 6f7485986776204138a1d221ac5eec40 MD5 (subversion-1.4.2.tar.gz) = 7ab125937c4f3853149f33b09464b211
RMD160 (subversion-1.4.0.tar.gz) = 7a868b4fe6338ccdb93916afffbe8e2692450039 RMD160 (subversion-1.4.2.tar.gz) = 33ac6fa37880c1c2e2bfefa189f97c5a5c1b0d37
SHA1 (subversion-1.4.0.tar.gz) = fcea8ab76d6d6b3d532d921b94c312ca7fdc9f81 SHA1 (subversion-1.4.2.tar.gz) = 04a1bd565b8505683689e0206828053a08d0cc1e
SIZE (subversion-1.4.0.tar.gz) = 6268503 SIZE (subversion-1.4.2.tar.gz) = 6288565

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-build-outputs_mk,v 1.1 2006/09/30 06:23:58 steven Exp $
--- build-outputs.mk.orig Sun Sep 10 17:20:54 2006
+++ build-outputs.mk Sun Sep 10 17:21:44 2006
@@ -32,7 +32,7 @@ TEST_DEPS = subversion/tests/libsvn_subr
TEST_PROGRAMS = subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_wc/translate-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_subr/target-test.py subversion/tests/cmdline/getopt_tests.py subversion/tests/cmdline/basic_tests.py subversion/tests/cmdline/commit_tests.py subversion/tests/cmdline/update_tests.py subversion/tests/cmdline/switch_tests.py subversion/tests/cmdline/prop_tests.py subversion/tests/cmdline/schedule_tests.py subversion/tests/cmdline/log_tests.py subversion/tests/cmdline/copy_tests.py subversion/tests/cmdline/diff_tests.py subversion/tests/cmdline/export_tests.py subversion/tests/cmdline/externals_tests.py subversion/tests/cmdline/merge_tests.py subversion/tests/cmdline/revert_tests.py subversion/tests/cmdline/stat_tests.py subversion/tests/cmdline/trans_tests.py subversion/tests/cmdline/autoprop_tests.py subversion/tests/cmdline/blame_tests.py subversion/tests/cmdline/special_tests.py subversion/tests/cmdline/svnadmin_tests.py subversion/tests/cmdline/svnlook_tests.py subversion/tests/cmdline/svnversion_tests.py subversion/tests/cmdline/utf8_tests.py subversion/tests/cmdline/history_tests.py subversion/tests/cmdline/lock_tests.py subversion/tests/cmdline/cat_tests.py subversion/tests/cmdline/import_tests.py subversion/tests/cmdline/svnsync_tests.py subversion/tests/cmdline/authz_tests.py
-MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnversion/svnsync.1 subversion/svnversion/svnversion.1
+MANPAGES = subversion/svn/svn.1 subversion/svnadmin/svnadmin.1 subversion/svndumpfilter/svndumpfilter.1 subversion/svnlook/svnlook.1 subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5 subversion/svnsync/svnsync.1 subversion/svnversion/svnversion.1
CLEAN_FILES = contrib/client-side/mucc$(EXEEXT) contrib/client-side/svn-push/svn-push$(EXEEXT) subversion/svn/svn$(EXEEXT) subversion/svnadmin/svnadmin$(EXEEXT) subversion/svndumpfilter/svndumpfilter$(EXEEXT) subversion/svnlook/svnlook$(EXEEXT) subversion/svnserve/svnserve$(EXEEXT) subversion/svnsync/svnsync$(EXEEXT) subversion/svnversion/svnversion$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_fs_base/changes-test$(EXEEXT) subversion/tests/libsvn_fs_base/fs-base-test$(EXEEXT) subversion/tests/libsvn_fs_base/key-test$(EXEEXT) subversion/tests/libsvn_fs_base/skel-test$(EXEEXT) subversion/tests/libsvn_fs_base/strings-reps-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_wc/translate-test$(EXEEXT) tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.6 2006/09/30 06:23:58 steven Exp $ $OpenBSD: patch-configure,v 1.7 2006/12/21 08:58:04 steven Exp $
--- configure.orig Sat Jul 15 20:55:11 2006 --- configure.orig Thu Nov 2 23:48:21 2006
+++ configure Sat Jul 15 21:00:22 2006 +++ configure Thu Dec 14 18:33:09 2006
@@ -3012,7 +3012,7 @@ if test "$INSTALL" = "build/install-sh - @@ -3012,7 +3012,7 @@ if test "$INSTALL" = "build/install-sh -
INSTALL="$abs_srcdir/$INSTALL" INSTALL="$abs_srcdir/$INSTALL"
fi fi
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.6 2006/09/30 06:23:58 steven Exp $
@@ -20609,7 +20609,7 @@ rm -f conftest.err conftest.$ac_objext \ @@ -20630,7 +20630,7 @@ rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_bindtextdomain" = no; then if test "$ac_cv_search_bindtextdomain" = no; then
for ac_lib in intl; do for ac_lib in intl; do
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.6 2006/09/30 06:23:58 steven Exp $
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@@ -20654,7 +20654,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l @@ -20675,7 +20675,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
ac_status=$? ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then (exit $ac_status); }; }; then
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.6 2006/09/30 06:23:58 steven Exp $
break break
else else
echo "$as_me: failed program was:" >&5 echo "$as_me: failed program was:" >&5
@@ -21943,7 +21943,7 @@ fi; @@ -21964,7 +21964,7 @@ fi;
# Python: Used for testsuite, and bindings # Python: Used for testsuite, and bindings

View File

@ -1,9 +1,7 @@
@comment $OpenBSD: PLIST-python,v 1.2 2005/07/04 22:22:00 alek Exp $ @comment $OpenBSD: PLIST-python,v 1.3 2006/12/21 08:58:04 steven Exp $
%%SHARED%% %%SHARED%%
lib/libsvn_swig_py-1.a lib/libsvn_swig_py-1.a
lib/libsvn_swig_py-1.la lib/libsvn_swig_py-1.la
lib/python${PYTHON_VER}/
lib/python${PYTHON_VER}/site-packages/
lib/python${PYTHON_VER}/site-packages/libsvn/ lib/python${PYTHON_VER}/site-packages/libsvn/
lib/python${PYTHON_VER}/site-packages/libsvn/__init__.py lib/python${PYTHON_VER}/site-packages/libsvn/__init__.py
lib/python${PYTHON_VER}/site-packages/libsvn/__init__.pyc lib/python${PYTHON_VER}/site-packages/libsvn/__init__.pyc

View File

@ -1,18 +1,7 @@
@comment $OpenBSD: PLIST-ruby,v 1.1 2006/11/29 08:52:39 msf Exp $ @comment $OpenBSD: PLIST-ruby,v 1.2 2006/12/21 08:58:04 steven Exp $
%%SHARED%% %%SHARED%%
lib/libsvn_swig_ruby-1.a lib/libsvn_swig_ruby-1.a
lib/libsvn_swig_ruby-1.la lib/libsvn_swig_ruby-1.la
lib/ruby/site_ruby/${MODRUBY_REV}/svn/
lib/ruby/site_ruby/${MODRUBY_REV}/svn/client.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/core.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/delta.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/error.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/fs.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/info.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/ra.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/repos.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/util.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/wc.rb
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.a lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.la lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.la
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.a lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/core.a
@ -27,3 +16,14 @@ lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.la lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/repos.la
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.a lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.a
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.la lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/wc.la
lib/ruby/site_ruby/${MODRUBY_REV}/svn/
lib/ruby/site_ruby/${MODRUBY_REV}/svn/client.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/core.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/delta.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/error.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/fs.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/info.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/ra.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/repos.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/util.rb
lib/ruby/site_ruby/${MODRUBY_REV}/svn/wc.rb