[28347] trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Aug 28 15:00:41 PDT 2007


Revision: 28347
          http://trac.macosforge.org/projects/macports/changeset/28347
Author:   dluke at macports.org
Date:     2007-08-28 15:00:40 -0700 (Tue, 28 Aug 2007)

Log Message:
-----------
Version bump, update subversion and associated bindings ports to 1.4.5.

Also:
  - remove subversion-pythonbindings port
  - Set DYLD_LIBRARY_PATH for test runs via method from #12421 (thanks nox!)
  - use copy instead of file copy
  - remove no longer necessary file delete commands
  - send apr-1-config and apu-1-config to configure to avoid linking in the wrong apr/apr-util

Modified Paths:
--------------
    trunk/dports/devel/subversion/Portfile
    trunk/dports/devel/subversion-javahlbindings/Portfile
    trunk/dports/devel/subversion-perlbindings/Portfile
    trunk/dports/devel/subversion-python25bindings/Portfile
    trunk/dports/devel/subversion-rubybindings/Portfile

Removed Paths:
-------------
    trunk/dports/devel/subversion-pythonbindings/

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326
40426cdb-d25d-4106-b89a-567fc1e9311f:/local/trunk:22799
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
c8fed718-8f51-4de5-9efe-445163856910:/local:28180
d9146071-5dc1-4620-afc7-8ba4e23d31df:/local/trunk:21690
e4b2a6a8-e742-4924-8f8a-3771363e925e:/local/trunk:25771
f2dd1c64-7982-4318-98ce-263798263e0a:/local:28228
fd7794eb-1723-4a49-8be4-c69b2a184b6d:/local/trunk:24020
   + 023a8b07-a327-4f20-9012-67c915bb7b7c:/local/branches/updates:21118
023a8b07-a327-4f20-9012-67c915bb7b7c:/local/trunk:21326
40426cdb-d25d-4106-b89a-567fc1e9311f:/local/trunk:22799
a2b01108-8822-4c85-91cd-1541804339d8:/local/macports:20632
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/libdnet-maintainer:20898
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-app-cli:20923
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-list-moreutils:20919
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/p5-path-class:20929
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/branches/updates:20946
b1dfe3f6-5eec-4605-9368-528ffc7f2357:/local/trunk:20947
c8fed718-8f51-4de5-9efe-445163856910:/local:28357
d9146071-5dc1-4620-afc7-8ba4e23d31df:/local/trunk:21690
e4b2a6a8-e742-4924-8f8a-3771363e925e:/local/trunk:25771
f2dd1c64-7982-4318-98ce-263798263e0a:/local:28228
fd7794eb-1723-4a49-8be4-c69b2a184b6d:/local/trunk:24020

Modified: trunk/dports/devel/subversion/Portfile
===================================================================
--- trunk/dports/devel/subversion/Portfile	2007-08-28 21:11:37 UTC (rev 28346)
+++ trunk/dports/devel/subversion/Portfile	2007-08-28 22:00:40 UTC (rev 28347)
@@ -2,8 +2,9 @@
 
 PortSystem 1.0
 name			subversion
-version			1.4.4
+version			1.4.5
 categories		devel
+platforms		darwin
 maintainers		dluke at geeklair.net
 description		A cvs like version control system, but without the suck
 
@@ -12,9 +13,9 @@
 			outstanding problems with cvs(1).
 
 homepage		http://subversion.tigris.org/
-master_sites		http://subversion.tigris.org/downloads/
+master_sites		${homepage}/downloads/
 use_bzip2		yes
-checksums		md5 d4aa5aeb09acb3307841022d279ab895
+checksums		md5 4c333a5fe827568c67d195cda7a5e154
 
 depends_lib		port:expat port:neon \
 			port:apr port:apr-util \
@@ -23,19 +24,30 @@
 
 test.run		yes
 test.target		check
-test.env		DYLD_LIBRARY_PATH=${worksrcpath}/subversion/libsvn_client/.libs:${worksrcpath}/subversion/libsvn_delta/.libs:${worksrcpath}/subversion/libsvn_diff/.libs:${worksrcpath}/subversion/libsvn_fs/.libs:${worksrcpath}/subversion/libsvn_fs_base/.libs:${worksrcpath}/subversion/libsvn_fs_base/bdb/.libs:${worksrcpath}/subversion/libsvn_fs_base/util/.libs:${worksrcpath}/subversion/libsvn_fs_fs/.libs:${worksrcpath}/subversion/libsvn_ra/.libs:${worksrcpath}/subversion/libsvn_ra_dav/.libs:${worksrcpath}/subversion/libsvn_ra_local/.libs:${worksrcpath}/subversion/libsvn_ra_svn/.libs:${worksrcpath}/subversion/libsvn_repos/.libs:${worksrcpath}/subversion/libsvn_subr/.libs:${worksrcpath}/subversion/libsvn_wc/.libs:${worksrcpath}/subversion/svn/.libs:${worksrcpath}/subversion/svnadmin/.libs:${worksrcpath}/subversion/svndumpfilter/.libs:${worksrcpath}/subversion/svnlook/.libs:${worksrcpath}/subversion/svnserve/.libs:${worksrcpath}/subversion/svnsync/.libs:${worksrcpath}/subversion/svnver
 sion/.libs:${worksrcpath}/subversion/tests/.libs:${worksrcpath}/subversion/tests/libsvn_delta/.libs:${worksrcpath}/subversion/tests/libsvn_diff/.libs:${worksrcpath}/subversion/tests/libsvn_fs/.libs:${worksrcpath}/subversion/tests/libsvn_fs_base/.libs:${worksrcpath}/subversion/tests/libsvn_ra_local/.libs:${worksrcpath}/subversion/tests/libsvn_repos/.libs:${worksrcpath}/subversion/tests/libsvn_subr/.libs:${worksrcpath}/subversion/tests/libsvn_wc/.libs \
-				CLEANUP=true
+test.env		CLEANUP=true
 
 patchfiles		patch-Makefile.in
 
 configure.args		--with-berkeley-db=${prefix}/include/db44:${prefix}/lib/db44 \
-			--with-neon=${prefix} --with-apr=${prefix} \
-			--with-apr-util=${prefix} --without-apxs \
+			--with-neon=${prefix} --with-apr=${prefix}/bin/apr-1-config \
+			--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
 			--mandir=\\\${prefix}/share/man \
 			--disable-neon-version-check
 
 build.target		all mucc
 
+pre-test {
+			set x {}
+			fs-traverse dir ${worksrcpath}/subversion {
+				if {[file tail ${dir}] == ".libs" && [file isdirectory ${dir}]} {
+					lappend x ${dir}
+					continue
+				}
+			}
+
+			test.env-append DYLD_LIBRARY_PATH=[join ${x} ":"]
+			}
+
 pre-configure {		reinplace "s|hardcode_direct=yes|hardcode_direct=no|g" \
 				${worksrcpath}/configure
 			reinplace "s|@@DESTROOT@@|${destroot}|g" \
@@ -79,12 +91,12 @@
 
 variant tools { 	post-destroot {
 				xinstall -d -m 755 ${destroot}${prefix}/share/${name}
-				file copy ${worksrcpath}/tools ${destroot}${prefix}/share/${name}/tools
-				file copy ${worksrcpath}/contrib/client-side/mucc ${destroot}${prefix}/bin/
+				copy ${worksrcpath}/tools ${destroot}${prefix}/share/${name}/tools
+				copy ${worksrcpath}/contrib/client-side/mucc ${destroot}${prefix}/bin/
 				foreach f {mucc mucc.o mucc.lo .libs} {
-					file delete ${worksrcpath}/contrib/client-side/${f}
+					 delete ${worksrcpath}/contrib/client-side/${f}
 					}
-				file copy ${worksrcpath}/contrib ${destroot}${prefix}/share/${name}/contrib
+				copy ${worksrcpath}/contrib ${destroot}${prefix}/share/${name}/contrib
 				}
 			}
 
@@ -92,7 +104,7 @@
 				depends_run-append port:bash-completion
 				post-destroot {
 					xinstall -d ${destroot}${prefix}/etc/bash_completion.d
-					file copy ${worksrcpath}/tools/client-side/bash_completion ${destroot}${prefix}/etc/bash_completion.d/subversion
+					copy ${worksrcpath}/tools/client-side/bash_completion ${destroot}${prefix}/etc/bash_completion.d/subversion
 					}
 				}
 

Modified: trunk/dports/devel/subversion-javahlbindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-javahlbindings/Portfile	2007-08-28 21:11:37 UTC (rev 28346)
+++ trunk/dports/devel/subversion-javahlbindings/Portfile	2007-08-28 22:00:40 UTC (rev 28347)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name			subversion-javahlbindings
-version			1.4.4
+version			1.4.5
 categories		devel java
 platforms		darwin
 maintainers		dluke at geeklair.net
@@ -14,9 +14,9 @@
 			provide access to subversion API from java.
 
 homepage		http://subversion.tigris.org/
-master_sites		http://subversion.tigris.org/tarballs/
+master_sites		${homepage}/downloads/
 use_bzip2		yes
-checksums 		md5 d4aa5aeb09acb3307841022d279ab895
+checksums 		md5 4c333a5fe827568c67d195cda7a5e154
 distname		subversion-${version}
 dist_subdir		subversion
 
@@ -29,8 +29,8 @@
 configure.env		CXX=g++
 
 configure.args		--with-berkeley-db=${prefix}/include/db44:${prefix}/lib/db44 \
-			--with-neon=${prefix} --with-apr=${prefix} \
-			--with-apr-util=${prefix} --without-apxs \
+			--with-neon=${prefix} --with-apr=${prefix}/bin/apr-1-config \
+			--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
 			--mandir=\\\${prefix}/share/man \
 			--disable-neon-version-check \
 			--with-javahl --without-jikes \
@@ -42,6 +42,8 @@
 test.run		yes
 test.target		check-javahl
 
+destroot.violate_mtree	yes
+
 patchfiles		patch-configure
 
 pre-test {		reinplace "s|-Djava.library.path=:\$(libdir)|-Djava.library.path=:${worksrcpath}/subversion/bindings/java/javahl/native/.libs|g" \
@@ -75,72 +77,6 @@
 		system "ln -sf ${prefix}/lib/libsvnjavahl-1.dylib ${destroot}/Library/Java/Extensions/libsvnjavahl.jnilib"
 		file mkdir ${destroot}${prefix}/share/java
 		system "ln -sf ${prefix}/lib/svn-javahl/svn-javahl.jar ${destroot}/${prefix}/share/java/svn-javahl.jar"
-
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.a"
 		}
 
 # 10.3 says -> CarbonCore/MacTypes.h: No such file or directory

Modified: trunk/dports/devel/subversion-perlbindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-perlbindings/Portfile	2007-08-28 21:11:37 UTC (rev 28346)
+++ trunk/dports/devel/subversion-perlbindings/Portfile	2007-08-28 22:00:40 UTC (rev 28347)
@@ -2,8 +2,9 @@
 
 PortSystem 1.0
 name			subversion-perlbindings
-version			1.4.4
+version			1.4.5
 categories		devel perl
+platforms		darwin
 maintainers		dluke at geeklair.net
 description		Perl bindings for the subversion version control system.
 
@@ -13,9 +14,9 @@
 			provide access to subversion API from perl.
 
 homepage		http://subversion.tigris.org/
-master_sites		http://subversion.tigris.org/downloads/
+master_sites		${homepage}/downloads/
 use_bzip2		yes
-checksums 		md5 d4aa5aeb09acb3307841022d279ab895
+checksums 		md5 4c333a5fe827568c67d195cda7a5e154
 distname		subversion-${version}
 dist_subdir		subversion
 
@@ -29,8 +30,8 @@
 			port:gettext
 
 configure.args		--with-berkeley-db=${prefix}/include/db44:${prefix}/lib/db44 \
-			--with-neon=${prefix} --with-apr=${prefix} \
-			--with-apr-util=${prefix} --without-apxs \
+			--with-neon=${prefix} --with-apr=${prefix}/bin/apr-1-config \
+			--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
 			--mandir=\\\${prefix}/share/man \
 			--disable-neon-version-check \
 			--with-perl5=${prefix}/bin/perl 
@@ -61,21 +62,6 @@
                         }
 
 post-destroot {
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.la"
                 foreach packlist [exec find ${destroot} -name .packlist] {
                         ui_info "Fixing packlist ${packlist}"
                         reinplace "s|${destroot}||" ${packlist}

Modified: trunk/dports/devel/subversion-python25bindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-python25bindings/Portfile	2007-08-28 21:11:37 UTC (rev 28346)
+++ trunk/dports/devel/subversion-python25bindings/Portfile	2007-08-28 22:00:40 UTC (rev 28347)
@@ -2,8 +2,9 @@
 
 PortSystem 1.0
 name			subversion-python25bindings
-version			1.4.4
+version			1.4.5
 categories		devel python
+platforms		darwin
 maintainers		dluke at geeklair.net
 description		Python bindings for the subversion version control system.
 
@@ -13,9 +14,9 @@
 			provide access to subversion API from python.
 
 homepage		http://subversion.tigris.org/
-master_sites		http://subversion.tigris.org/tarballs/
+master_sites		${homepage}/downloads
 use_bzip2		yes
-checksums 		md5 d4aa5aeb09acb3307841022d279ab895
+checksums 		md5 4c333a5fe827568c67d195cda7a5e154
 distname		subversion-${version}
 dist_subdir		subversion
 
@@ -43,10 +44,20 @@
 build.target		swig-py
 destroot.target		install-swig-py DESTDIR=${destroot} 
 
-test.env                DYLD_LIBRARY_PATH=${worksrcpath}/subversion/bindings/swig/python/.libs:${worksrcpath}/subversion/bindings/swig/python/libsvn_swig_py25/.libs:${worksrcpath}/subversion/libsvn_client/.libs:${worksrcpath}/subversion/libsvn_delta/.libs:${worksrcpath}/subversion/libsvn_diff/.libs:${worksrcpath}/subversion/libsvn_fs/.libs:${worksrcpath}/subversion/libsvn_fs_base/.libs:${worksrcpath}/subversion/libsvn_fs_base/bdb/.libs:${worksrcpath}/subversion/libsvn_fs_base/util/.libs:${worksrcpath}/subversion/libsvn_fs_fs/.libs:${worksrcpath}/subversion/libsvn_ra/.libs:${worksrcpath}/subversion/libsvn_ra_dav/.libs:${worksrcpath}/subversion/libsvn_ra_local/.libs:${worksrcpath}/subversion/libsvn_ra_svn/.libs:${worksrcpath}/subversion/libsvn_repos/.libs:${worksrcpath}/subversion/libsvn_subr/.libs:${worksrcpath}/subversion/libsvn_wc/.libs
 test.run		yes
 test.target		check-swig-py
 
+pre-test {
+			set x {}
+			fs-traverse dir ${worksrcpath}/subversion {
+				if {[file tail ${dir}] == ".libs" && [file isdirectory ${dir}]} {
+				lappend x ${dir}
+				continue
+				}
+			}
+			test.env-append DYLD_LIBRARY_PATH=[join ${x} ":"]
+			}
+
 pre-configure {		reinplace "s|hardcode_direct=yes|hardcode_direct=no|g" \
 				${worksrcpath}/configure
 			}
@@ -76,72 +87,6 @@
 
 		file rename "${destroot}/${prefix}/lib/svn-python" \
 			"${destroot}/${prefix}/lib/svn-python2.5"
-
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_client-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_base-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_local-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_svn-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_diff-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_wc-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_ra_dav-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_repos-1.dylib"
 		}
 
 # 10.3 says -> CarbonCore/MacTypes.h: No such file or directory

Modified: trunk/dports/devel/subversion-rubybindings/Portfile
===================================================================
--- trunk/dports/devel/subversion-rubybindings/Portfile	2007-08-28 21:11:37 UTC (rev 28346)
+++ trunk/dports/devel/subversion-rubybindings/Portfile	2007-08-28 22:00:40 UTC (rev 28347)
@@ -2,8 +2,9 @@
 
 PortSystem 1.0
 name			subversion-rubybindings
-version			1.4.4
+version			1.4.5
 categories		devel ruby
+platforms		darwin
 maintainers		dluke at geeklair.net
 description		Ruby bindings for the subversion version control system.
 
@@ -13,13 +14,12 @@
 			provide access to subversion API from ruby.
 
 homepage		http://subversion.tigris.org/
-master_sites		http://subversion.tigris.org/downloads/
+master_sites		${homepage}/downloads/
 use_bzip2		yes
-checksums 		md5 d4aa5aeb09acb3307841022d279ab895
+checksums 		md5 4c333a5fe827568c67d195cda7a5e154
 distname		subversion-${version}
 dist_subdir		subversion
 
-test.env                DYLD_LIBRARY_PATH=${worksrcpath}/subversion/bindings/swig/ruby/.libs:${worksrcpath}/subversion/bindings/swig/ruby/libsvn_swig_ruby/.libs:${worksrcpath}/subversion/libsvn_client/.libs:${worksrcpath}/subversion/libsvn_delta/.libs:${worksrcpath}/subversion/libsvn_diff/.libs:${worksrcpath}/subversion/libsvn_fs/.libs:${worksrcpath}/subversion/libsvn_fs_base/.libs:${worksrcpath}/subversion/libsvn_fs_base/bdb/.libs:${worksrcpath}/subversion/libsvn_fs_base/util/.libs:${worksrcpath}/subversion/libsvn_fs_fs/.libs:${worksrcpath}/subversion/libsvn_ra/.libs:${worksrcpath}/subversion/libsvn_ra_dav/.libs:${worksrcpath}/subversion/libsvn_ra_local/.libs:${worksrcpath}/subversion/libsvn_ra_svn/.libs:${worksrcpath}/subversion/libsvn_repos/.libs:${worksrcpath}/subversion/libsvn_subr/.libs:${worksrcpath}/subversion/libsvn_wc/.libs
 test.run		yes
 test.target		check-swig-rb
 
@@ -31,14 +31,26 @@
 
 configure.env		RUBY=${prefix}/bin/ruby
 configure.args		--with-berkeley-db=${prefix}/include/db44:${prefix}/lib/db44 \
-			--with-neon=${prefix} --with-apr=${prefix} \
-			--with-apr-util=${prefix} --without-apxs \
+			--with-neon=${prefix} --with-apr=${prefix}/bin/apr-1-config \
+			--with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
 			--mandir=\\\${prefix}/share/man \
 			--disable-neon-version-check
 
 build.target		swig-rb
 destroot.target		install-swig-rb
 
+pre-test {
+			set x {}
+			fs-traverse dir ${worksrcpath}/subversion {
+				if {[file tail ${dir}] == ".libs" && [file isdirectory ${dir}]} {
+				lappend x ${dir}
+				continue
+				}
+			}
+
+			test.env-append DYLD_LIBRARY_PATH=[join ${x} ":"]
+			}
+
 pre-configure {		reinplace "s|hardcode_direct=yes|hardcode_direct=no|g" \
 				${worksrcpath}/configure
 			}
@@ -57,24 +69,6 @@
                         configure.args-delete   --with-neon=${prefix}
                         }
 
-post-destroot {
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_delta-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_fs_fs-1.la"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.0.0.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.0.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.a"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.dylib"
-		file delete "${destroot}/${prefix}/lib/libsvn_subr-1.la"
-        }
-
 # 10.3 says -> CarbonCore/MacTypes.h: No such file or directory
 platform darwin 7 {		configure.args-append \
 					--disable-keychain

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070828/aae2d292/attachment.html


More information about the macports-changes mailing list