October 2012 - macports-changes - lists.macosforge.org

[98250] trunk/dports/databases/libzdb-mysql55/Portfile
by ryandesign＠macports.org 01 Oct '12

01 Oct '12

Revision: 98250 http://trac.macports.org//changeset/98250 Author: ryandesign(a)macports.org Date: 2012-09-30 17:51:51 -0700 (Sun, 30 Sep 2012) Log Message: ----------- libzdb-oracle: build 32-bit on Lion and up to avoid crash (#36261) Modified Paths: -------------- trunk/dports/databases/libzdb-mysql55/Portfile Modified: trunk/dports/databases/libzdb-mysql55/Portfile =================================================================== --- trunk/dports/databases/libzdb-mysql55/Portfile 2012-10-01 00:45:56 UTC (rev 98249) +++ trunk/dports/databases/libzdb-mysql55/Portfile 2012-10-01 00:51:51 UTC (rev 98250) @@ -125,9 +125,17 @@ subport libzdb-oracle { + revision 1 + description-append {Built for oracle.} depends_lib-append port:oracle-instantclient + + if {${os.platform} == "darwin" && ${os.major} > 10} { + # oracle-instantclient 10.2.0.4.0 crashes in 64-bit mode on Lion and up. + supported_archs i386 + } + configure.args-delete --without-oci configure.args-append --with-oci-include=${prefix}/lib/oracle/sdk/include \ --with-oci-lib=${prefix}/lib/oracle \

1 0

[98249] trunk/dports/aqua/TOra/Portfile
by ryandesign＠macports.org 01 Oct '12

01 Oct '12

Revision: 98249 http://trac.macports.org//changeset/98249 Author: ryandesign(a)macports.org Date: 2012-09-30 17:45:56 -0700 (Sun, 30 Sep 2012) Log Message: ----------- TOra: change no_oracle variant into oracle variant; build 32-bit on Lion and up when oracle variant is selected to avoid crash (#36260) Modified Paths: -------------- trunk/dports/aqua/TOra/Portfile Modified: trunk/dports/aqua/TOra/Portfile =================================================================== --- trunk/dports/aqua/TOra/Portfile 2012-10-01 00:34:10 UTC (rev 98248) +++ trunk/dports/aqua/TOra/Portfile 2012-10-01 00:45:56 UTC (rev 98249) @@ -6,7 +6,7 @@ name TOra version 2.1.3 -revision 2 +revision 3 description GUI tool for Oracle, PostgreSQL, and MySQL long_description Database developer/DBA frontend for various DB servers. maintainers scribus.info:petr @@ -25,8 +25,7 @@ # WARNING: postgresql83 is there due to qt4-mac's dependency on it. # It's dangerous to mix library versions in one binary. It's required # to spot qt4-mac's dependencies' version bumps. -depends_lib port:qscintilla \ - port:oracle-instantclient +depends_lib port:qscintilla patchfiles patch-osx_tools-Info.plist.in.diff @@ -37,13 +36,12 @@ -DCMAKE_INCLUDE_PATH=${prefix}/include \ -DUSE_PCH=0 \ -Dmacports_prefix=${prefix} \ - -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \ - -DORACLE_PATH_LIB=${prefix}/lib/oracle \ -DWANT_BUNDLE=1 \ -DWANT_BUNDLE_STANDALONE=0 \ -DWANT_RPM=0 \ -DWANT_INTERNAL_QSCINTILLA=0 \ -DENABLE_DB2=0 \ + -DENABLE_ORACLE=0 \ ${qt_cmake_defines} . @@ -85,10 +83,23 @@ # # Oracle -variant no_oracle description {Disable support for Oracle} { - depends_lib-delete port:oracle-instantclient - configure.pre_args-append -DENABLE_ORACLE=0 +variant no_oracle conflicts oracle description {Legacy compatibility variant} {} +variant oracle conflicts no_oracle description {Enable support for Oracle} { + depends_lib-append port:oracle-instantclient + configure.args-delete -DENABLE_ORACLE=0 + configure.args-append -DENABLE_ORACLE=1 \ + -DORACLE_PATH_INCLUDES=${prefix}/lib/oracle/sdk/include \ + -DORACLE_PATH_LIB=${prefix}/lib/oracle \ } +if {[variant_isset no_oracle]} { + default_variants -oracle +} else { + default_variants +oracle +} +if {[variant_isset oracle] && ${os.platform} == "darwin" && ${os.major} > 10} { + # oracle-instantclient 10.2.0.4.0 crashes in 64-bit mode on Lion and up. + supported_archs i386 +} # # Debug

1 0

[98248] trunk/dports/databases/ocilib/Portfile
by ryandesign＠macports.org 01 Oct '12

01 Oct '12

Revision: 98248 http://trac.macports.org//changeset/98248 Author: ryandesign(a)macports.org Date: 2012-09-30 17:34:10 -0700 (Sun, 30 Sep 2012) Log Message: ----------- ocilib: fix livecheck (#36262) Modified Paths: -------------- trunk/dports/databases/ocilib/Portfile Modified: trunk/dports/databases/ocilib/Portfile =================================================================== --- trunk/dports/databases/ocilib/Portfile 2012-10-01 00:15:28 UTC (rev 98247) +++ trunk/dports/databases/ocilib/Portfile 2012-10-01 00:34:10 UTC (rev 98248) @@ -29,3 +29,5 @@ # oracle-instantclient 10.2.0.4.0 crashes in 64-bit mode on Lion and up. supported_archs i386 } + +livecheck.regex /${name}-(\[0-9.\]+)-gnu${extract.suffix}

1 0

[98247] trunk/dports/graphics/vlfeat/Portfile
by ryandesign＠macports.org 01 Oct '12

01 Oct '12

Revision: 98247 http://trac.macports.org//changeset/98247 Author: ryandesign(a)macports.org Date: 2012-09-30 17:15:28 -0700 (Sun, 30 Sep 2012) Log Message: ----------- vlfeat: disable silent rules Modified Paths: -------------- trunk/dports/graphics/vlfeat/Portfile Modified: trunk/dports/graphics/vlfeat/Portfile =================================================================== --- trunk/dports/graphics/vlfeat/Portfile 2012-10-01 00:12:07 UTC (rev 98246) +++ trunk/dports/graphics/vlfeat/Portfile 2012-10-01 00:15:28 UTC (rev 98247) @@ -47,6 +47,9 @@ build.args-append CC="${configure.cc}" +# disable silent rules +build.args-append VERB=1 + post-patch { reinplace "s|-install_name @loader_path/|-install_name ${prefix}/lib/|g" ${worksrcpath}/make/dll.mak }

1 0

[98246] trunk/dports/graphics/vlfeat/Portfile
by ryandesign＠macports.org 01 Oct '12

01 Oct '12

Revision: 98246 http://trac.macports.org//changeset/98246 Author: ryandesign(a)macports.org Date: 2012-09-30 17:12:07 -0700 (Sun, 30 Sep 2012) Log Message: ----------- vlfeat: ensure we're UsingTheRightCompiler Modified Paths: -------------- trunk/dports/graphics/vlfeat/Portfile Modified: trunk/dports/graphics/vlfeat/Portfile =================================================================== --- trunk/dports/graphics/vlfeat/Portfile 2012-09-30 20:43:02 UTC (rev 98245) +++ trunk/dports/graphics/vlfeat/Portfile 2012-10-01 00:12:07 UTC (rev 98246) @@ -45,6 +45,8 @@ build.args-append SDKROOT=/ } +build.args-append CC="${configure.cc}" + post-patch { reinplace "s|-install_name @loader_path/|-install_name ${prefix}/lib/|g" ${worksrcpath}/make/dll.mak }

1 0