Skip to content
Permalink
Browse files

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 https://trac.macports.org/ticket/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

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@28347 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
danielluke committed Aug 28, 2007
1 parent 12e2bdb commit e42a5a28101e37c0409a4ae085539df1fc4a9fb9
@@ -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@geeklair.net
@@ -14,9 +14,9 @@ long_description Subversion is a version control system designed to be \
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 @@ depends_lib port:expat port:neon \
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 @@ destroot.target install-javahl
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 @@ post-destroot {
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
@@ -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@geeklair.net
description Perl bindings for the subversion version control system.

@@ -13,9 +14,9 @@ long_description Subversion is a version control system designed to be \
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 @@ depends_lib port:expat port:neon \
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 @@ variant no_neon { depends_lib-delete port:neon
}

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}
@@ -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@geeklair.net
description Python bindings for the subversion version control system.

@@ -13,9 +14,9 @@ long_description Subversion is a version control system designed to be \
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 @@ configure.env ac_cv_path_PYTHON=${prefix}/bin/python2.5
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 @@ post-destroot {

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

This file was deleted.

This file was deleted.

@@ -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@geeklair.net
description Ruby bindings for the subversion version control system.

@@ -13,13 +14,12 @@ long_description Subversion is a version control system designed to be \
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 @@ depends_lib port:expat port:neon \

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 @@ variant no_neon { depends_lib-delete port:neon
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

0 comments on commit e42a5a2

Please sign in to comment.
You can’t perform that action at this time.