Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 45 insertions, 1 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 0cd944021006..6963fe53fe73 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.3.0
-PORTREVISION?=	3
+PORTREVISION?=	4
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com:9000/en/1.1/:bookhtml \
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 8cb8340179d2..aebed9a4b2fe 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -43,42 +43,55 @@ include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
 lib/libsvn_client-1.a
+lib/libsvn_client-1.la
 lib/libsvn_client-1.so
 lib/libsvn_client-1.so.0
 lib/libsvn_delta-1.a
+lib/libsvn_delta-1.la
 lib/libsvn_delta-1.so
 lib/libsvn_delta-1.so.0
 lib/libsvn_diff-1.a
+lib/libsvn_diff-1.la
 lib/libsvn_diff-1.so
 lib/libsvn_diff-1.so.0
 lib/libsvn_fs-1.a
+lib/libsvn_fs-1.la
 lib/libsvn_fs-1.so
 lib/libsvn_fs-1.so.0
 %%WITHOUT_BDB%%lib/libsvn_fs_base-1.a
+%%WITHOUT_BDB%%lib/libsvn_fs_base-1.la
 %%WITHOUT_BDB%%lib/libsvn_fs_base-1.so
 %%WITHOUT_BDB%%lib/libsvn_fs_base-1.so.0
 lib/libsvn_fs_fs-1.a
+lib/libsvn_fs_fs-1.la
 lib/libsvn_fs_fs-1.so
 lib/libsvn_fs_fs-1.so.0
 lib/libsvn_ra-1.a
+lib/libsvn_ra-1.la
 lib/libsvn_ra-1.so
 lib/libsvn_ra-1.so.0
 %%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a
+%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la
 %%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so
 %%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0
 lib/libsvn_ra_local-1.a
+lib/libsvn_ra_local-1.la
 lib/libsvn_ra_local-1.so
 lib/libsvn_ra_local-1.so.0
 lib/libsvn_ra_svn-1.a
+lib/libsvn_ra_svn-1.la
 lib/libsvn_ra_svn-1.so
 lib/libsvn_ra_svn-1.so.0
 lib/libsvn_repos-1.a
+lib/libsvn_repos-1.la
 lib/libsvn_repos-1.so
 lib/libsvn_repos-1.so.0
 lib/libsvn_subr-1.a
+lib/libsvn_subr-1.la
 lib/libsvn_subr-1.so
 lib/libsvn_subr-1.so.0
 lib/libsvn_wc-1.a
+lib/libsvn_wc-1.la
 lib/libsvn_wc-1.so
 lib/libsvn_wc-1.so.0
 %%WITHOUT_GETTEXT%%share/locale/de/LC_MESSAGES/subversion.mo
@@ -192,6 +205,7 @@ lib/libsvn_wc-1.so.0
 %%WITH_JAVA%%@dirrm lib/svn-javahl/include
 %%WITH_JAVA%%@dirrm lib/svn-javahl
 %%WITH_PERL%%lib/libsvn_swig_perl-1.a
+%%WITH_PERL%%lib/libsvn_swig_perl-1.la
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/SVN/Base.pm
@@ -227,16 +241,31 @@ lib/libsvn_wc-1.so.0
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/SVN
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/SVN
 %%WITH_PYTHON%%lib/libsvn_swig_py-1.a
+%%WITH_PYTHON%%lib/libsvn_swig_py-1.la
 %%WITH_PYTHON%%lib/libsvn_swig_py-1.so
 %%WITH_PYTHON%%lib/libsvn_swig_py-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_client.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_core.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_ra.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_repos.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_wc.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/client.pyc
@@ -271,14 +300,29 @@ lib/libsvn_wc-1.so.0
 %%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.la
 %%WITH_RUBY%%lib/libsvn_swig_ruby-1.so
 %%WITH_RUBY%%lib/libsvn_swig_ruby-1.so.0
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.a
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.la
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/core.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.a
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.la
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/client.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.a
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.la
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/delta.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.a
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.la
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/fs.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.a
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.la
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/ra.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.a
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.la
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/repos.so
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.a
+%%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.la
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/svn/ext/wc.so
 %%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/client.rb
 %%WITH_RUBY%%%%RUBY_SITELIBDIR%%/svn/core.rb