[prev in list] [next in list] [prev in thread] [next in thread]
List: macports-changes
Subject: [98115] trunk/dports/math/maxima
From: and.damore () macports ! org
Date: 2012-09-25 12:38:25
Message-ID: 20120925123826.2C976140E4E () svn ! macports ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 98115
http://trac.macports.org//changeset/98115
Author: and.damore@macports.org
Date: 2012-09-25 05:38:24 -0700 (Tue, 25 Sep 2012)
Log Message:
-----------
port maxima: committing patch provided by maintainer, close ticket #36243
Modified Paths:
--------------
trunk/dports/math/maxima/Portfile
Added Paths:
-----------
trunk/dports/math/maxima/files/no-xmaxima.patch
Modified: trunk/dports/math/maxima/Portfile
===================================================================
--- trunk/dports/math/maxima/Portfile 2012-09-25 12:26:31 UTC (rev 98114)
+++ trunk/dports/math/maxima/Portfile 2012-09-25 12:38:24 UTC (rev 98115)
@@ -5,6 +5,7 @@
name maxima
version 5.28.0
+revision 1
categories math
maintainers mareimbrium.org:kuba
platforms darwin
@@ -25,7 +26,7 @@
master_sites sourceforge
checksums sha256 \
d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda \
- rmd160 a2d9aff1ac7e8a5464750b3b59f8b7dcedb148d5 \
+ rmd160 a2d9aff1ac7e8a5464750b3b59f8b7dcedb148d5
depends_lib port:sbcl
depends_run port:tk \
@@ -47,7 +48,12 @@
}
}
-variant abcl description {Use ABCL instead of SBCL for Lisp } {
+variant no_xmaxima description {Do not build xmaxima} {
+ depends_run-delete port:tk
+ patchfiles-append no-xmaxima.patch
+}
+
+variant abcl description {Use ABCL instead of SBCL for Lisp} {
depends_lib-delete port:sbcl
depends_lib-append port:abcl
configure.args-delete --enable-sbcl
Added: trunk/dports/math/maxima/files/no-xmaxima.patch
===================================================================
--- trunk/dports/math/maxima/files/no-xmaxima.patch (rev 0)
+++ trunk/dports/math/maxima/files/no-xmaxima.patch 2012-09-25 12:38:24 UTC (rev \
98115) @@ -0,0 +1,65 @@
+--- interfaces/Makefile.in.orig 2012-09-20 09:30:55.000000000 -0400
++++ interfaces/Makefile.in 2012-09-20 09:31:16.000000000 -0400
+@@ -183,8 +183,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = emacs xmaxima
+-EXTRA_DIST = bin/xmaxima.iss
++SUBDIRS = emacs
+ all: all-recursive
+
+ .SUFFIXES:
+--- Makefile.in.orig 2012-09-20 09:37:06.000000000 -0400
++++ Makefile.in 2012-09-20 09:38:15.000000000 -0400
+@@ -36,9 +36,8 @@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/common.mk \
+ $(srcdir)/maxima-local.in $(srcdir)/maxima.iss.in \
+- $(srcdir)/maxima.spec.in $(srcdir)/xmaxima-local.in \
++ $(srcdir)/maxima.spec.in \
+ $(top_srcdir)/configure $(top_srcdir)/doc/man/ru/maxima.1.in \
+- $(top_srcdir)/interfaces/xmaxima/Tkmaxima/Header.tcl.in \
+ AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
+ install-sh missing
+ subdir = .
+@@ -49,8 +48,8 @@
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
+-CONFIG_CLEAN_FILES = maxima-local xmaxima-local maxima.spec maxima.iss \
+- doc/man/ru/maxima.1 interfaces/xmaxima/Tkmaxima/Header.tcl
++CONFIG_CLEAN_FILES = maxima-local maxima.spec maxima.iss \
++ doc/man/ru/maxima.1
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -212,9 +211,9 @@
+ common.mk maxima.iss.in \
+ README.lisps README.rpms README.i18n README.external \
+ INSTALL.win32 INSTALL.lisp \
+- configure.lisp maxima-local.in xmaxima-local.in \
++ configure.lisp maxima-local.in \
+ macosx/Makefile macosx/Readme.txt macosx/maxima.sh macosx/script \
+- macosx/xmaxima.sh macosx/appIcon.icns \
++ macosx/appIcon.icns \
+ ChangeLog-5.9.2 ChangeLog-5.9.3 ChangeLog-5.10.0 ChangeLog-5.11.0 \
+ ChangeLog-5.12.0 ChangeLog-5.13.0 ChangeLog-5.14.0 ChangeLog-5.15.0 \
+ ChangeLog-5.16 ChangeLog-5.17 ChangeLog-5.17-special-functions \
+@@ -282,16 +281,12 @@
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ maxima-local: $(top_builddir)/config.status $(srcdir)/maxima-local.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+-xmaxima-local: $(top_builddir)/config.status $(srcdir)/xmaxima-local.in
+- cd $(top_builddir) && $(SHELL) ./config.status $@
+ maxima.spec: $(top_builddir)/config.status $(srcdir)/maxima.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ maxima.iss: $(top_builddir)/config.status $(srcdir)/maxima.iss.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ doc/man/ru/maxima.1: $(top_builddir)/config.status \
$(top_srcdir)/doc/man/ru/maxima.1.in + cd $(top_builddir) && $(SHELL) \
./config.status $@ +-interfaces/xmaxima/Tkmaxima/Header.tcl: \
$(top_builddir)/config.status $(top_srcdir)/interfaces/xmaxima/Tkmaxima/Header.tcl.in \
+- cd $(top_builddir) && $(SHELL) ./config.status $@ +
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[98115] trunk/dports/math/maxima</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.macports.org//changeset/98115">98115</a></dd> <dt>Author</dt> \
<dd>and.damore@macports.org</dd> <dt>Date</dt> <dd>2012-09-25 05:38:24 -0700 (Tue, 25 \
Sep 2012)</dd> </dl>
<h3>Log Message</h3>
<pre>port maxima: committing patch provided by maintainer, close ticket #36243</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathmaximaPortfile">trunk/dports/math/maxima/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmathmaximafilesnoxmaximapatch">trunk/dports/math/maxima/files/no-xmaxima.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathmaximaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/maxima/Portfile (98114 => \
98115)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/math/maxima/Portfile 2012-09-25 12:26:31 UTC (rev \
98114)
+++ trunk/dports/math/maxima/Portfile 2012-09-25 12:38:24 UTC (rev 98115)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name maxima
</span><span class="cx"> version 5.28.0
</span><ins>+revision 1
</ins><span class="cx"> categories math
</span><span class="cx"> maintainers mareimbrium.org:kuba
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -25,7 +26,7 @@
</span><span class="cx"> master_sites sourceforge
</span><span class="cx">
</span><span class="cx"> checksums sha256 \
d73e925f0116ba361bf4390c80e24d4fa763f647cc1fc4cc06bbf40ceb3facda \ </span><del>- \
rmd160 a2d9aff1ac7e8a5464750b3b59f8b7dcedb148d5 \ </del><ins>+ rmd160 \
a2d9aff1ac7e8a5464750b3b59f8b7dcedb148d5 </ins><span class="cx">
</span><span class="cx"> depends_lib port:sbcl
</span><span class="cx"> depends_run port:tk \
</span><span class="lines">@@ -47,7 +48,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant abcl description {Use ABCL instead of SBCL for Lisp } {
</del><ins>+variant no_xmaxima description {Do not build xmaxima} {
+ depends_run-delete port:tk
+ patchfiles-append no-xmaxima.patch
+}
+
+variant abcl description {Use ABCL instead of SBCL for Lisp} {
</ins><span class="cx"> depends_lib-delete port:sbcl
</span><span class="cx"> depends_lib-append port:abcl
</span><span class="cx"> configure.args-delete --enable-sbcl
</span></span></pre></div>
<a id="trunkdportsmathmaximafilesnoxmaximapatch"></a>
<div class="addfile"><h4>Added: trunk/dports/math/maxima/files/no-xmaxima.patch (0 => \
98115)</h4> <pre class="diff"><span>
<span class="info">--- trunk/dports/math/maxima/files/no-xmaxima.patch \
(rev 0)
+++ trunk/dports/math/maxima/files/no-xmaxima.patch 2012-09-25 12:38:24 UTC (rev \
98115) </span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+--- interfaces/Makefile.in.orig 2012-09-20 09:30:55.000000000 -0400
++++ interfaces/Makefile.in 2012-09-20 09:31:16.000000000 -0400
+@@ -183,8 +183,7 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = emacs xmaxima
+-EXTRA_DIST = bin/xmaxima.iss
++SUBDIRS = emacs
+ all: all-recursive
+
+ .SUFFIXES:
+--- Makefile.in.orig 2012-09-20 09:37:06.000000000 -0400
++++ Makefile.in 2012-09-20 09:38:15.000000000 -0400
+@@ -36,9 +36,8 @@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/common.mk \
+ $(srcdir)/maxima-local.in $(srcdir)/maxima.iss.in \
+- $(srcdir)/maxima.spec.in $(srcdir)/xmaxima-local.in \
++ $(srcdir)/maxima.spec.in \
+ $(top_srcdir)/configure $(top_srcdir)/doc/man/ru/maxima.1.in \
+- $(top_srcdir)/interfaces/xmaxima/Tkmaxima/Header.tcl.in \
+ AUTHORS COPYING ChangeLog INSTALL NEWS config.guess config.sub \
+ install-sh missing
+ subdir = .
+@@ -49,8 +48,8 @@
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
+-CONFIG_CLEAN_FILES = maxima-local xmaxima-local maxima.spec maxima.iss \
+- doc/man/ru/maxima.1 interfaces/xmaxima/Tkmaxima/Header.tcl
++CONFIG_CLEAN_FILES = maxima-local maxima.spec maxima.iss \
++ doc/man/ru/maxima.1
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -212,9 +211,9 @@
+ common.mk maxima.iss.in \
+ README.lisps README.rpms README.i18n README.external \
+ INSTALL.win32 INSTALL.lisp \
+- configure.lisp maxima-local.in xmaxima-local.in \
++ configure.lisp maxima-local.in \
+ macosx/Makefile macosx/Readme.txt macosx/maxima.sh macosx/script \
+- macosx/xmaxima.sh macosx/appIcon.icns \
++ macosx/appIcon.icns \
+ ChangeLog-5.9.2 ChangeLog-5.9.3 ChangeLog-5.10.0 ChangeLog-5.11.0 \
+ ChangeLog-5.12.0 ChangeLog-5.13.0 ChangeLog-5.14.0 ChangeLog-5.15.0 \
+ ChangeLog-5.16 ChangeLog-5.17 ChangeLog-5.17-special-functions \
+@@ -282,16 +281,12 @@
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ maxima-local: $(top_builddir)/config.status $(srcdir)/maxima-local.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+-xmaxima-local: $(top_builddir)/config.status $(srcdir)/xmaxima-local.in
+- cd $(top_builddir) && $(SHELL) ./config.status $@
+ maxima.spec: $(top_builddir)/config.status $(srcdir)/maxima.spec.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ maxima.iss: $(top_builddir)/config.status $(srcdir)/maxima.iss.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+ doc/man/ru/maxima.1: $(top_builddir)/config.status \
$(top_srcdir)/doc/man/ru/maxima.1.in + cd $(top_builddir) && $(SHELL) \
./config.status $@ +-interfaces/xmaxima/Tkmaxima/Header.tcl: \
$(top_builddir)/config.status $(top_srcdir)/interfaces/xmaxima/Tkmaxima/Header.tcl.in \
+- cd $(top_builddir) && $(SHELL) ./config.status $@ +
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
</ins></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
macports-changes mailing list
macports-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo/macports-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic