<!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>[119189] trunk/dports/graphics/pgplot</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="https://trac.macports.org/changeset/119189">119189</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2014-04-19 08:40:31 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Fix crash on 64-bit machines (#37551)
* Minor cleanup (duplicate dependencies, checksum)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicspgplotPortfile">trunk/dports/graphics/pgplot/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicspgplotfilespatch64bitdiff">trunk/dports/graphics/pgplot/files/patch-64bit.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicspgplotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/pgplot/Portfile (119188 => 119189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/pgplot/Portfile 2014-04-19 15:23:06 UTC (rev 119188)
+++ trunk/dports/graphics/pgplot/Portfile 2014-04-19 15:40:31 UTC (rev 119189)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> name pgplot
</span><span class="cx"> conflicts miriad
</span><span class="cx"> version 5.2.2
</span><del>-revision 9
</del><ins>+revision 10
</ins><span class="cx"> categories graphics devel
</span><span class="cx"> license Noncommercial
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -33,9 +33,8 @@
</span><span class="cx"> configure.dir ${workpath}/build
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx">
</span><del>-checksums md5 e8a6e8d0d5ef9d1709dfb567724525ae \
- sha1 1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 \
- rmd160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1
</del><ins>+checksums rmd160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 \
+ sha256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4
</ins><span class="cx">
</span><span class="cx"> depends_build bin:perl:perl5 \
</span><span class="cx"> port:pkgconfig
</span><span class="lines">@@ -48,6 +47,11 @@
</span><span class="cx"> patch-drivers-pndriv.c.diff \
</span><span class="cx"> patch-proccom.c.diff
</span><span class="cx">
</span><ins>+# See #37551
+if { [string match *64 ${build_arch}] } {
+ patchfiles-append patch-64bit.diff
+}
+
</ins><span class="cx"> # Tell the compiler not to treat backslash characters as C-style escape sequences.
</span><span class="cx"> configure.fcflags-append -fno-backslash
</span><span class="cx">
</span><span class="lines">@@ -211,7 +215,6 @@
</span><span class="cx">
</span><span class="cx"> variant x11 conflicts no_x11 {
</span><span class="cx"> depends_lib-append port:xorg-libX11
</span><del>- depends_build-append port:pkgconfig
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
</span><span class="lines">@@ -279,6 +282,6 @@
</span><span class="cx"> depends_build-append bin:pdflatex:texlive
</span><span class="cx">
</span><span class="cx"> post-build {
</span><del>- system "cd ${build.dir} && pdflatex pgplot-routines.tex && pdflatex pgplot-routines.tex"
</del><ins>+ system -W ${build.dir} "pdflatex pgplot-routines.tex && pdflatex pgplot-routines.tex"
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsgraphicspgplotfilespatch64bitdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/pgplot/files/patch-64bit.diff (0 => 119189)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/pgplot/files/patch-64bit.diff (rev 0)
+++ trunk/dports/graphics/pgplot/files/patch-64bit.diff 2014-04-19 15:40:31 UTC (rev 119189)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+--- drivers/gidriv.f.orig 1998-05-13 18:05:05.000000000 -0700
++++ drivers/gidriv.f 2014-04-19 07:55:46.000000000 -0700
+@@ -78,7 +78,7 @@
+ C Note: for 64-bit operating systems, change the following
+ C declaration to INTEGER*8:
+ C
+- INTEGER PIXMAP, WORK
++ INTEGER*8 PIXMAP, WORK
+ C
+ SAVE UNIT, IC, CTABLE, NPICT, MAXIDX, BX, BY, PIXMAP, FILENM
+ SAVE CDEFLT, STATE
+--- drivers/ppdriv.f.orig 1998-05-13 18:04:29.000000000 -0700
++++ drivers/ppdriv.f 2014-04-19 07:55:39.000000000 -0700
+@@ -68,7 +68,7 @@
+ C Note: for 64-bit operating systems, change the following
+ C declaration to INTEGER*8:
+ C
+- INTEGER PIXMAP
++ INTEGER*8 PIXMAP
+ C
+ SAVE UNIT, IC, CVAL, CTABLE, BX, BY, PIXMAP, NPICT, CDEFLT
+ SAVE STATE
+--- drivers/wddriv.f.orig 1998-05-13 18:03:53.000000000 -0700
++++ drivers/wddriv.f 2014-04-19 07:55:31.000000000 -0700
+@@ -61,7 +61,7 @@
+ C Note: for 64-bit operating systems, change the following
+ C declaration to INTEGER*8:
+ C
+- INTEGER PIXMAP
++ INTEGER*8 PIXMAP
+ C
+ SAVE UNIT, IC, CTABLE, NPICT, MAXIDX, BX, BY, PIXMAP, FILENM
+ SAVE CDEFLT, STATE
+--- sys_win/gidriv.f.orig 2001-01-31 12:54:26.000000000 -0700
++++ sys_win/gidriv.f 2014-04-19 07:55:25.000000000 -0700
+@@ -83,8 +83,8 @@
+ ! Note: for 64-bit operating systems, change the following
+ ! declaration to INTEGER*8:
+ !
+- INTEGER(1),ALLOCATABLE :: PIXMAP(:,:)
+- INTEGER(2),ALLOCATABLE :: WORK(:,:)
++ INTEGER*8,ALLOCATABLE :: PIXMAP(:,:)
++ INTEGER*8,ALLOCATABLE :: WORK(:,:)
+ !
+ SAVE UNIT, IC, CTABLE, NPICT, MAXIDX, BX, BY, PIXMAP, FILENM
+ SAVE CDEFLT, STATE
</ins></span></pre>
</div>
</div>
</body>
</html>