I've attached a patch that updates devel/subversion to version 1.2.3.
Tested on i386.
Release notes: http://svn.collab.net/repos/svn/trunk/CHANGES
By default "svnserve -d -r /my/repo/path" will listen on IPv6 *:3690,
but there is no option to listen on IPv4 *. I've patched svnserve
so that IPv6 is disabled by default, but may be enabled with
a new option --ipv6. Comments?
In addition I've added some example scripts.
/Sigfred
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 7 Jul 2005 14:20:34 -0000 1.9
+++ Makefile 13 Sep 2005 20:36:44 -0000
@@ -4,7 +4,7 @@
COMMENT-perl= "perl interface to subversion"
COMMENT-python= "python interface to subversion"
-VERSION= 1.2.1
+VERSION= 1.2.3
DISTNAME= subversion-${VERSION}
PKGNAME= ${DISTNAME}
PKGNAME-perl= p5-SVN-${VERSION}
@@ -98,6 +98,31 @@
post-install:
@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-py
@cd ${WRKBUILD} && ${MAKE_PROGRAM} install-swig-pl
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/backup
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA_DIR}
${PREFIX}/share/examples/subversion/hook-scripts/mailer
+ ${INSTALL_DATA_DIR}
${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
+ ${INSTALL_DATA} ${WRKBUILD}/tools/backup/hot-backup.py \
+ ${PREFIX}/share/examples/subversion/backup
+ ${INSTALL_DATA} ${WRKBUILD}/tools/hook-scripts/* \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/README \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA}
${WRKSRC}/tools/hook-scripts/commit-access-control.cfg.example \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-email.rb \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms.conf.example \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/svnperms.py \
+ ${PREFIX}/share/examples/subversion/hook-scripts
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example
\
+ ${PREFIX}/share/examples/subversion/hook-scripts/mailer
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.py \
+ ${PREFIX}/share/examples/subversion/hook-scripts/mailer
+ ${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/tests/* \
+
${PREFIX}/share/examples/subversion/hook-scripts/mailer/tests
post-regress:
@cd ${WRKBUILD} && ${MAKE_PROGRAM} ${REGRESS_FLAGS} check FSTYPE=bdb
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 7 Jul 2005 14:20:34 -0000 1.6
+++ distinfo 13 Sep 2005 20:36:44 -0000
@@ -1,4 +1,4 @@
-MD5 (subversion-1.2.1.tar.gz) = 01c3742745d50d4395684a4fb2908c5f
-RMD160 (subversion-1.2.1.tar.gz) = 7768a29ad96746285cb4ed9b32fc54c07f97f4f4
-SHA1 (subversion-1.2.1.tar.gz) = 88d3dd6e8c191933c8966faa5c69dc4ee84411cf
-SIZE (subversion-1.2.1.tar.gz) = 8847778
+MD5 (subversion-1.2.3.tar.gz) = 95f9b43801b4d9bc071564bca2116763
+RMD160 (subversion-1.2.3.tar.gz) = 4a39e2b9f4dcd39023e785ce0a31b3bd493d6a85
+SHA1 (subversion-1.2.3.tar.gz) = 790cfc94db98799a48a157fef22a13c878e74345
+SIZE (subversion-1.2.3.tar.gz) = 8868156
Index: patches/patch-subversion_svnserve_main_c
===================================================================
RCS file: patches/patch-subversion_svnserve_main_c
diff -N patches/patch-subversion_svnserve_main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-subversion_svnserve_main_c 13 Sep 2005 20:36:44 -0000
@@ -0,0 +1,68 @@
+$OpenBSD$
+--- subversion/svnserve/main.c.orig Wed Aug 31 20:43:23 2005
++++ subversion/svnserve/main.c Wed Aug 31 20:41:42 2005
+@@ -96,6 +96,7 @@ enum run_mode {
+ #define SVNSERVE_OPT_FOREGROUND 258
+ #define SVNSERVE_OPT_TUNNEL_USER 259
+ #define SVNSERVE_OPT_VERSION 260
++#define SVNSERVE_OPT_IPV6 261
+
+ static const apr_getopt_option_t svnserve__options[] =
+ {
+@@ -119,6 +120,7 @@ static const apr_getopt_option_t svnserv
+ {"threads", 'T', 0, N_("use threads instead of fork")},
+ #endif
+ {"listen-once", 'X', 0, N_("listen once (useful for debugging)")},
++ {"ipv6", SVNSERVE_OPT_IPV6, 0, N_("use IPv6")},
+ {0, 0, 0, 0}
+ };
+
+@@ -257,6 +259,7 @@ int main(int argc, const char *const *ar
+ const char *host = NULL;
+ int family = APR_INET;
+ int mode_opt_count = 0;
++ svn_boolean_t use_ipv6 = FALSE;
+
+ /* Initialize the app. */
+ if (svn_cmdline_init("svn", stderr) != EXIT_SUCCESS)
+@@ -368,6 +371,10 @@ int main(int argc, const char *const *ar
+ case 'T':
+ handling_mode = connection_mode_thread;
+ break;
++
++ case SVNSERVE_OPT_IPV6:
++ use_ipv6 = TRUE;
++ break;
+ }
+ }
+ if (os->ind != argc)
+@@ -407,18 +414,21 @@ int main(int argc, const char *const *ar
+ create IPV6 sockets. */
+
+ #if APR_HAVE_IPV6
++if (use_ipv6)
++ {
+ #ifdef MAX_SECS_TO_LINGER
+- /* ### old APR interface */
+- status = apr_socket_create(&sock, APR_INET6, SOCK_STREAM, pool);
++ /* ### old APR interface */
++ status = apr_socket_create(&sock, APR_INET6, SOCK_STREAM, pool);
+ #else
+- status = apr_socket_create(&sock, APR_INET6, SOCK_STREAM, APR_PROTO_TCP,
++ status = apr_socket_create(&sock, APR_INET6, SOCK_STREAM, APR_PROTO_TCP,
+ pool);
+ #endif
+- if (status == 0)
+- {
+- apr_socket_close(sock);
+- family = APR_UNSPEC;
+- }
++ if (status == 0)
++ {
++ apr_socket_close(sock);
++ family = APR_UNSPEC;
++ }
++ }
+ #endif
+
+ status = apr_sockaddr_info_get(&sa, host, family, port, 0, pool);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/subversion/pkg/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- pkg/PLIST 4 Jul 2005 22:22:00 -0000 1.3
+++ pkg/PLIST 13 Sep 2005 20:36:44 -0000
@@ -75,40 +75,35 @@
@man man/man1/svnversion.1
@man man/man5/svnserve.conf.5
@man man/man8/svnserve.8
-share/locale/
-share/locale/de/
-share/locale/de/LC_MESSAGES/
+share/examples/subversion/
+share/examples/subversion/backup/
+share/examples/subversion/backup/hot-backup.py
+share/examples/subversion/hook-scripts/
+share/examples/subversion/hook-scripts/README
+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-email.pl
+share/examples/subversion/hook-scripts/commit-email.rb
+share/examples/subversion/hook-scripts/mailer/
+share/examples/subversion/hook-scripts/mailer/mailer.conf.example
+share/examples/subversion/hook-scripts/mailer/mailer.py
+share/examples/subversion/hook-scripts/mailer/tests/
+share/examples/subversion/hook-scripts/mailer/tests/mailer-init.sh
+share/examples/subversion/hook-scripts/mailer/tests/mailer-t1.output
+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/propchange-email.pl
+share/examples/subversion/hook-scripts/svnperms.conf.example
+share/examples/subversion/hook-scripts/svnperms.py
share/locale/de/LC_MESSAGES/subversion.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/subversion.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/subversion.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/subversion.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/subversion.mo
-share/locale/ko/
-share/locale/ko/LC_MESSAGES/
share/locale/ko/LC_MESSAGES/subversion.mo
-share/locale/nb/
-share/locale/nb/LC_MESSAGES/
share/locale/nb/LC_MESSAGES/subversion.mo
-share/locale/pl/
-share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/subversion.mo
-share/locale/pt_BR/
-share/locale/pt_BR/LC_MESSAGES/
share/locale/pt_BR/LC_MESSAGES/subversion.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/subversion.mo
-share/locale/zh_CN/
-share/locale/zh_CN/LC_MESSAGES/
share/locale/zh_CN/LC_MESSAGES/subversion.mo
-share/locale/zh_TW/
-share/locale/zh_TW/LC_MESSAGES/
share/locale/zh_TW/LC_MESSAGES/subversion.mo
