Update to 1.2.1.

  Add ruby bindings [1].
  Fix WITH_BOOK option [2].

PR:		ports/82949 [1], ports/81808 [2]

20 files changed, 372 insertions, 36 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 8c3052aa688d..55c3a3ede6f9 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -106,6 +106,16 @@ PLIST_SUB+=		WITH_PYTHON=""
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
+.if defined(WITH_RUBY)
+USE_RUBY=		yes
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+SWIG_BINDINGS+=		ruby
+DEPENDS_ARGS+=		WANT_SWIG_RUBY=yes
+PLIST_SUB+=		WITH_RUBY=""
+.else
+PLIST_SUB+=		WITH_RUBY="@comment "
+.endif
+
 #.if defined(WITH_JAVA)
 #USE_JAVA=	yes
 #JAVA_VERSION=	1.2+
@@ -217,6 +227,12 @@ pre-extract:
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .endif
 	@${ECHO_MSG} ""
+.if defined(WITH_RUBY)
+	@${ECHO_MSG} "Build with Ruby bindings."
+.else
+	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
+.endif
+	@${ECHO_MSG} ""
 #.if defined(WITH_JAVA)
 #	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
 #.else
@@ -300,8 +316,8 @@ pre-configure:
 .if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
- 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
- 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
+		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
+		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \
 		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
@@ -319,6 +335,10 @@ post-build:
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
+.if defined(WITH_RUBY)
+	cd ${WRKSRC} ; \
+	  ${MAKE} swig-rb
+.endif
 #.if defined(WITH_JAVA)
 #	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
 #	cd ${WRKSRC} ; \
@@ -340,11 +360,8 @@ post-install:	${MKREPOS_TARGET}
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
-	@${MKDIR} ${DOCSDIR}/book/images
-	cd ${WRKSRC}/doc/book/book ; \
+	cd ${WRKSRC}/doc/book ; \
 	  ${INSTALL_DATA} svn-book.html svn-book.pdf ${DOCSDIR}/book
-	cd ${WRKSRC}/doc/book/book/images ; \
-	  ${INSTALL_DATA} *.png ${DOCSDIR}/book/images
 .endif
 .endif
 .if defined(WITH_PERL)
@@ -356,6 +373,10 @@ post-install:	${MKREPOS_TARGET}
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
+.if defined(WITH_RUBY)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-swig-rb
+.endif
 #.if defined(WITH_JAVA)
 #	cd ${WRKSRC} ; \
 #	  ${MAKE} install-javahl
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index 9d0ec99dbd21..fc9449dd3435 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.2.0.tar.bz2) = f25c0c884201f411e99a6cb6c25529ff
-SIZE (subversion-1.2.0.tar.bz2) = 7011017
+MD5 (subversion-1.2.1.tar.bz2) = 0b546195ca794c327c6830f2e88661f7
+SIZE (subversion-1.2.1.tar.bz2) = 7226600
diff --git a/devel/subversion-devel/files/patch-subversion::bindings::swig::core.i b/devel/subversion-devel/files/patch-subversion::bindings::swig::core.i
new file mode 100644
index 000000000000..15b2da42b450
--- /dev/null
+++ b/devel/subversion-devel/files/patch-subversion::bindings::swig::core.i
@@ -0,0 +1,18 @@
+--- subversion/bindings/swig/core.i.orig	Wed Jul 13 14:25:06 2005
++++ subversion/bindings/swig/core.i	Wed Jul 13 14:25:24 2005
+@@ -425,13 +425,13 @@
+ 
+ static apr_pool_t *current_pool = 0;
+ 
+-SWIGEXPORT(apr_pool_t *)
++SWIGEXPORT apr_pool_t *
+ svn_swig_pl_get_current_pool (void)
+ {
+   return current_pool;
+ }
+ 
+-SWIGEXPORT(void)
++SWIGEXPORT void
+ svn_swig_pl_set_current_pool (apr_pool_t *pool)
+ {
+   current_pool = pool;
diff --git a/devel/subversion-devel/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c b/devel/subversion-devel/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
new file mode 100644
index 000000000000..2b9c9787fef2
--- /dev/null
+++ b/devel/subversion-devel/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
@@ -0,0 +1,22 @@
+--- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig	Tue Mar 22 23:42:12 2005
++++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c	Mon Jul  4 02:40:49 2005
+@@ -1,10 +1,16 @@
+-#include "swigutil_rb.h"
+ #include <st.h>
+ 
+-#include <swigrun.swg>
++#if SVN_SWIG_VERSION >= 103024
++#if SVN_SWIG_VERSION >= 103025
++#include <swiglabels.swg>
++#endif
+ #include <ruby/rubyhead.swg>
+-#include <common.swg>
++#include <swigrun.swg>
+ #include <ruby/rubydef.swg>
++#include <runtime.swg>
++#endif
++
++#include "swigutil_rb.h"
+ 
+ static VALUE mSvn = Qnil;
+ static VALUE mSvnCore = Qnil;
diff --git a/devel/subversion-devel/pkg-plist b/devel/subversion-devel/pkg-plist
index 8f385845ccd7..68f811d5a394 100644
--- a/devel/subversion-devel/pkg-plist
+++ b/devel/subversion-devel/pkg-plist
@@ -256,6 +256,29 @@ lib/libsvn_wc-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.a
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so.0
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.so
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/client.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/core.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/delta.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/error.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/fs.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/info.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/ra.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/repos.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/util.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/wc.rb
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn/ext
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn
+%%WITH_RUBY%%@dirrm %%RUBY_SITELIBDIR%%/svn
 @dirrm %%DATADIR%%/backup
 @dirrm %%DATADIR%%/bdb
 @dirrm %%DATADIR%%/client-side
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 8c3052aa688d..55c3a3ede6f9 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -106,6 +106,16 @@ PLIST_SUB+=		WITH_PYTHON=""
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
+.if defined(WITH_RUBY)
+USE_RUBY=		yes
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+SWIG_BINDINGS+=		ruby
+DEPENDS_ARGS+=		WANT_SWIG_RUBY=yes
+PLIST_SUB+=		WITH_RUBY=""
+.else
+PLIST_SUB+=		WITH_RUBY="@comment "
+.endif
+
 #.if defined(WITH_JAVA)
 #USE_JAVA=	yes
 #JAVA_VERSION=	1.2+
@@ -217,6 +227,12 @@ pre-extract:
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .endif
 	@${ECHO_MSG} ""
+.if defined(WITH_RUBY)
+	@${ECHO_MSG} "Build with Ruby bindings."
+.else
+	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
+.endif
+	@${ECHO_MSG} ""
 #.if defined(WITH_JAVA)
 #	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
 #.else
@@ -300,8 +316,8 @@ pre-configure:
 .if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
- 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
- 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
+		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
+		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \
 		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
@@ -319,6 +335,10 @@ post-build:
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
+.if defined(WITH_RUBY)
+	cd ${WRKSRC} ; \
+	  ${MAKE} swig-rb
+.endif
 #.if defined(WITH_JAVA)
 #	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
 #	cd ${WRKSRC} ; \
@@ -340,11 +360,8 @@ post-install:	${MKREPOS_TARGET}
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
-	@${MKDIR} ${DOCSDIR}/book/images
-	cd ${WRKSRC}/doc/book/book ; \
+	cd ${WRKSRC}/doc/book ; \
 	  ${INSTALL_DATA} svn-book.html svn-book.pdf ${DOCSDIR}/book
-	cd ${WRKSRC}/doc/book/book/images ; \
-	  ${INSTALL_DATA} *.png ${DOCSDIR}/book/images
 .endif
 .endif
 .if defined(WITH_PERL)
@@ -356,6 +373,10 @@ post-install:	${MKREPOS_TARGET}
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
+.if defined(WITH_RUBY)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-swig-rb
+.endif
 #.if defined(WITH_JAVA)
 #	cd ${WRKSRC} ; \
 #	  ${MAKE} install-javahl
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index 9d0ec99dbd21..fc9449dd3435 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.2.0.tar.bz2) = f25c0c884201f411e99a6cb6c25529ff
-SIZE (subversion-1.2.0.tar.bz2) = 7011017
+MD5 (subversion-1.2.1.tar.bz2) = 0b546195ca794c327c6830f2e88661f7
+SIZE (subversion-1.2.1.tar.bz2) = 7226600
diff --git a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::core.i b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::core.i
new file mode 100644
index 000000000000..15b2da42b450
--- /dev/null
+++ b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::core.i
@@ -0,0 +1,18 @@
+--- subversion/bindings/swig/core.i.orig	Wed Jul 13 14:25:06 2005
++++ subversion/bindings/swig/core.i	Wed Jul 13 14:25:24 2005
+@@ -425,13 +425,13 @@
+ 
+ static apr_pool_t *current_pool = 0;
+ 
+-SWIGEXPORT(apr_pool_t *)
++SWIGEXPORT apr_pool_t *
+ svn_swig_pl_get_current_pool (void)
+ {
+   return current_pool;
+ }
+ 
+-SWIGEXPORT(void)
++SWIGEXPORT void
+ svn_swig_pl_set_current_pool (apr_pool_t *pool)
+ {
+   current_pool = pool;
diff --git a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
new file mode 100644
index 000000000000..2b9c9787fef2
--- /dev/null
+++ b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
@@ -0,0 +1,22 @@
+--- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig	Tue Mar 22 23:42:12 2005
++++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c	Mon Jul  4 02:40:49 2005
+@@ -1,10 +1,16 @@
+-#include "swigutil_rb.h"
+ #include <st.h>
+ 
+-#include <swigrun.swg>
++#if SVN_SWIG_VERSION >= 103024
++#if SVN_SWIG_VERSION >= 103025
++#include <swiglabels.swg>
++#endif
+ #include <ruby/rubyhead.swg>
+-#include <common.swg>
++#include <swigrun.swg>
+ #include <ruby/rubydef.swg>
++#include <runtime.swg>
++#endif
++
++#include "swigutil_rb.h"
+ 
+ static VALUE mSvn = Qnil;
+ static VALUE mSvnCore = Qnil;
diff --git a/devel/subversion-freebsd/pkg-plist b/devel/subversion-freebsd/pkg-plist
index 8f385845ccd7..68f811d5a394 100644
--- a/devel/subversion-freebsd/pkg-plist
+++ b/devel/subversion-freebsd/pkg-plist
@@ -256,6 +256,29 @@ lib/libsvn_wc-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.a
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so.0
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.so
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/client.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/core.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/delta.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/error.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/fs.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/info.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/ra.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/repos.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/util.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/wc.rb
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn/ext
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn
+%%WITH_RUBY%%@dirrm %%RUBY_SITELIBDIR%%/svn
 @dirrm %%DATADIR%%/backup
 @dirrm %%DATADIR%%/bdb
 @dirrm %%DATADIR%%/client-side
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 8c3052aa688d..55c3a3ede6f9 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -106,6 +106,16 @@ PLIST_SUB+=		WITH_PYTHON=""
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
+.if defined(WITH_RUBY)
+USE_RUBY=		yes
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+SWIG_BINDINGS+=		ruby
+DEPENDS_ARGS+=		WANT_SWIG_RUBY=yes
+PLIST_SUB+=		WITH_RUBY=""
+.else
+PLIST_SUB+=		WITH_RUBY="@comment "
+.endif
+
 #.if defined(WITH_JAVA)
 #USE_JAVA=	yes
 #JAVA_VERSION=	1.2+
@@ -217,6 +227,12 @@ pre-extract:
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .endif
 	@${ECHO_MSG} ""
+.if defined(WITH_RUBY)
+	@${ECHO_MSG} "Build with Ruby bindings."
+.else
+	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
+.endif
+	@${ECHO_MSG} ""
 #.if defined(WITH_JAVA)
 #	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
 #.else
@@ -300,8 +316,8 @@ pre-configure:
 .if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
- 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
- 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
+		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
+		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \
 		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
@@ -319,6 +335,10 @@ post-build:
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
+.if defined(WITH_RUBY)
+	cd ${WRKSRC} ; \
+	  ${MAKE} swig-rb
+.endif
 #.if defined(WITH_JAVA)
 #	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
 #	cd ${WRKSRC} ; \
@@ -340,11 +360,8 @@ post-install:	${MKREPOS_TARGET}
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
-	@${MKDIR} ${DOCSDIR}/book/images
-	cd ${WRKSRC}/doc/book/book ; \
+	cd ${WRKSRC}/doc/book ; \
 	  ${INSTALL_DATA} svn-book.html svn-book.pdf ${DOCSDIR}/book
-	cd ${WRKSRC}/doc/book/book/images ; \
-	  ${INSTALL_DATA} *.png ${DOCSDIR}/book/images
 .endif
 .endif
 .if defined(WITH_PERL)
@@ -356,6 +373,10 @@ post-install:	${MKREPOS_TARGET}
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
+.if defined(WITH_RUBY)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-swig-rb
+.endif
 #.if defined(WITH_JAVA)
 #	cd ${WRKSRC} ; \
 #	  ${MAKE} install-javahl
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 9d0ec99dbd21..fc9449dd3435 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.2.0.tar.bz2) = f25c0c884201f411e99a6cb6c25529ff
-SIZE (subversion-1.2.0.tar.bz2) = 7011017
+MD5 (subversion-1.2.1.tar.bz2) = 0b546195ca794c327c6830f2e88661f7
+SIZE (subversion-1.2.1.tar.bz2) = 7226600
diff --git a/devel/subversion/files/patch-subversion::bindings::swig::core.i b/devel/subversion/files/patch-subversion::bindings::swig::core.i
new file mode 100644
index 000000000000..15b2da42b450
--- /dev/null
+++ b/devel/subversion/files/patch-subversion::bindings::swig::core.i
@@ -0,0 +1,18 @@
+--- subversion/bindings/swig/core.i.orig	Wed Jul 13 14:25:06 2005
++++ subversion/bindings/swig/core.i	Wed Jul 13 14:25:24 2005
+@@ -425,13 +425,13 @@
+ 
+ static apr_pool_t *current_pool = 0;
+ 
+-SWIGEXPORT(apr_pool_t *)
++SWIGEXPORT apr_pool_t *
+ svn_swig_pl_get_current_pool (void)
+ {
+   return current_pool;
+ }
+ 
+-SWIGEXPORT(void)
++SWIGEXPORT void
+ svn_swig_pl_set_current_pool (apr_pool_t *pool)
+ {
+   current_pool = pool;
diff --git a/devel/subversion/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c b/devel/subversion/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
new file mode 100644
index 000000000000..2b9c9787fef2
--- /dev/null
+++ b/devel/subversion/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
@@ -0,0 +1,22 @@
+--- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig	Tue Mar 22 23:42:12 2005
++++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c	Mon Jul  4 02:40:49 2005
+@@ -1,10 +1,16 @@
+-#include "swigutil_rb.h"
+ #include <st.h>
+ 
+-#include <swigrun.swg>
++#if SVN_SWIG_VERSION >= 103024
++#if SVN_SWIG_VERSION >= 103025
++#include <swiglabels.swg>
++#endif
+ #include <ruby/rubyhead.swg>
+-#include <common.swg>
++#include <swigrun.swg>
+ #include <ruby/rubydef.swg>
++#include <runtime.swg>
++#endif
++
++#include "swigutil_rb.h"
+ 
+ static VALUE mSvn = Qnil;
+ static VALUE mSvnCore = Qnil;
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 8f385845ccd7..68f811d5a394 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -256,6 +256,29 @@ lib/libsvn_wc-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.a
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so.0
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.so
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/client.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/core.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/delta.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/error.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/fs.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/info.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/ra.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/repos.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/util.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/wc.rb
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn/ext
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn
+%%WITH_RUBY%%@dirrm %%RUBY_SITELIBDIR%%/svn
 @dirrm %%DATADIR%%/backup
 @dirrm %%DATADIR%%/bdb
 @dirrm %%DATADIR%%/client-side
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 8c3052aa688d..55c3a3ede6f9 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -106,6 +106,16 @@ PLIST_SUB+=		WITH_PYTHON=""
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
+.if defined(WITH_RUBY)
+USE_RUBY=		yes
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+SWIG_BINDINGS+=		ruby
+DEPENDS_ARGS+=		WANT_SWIG_RUBY=yes
+PLIST_SUB+=		WITH_RUBY=""
+.else
+PLIST_SUB+=		WITH_RUBY="@comment "
+.endif
+
 #.if defined(WITH_JAVA)
 #USE_JAVA=	yes
 #JAVA_VERSION=	1.2+
@@ -217,6 +227,12 @@ pre-extract:
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .endif
 	@${ECHO_MSG} ""
+.if defined(WITH_RUBY)
+	@${ECHO_MSG} "Build with Ruby bindings."
+.else
+	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
+.endif
+	@${ECHO_MSG} ""
 #.if defined(WITH_JAVA)
 #	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
 #.else
@@ -300,8 +316,8 @@ pre-configure:
 .if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
- 		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
- 		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
+		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
+		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \
 		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
@@ -319,6 +335,10 @@ post-build:
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
+.if defined(WITH_RUBY)
+	cd ${WRKSRC} ; \
+	  ${MAKE} swig-rb
+.endif
 #.if defined(WITH_JAVA)
 #	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
 #	cd ${WRKSRC} ; \
@@ -340,11 +360,8 @@ post-install:	${MKREPOS_TARGET}
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
 .if defined(WITH_BOOK)
-	@${MKDIR} ${DOCSDIR}/book/images
-	cd ${WRKSRC}/doc/book/book ; \
+	cd ${WRKSRC}/doc/book ; \
 	  ${INSTALL_DATA} svn-book.html svn-book.pdf ${DOCSDIR}/book
-	cd ${WRKSRC}/doc/book/book/images ; \
-	  ${INSTALL_DATA} *.png ${DOCSDIR}/book/images
 .endif
 .endif
 .if defined(WITH_PERL)
@@ -356,6 +373,10 @@ post-install:	${MKREPOS_TARGET}
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
+.if defined(WITH_RUBY)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-swig-rb
+.endif
 #.if defined(WITH_JAVA)
 #	cd ${WRKSRC} ; \
 #	  ${MAKE} install-javahl
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 9d0ec99dbd21..fc9449dd3435 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.2.0.tar.bz2) = f25c0c884201f411e99a6cb6c25529ff
-SIZE (subversion-1.2.0.tar.bz2) = 7011017
+MD5 (subversion-1.2.1.tar.bz2) = 0b546195ca794c327c6830f2e88661f7
+SIZE (subversion-1.2.1.tar.bz2) = 7226600
diff --git a/devel/subversion16/files/patch-subversion::bindings::swig::core.i b/devel/subversion16/files/patch-subversion::bindings::swig::core.i
new file mode 100644
index 000000000000..15b2da42b450
--- /dev/null
+++ b/devel/subversion16/files/patch-subversion::bindings::swig::core.i
@@ -0,0 +1,18 @@
+--- subversion/bindings/swig/core.i.orig	Wed Jul 13 14:25:06 2005
++++ subversion/bindings/swig/core.i	Wed Jul 13 14:25:24 2005
+@@ -425,13 +425,13 @@
+ 
+ static apr_pool_t *current_pool = 0;
+ 
+-SWIGEXPORT(apr_pool_t *)
++SWIGEXPORT apr_pool_t *
+ svn_swig_pl_get_current_pool (void)
+ {
+   return current_pool;
+ }
+ 
+-SWIGEXPORT(void)
++SWIGEXPORT void
+ svn_swig_pl_set_current_pool (apr_pool_t *pool)
+ {
+   current_pool = pool;
diff --git a/devel/subversion16/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c b/devel/subversion16/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
new file mode 100644
index 000000000000..2b9c9787fef2
--- /dev/null
+++ b/devel/subversion16/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
@@ -0,0 +1,22 @@
+--- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig	Tue Mar 22 23:42:12 2005
++++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c	Mon Jul  4 02:40:49 2005
+@@ -1,10 +1,16 @@
+-#include "swigutil_rb.h"
+ #include <st.h>
+ 
+-#include <swigrun.swg>
++#if SVN_SWIG_VERSION >= 103024
++#if SVN_SWIG_VERSION >= 103025
++#include <swiglabels.swg>
++#endif
+ #include <ruby/rubyhead.swg>
+-#include <common.swg>
++#include <swigrun.swg>
+ #include <ruby/rubydef.swg>
++#include <runtime.swg>
++#endif
++
++#include "swigutil_rb.h"
+ 
+ static VALUE mSvn = Qnil;
+ static VALUE mSvnCore = Qnil;
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index 8f385845ccd7..68f811d5a394 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -256,6 +256,29 @@ lib/libsvn_wc-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.a
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so
+%%WITH_RUBY%%lib/libsvn_swig_ruby-1.so.0
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.so
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/client.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/core.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/delta.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/error.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/fs.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/info.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/ra.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/repos.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/util.rb
+%%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/wc.rb
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn/ext
+%%WITH_RUBY%%@dirrm %%RUBY_SITEARCHLIBDIR%%/svn
+%%WITH_RUBY%%@dirrm %%RUBY_SITELIBDIR%%/svn
 @dirrm %%DATADIR%%/backup
 @dirrm %%DATADIR%%/bdb
 @dirrm %%DATADIR%%/client-side