On Sun, Mar 22, 2009 at 11:47:37PM +0000, Stefan Sperling wrote:
> Here is a diff that updates devel/subversion to 1.6.0.
Updated diff based on comments by ajacoutot@ (extra BUILD_DEPENDS
for the gnome-keyring subpackage had errors and were not even needed).
Stefan
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile 16 Mar 2009 22:20:02 -0000 1.57
+++ Makefile 23 Mar 2009 10:18:03 -0000
@@ -1,21 +1,23 @@
# $OpenBSD: Makefile,v 1.57 2009/03/16 22:20:02 kili Exp $
-COMMENT-main= subversion revision control system
-COMMENT-perl= perl interface to subversion
-COMMENT-python= python interface to subversion
-COMMENT-ruby= ruby interface to subversion
-COMMENT-ap2= apache2 subversion modules
-
-VERSION= 1.5.6
-DISTNAME= subversion-${VERSION}
-PKGNAME= ${DISTNAME}
-PKGNAME-main= ${DISTNAME}
-PKGNAME-perl= p5-SVN-${VERSION}
-PKGNAME-python= py-subversion-${VERSION}p0
-PKGNAME-ruby= ruby-subversion-${VERSION}
-PKGNAME-ap2= ap2-subversion-${VERSION}
+COMMENT-main= subversion revision control system
+COMMENT-perl= perl interface to subversion
+COMMENT-python= python interface to subversion
+COMMENT-ruby= ruby interface to subversion
+COMMENT-ap2= apache2 subversion modules
+COMMENT-gnome-keyring= gnome-keyring support for subversion
+
+VERSION= 1.6.0
+DISTNAME= subversion-1.6.0
+PKGNAME= ${DISTNAME}
+PKGNAME-main= ${DISTNAME}
+PKGNAME-perl= p5-SVN-${VERSION}
+PKGNAME-python= py-subversion-${VERSION}
+PKGNAME-ruby= ruby-subversion-${VERSION}
+PKGNAME-ap2= ap2-subversion-${VERSION}
+PKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
-SO_VERSION= 1.1
+SO_VERSION= 1.2
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
@@ -36,18 +38,20 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/tarballs/
+EXTRACT_SUFX= .tar.bz2
-PSEUDO_FLAVORS= no_bindings no_ap2
+PSEUDO_FLAVORS= no_bindings no_ap2 no_gnome-keyring
FLAVOR?=
MODULES= devel/gettext lang/python
-WANTLIB= expat db z
+WANTLIB= expat db z sqlite3
LIB_DEPENDS= neon.>=26:neon->=0.26.2:net/neon \
apr-1::devel/apr \
aprutil-1::devel/apr-util \
- sasl2.>=2::security/cyrus-sasl2
+ sasl2.>=2::security/cyrus-sasl2 \
+ sqlite3::databases/sqlite3
MULTI_PACKAGES= -main
@@ -58,11 +62,11 @@ RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPEN
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
+ 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.pl commit-email.rb \
+ 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
@@ -121,6 +125,23 @@ MODULES+= lang/ruby
BUILD_DEPENDS+= :swig->=1.3.36:devel/swig
.endif
+.if !${FLAVOR:L:Mno_gnome-keyring}
+MULTI_PACKAGES+= -gnome-keyring
+SHARED_ONLY= Yes
+LIB_DEPENDS-gnome-keyring= dbus-1.>=7::x11/dbus \
+ glib-2.0::devel/glib2 \
+ gnome-keyring.>=4::x11/gnome/keyring \
+ pcre.>=2::devel/pcre \
+ ${MODGETTEXT_LIB_DEPENDS} \
+
svn_subr-1.>=${SO_VERSION}:${PKGNAME}:devel/subversion,-main
+WANTLIB-gnome-keyring= ${WANTLIB} apr-1 aprutil-1 iconv
+SHARED_LIBS+= svn_auth_gnome_keyring-1 ${SO_VERSION}
+# gnome-keyring depends on dbus depends on pthread, so svn won't be able
+# to load libsvn_auth_gnome_keyring without this:
+WANTLIB-main+= pthread
+CFLAGS+= -pthread
+.endif
+
# BSD make cannot build target autogen-swig to regenerate bindings
USE_GMAKE= Yes
MAKE_FLAGS= MAKE=${MAKE_PROGRAM}
@@ -129,6 +150,7 @@ AUTOCONF_VERSION=2.62
CONFIGURE_STYLE=autoconf
CONFIGURE_ENV= PYTHON2=${MODPY_BIN}
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
+ --with-sasl=${LOCALBASE} \
--without-jikes \
--without-jdk
.if !${FLAVOR:L:Mno_bindings}
@@ -144,15 +166,20 @@ CONFIGURE_ARGS+=--with-apxs=${LOCALBASE}
CONFIGURE_ARGS+=--without-apxs
.endif
+.if !${FLAVOR:L:Mno_gnome-keyring}
+CONFIGURE_ARGS+=--with-gnome-keyring
+.endif
+
REGRESS_DEPENDS=::lang/python/${MODPY_VERSION}
MODPY_VERSION?= 2.5
-SUBST_VARS= LOCALBASE
+SUBST_VARS+= LOCALBASE SO_VERSION
pre-patch:
@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
pre-configure:
- @${SUBST_CMD} ${WRKSRC}/Makefile.in ${WRKSRC}/configure.ac
+ @${SUBST_CMD} ${WRKSRC}/Makefile.in ${WRKSRC}/configure.ac \
+ ${WRKSRC}/subversion/libsvn_subr/auth.c
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
AUTOCONF_VERSION=${AUTOCONF_VERSION} ./autogen.sh
Index: distinfo
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 5 Mar 2009 23:14:07 -0000 1.18
+++ distinfo 22 Mar 2009 23:39:49 -0000
@@ -1,5 +1,5 @@
-MD5 (subversion-1.5.6.tar.gz) = rYHlQFjmS105nT7aX4v80Q==
-RMD160 (subversion-1.5.6.tar.gz) = zHJcgYVPWUyUcf1aRxLlPoPRvpo=
-SHA1 (subversion-1.5.6.tar.gz) = 3l/YxG44cvfuOgWkW3GTb4JkapI=
-SHA256 (subversion-1.5.6.tar.gz) = bvyOUo2HbPGirT1ZFibSGYnhBLB29s5pDPskigxsoow=
-SIZE (subversion-1.5.6.tar.gz) = 6727513
+MD5 (subversion-1.6.0.tar.bz2) = 258ZZxwfUoa+OpMMCn0Y8w==
+RMD160 (subversion-1.6.0.tar.bz2) = xZFi6oLpw+eJ72N2wAv9zwe5ogU=
+SHA1 (subversion-1.6.0.tar.bz2) = qAiN0XDqOPbRdcawCTUpIryAgBM=
+SHA256 (subversion-1.6.0.tar.bz2) =
1vuL9hY4WAoK1mHttkLDj7/60qTCc+P4YxxswNoU0KI=
+SIZE (subversion-1.6.0.tar.bz2) = 5477732
Index: patches/patch-Makefile_in
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in 27 Dec 2008 19:20:36 -0000 1.9
+++ patches/patch-Makefile_in 19 Feb 2009 19:39:11 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.9 2008/12/27 19:20:36 steven Exp $
---- Makefile.in.orig Tue Aug 26 19:27:56 2008
-+++ Makefile.in Sat Nov 29 18:45:38 2008
-@@ -68,12 +68,12 @@ swig_pl_libdir = @libdir@
+--- Makefile.in.orig Mon Feb 16 16:10:48 2009
++++ Makefile.in Thu Feb 19 19:36:18 2009
+@@ -76,12 +76,12 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
### these possibly need further discussion
@@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile_in,v 1.9 2008/1
javahl_javadir = @libdir@/svn-javahl
javahl_javahdir = @libdir@/svn-javahl/include
-@@ -114,8 +114,8 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@
+@@ -122,8 +122,8 @@ 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-build_ac-macros_swig_m4
===================================================================
RCS file: patches/patch-build_ac-macros_swig_m4
diff -N patches/patch-build_ac-macros_swig_m4
--- patches/patch-build_ac-macros_swig_m4 2 Nov 2008 20:43:49 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-build_ac-macros_swig_m4,v 1.1 2008/11/02 20:43:49 steven Exp $
---- build/ac-macros/swig.m4.orig Sat Oct 25 22:10:37 2008
-+++ build/ac-macros/swig.m4 Sat Oct 25 22:11:25 2008
-@@ -212,16 +212,16 @@ AC_DEFUN(SVN_FIND_SWIG,
-
- AC_MSG_CHECKING([where to install Ruby scripts])
- AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[
-- svn_cv_ruby_sitedir_libsuffix="`echo \"$rbconfig_sitelibdir\" | \
-- sed -e \"s,^$rbconfig_sitedir,,\"`"
-+ svn_cv_ruby_sitedir_libsuffix="`echo $rbconfig_sitelibdir | \
-+ sed -e s,^$rbconfig_sitedir,,`"
- ])
-
SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"
- AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])
-
- AC_MSG_CHECKING([where to install Ruby extensions])
- AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[
-- svn_cv_ruby_sitedir_archsuffix="`echo \"$rbconfig_sitearchdir\" | \
-- sed -e \"s,^$rbconfig_sitedir,,\"`"
-+ svn_cv_ruby_sitedir_archsuffix="`echo $rbconfig_sitearchdir | \
-+ sed -e s,^$rbconfig_sitedir,,`"
- ])
-
SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"
- AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])
Index: patches/patch-configure_ac
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/patches/patch-configure_ac,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure_ac
--- patches/patch-configure_ac 2 Nov 2008 20:43:49 -0000 1.1
+++ patches/patch-configure_ac 19 Feb 2009 19:39:11 -0000
@@ -1,25 +1,25 @@
$OpenBSD: patch-configure_ac,v 1.1 2008/11/02 20:43:49 steven Exp $
---- configure.ac.orig Tue Aug 26 19:27:56 2008
-+++ configure.ac Sat Oct 25 22:08:16 2008
+--- configure.ac.orig Sat Feb 7 20:46:30 2009
++++ configure.ac Thu Feb 19 19:37:20 2009
@@ -6,7 +6,7 @@ AC_PREREQ(2.58)
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
subversion/include/svn_version.h)],
-+ [esyscmd(${MODPY_BIN} build/getversion.py
subversion/include/svn_version.h)],
- [http://subversion.tigris.org/])
+- [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/])
AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
-@@ -48,7 +48,7 @@ if test "$INSTALL" = "build/install-sh -c"; then
+@@ -56,7 +56,7 @@ if test "$INSTALL" = "build/install-sh -c"; then
INSTALL="$abs_srcdir/$INSTALL"
fi
-AC_SUBST([MKDIR], ["$INSTALL -d"])
+AC_SUBST([MKDIR], ["mkdir -p"])
+ # ==== Libraries, for which we may have source to build ======================
- dnl find Apache with a recent-enough magic module number.
-@@ -309,7 +309,8 @@ if test "$enable_nls" = "yes"; then
+@@ -447,7 +447,8 @@ if test "$enable_nls" = "yes"; then
[
AC_MSG_WARN([bindtextdomain() not found. Disabling NLS.])
enable_nls="no"
@@ -29,12 +29,12 @@ $OpenBSD: patch-configure_ac,v 1.1 2008/
if test "$enable_nls" = "yes"; then
AC_DEFINE(ENABLE_NLS, 1,
[Define to 1 if translation of program messages to the user's
-@@ -540,7 +541,7 @@ AS_HELP_STRING([--enable-gprof],
+@@ -749,7 +750,7 @@ AS_HELP_STRING([--enable-gprof],
# Python: Used for testsuite, and bindings
-PYTHON="`$abs_srcdir/build/find_python.sh`"
+PYTHON=${MODPY_BIN}
if test -z "$PYTHON"; then
- AC_MSG_WARN([Python 2.2 or later is required to run the testsuite])
+ AC_MSG_WARN([Python 2.4 or later is required to run the testsuite])
AC_MSG_WARN([or to use the Subversion Python bindings])
Index: patches/patch-contrib_client-side_svn2cl_NEWS
===================================================================
RCS file: patches/patch-contrib_client-side_svn2cl_NEWS
diff -N patches/patch-contrib_client-side_svn2cl_NEWS
--- patches/patch-contrib_client-side_svn2cl_NEWS 27 Dec 2008 19:20:36
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-contrib_client-side_svn2cl_NEWS,v 1.1 2008/12/27 19:20:36
steven Exp $
---- contrib/client-side/svn2cl/NEWS.orig Sun Apr 8 14:18:27 2007
-+++ contrib/client-side/svn2cl/NEWS Mon Dec 22 21:41:47 2008
-@@ -1,3 +1,19 @@
-+changes from 0.10 to 0.11
-+-------------------------
-+
-+* small portability improvements
-+* fix for OpenBSD's ksh by Carlo Marcelo Arenas Belon
-+
-+
-+changes from 0.9 to 0.10
-+------------------------
-+
-+* add an --include-actions option that adds action labels about file
-+ additions and removals
-+* small fix for other XSLT processors
-+* manual page improvement
-+
-+
- changes from 0.8 to 0.9
- -----------------------
-
Index: patches/patch-contrib_client-side_svn2cl_svn2cl_1
===================================================================
RCS file: patches/patch-contrib_client-side_svn2cl_svn2cl_1
diff -N patches/patch-contrib_client-side_svn2cl_svn2cl_1
--- patches/patch-contrib_client-side_svn2cl_svn2cl_1 27 Dec 2008 19:20:36
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,109 +0,0 @@
-$OpenBSD: patch-contrib_client-side_svn2cl_svn2cl_1,v 1.1 2008/12/27 19:20:36
steven Exp $
---- contrib/client-side/svn2cl/svn2cl.1.orig Sun Apr 8 14:18:27 2007
-+++ contrib/client-side/svn2cl/svn2cl.1 Mon Dec 22 21:41:47 2008
-@@ -1,4 +1,4 @@
--.\" Copyright (C) 2005, 2006, 2007 Arthur de Jong
-+.\" Copyright (C) 2005, 2006, 2007, 2008 Arthur de Jong
- .\"
- .\" Redistribution and use in source and binary forms, with or without
- .\" modification, are permitted provided that the following conditions
-@@ -12,7 +12,7 @@
- .\" 3. The name of the author may not be used to endorse or promote
- .\" products derived from this software without specific prior
- .\" written permission.
--.\"
-+.\"
- .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- .\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-@@ -24,7 +24,7 @@
- .\" IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--.TH "svn2cl" "1" "Apr 2007" "Version 0.9" "User Commands"
-+.TH "svn2cl" "1" "Apr 2008" "Version 0.11" "User Commands"
- .nh
- .SH "NAME"
- svn2cl - Create a ChangeLog from a subversion log.
-@@ -35,10 +35,10 @@ svn2cl - Create a ChangeLog from a subversion log.
-
- .SH "DESCRIPTION"
- \fBsvn2cl\fP generates a classic GNU-style ChangeLog from the log messages in
a subversion repository.
--It acts as a wrapper around the `\fBsvn log\fP' command, parsing the XML
output with an XSLT stylesheet.
-+It acts as a wrapper around the '\fBsvn log\fP' command, parsing the XML
output with an XSLT stylesheet.
- Alternatively it can generate HTML output intended for use with the
\fBsvn2html.css\fP style sheet that comes with \fBsvn2cl\fP.
-
--In addition to its own options, it accepts and passes along most svn log
options; see `\fBsvn help log\fP' for a list of those and their documentation.
-+In addition to its own options, it accepts and passes along most svn log
options; see '\fBsvn help log\fP' for a list of those and their documentation.
- If PATH is not given, \fBsvn2cl\fP will run svn log on the current directory,
so it should do the right thing when run from the top of a subversion checkout
of the project.
-
- .TP
-@@ -69,6 +69,11 @@ Include the subversion revision number in the ChangeLo
- If the \-\-html option is specified this is implied, edit \fBsvn2html.css\fP
to turn it off.
-
- .TP
-+\fB\-a\fR, \fB\-\-include\-actions\fR
-+Add action labels [ADD], [DEL] and [CPY] tags to files to show the operation
-+that is performned on the files.
-+
-+.TP
- \fB\-\-break\-before\-msg\fR[=\fINUM\fR]
- Add a line break (or multiple line breadks) between the paths and the log
message.
- If the \-\-html option is specified this option is ignored, edit
\fBsvn2html.css\fP to set spacing.
-@@ -86,8 +91,8 @@ This option is ignored for normal text output.
- .TP
- \fB\-\-revision\-link\fR=\fINAME\fR
- This option is used to generate links from the revision numbers in the
generated HTML file.
--If \fINAME\fR contains two hashes `\fB##\fP' that part will be replaced by
the revision number, otherwise the revision number will be appended to
\fINAME\fR.
--Only the first occurrence of `\fB##\fP' will be replaced.
-+If \fINAME\fR contains two hashes '\fB##\fP' that part will be replaced by
the revision number, otherwise the revision number will be appended to
\fINAME\fR.
-+Only the first occurrence of '\fB##\fP' will be replaced.
- .br
- This option is ignored for normal text output.
-
-@@ -126,10 +131,10 @@ Show short summary of options.
- Show version of program.
-
- .PP
--Optional PATH arguments and the following options are passed directly to the
`\fBsvn \-\-xml log\fP' command:
-+Optional PATH arguments and the following options are passed directly to the
'\fBsvn \-\-xml log\fP' command:
- \fB\-r\fR, \fB\-\-revision\fR, \fB\-\-targets\fR, \fB\-\-stop\-on\-copy\fR,
\fB\-\-username\fR, \fB\-\-password\fR, \fB\-\-no\-auth\-cache\fR,
\fB\-\-non\-interactive\fR, \fB\-\-config\-dir\fR and \fB\-\-limit\fR.
- .br
--See `\fBsvn help log\fP' for more information on these options.
-+See '\fBsvn help log\fP' for more information on these options.
-
- .SH "AUTHORS FILES"
-
-@@ -164,6 +169,13 @@ As a bonus a plain text authors file that looks like t
- arthur:Arthur de Jong <art...@ch.tudelft.nl>
- .ft R
-
-+.SH "NOTES"
-+
-+Note that the default revison range for \fBsvn log\fP is BASE:1.
-+This means that \fBsvn2cl\fP will not always include the most recent revisons
-+of the repository. Either run '\fBsvn update\fP' before running \fBsvn2cl\fP
-+or pass '\fB\-r HEAD:1\fP'.
-+
- .SH "EXAMPLES"
-
- Run svn log recursively on the current directory and generate a text
ChangeLog file in the current directory for the entire log history:
-@@ -182,14 +194,15 @@ Generate an HTML changelog for svn://svn.example.com/p
- Group all commits per day into one ChangeLog entry and only include changes
from 2005:
- .ft B
- svn2cl \-\-html \-\-strip\-prefix=project/trunk \-\-group\-by\-day \e
-- \-r '{2006\-01\-01}:{2005\-01\-01}'
svn://svn.example.com/project/trunk
-+ \-r '{2006\-01\-01}:{2005\-01\-01}' \e
-+ svn://svn.example.com/project/trunk
- .ft R
-
- .SH "SEE ALSO"
--.BR `\fBsvn\ help\ log\fP'
-+.BR '\fBsvn\ help\ log\fP'
-
- .SH "COPYRIGHT"
--Copyright \(co 2005, 2006, 2007 Arthur de Jong <art...@ch.tudelft.nl>.
-+Copyright \(co 2005, 2006, 2007, 2008 Arthur de Jong <art...@ch.tudelft.nl>.
- .br
- This is free software; see the license for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Index: patches/patch-contrib_client-side_svn2cl_svn2cl_sh
===================================================================
RCS file: patches/patch-contrib_client-side_svn2cl_svn2cl_sh
diff -N patches/patch-contrib_client-side_svn2cl_svn2cl_sh
--- patches/patch-contrib_client-side_svn2cl_svn2cl_sh 27 Dec 2008 19:20:36
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,114 +0,0 @@
-$OpenBSD: patch-contrib_client-side_svn2cl_svn2cl_sh,v 1.1 2008/12/27 19:20:36
steven Exp $
---- contrib/client-side/svn2cl/svn2cl.sh.orig Sun Apr 8 14:18:27 2007
-+++ contrib/client-side/svn2cl/svn2cl.sh Mon Dec 22 21:41:47 2008
-@@ -2,9 +2,9 @@
-
- # svn2cl.sh - front end shell script for svn2cl.xsl, calls xsltproc
- # with the correct parameters
--#
--# Copyright (C) 2005, 2006, 2007 Arthur de Jong.
--#
-+#
-+# Copyright (C) 2005, 2006, 2007, 2008 Arthur de Jong.
-+#
- # Redistribution and use in source and binary forms, with or without
- # modification, are permitted provided that the following conditions
- # are met:
-@@ -17,7 +17,7 @@
- # 3. The name of the author may not be used to endorse or promote
- # products derived from this software without specific prior
- # written permission.
--#
-+#
- # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-@@ -36,7 +36,7 @@ set -e
- set -u
-
- # svn2cl version
--VERSION="0.9"
-+VERSION="0.11"
-
- # set default parameters
- PWD=`pwd`
-@@ -47,6 +47,7 @@ INCLUDEREV="no"
- BREAKBEFOREMSG="no"
- REPARAGRAPH="no"
- SEPARATEDAYLOGS="no"
-+ACTIONS="no"
- CHANGELOG=""
- OUTSTYLE="cl"
- SVNLOGCMD="svn --verbose --xml log"
-@@ -56,6 +57,7 @@ IGNORE_MESSAGE_STARTING=""
- TITLE="ChangeLog"
- REVISION_LINK="#r"
- TMPFILES=""
-+AWK="awk"
-
- # do command line checking
- prog=`basename $0`
-@@ -90,8 +92,12 @@ do
- INCLUDEREV="yes";
- shift
- ;;
-+ -a|--include-actions)
-+ ACTIONS="yes"
-+ shift
-+ ;;
- --break-before-msg|--breaks-before-msg)
-- # FIXME: if next argument is numeric use that as a parameter
-+ # FIXME: if next argument is numeric use that as a parameter
- BREAKBEFOREMSG="yes"
- shift
- ;;
-@@ -210,6 +216,7 @@ do
- echo " --group-by-day group changelog entries by day"
- echo " --separate-daylogs put a blank line between grouped by day
entries"
- echo " -i, --include-rev include revision numbers"
-+ echo " -a, --include-actions add [ADD], [DEL] and [CPY] tags to
files"
- echo " --break-before-msg[=NUM] add a line break (or multiple breaks)"
- echo " between the paths and the log message"
- echo " --reparagraph rewrap lines inside a paragraph"
-@@ -228,12 +235,12 @@ do
- echo "PATH arguments and the following options are passed to the svn
log"
- echo "command: -r, --revision, --targets --stop-on-copy, --username,"
- echo "--password, --no-auth-cache, --non-interactive, --config-dir and"
-- echo "--limit (see \`svn help log' for more information)."
-+ echo "--limit (see 'svn help log' for more information)."
- exit 0
- ;;
- -*)
- echo "$prog: invalid option -- $1"
-- echo "Try \`$prog --help' for more information."
-+ echo "Try '$prog --help' for more information."
- exit 1
- ;;
- *)
-@@ -282,13 +289,16 @@ AUTHORSFILE=`echo "$AUTHORSFILE" | sed "/^[^/]/s|^|$pw
- if [ -z "$CHANGELOG" ]
- then
- CHANGELOG="ChangeLog"
-- [ "$OUTSTYLE" != "cl" ] && CHANGELOG="$CHANGELOG.$OUTSTYLE"
-+ if [ "$OUTSTYLE" != "cl" ]
-+ then
-+ CHANGELOG="$CHANGELOG.$OUTSTYLE"
-+ fi
- fi
-
- # try to determin a prefix to strip from all paths
- if [ "$STRIPPREFIX" = "AUTOMATICALLY-DETERMINED" ]
- then
-- STRIPPREFIX=`LANG=C eval "$SVNINFOCMD" 2> /dev/null | awk '/^URL:/{url=$2}
/^Repository Root:/{root=$3} END{if(root){print
substr(url,length(root)+2)}else{gsub("^.*/","",url);print url}}'`
-+ STRIPPREFIX=`LANG=C eval "$SVNINFOCMD" 2> /dev/null | $AWK '/^URL:/{url=$2}
/^Repository Root:/{root=$3} END{if(root){print
substr(url,length(root)+2)}else{n=split(url,u,"/");print u[n]}}'`
- STRIPPREFIX=`echo "$STRIPPREFIX" | sed 's/%20/ /g'`
- fi
-
-@@ -305,6 +315,7 @@ eval "$SVNLOGCMD" | \
- --stringparam groupbyday "$GROUPBYDAY" \
- --stringparam separate-daylogs "$SEPARATEDAYLOGS" \
- --stringparam include-rev "$INCLUDEREV" \
-+ --stringparam include-actions "$ACTIONS" \
- --stringparam breakbeforemsg "$BREAKBEFOREMSG" \
- --stringparam reparagraph "$REPARAGRAPH" \
- --stringparam authorsfile "$AUTHORSFILE" \
Index: patches/patch-contrib_client-side_svn2cl_svn2cl_xsl
===================================================================
RCS file: patches/patch-contrib_client-side_svn2cl_svn2cl_xsl
diff -N patches/patch-contrib_client-side_svn2cl_svn2cl_xsl
--- patches/patch-contrib_client-side_svn2cl_svn2cl_xsl 27 Dec 2008 19:20:36
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,113 +0,0 @@
-$OpenBSD: patch-contrib_client-side_svn2cl_svn2cl_xsl,v 1.1 2008/12/27
19:20:36 steven Exp $
---- contrib/client-side/svn2cl/svn2cl.xsl.orig Sun Apr 8 14:18:27 2007
-+++ contrib/client-side/svn2cl/svn2cl.xsl Mon Dec 22 21:41:47 2008
-@@ -5,7 +5,7 @@
- svn2cl.xsl - xslt stylesheet for converting svn log to a normal
- changelog
-
-- version 0.9
-+ version 0.11
-
- Usage (replace ++ with two minus signs which aren't allowed
- inside xml comments):
-@@ -15,6 +15,7 @@
- ++stringparam groupbyday yes \
- ++stringparam separate-daylogs yes \
- ++stringparam include-rev yes \
-+ ++stringparam include-actions yes \
- ++stringparam breakbeforemsg yes/2 \
- ++stringparam reparagraph yes \
- ++stringparam authorsfile FILE \
-@@ -56,7 +57,7 @@
-
- <!DOCTYPE xsl:stylesheet [
- <!ENTITY tab "	">
-- <!ENTITY newl " ">
-+ <!ENTITY newl "&#xA;">
- <!ENTITY space " ">
- ]>
-
-@@ -79,7 +80,7 @@
-
- <!-- the length of a line to wrap messages at -->
- <xsl:param name="linelen" select="75" />
--
-+
- <!-- whether entries should be grouped by day -->
- <xsl:param name="groupbyday" select="'no'" />
-
-@@ -89,6 +90,9 @@
- <!-- whether a revision number should be included -->
- <xsl:param name="include-rev" select="'no'" />
-
-+ <!-- whether aaction labels should be added to files -->
-+ <xsl:param name="include-actions" select="'no'" />
-+
- <!-- whether the log message should start on a new line -->
- <xsl:param name="breakbeforemsg" select="'no'" />
-
-@@ -177,7 +181,6 @@
- <!-- get paths string -->
- <xsl:variable name="paths">
- <xsl:apply-templates select="paths" />
-- <xsl:text>:&space;</xsl:text>
- </xsl:variable>
- <!-- get revision number -->
- <xsl:variable name="rev">
-@@ -208,9 +211,17 @@
- <xsl:if test="$groupbyday='yes' and
$separate-daylogs='yes'"><xsl:text>&newl;</xsl:text></xsl:if>
- <!-- first line is indented (other indents are done in wrap template) -->
- <xsl:text>&tab;*&space;</xsl:text>
-+ <!-- set up the text to wrap -->
-+ <xsl:variable name="txt">
-+ <xsl:value-of select="$rev" />
-+ <xsl:if test="$paths!=''">
-+ <xsl:value-of select="concat($paths,':&space;')" />
-+ </xsl:if>
-+ <xsl:value-of select="$msg" />
-+ </xsl:variable>
- <!-- print the paths and message nicely wrapped -->
- <xsl:call-template name="wrap">
-- <xsl:with-param name="txt" select="concat($rev,$paths,$msg)" />
-+ <xsl:with-param name="txt" select="$txt" />
- </xsl:call-template>
- </xsl:template>
-
-@@ -301,6 +312,10 @@
- <xsl:call-template name="printpath">
- <xsl:with-param name="path"
select="substring(normalize-space(.),string-length($strip-prefix)+3)" />
- </xsl:call-template>
-+ <!-- add the action flag -->
-+ <xsl:if test="$include-actions='yes'">
-+ <xsl:apply-templates select="." mode="action"/>
-+ </xsl:if>
- </xsl:for-each>
- </xsl:when>
- <!-- print a simple list of all paths -->
-@@ -313,8 +328,26 @@
- </xsl:if>
- <!-- print the path name -->
- <xsl:value-of select="normalize-space(.)" />
-+ <!-- add the action flag -->
-+ <xsl:if test="$include-actions='yes'">
-+ <xsl:apply-templates select="." mode="action"/>
-+ </xsl:if>
- </xsl:for-each>
- </xsl:otherwise>
-+ </xsl:choose>
-+ </xsl:template>
-+
-+ <xsl:template match="path" mode="action">
-+ <xsl:choose>
-+ <xsl:when test="@action='D'">
-+ <xsl:text>[DEL]</xsl:text>
-+ </xsl:when>
-+ <xsl:when test="@copyfrom-path">
-+ <xsl:text>[CPY]</xsl:text>
-+ </xsl:when>
-+ <xsl:when test="@action='D'">
-+ <xsl:text>[ADD]</xsl:text>
-+ </xsl:when>
- </xsl:choose>
- </xsl:template>
-
Index: patches/patch-contrib_client-side_svn2cl_svn2html_xsl
===================================================================
RCS file: patches/patch-contrib_client-side_svn2cl_svn2html_xsl
diff -N patches/patch-contrib_client-side_svn2cl_svn2html_xsl
--- patches/patch-contrib_client-side_svn2cl_svn2html_xsl 27 Dec 2008
19:20:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-$OpenBSD: patch-contrib_client-side_svn2cl_svn2html_xsl,v 1.1 2008/12/27
19:20:36 steven Exp $
---- contrib/client-side/svn2cl/svn2html.xsl.orig Sun Apr 8 14:18:27 2007
-+++ contrib/client-side/svn2cl/svn2html.xsl Mon Dec 22 21:41:47 2008
-@@ -5,7 +5,7 @@
- svn2html.xsl - xslt stylesheet for converting svn log to a normal
- changelog fromatted in html
-
-- version 0.9
-+ version 0.11
-
- Usage (replace ++ with two minus signs):
- svn ++verbose ++xml log | \
-@@ -13,7 +13,7 @@
- ++stringparam groupbyday yes \
- ++stringparam authorsfile FILE \
- ++stringparam title NAME \
-- ++stringparam revision-link NAME \
-+ ++stringparam revision-link NAME \
- svn2html.xsl - > ChangeLog.html
-
- This file is partially based on (and includes) svn2cl.xsl.
-@@ -48,7 +48,7 @@
- -->
-
- <!DOCTYPE xsl:stylesheet [
-- <!ENTITY newl " ">
-+ <!ENTITY newl "&#xA;">
- <!ENTITY space " ">
- ]>
-
-@@ -100,7 +100,7 @@
- </xsl:choose>
- </ul>
- <p class="changelog_footer">
-- <xsl:text>Generated by </xsl:text><a
href="http://ch.tudelft.nl/~arthur/svn2cl/";>svn2cl 0.9</a>
-+ <xsl:text>Generated by </xsl:text><a
href="http://ch.tudelft.nl/~arthur/svn2cl/";>svn2cl 0.11</a>
- </p>
- </body>
- </html>
-@@ -159,7 +159,7 @@
- <xsl:when test="contains($revision-link,'##')">
- <xsl:value-of
select="concat(substring-before($revision-link,'##'),@revision,substring-after($revision-link,'##'))"
/>
- </xsl:when>
-- <xsl:otherwise>
-+ <xsl:otherwise>
- <xsl:value-of select="concat($revision-link,@revision)" />
- </xsl:otherwise>
- </xsl:choose>
Index: patches/patch-subversion_libsvn_subr_auth_c
===================================================================
RCS file: patches/patch-subversion_libsvn_subr_auth_c
diff -N patches/patch-subversion_libsvn_subr_auth_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-subversion_libsvn_subr_auth_c 20 Feb 2009 02:05:11 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- subversion/libsvn_subr/auth.c.orig Fri Feb 20 01:59:30 2009
++++ subversion/libsvn_subr/auth.c Fri Feb 20 02:05:05 2009
+@@ -393,7 +393,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,
+- "libsvn_auth_%s-%d.so.0",
++ "libsvn_auth_%s-%d.so.${SO_VERSION}",
+ provider_name,
+ SVN_VER_MAJOR);
+ library_label = apr_psprintf(pool, "svn_%s", provider_name);
Index: pkg/PLIST-ap2
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/pkg/PLIST-ap2,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-ap2
--- pkg/PLIST-ap2 2 Nov 2008 20:43:49 -0000 1.2
+++ pkg/PLIST-ap2 20 Feb 2009 20:36:15 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-ap2,v 1.2 2008/11/02 20:43:49 steven Exp $
include/subversion-1/mod_authz_svn.h
include/subversion-1/mod_dav_svn.h
+lib/apache2/
lib/apache2/mod_authz_svn.so
lib/apache2/mod_dav_svn.so
Index: pkg/PLIST-main
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 27 Dec 2008 19:20:36 -0000 1.4
+++ pkg/PLIST-main 20 Feb 2009 20:36:16 -0000
@@ -2,9 +2,13 @@
@pkgpath devel/subversion,no_bindings
@pkgpath devel/subversion
%%SHARED%%
+...@comment @bin bin/diff
+...@comment @bin bin/diff3
+...@comment @bin bin/diff4
@bin bin/svn
@bin bin/svn-populate-node-origins-index
@bin bin/svnadmin
+...@bin bin/svnauthz-validate
@bin bin/svndumpfilter
@bin bin/svnlook
@bin bin/svnmucc
@@ -15,6 +19,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_checksum.h
include/subversion-1/svn_client.h
include/subversion-1/svn_cmdline.h
include/subversion-1/svn_compat.h
@@ -23,6 +28,7 @@ include/subversion-1/svn_ctype.h
include/subversion-1/svn_dav.h
include/subversion-1/svn_delta.h
include/subversion-1/svn_diff.h
+include/subversion-1/svn_dirent_uri.h
include/subversion-1/svn_dso.h
include/subversion-1/svn_error.h
include/subversion-1/svn_error_codes.h
@@ -89,6 +95,7 @@ lib/libsvn_wc-1.la
@man man/man8/svnserve.8
share/examples/subversion/
@sample ${SYSCONFDIR}/subversion/
+share/examples/subversion/SvnCLBrowse
share/examples/subversion/backup/
share/examples/subversion/backup/hot-backup.py
share/examples/subversion/bdb/
Index: pkg/PLIST-perl
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/pkg/PLIST-perl,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-perl
--- pkg/PLIST-perl 27 Dec 2008 19:20:36 -0000 1.4
+++ pkg/PLIST-perl 20 Feb 2009 20:37:24 -0000
@@ -2,6 +2,7 @@
%%SHARED%%
lib/libsvn_swig_perl-1.a
lib/libsvn_swig_perl-1.la
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Base.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Client.pm
@@ -11,6 +12,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Ra.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Repos.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/SVN/Wc.pm
+libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/SVN/_Client/_Client.bs
Index: pkg/PLIST-python
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/pkg/PLIST-python,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-python
--- pkg/PLIST-python 2 Nov 2008 20:43:49 -0000 1.5
+++ pkg/PLIST-python 20 Feb 2009 20:33:46 -0000
@@ -2,6 +2,8 @@
%%SHARED%%
lib/libsvn_swig_py-1.a
lib/libsvn_swig_py-1.la
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/libsvn/
lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.py
lib/python${MODPY_VERSION}/site-packages/libsvn/__init__.pyc
Index: pkg/PLIST-ruby
===================================================================
RCS file: /usr/cvs/ports/devel/subversion/pkg/PLIST-ruby,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-ruby
--- pkg/PLIST-ruby 2 Nov 2008 20:43:49 -0000 1.4
+++ pkg/PLIST-ruby 20 Feb 2009 20:33:20 -0000
@@ -2,6 +2,10 @@
%%SHARED%%
lib/libsvn_swig_ruby-1.a
lib/libsvn_swig_ruby-1.la
+lib/ruby/
+lib/ruby/site_ruby/
+lib/ruby/site_ruby/${MODRUBY_REV}/
+lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/
lib/ruby/site_ruby/${MODRUBY_REV}/${MODRUBY_ARCH}/svn/ext/client.a
