Revision: 76645 http://trac.macports.org/changeset/76645 Author: michaelld@macports.org Date: 2011-03-03 12:18:04 -0800 (Thu, 03 Mar 2011) Log Message: ----------- qjackctl changes: * bump to version 0.3.7 * move to using qt4-mac instead of qt4-x11 * fully disable -lX11x and -lXext linking. * add variants for various features, with defaults. * should address the reason for ticket #28592 . Modified Paths: -------------- trunk/dports/audio/qjackctl/Portfile Added Paths: ----------- trunk/dports/audio/qjackctl/files/ trunk/dports/audio/qjackctl/files/patch-configure-no-x11.diff trunk/dports/audio/qjackctl/files/patch-src_qjackctlSession.cpp.diff Modified: trunk/dports/audio/qjackctl/Portfile =================================================================== --- trunk/dports/audio/qjackctl/Portfile 2011-03-03 19:05:18 UTC (rev 76644) +++ trunk/dports/audio/qjackctl/Portfile 2011-03-03 20:18:04 UTC (rev 76645) @@ -2,9 +2,10 @@ # $Id$ PortSystem 1.0 +PortGroup qt4 1.0 name qjackctl -version 0.3.4 +version 0.3.7 categories audio maintainers devans openmaintainter platforms darwin @@ -19,18 +20,59 @@ universal_variant no -checksums md5 65736e83650468256ba22aa5d35fd0cb \ - sha1 33aa986c81b0cc6891c9c6cef6366470394d3eb6 \ - rmd160 1ab208e0c0f4e68c58b048a32d05ca3d47dfaca8 +checksums md5 3462613bd5c92fa6e6ae92950bd69c0b \ + sha1 187ed47a797d7083608aacf2f08353896646ed74 \ + rmd160 64a4d6025aebd8a11212605139c0a654b7fbfb19 -depends_lib port:jack \ - port:qt4-x11 \ - port:xorg-libX11 \ - port:xorg-libXext +depends_lib-append port:jack -configure.args-append --with-qt=${prefix}/libexec/qt4-x11 \ - --with-jack=${prefix} \ +patchfiles patch-src_qjackctlSession.cpp.diff \ + patch-configure-no-x11.diff + +configure.args-append --with-jack=${prefix} \ + --with-qt=${qt_dir} \ --disable-alsa-seq +configure.args-delete --disable-dependency-tracking +post-destroot { + delete ${destroot}${applications_dir} + move ${destroot}${prefix}/bin ${destroot}${applications_dir} +} + +variant debug description "Enable debugging" {} + +if {[variant_isset debug]} { + configure.args-append --enable-debug +} else { + configure.args-append --disable-debug +} + +variant portaudio description "enable PortAudio interface" {} +default_variants +portaudio + +if {[variant_isset portaudio]} { + configure.args-append --enable-portaudio + depends_lib-append port:portaudio +} else { + configure.args-append --disable-portaudio +} + +variant stacktrace description "enable debugger stack-trace" {} + +if {[variant_isset stacktrace]} { + configure.args-append --enable-stacktrace +} else { + configure.args-append --disable-stacktrace +} + +variant dbus description "enable D-Bus interface" {} +default_variants +dbus + +if {[variant_isset dbus]} { + configure.args-append --enable-dbus +} else { + configure.args-append --disable-dbus +} + livecheck.url http://sourceforge.net/projects/${name}/files/ livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" Added: trunk/dports/audio/qjackctl/files/patch-configure-no-x11.diff =================================================================== --- trunk/dports/audio/qjackctl/files/patch-configure-no-x11.diff (rev 0) +++ trunk/dports/audio/qjackctl/files/patch-configure-no-x11.diff 2011-03-03 20:18:04 UTC (rev 76645) @@ -0,0 +1,26 @@ +--- configure.orig 2011-03-03 14:27:51.000000000 -0500 ++++ configure 2011-03-03 14:32:00.000000000 -0500 +@@ -4195,6 +4195,9 @@ + + fi + ++ac_cv_lib_X11_main=no ++ac_cv_lib_Xext_main=no ++ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lX11" >&5 + $as_echo_n "checking for main in -lX11... " >&6; } + if test "${ac_cv_lib_X11_main+set}" = set; then : +@@ -4459,10 +4462,12 @@ + fi + fi + ++if test "x$ac_cv_lib_X11_main" = "xyes"; then ++ + # Some recent distros (eg. fedora, debian) require this. + ac_libs="$ac_libs -lX11" + +- ++fi + + + # Checks for header files. Added: trunk/dports/audio/qjackctl/files/patch-src_qjackctlSession.cpp.diff =================================================================== --- trunk/dports/audio/qjackctl/files/patch-src_qjackctlSession.cpp.diff (rev 0) +++ trunk/dports/audio/qjackctl/files/patch-src_qjackctlSession.cpp.diff 2011-03-03 20:18:04 UTC (rev 76645) @@ -0,0 +1,11 @@ +--- src/qjackctlSession.cpp.orig 2011-03-03 13:52:18.000000000 -0500 ++++ src/qjackctlSession.cpp 2011-03-03 13:52:23.000000000 -0500 +@@ -19,6 +19,8 @@ + + *****************************************************************************/ + ++#include <errno.h> ++ + #include "qjackctlAbout.h" + #include "qjackctlSession.h" +