On 6/29/15 12:22 PM, [email protected] wrote:
[138119] users/elelay/ports/devel/gtk-osx-application/Portfile
Revision
138119 <https://trac.macports.org/changeset/138119>
Author
[email protected]
Date
2015-06-29 12:22:04 -0700 (Mon, 29 Jun 2015)
Log Message
update messages and docs, remove unused variants
Modified Paths
* users/elelay/ports/devel/gtk-osx-application/Portfile
<#userselelayportsdevelgtkosxapplicationPortfile>
Diff
Modified:
users/elelay/ports/devel/gtk-osx-application/Portfile (138118
=> 138119)
--- users/elelay/ports/devel/gtk-osx-application/Portfile 2015-06-29
19:16:00 UTC (rev 138118) +++
users/elelay/ports/devel/gtk-osx-application/Portfile 2015-06-29
19:22:04 UTC (rev 138119) @@ -16,9 +16,9 @@ long_description \ A
simple library whose purpose is to \ - allow GTK2 quartz applications
to integrate with \ - the Mac OS X menu bar. Requires gtk2 and its \ -
dependencies to be built with variants +no_x11 +quartz + allow GTK
quartz applications to integrate with \ + the Mac OS X menu bar.
Requires gtk2 or gtk3 and its \ + dependencies to be built with
variant +quartz homepage
https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration @@ -36,37
+36,29 @@ depends_build port:pkgconfig -variant gtk2 description
{Dummy gtk2 variant} { -} - -variant gtk3 description {Dummy gtk3
variant} { -} - set gtk_version gtk2 pre-configure { if {${name} eq
${subport}} { ui_error " -*** The gtk-osx-application port has been
replaced by 'gtk-osx-application-gtk2' -*** and
'gtk-osx-application-gtk3'. Please `sudo port deactivate
gtk-osx-application` -*** followed by the `sudo port upgrade -u
outdated` or another command to update. -*** Then if all works as
intended `sudo port uninstall gtk-osx-application` -***" +The
gtk-osx-application port has been replaced by
'gtk-osx-application-gtk2' +and 'gtk-osx-application-gtk3'. +Please
`sudo port deactivate gtk-osx-application` +followed by `sudo port
upgrade -u outdated` or another command to update. +Then if all works
as intended `sudo port uninstall gtk-osx-application` +" return -code
error } - if {![active_variants $gtk_version quartz x11]} { + if
{![active_variants $gtk_version quartz ""]} { ui_error " - -**** -****
gtk-osx-application is meant to be used only in a GTK quartz -****
development environment but your version of GTK does not -**** support
quartz. Please make sure that port $gtk_version and all its -****
dependencies are built with variants +no_x11 +quartz and try again.
-**** +${name} is meant to be used only in a GTK quartz +development
environment but your version of GTK does not +support quartz. Please
make sure that port $gtk_version and all its +dependencies are built
with variants +quartz and try again. " - error "$gtk_version +no_x11
+quartz not installed." + error "$gtk_version +quartz not installed." } }
Eric --
I've updated my copy to be in sync with yours and will be testing the
gimp ports and adding a +quartz variant to gedit this afternoon. Will
let you know how that goes.
One small additional suggestion. The error message that is emitted when
one of the subports is attempted without +quartz still refers to
"gtk-osx-application" rather than the subport name. Changing ${name} to
${name}-${gtk_version} in that message fixes the issue.
Otherwise looks good.
Dave
_______________________________________________
macports-dev mailing list
[email protected]
https://lists.macosforge.org/mailman/listinfo/macports-dev
