<pre style='margin:0'>
David Strubbe (dstrubbe) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/327b12b4beffe478c4f6f29cd866e8852276083c">https://github.com/macports/macports-ports/commit/327b12b4beffe478c4f6f29cd866e8852276083c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 327b12b xemacs: Change negative variant.
</span>327b12b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 327b12b4beffe478c4f6f29cd866e8852276083c
</span>Author: David Strubbe <dstrubbe@macports.org>
AuthorDate: Wed Jul 12 11:25:20 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> xemacs: Change negative variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previously the default was to install SUMO and mule, and the +no_sumo variant installed only the minimal efs and xemacs-base packages. In accordance with our policy to avoid negative variants, there is now a +sumo variant (which is the default) and without this, just efs and xemacs-base are installed. A legacy +no_sumo variant has been left for compatibility in upgrades.
</span>---
editors/xemacs/Portfile | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/xemacs/Portfile b/editors/xemacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c1f58b7..81cf671 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/xemacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/xemacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,14 +14,15 @@ categories editors x11
</span> platforms darwin
maintainers dstrubbe openmaintainer
license GPL-2+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 13
</span>
description A highly customizable open-source text editor.
long_description \
XEmacs is a highly customizable open-source text editor and application development \
system. It is protected under the GNU Public License and related to other versions of \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Emacs, in particular GNU Emacs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Emacs, in particular GNU Emacs. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ efs and xemacs-base packages are installed by default, more with +sumo.
</span>
homepage http://www.xemacs.org
master_sites http://ftp.xemacs.org/pub/xemacs/xemacs-21.4/:xemacs \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +35,7 @@ set xemacs_dist ${name}-${version}${extract.suffix}
</span> set sumo_dist ${name}-sumo-${sumo_date}${extract.suffix}
set mule_dist ${name}-mule-sumo-${sumo_date}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles ${xemacs_dist}:xemacs ${sumo_dist}:package ${mule_dist}:package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles ${xemacs_dist}:xemacs efs-${efs_version}-pkg.tar.gz:package xemacs-base-${base_version}-pkg.tar.gz:package
</span>
checksums xemacs-${version}.tar.gz \
md5 b0b762407316d6de170db69aba7a37cf \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,14 +73,13 @@ configure.args --mandir=${prefix}/share/man \
</span> --with-dialogs=athena \
--with-widgets=athena \
--with-athena=3d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-database=gdbm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-mule
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-database=gdbm
</span>
depends_build bin:makeinfo:texinfo port:xbitmaps
depends_skip_archcheck-append texinfo
depends_lib port:libpng port:Xaw3d port:ncurses port:gdbm port:jpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:tiff port:compface port:gettext port:zlib port:xorg-libXaw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff port:compface port:zlib port:xorg-libXaw
</span> depends_run port:ctags
destroot.args prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man/man1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +93,7 @@ post-destroot {
</span> delete ${destroot}${prefix}/lib/xemacs
ln -s xemacs-${version} ${destroot}${prefix}/lib/xemacs
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset no_sumo]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset sumo]} {
</span> file mkdir ${workpath}/xemacs-packages
file copy ${workpath}/man ${workpath}/xemacs-packages
file copy ${workpath}/info ${workpath}/xemacs-packages
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@ post-destroot {
</span>
file copy ${workpath}/xemacs-packages ${xemacs_lib}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset no_sumo]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset sumo]} {
</span> file copy ${workpath}/mule-packages ${xemacs_lib}/
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,12 +113,22 @@ post-destroot {
</span> delete ${destroot}${prefix}/share/man/man1/ctags.1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# TODO: Remove legacy variant after 2018-07-12
</span> variant no_sumo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description "Do not install SUMO (all packages) and mule (multilanguage) support. efs and xemacs-base packages are installed." {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-mule
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:gettext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-delete ${sumo_dist}:package ${mule_dist}:package
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append efs-${efs_version}-pkg.tar.gz:package xemacs-base-${base_version}-pkg.tar.gz:package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Legacy variant" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts sumo { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant sumo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description "Install SUMO (all packages) and mule (multilanguage) support." \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts no_sumo {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-mule
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gettext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-append ${sumo_dist}:package ${mule_dist}:package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ distfiles-delete efs-${efs_version}-pkg.tar.gz:package xemacs-base-${base_version}-pkg.tar.gz:package
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset no_sumo]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +sumo
</span> }
# https://trac.macports.org/ticket/31679
</pre><pre style='margin:0'>
</pre>