The final 1.7.0 release is here!
See here for the release announcement:
http://svn.haxx.se/dev/archive-2011-10/0152.shtml
The final release is identical to 1.7.0-rc4 (except for the version number).
mpi@ found a regression from 1.6 in RC4. I'm gonna hold off on
committing the 1.7.0 update until we've figured that out. I'd like
to add a patch to fix his problem if necessary.
In the meantime, enjoy this release by building the port yourselves.
If you run into problems I'd like to know about them. Thanks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile
--- Makefile 11 Oct 2011 09:59:45 -0000 1.97
+++ Makefile 11 Oct 2011 12:28:25 -0000
@@ -6,7 +6,7 @@ COMMENT-python= python interface to sub
COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
-VERSION= 1.6.17
+VERSION= 1.7.0
DISTNAME= subversion-${VERSION}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-perl= p5-SVN-${VERSION}
@@ -18,13 +18,7 @@ FULLPKGPATH-ruby= devel/subversion,-ruby
FULLPKGNAME-ap2= ap2-subversion-${VERSION}
FULLPKGPATH-ap2= devel/subversion,-ap2
-REVISION-main= 4
-REVISION-python= 1
-REVISION-perl= 0
-REVISION-ruby= 3
-REVISION-ap2= 0
-
-SO_VERSION= 1.2
+SO_VERSION= 1.3
SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 svn_ra_neon-1 \
svn_ra_local-1 svn_ra_neon-1 svn_ra_svn-1 svn_repos-1
svn_subr-1 svn_wc-1
@@ -44,8 +38,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-# Subversion 1.6.x tarballs are still hosted at tigris.org, not apache.org
-MASTER_SITES= http://subversion.tigris.org/downloads/
+MASTER_SITES= ${MASTER_SITE_APACHE:=subversion/}
EXTRACT_SUFX= .tar.bz2
PSEUDO_FLAVORS= no_bindings no_ap2
@@ -55,7 +48,7 @@ FLAVOR?=
MODULES= devel/gettext lang/python
USE_GROFF = Yes
-WANTLIB= expat db z
+WANTLIB= expat db magic z
# autogen.sh checks for libtoolize
@@ -70,34 +63,19 @@ LIB_DEPENDS-main = ${LIB_DEPENDS} \
devel/apr \
devel/apr-util \
security/cyrus-sasl2 \
- databases/sqlite3
+ databases/sqlite3 \
+ devel/libmagic
WANTLIB-main= ${WANTLIB} asn1 c crypto gssapi krb5 ssl \
neon>=26 apr-1 aprutil-1 sasl2>=2 sqlite3
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS}
-CONTRIB_HOOK_SCRIPTS= case-insensitive.py pre-commit-check.py \
- check-mime-type.pl pre-lock-require-needs-lock.py \
- commit-block-joke.py remove-zombie-locks.py \
- syntax-check.sh commit-email.pl
-# There's also 'enforcer', but we handle it separately, see post-install
-
TOOLS_HOOK_SCRIPTS= commit-access-control.cfg.example \
commit-access-control.pl commit-email.rb \
log-police.py svn2feed.py svnperms.conf.example \
svnperms.py verify-po.py
# There's also 'mailer', but we handle it separately, see post-install
-CONTRIB_CLIENT_SIDE_SCRIPTS= incremental-update.py search-svnlog.pl \
- svn-clean svn-merge-vendor.py svn_apply_autoprops.py \
- svn_export_empty_files.py
-
-SVN_LOAD_DIRS_FILES= LICENSE_AFL3.txt svn_load_dirs.README \
- svn_load_dirs.pl svn_load_dirs_property_table.example
-
-CONTRIB_SERVER_SIDE_SCRIPTS= authz_svn_group.py fsfsverify.py \
- svn-fast-backup svn-tweak-author.py
-
TOOLS_CLIENT_SIDE_SCRIPTS= bash_completion change-svn-wc-format.py \
server-version.py showchange.pl svn-graph.pl
@@ -171,13 +149,15 @@ MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
USE_LIBTOOL= Yes
AUTOCONF_VERSION=2.64
CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= PYTHON2=${MODPY_BIN}
+CONFIGURE_ENV= PYTHON2=${MODPY_BIN} MKDIR="/bin/mkdir -p"
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--with-sasl=${LOCALBASE} \
--without-jikes \
- --without-jdk
+ --without-jdk \
+ --with-libmagic=${LOCALBASE}
.if !${FLAVOR:L:Mno_bindings}
CONFIGURE_ARGS+=--with-swig
+CONFIGURE_ENV+= RUBY=ruby${MODRUBY_BINREV} RDOC=rdoc${MODRUBY_BINREV}
.else
CONFIGURE_ARGS+=--without-swig
.endif
@@ -268,34 +248,6 @@ post-install:
${INSTALL_DATA_DIR}
${PREFIX}/share/examples/subversion/hook-scripts/enforcer
${INSTALL_DATA_DIR}
${PREFIX}/share/examples/subversion/server-side/mod_dontdothat
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/xslt
- ${INSTALL_DATA} ${WRKSRC}/contrib/cgi/* \
- ${PREFIX}/share/examples/subversion/cgi
- ${INSTALL_DATA} ${WRKSRC}/contrib/client-side/emacs/* \
- ${PREFIX}/share/examples/subversion/client-side/emacs
- ${INSTALL_DATA} ${WRKSRC}/contrib/client-side/svn2cl/* \
- ${PREFIX}/share/examples/subversion/client-side/svn2cl
-.for _file in ${SVN_LOAD_DIRS_FILES}
- ${INSTALL_DATA} ${WRKSRC}/contrib/client-side/svn_load_dirs/${_file} \
-
${PREFIX}/share/examples/subversion/client-side/svn_load_dirs
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/contrib/server-side/mod_dontdothat/* \
-
${PREFIX}/share/examples/subversion/server-side/mod_dontdothat
-.for _script in ${CONTRIB_CLIENT_SIDE_SCRIPTS}
- ${INSTALL_DATA} ${WRKSRC}/contrib/client-side/${_script} \
- ${PREFIX}/share/examples/subversion/client-side
-.endfor
-.for _script in ${CONTRIB_SERVER_SIDE_SCRIPTS}
- ${INSTALL_DATA} ${WRKSRC}/contrib/server-side/${_script} \
- ${PREFIX}/share/examples/subversion/server-side
-.endfor
- ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/enforcer/enforcer \
-
${PREFIX}/share/examples/subversion/hook-scripts/enforcer/
- ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/enforcer/enforcer.conf \
-
${PREFIX}/share/examples/subversion/hook-scripts/enforcer/
-.for _hook_script in ${CONTRIB_HOOK_SCRIPTS}
- ${INSTALL_DATA} ${WRKSRC}/contrib/hook-scripts/${_hook_script} \
- ${PREFIX}/share/examples/subversion/hook-scripts/
-.endfor
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
${ALL_FAKE_FLAGS} install-tools
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/backup
@@ -317,8 +269,6 @@ post-install:
${PREFIX}/share/examples/subversion/server-side
${INSTALL_PROGRAM}
${WRKSRC}/tools/server-side/svn-populate-node-origins-index.c \
${PREFIX}/share/examples/subversion/server-side
- ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/README \
- ${PREFIX}/share/examples/subversion/hook-scripts/
${INSTALL_DATA} ${WRKSRC}/tools/xslt/* \
${PREFIX}/share/examples/subversion/xslt
.for _hook_script in ${TOOLS_HOOK_SCRIPTS}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.28
diff -u -p -r1.28 distinfo
--- distinfo 1 Jun 2011 22:19:17 -0000 1.28
+++ distinfo 11 Oct 2011 12:28:45 -0000
@@ -1,5 +1,5 @@
-MD5 (subversion-1.6.17.tar.bz2) = geXcW+7ks/wCWscMC2yqFA==
-RMD160 (subversion-1.6.17.tar.bz2) = sJN76AYid0/uXUVX50CtRPf0cXI=
-SHA1 (subversion-1.6.17.tar.bz2) = bj7XyH2Y/fXwqZkFCrYB3OxhVaE=
-SHA256 (subversion-1.6.17.tar.bz2) =
1inGV+FxYW0wzAy93xARoGV3CBO/wy94xpQNCcqGgSQ=
-SIZE (subversion-1.6.17.tar.bz2) = 5504298
+MD5 (subversion-1.7.0.tar.bz2) = kw5mRKG2CU79Jo/eajGPBA==
+RMD160 (subversion-1.7.0.tar.bz2) = SkdKT/NWssr24E+xy8np7NKTraY=
+SHA1 (subversion-1.7.0.tar.bz2) = PlFOD7qchk0tE3Y8IoltMUltew0=
+SHA256 (subversion-1.7.0.tar.bz2) =
ZP1fJjqA5glxejykLx8mJWBqXEpAqFcW+CyGYDN4CXg=
+SIZE (subversion-1.7.0.tar.bz2) = 5953297
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-Makefile_in,v
retrieving revision 1.11
diff -u -p -r1.11 patch-Makefile_in
--- patches/patch-Makefile_in 23 Sep 2010 22:12:10 -0000 1.11
+++ patches/patch-Makefile_in 11 Oct 2011 12:24:23 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.11 2010/09/23 22:12:10 jeremy Exp $
---- Makefile.in.orig Mon Feb 16 08:10:48 2009
-+++ Makefile.in Thu Sep 16 14:04:24 2010
-@@ -76,12 +76,12 @@ swig_pl_libdir = @libdir@
+--- Makefile.in.orig Thu May 26 10:58:42 2011
++++ Makefile.in Sat Jun 4 16:41:02 2011
+@@ -84,11 +84,11 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
### these possibly need further discussion
@@ -11,13 +11,12 @@ $OpenBSD: patch-Makefile_in,v 1.11 2010/
+swig_pydir_extra = @libdir@/python${MODPY_VERSION}/site-packages/svn
swig_pldir = @libdir@/svn-perl
swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
- contribdir = @bindir@/svn-contrib
-toolsdir = @bindir@/svn-tools
+toolsdir = @bindir@
javahl_javadir = @libdir@/svn-javahl
javahl_javahdir = @libdir@/svn-javahl/include
-@@ -122,13 +122,13 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@
+@@ -132,13 +132,13 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/devel/subversion/patches/patch-configure_ac,v
retrieving revision 1.6
diff -u -p -r1.6 patch-configure_ac
--- patches/patch-configure_ac 23 Sep 2010 22:12:10 -0000 1.6
+++ patches/patch-configure_ac 11 Oct 2011 12:24:23 -0000
@@ -1,25 +1,16 @@
$OpenBSD: patch-configure_ac,v 1.6 2010/09/23 22:12:10 jeremy Exp $
---- configure.ac.orig Tue Oct 13 09:09:30 2009
-+++ configure.ac Thu Sep 16 14:06:25 2010
-@@ -6,7 +6,7 @@ AC_PREREQ(2.58)
+--- configure.ac.orig Fri May 20 11:28:57 2011
++++ configure.ac Sat Jun 4 16:42:55 2011
+@@ -23,7 +23,7 @@ AC_PREREQ(2.59)
dnl Get the version of Subversion, using m4's esyscmd() command to do this
dnl at m4-time, since AC_INIT() requires it then.
AC_INIT([subversion],
- [esyscmd(python build/getversion.py SVN
subversion/include/svn_version.h)],
+ [esyscmd(${MODPY_BIN} build/getversion.py SVN
subversion/include/svn_version.h)],
- [http://subversion.tigris.org/])
+ [http://subversion.apache.org/])
AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
-@@ -60,7 +60,7 @@ if test "$INSTALL" = "build/install-sh -c"; then
- INSTALL="$abs_srcdir/$INSTALL"
- fi
-
--AC_SUBST([MKDIR], ["$INSTALL -d"])
-+AC_SUBST([MKDIR], ["/bin/mkdir -p"])
-
- # ==== Libraries, for which we may have source to build ======================
-
-@@ -769,7 +769,7 @@ AS_HELP_STRING([--enable-gprof],
+@@ -1021,7 +1021,7 @@ AS_HELP_STRING([--enable-gprof],
# Python: Used for testsuite, and bindings
@@ -28,16 +19,3 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/
if test -z "$PYTHON"; then
AC_MSG_WARN([Python 2.4 or later is required to run the testsuite])
AC_MSG_WARN([or to use the Subversion Python bindings])
-@@ -787,10 +787,10 @@ SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
-
- AC_PATH_PROG(PERL, perl, none)
-
--AC_PATH_PROG(RUBY, ruby, none)
-+AC_PATH_PROG(RUBY, ruby18, none)
- if test "$RUBY" != "none"; then
- if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)'; then
-- AC_PATH_PROG(RDOC, rdoc, none)
-+ AC_PATH_PROG(RDOC, rdoc18, none)
- AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
- svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print
Config::CONFIG.fetch(%q(MAJOR))'`"
- ])
Index: patches/patch-subversion_libsvn_subr_auth_c
===================================================================
RCS file:
/cvs/ports/devel/subversion/patches/patch-subversion_libsvn_subr_auth_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-subversion_libsvn_subr_auth_c
--- patches/patch-subversion_libsvn_subr_auth_c 23 Sep 2010 22:12:10 -0000
1.2
+++ patches/patch-subversion_libsvn_subr_auth_c 11 Oct 2011 12:24:23 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-subversion_libsvn_subr_auth_c,v 1.2 2010/09/23 22:12:10 jeremy
Exp $
---- subversion/libsvn_subr/auth.c.orig Fri Jan 23 10:30:04 2009
-+++ subversion/libsvn_subr/auth.c Thu Sep 16 14:07:10 2010
-@@ -393,7 +393,7 @@ svn_auth_get_platform_specific_provider
+--- subversion/libsvn_subr/auth.c.orig Fri Dec 31 15:24:13 2010
++++ subversion/libsvn_subr/auth.c Sat Jun 4 16:40:04 2011
+@@ -398,7 +398,7 @@ svn_auth_get_platform_specific_provider
const char *library_label, *library_name;
const char *provider_function_name, *version_function_name;
library_name = apr_psprintf(pool,
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-main
--- pkg/PLIST-main 16 Nov 2010 18:17:06 -0000 1.9
+++ pkg/PLIST-main 11 Oct 2011 12:24:23 -0000
@@ -9,11 +9,14 @@
@comment @bin bin/diff4
@bin bin/svn
@bin bin/svn-populate-node-origins-index
+@bin bin/svn-rep-sharing-stats
@bin bin/svnadmin
@bin bin/svnauthz-validate
@bin bin/svndumpfilter
@bin bin/svnlook
@bin bin/svnmucc
+@bin bin/svnraisetreeconflict
+@bin bin/svnrdump
@bin bin/svnserve
@bin bin/svnsync
@bin bin/svnversion
@@ -21,6 +24,7 @@ include/subversion-1/
include/subversion-1/svn-revision.txt
include/subversion-1/svn_auth.h
include/subversion-1/svn_base64.h
+include/subversion-1/svn_cache_config.h
include/subversion-1/svn_checksum.h
include/subversion-1/svn_client.h
include/subversion-1/svn_cmdline.h
@@ -98,6 +102,7 @@ lib/libsvn_wc-1.la
@man man/man1/svnadmin.1
@man man/man1/svndumpfilter.1
@man man/man1/svnlook.1
+@man man/man1/svnrdump.1
@man man/man1/svnsync.1
@man man/man1/svnversion.1
@man man/man5/svnserve.conf.5
@@ -115,41 +120,16 @@ share/examples/subversion/bdb/svnfs.py
share/examples/subversion/bdb/whatis-rep.py
share/examples/subversion/blame.py
share/examples/subversion/cgi/
-share/examples/subversion/cgi/mirror_dir_through_svn.README
-share/examples/subversion/cgi/mirror_dir_through_svn.cgi
-share/examples/subversion/cgi/tweak-log.cgi
share/examples/subversion/check-modified.py
share/examples/subversion/client-side/
share/examples/subversion/client-side/bash_completion
share/examples/subversion/client-side/change-svn-wc-format.py
share/examples/subversion/client-side/emacs/
-share/examples/subversion/client-side/emacs/dsvn.el
-share/examples/subversion/client-side/emacs/psvn.el
-share/examples/subversion/client-side/emacs/vc-svn.el
-share/examples/subversion/client-side/incremental-update.py
-share/examples/subversion/client-side/search-svnlog.pl
share/examples/subversion/client-side/server-version.py
share/examples/subversion/client-side/showchange.pl
-share/examples/subversion/client-side/svn-clean
share/examples/subversion/client-side/svn-graph.pl
-share/examples/subversion/client-side/svn-merge-vendor.py
share/examples/subversion/client-side/svn2cl/
-share/examples/subversion/client-side/svn2cl/NEWS
-share/examples/subversion/client-side/svn2cl/README
-share/examples/subversion/client-side/svn2cl/TODO
-share/examples/subversion/client-side/svn2cl/authors.xml
-share/examples/subversion/client-side/svn2cl/svn2cl.1
-share/examples/subversion/client-side/svn2cl/svn2cl.sh
-share/examples/subversion/client-side/svn2cl/svn2cl.xsl
-share/examples/subversion/client-side/svn2cl/svn2html.css
-share/examples/subversion/client-side/svn2cl/svn2html.xsl
-share/examples/subversion/client-side/svn_apply_autoprops.py
-share/examples/subversion/client-side/svn_export_empty_files.py
share/examples/subversion/client-side/svn_load_dirs/
-share/examples/subversion/client-side/svn_load_dirs/LICENSE_AFL3.txt
-share/examples/subversion/client-side/svn_load_dirs/svn_load_dirs.README
-share/examples/subversion/client-side/svn_load_dirs/svn_load_dirs.pl
-share/examples/subversion/client-side/svn_load_dirs/svn_load_dirs_property_table.example
share/examples/subversion/dumpprops.py
share/examples/subversion/get-location-segments.py
share/examples/subversion/getfile.py
@@ -157,17 +137,10 @@ share/examples/subversion/getlocks_test.
share/examples/subversion/geturl.py
share/examples/subversion/headrev.c
share/examples/subversion/hook-scripts/
-share/examples/subversion/hook-scripts/README
-share/examples/subversion/hook-scripts/case-insensitive.py
-share/examples/subversion/hook-scripts/check-mime-type.pl
share/examples/subversion/hook-scripts/commit-access-control.cfg.example
share/examples/subversion/hook-scripts/commit-access-control.pl
-share/examples/subversion/hook-scripts/commit-block-joke.py
-share/examples/subversion/hook-scripts/commit-email.pl
share/examples/subversion/hook-scripts/commit-email.rb
share/examples/subversion/hook-scripts/enforcer/
-share/examples/subversion/hook-scripts/enforcer/enforcer
-share/examples/subversion/hook-scripts/enforcer/enforcer.conf
share/examples/subversion/hook-scripts/log-police.py
share/examples/subversion/hook-scripts/mailer/
share/examples/subversion/hook-scripts/mailer/mailer.conf.example
@@ -178,30 +151,20 @@ share/examples/subversion/hook-scripts/m
share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.sh
share/examples/subversion/hook-scripts/mailer/tests/mailer-tweak.py
share/examples/subversion/hook-scripts/mailer/tests/mailer.conf
-share/examples/subversion/hook-scripts/pre-commit-check.py
-share/examples/subversion/hook-scripts/pre-lock-require-needs-lock.py
-share/examples/subversion/hook-scripts/remove-zombie-locks.py
share/examples/subversion/hook-scripts/svn2feed.py
share/examples/subversion/hook-scripts/svnperms.conf.example
share/examples/subversion/hook-scripts/svnperms.py
-share/examples/subversion/hook-scripts/syntax-check.sh
share/examples/subversion/hook-scripts/verify-po.py
share/examples/subversion/minimal_client.c
share/examples/subversion/putfile.py
share/examples/subversion/revplist.py
share/examples/subversion/server-side/
-share/examples/subversion/server-side/authz_svn_group.py
share/examples/subversion/server-side/fsfs-reshard.py
-share/examples/subversion/server-side/fsfsverify.py
@comment mod_dontdothat should be compiled and installed
@comment so that it can be loaded into apache
share/examples/subversion/server-side/mod_dontdothat/
-share/examples/subversion/server-side/mod_dontdothat/README
-share/examples/subversion/server-side/mod_dontdothat/mod_dontdothat.c
share/examples/subversion/server-side/svn-backup-dumps.py
-share/examples/subversion/server-side/svn-fast-backup
share/examples/subversion/server-side/svn-populate-node-origins-index.c
-share/examples/subversion/server-side/svn-tweak-author.py
share/examples/subversion/servers
@sample ${SYSCONFDIR}/subversion/servers
share/examples/subversion/svnlog2html.rb
