Update to 1.2.0

4 files changed, 41 insertions, 18 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 1b13ada96bf1..d26f50a24b36 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.1.4
+PORTVERSION=	1.2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -43,7 +43,7 @@ PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .include <bsd.port.pre.mk>
 
 SVNREPOS?=	/home/svn/repos
-SVNFSTYPE?=	bdb
+SVNFSTYPE?=	fsfs
 
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
@@ -80,6 +80,7 @@ PLIST_SUB+=		WITHOUT_BDB=""
 IGNORE=	"Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again"
 .endif
 SWIG_BINDINGS+=		perl
+DEPENDS_ARGS+=		WANT_SWIG_PERL=yes
 USE_PERL5=		yes
 PLIST_SUB+=		WITH_PERL=""
 MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -99,6 +100,7 @@ PLIST_SUB+=		WITH_PERL="@comment "
 USE_PYTHON=		yes
 .include "${PORTSDIR}/Mk/bsd.python.mk"
 SWIG_BINDINGS+=		python
+DEPENDS_ARGS+=		WANT_SWIG_PYTHON=yes
 PLIST_SUB+=		WITH_PYTHON=""
 .else
 PLIST_SUB+=		WITH_PYTHON="@comment "
@@ -119,7 +121,7 @@ PLIST_SUB+=		WITH_PYTHON="@comment "
 
 .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != ""
 BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
-DEPENDS_ARGS+=		SWIG_LANGUAGES='${SWIG_BINDINGS}'
+DEPENDS_ARGS+=		SWIG_LANGUAGES=""
 CONFIGURE_ARGS+=	--with-swig=${LOCALBASE} \
 			--enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g}
 .else
@@ -193,7 +195,7 @@ pre-extract:
 	@${ECHO_MSG} "db4 repository backend disabled."
 .else
 	@${ECHO_MSG} "db4 repository backend enabled."
-	@${ECHO_MSG} "To disable it define WITHOUT_DBD"
+	@${ECHO_MSG} "To disable it define WITHOUT_BDB"
 .endif
 	@${ECHO_MSG} ""
 .if defined(WITH_MAINTAINER_DEBUG)
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index a9bf3cf6b701..9d0ec99dbd21 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.1.4.tar.bz2) = 6e557ae65b6b8d7577cc7704ede85a23
-SIZE (subversion-1.1.4.tar.bz2) = 6737067
+MD5 (subversion-1.2.0.tar.bz2) = f25c0c884201f411e99a6cb6c25529ff
+SIZE (subversion-1.2.0.tar.bz2) = 7011017
diff --git a/devel/subversion/files/patch-ac-helpers::ltmain.sh b/devel/subversion/files/patch-ac-helpers::ltmain.sh
index ba6fe13c1cdb..66f0c795aa35 100644
--- a/devel/subversion/files/patch-ac-helpers::ltmain.sh
+++ b/devel/subversion/files/patch-ac-helpers::ltmain.sh
@@ -1,11 +1,11 @@
---- ac-helpers/ltmain.sh.orig	2004-10-22 22:13:13.000000000 +0400
-+++ ac-helpers/ltmain.sh	2004-11-05 11:30:39.328125000 +0300
-@@ -1061,7 +1061,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
+--- ac-helpers/ltmain.sh.orig	Fri May 20 21:41:54 2005
++++ ac-helpers/ltmain.sh	Wed May 25 14:38:21 2005
+@@ -1492,7 +1492,7 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	  *-*-openbsd* | *-*-freebsd4* | *-*-dragonfly*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
  	    ;;
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 52c762cd9073..8f385845ccd7 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -13,6 +13,7 @@ include/subversion-1/svn_base64.h
 include/subversion-1/svn_client.h
 include/subversion-1/svn_cmdline.h
 include/subversion-1/svn_config.h
+include/subversion-1/svn_ctype.h
 include/subversion-1/svn_dav.h
 include/subversion-1/svn_delta.h
 include/subversion-1/svn_diff.h
@@ -82,7 +83,10 @@ lib/libsvn_wc-1.so
 lib/libsvn_wc-1.so.0
 %%WITHOUT_GETTEXT%%share/locale/de/LC_MESSAGES/subversion.mo
 %%WITHOUT_GETTEXT%%share/locale/es/LC_MESSAGES/subversion.mo
+%%WITHOUT_GETTEXT%%share/locale/fr/LC_MESSAGES/subversion.mo
+%%WITHOUT_GETTEXT%%share/locale/it/LC_MESSAGES/subversion.mo
 %%WITHOUT_GETTEXT%%share/locale/ja/LC_MESSAGES/subversion.mo
+%%WITHOUT_GETTEXT%%share/locale/ko/LC_MESSAGES/subversion.mo
 %%WITHOUT_GETTEXT%%share/locale/nb/LC_MESSAGES/subversion.mo
 %%WITHOUT_GETTEXT%%share/locale/pl/LC_MESSAGES/subversion.mo
 %%WITHOUT_GETTEXT%%share/locale/pt_BR/LC_MESSAGES/subversion.mo
@@ -90,10 +94,15 @@ lib/libsvn_wc-1.so.0
 %%WITHOUT_GETTEXT%%share/locale/zh_CN/LC_MESSAGES/subversion.mo
 %%WITHOUT_GETTEXT%%share/locale/zh_TW/LC_MESSAGES/subversion.mo
 %%DATADIR%%/backup/hot-backup.py
+%%DATADIR%%/bdb/erase-all-text-data.py
+%%DATADIR%%/bdb/skel.py
+%%DATADIR%%/bdb/svn-bdb-view.py
+%%DATADIR%%/bdb/svnfs.py
 %%DATADIR%%/client-side/bash_completion
 %%DATADIR%%/client-side/bash_completion_test
 %%DATADIR%%/client-side/server-vsn.py
 %%DATADIR%%/client-side/showchange.pl
+%%DATADIR%%/client-side/svn-graph.pl
 %%DATADIR%%/cvs2svn/README
 %%DATADIR%%/dev/check-license.py
 %%DATADIR%%/dev/datecheck.py
@@ -105,9 +114,12 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/dev/iz/ff2csv.py
 %%DATADIR%%/dev/iz/find-fix.py
 %%DATADIR%%/dev/iz/run-queries.sh
+%%DATADIR%%/dev/lock-check.py
+%%DATADIR%%/dev/mlpatch.py
 %%DATADIR%%/dev/normalize-dump.py
 %%DATADIR%%/dev/prebuild-cleanup.sh
 %%DATADIR%%/dev/random-commits.py
+%%DATADIR%%/dev/po-merge.py
 %%DATADIR%%/dev/scramble-tree.py
 %%DATADIR%%/dev/stress.pl
 %%DATADIR%%/dev/svn-dev.el
@@ -118,16 +130,22 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/examples/check-modified.py
 %%DATADIR%%/examples/dumpprops.py
 %%DATADIR%%/examples/getfile.py
+%%DATADIR%%/examples/getlocks_test.c
 %%DATADIR%%/examples/geturl.py
+%%DATADIR%%/examples/headrev.c
 %%DATADIR%%/examples/minimal_client.c
 %%DATADIR%%/examples/putfile.py
 %%DATADIR%%/examples/revplist.py
 %%DATADIR%%/examples/svnlook.py
+%%DATADIR%%/examples/svnlook.rb
+%%DATADIR%%/examples/svnput.c
 %%DATADIR%%/examples/svnserve-sgid.c
 %%DATADIR%%/examples/svnshell.py
+%%DATADIR%%/examples/svnshell.rb
 %%DATADIR%%/hook-scripts/commit-access-control.cfg.example
 %%DATADIR%%/hook-scripts/commit-access-control.pl
 %%DATADIR%%/hook-scripts/commit-email.pl
+%%DATADIR%%/hook-scripts/commit-email.rb
 %%DATADIR%%/hook-scripts/mailer/mailer.conf.example
 %%DATADIR%%/hook-scripts/mailer/mailer.py
 %%DATADIR%%/hook-scripts/mailer/tests/mailer-init.sh
@@ -140,13 +158,17 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/hook-scripts/svnperms.py
 %%DATADIR%%/hook-scripts/verify-po.py
 %%DATADIR%%/po/svn-po-status-report.sh
+%%DATADIR%%/po/svn-po-status-run.sh
 %%DATADIR%%/test-scripts/svntest/README
+%%DATADIR%%/test-scripts/svntest/svntest-bindings.sh
+%%DATADIR%%/test-scripts/svntest/svntest-bindings-generic.sh
 %%DATADIR%%/test-scripts/svntest/svntest-check-configuration.sh
 %%DATADIR%%/test-scripts/svntest/svntest-config.sh
 %%DATADIR%%/test-scripts/svntest/svntest-rebuild-generic.sh
 %%DATADIR%%/test-scripts/svntest/svntest-rebuild.sh
 %%DATADIR%%/test-scripts/svntest/svntest-run.sh
 %%DATADIR%%/test-scripts/svntest/svntest-sendmail.sh
+%%DATADIR%%/test-scripts/svntest/svntest-sendmail-generic.sh
 %%DATADIR%%/test-scripts/svntest/svntest-update.sh
 %%DATADIR%%/test-scripts/svntest/svntest.sh
 %%DATADIR%%/xslt/svnindex.css
@@ -230,13 +252,12 @@ lib/libsvn_wc-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/repos.pyc
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/util.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn
 @dirrm %%DATADIR%%/backup
+@dirrm %%DATADIR%%/bdb
 @dirrm %%DATADIR%%/client-side
 @dirrm %%DATADIR%%/cvs2svn
 @dirrm %%DATADIR%%/dev/iz