<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aab2be5bd05ec03d86da8669aabf9f0425abc2a4">https://github.com/macports/macports-ports/commit/aab2be5bd05ec03d86da8669aabf9f0425abc2a4</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aab2be5bd05ec03d86da8669aabf9f0425abc2a4
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Dec 13 12:11:13 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> oracle-instantclient: clean-up for older MacPorts' base releases
</span>---
databases/oracle-instantclient/Portfile | 36 +++++++++++++++------------------
1 file changed, 16 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/oracle-instantclient/Portfile b/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 161404ae042..4c4ce83d7bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,20 +24,20 @@ if {${os.arch} eq "powerpc"} {
</span> set library_version 10.1
supported_archs ppc
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> master_sites http://cmsrep.cern.ch/cmssw/cms/SOURCES/external/oracle/10.2.0.2/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums instantclient-basic-macosx-${version}${extract.suffix} \
rmd160 d1f056f8f1b308c5493f4938b29b55fcb32452cf \
sha256 55dafdab1b7387b05226fd7eb0d86d52225a702a5e690fc82af42073f49e7725 \
instantclient-sdk-macosx-${version}${extract.suffix} \
rmd160 c819db7f739b8ca468c8059dfbac31a6a6965938 \
sha256 350052656466cc2daecbb8b1c162ff444365def151636ba704f28ae5f05ca411
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set my_worksrcdir_format instantclient%s
set my_distname_format(ppc) instantclient-%s-macosx-${version}
set my_library_prefix(ppc) /b/729
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type none
} else {
version 11.2.0.4.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,10 +45,10 @@ if {${os.arch} eq "powerpc"} {
</span> set library_version 11.1
supported_archs x86_64 i386
variant universal {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #master_sites http://astro-wise.org/instantclient/
master_sites http://download.oracle.com/otn/mac/instantclient/[join [lrange [split ${version} .] 0 3] ""]/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums instantclient-basic-macos.x32-${version}${extract.suffix} \
rmd160 a34edfd79dc3a34026b755bba64499ca74f72f56 \
sha256 c1d59a284d7ed8a65fc38c1df08b4ab632aebeb27420f7892e38e0725f1325b4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,13 +61,13 @@ if {${os.arch} eq "powerpc"} {
</span> instantclient-sdk-macos.x64-${version}${extract.suffix} \
rmd160 dd54cc83c54bd9d702c0de6cd2219370ca98d2e2 \
sha256 aead0663c206a811cf1f61d3b2a533ff81e6e6109dd31544ad850a7ef6eb5d19
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set my_worksrcdir_format instantclient_%s
set my_distname_format(i386) instantclient-%s-macos.x32-${version}
set my_distname_format(x86_64) instantclient-%s-macos.x64-${version}
set my_library_prefix(i386) /ade
set my_library_prefix(x86_64) /ade
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.platform} eq "darwin" && ${os.major} < 9} {
known_fail yes
pre-fetch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ if {${os.arch} eq "powerpc"} {
</span> return -code error "incompatible Mac OS X version"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html
livecheck.regex instantclient-basic-macos.x64-(\[0-9.\]+)${extract.suffix}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,15 +133,11 @@ extract {
</span> xinstall -d ${my_build_dir}
foreach my_arch ${configure.universal_archs} {
foreach my_distfile_type {basic sdk} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[vercmp [macports_version] 2.6.99] >= 0} {
</span> system "${extract.cmd} ${extract.pre_args} ${extract.post_args} [shellescape ${distpath}/[format $my_distname_format(${my_arch}) ${my_distfile_type}]${extract.suffix}]"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${extract.cmd} ${extract.pre_args} ${extract.post_args} '${distpath}/[format $my_distname_format(${my_arch}) ${my_distfile_type}]${extract.suffix}'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> }
move ${extract.dir}/[format ${my_worksrcdir_format} [join [lrange [split ${version} .] 0 1] "_"]] ${my_build_dir}/${my_arch}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Fix permissions.
fs-traverse f ${my_build_dir} {
if {[string match "*.dylib.*" ${f}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +167,7 @@ build {
</span> # For each dylib, change the directory of its install_name to ${lib_dir}.
foreach lib [glob -directory ${workpath}/build/${my_arch} *.dylib*] {
system "install_name_tool -id ${lib_dir}/[strsed ${lib} /^.*\\///] ${lib}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Then for each dependent dylib with a strange install_name that
# this dylib references, fix the reference to use ${lib_dir}.
foreach dep [exec otool -L ${lib}] {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +175,7 @@ build {
</span> system "install_name_tool -change ${dep} ${lib_dir}/[strsed ${dep} /^.*\\///] ${lib}"
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # libociei is special: it's not linked to; it's dynamically loaded at
# runtime by libclntsh. Oracle says you have to set DYLD_LIBRARY_PATH
# to include ${lib_dir}, but adding an rpath works too—but rpath only
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -200,19 +196,19 @@ destroot {
</span> {*}[glob -directory ${my_worksrcpath} *.dylib*] \
{*}[glob -directory ${my_worksrcpath} *.jar] \
${my_destroot}${lib_dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # You would think the includes should go in ${prefix}/include/oracle, but
# the "instantclient layout" dictates they must be in ${lib_dir}/sdk/include;
# ports like php-oracle will expect them there.
xinstall -d ${my_destroot}${lib_dir}/sdk
copy ${my_worksrcpath}/sdk/include ${my_destroot}${lib_dir}/sdk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> merge ${workpath}/pre-dest
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # php-oracle complains without a libclntsh.dylib symlink.
ln -s libclntsh.dylib.${library_version} ${destroot}${lib_dir}/libclntsh.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Add a libocci.dylib symlink too for good measure.
ln -s libocci.dylib.${library_version} ${destroot}${lib_dir}/libocci.dylib
}
</pre><pre style='margin:0'>
</pre>