Revision: 144108 https://trac.macports.org/changeset/144108 Author: khindenburg@macports.org Date: 2016-01-01 14:10:02 -0800 (Fri, 01 Jan 2016) Log Message: ----------- aspell: remove legacy variant Modified Paths: -------------- trunk/dports/textproc/aspell/Portfile Modified: trunk/dports/textproc/aspell/Portfile =================================================================== --- trunk/dports/textproc/aspell/Portfile 2016-01-01 22:00:18 UTC (rev 144107) +++ trunk/dports/textproc/aspell/Portfile 2016-01-01 22:10:02 UTC (rev 144108) @@ -50,24 +50,17 @@ system "${prefix}/bin/install-info ${prefix}/share/info/aspell-dev.info ${prefix}/share/info/dir" } -variant nls conflicts nonls { +variant nls { configure.args-delete --disable-nls configure.args-append --enable-nls } -# nonls variant to be removed after January 2014 -variant nonls conflicts nls description {Legacy compatibility variant} {} - -if {[variant_isset nonls]} { +if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx"} { + # gnustep-gui uses aspell and will not work if aspell is linked to gettext because + # gettext is linked to CoreFoundation which is itself linked to the Apple objc runtime default_variants -nls } else { - if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx"} { - # gnustep-gui uses aspell and will not work if aspell is linked to gettext because - # gettext is linked to CoreFoundation which is itself linked to the Apple objc runtime - default_variants -nls - } else { - default_variants +nls - } + default_variants +nls } notes "