[119189] trunk/dports/graphics/pgplot

[mcalhoun at macports.org]

Revision: 119189
          https://trac.macports.org/changeset/119189
Author:   mcalhoun at macports.org
Date:     2014-04-19 08:40:31 -0700 (Sat, 19 Apr 2014)
Log Message:
-----------
* Fix crash on 64-bit machines (#37551)
* Minor cleanup (duplicate dependencies, checksum)

Modified Paths:
--------------
    trunk/dports/graphics/pgplot/Portfile

Added Paths:
-----------
    trunk/dports/graphics/pgplot/files/patch-64bit.diff

Modified: trunk/dports/graphics/pgplot/Portfile
===================================================================
--- 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)
@@ -6,7 +6,7 @@
 name                pgplot
 conflicts           miriad
 version             5.2.2
-revision            9
+revision            10
 categories          graphics devel
 license             Noncommercial
 platforms           darwin
@@ -33,9 +33,8 @@
 configure.dir       ${workpath}/build
 build.dir           ${configure.dir}
 
-checksums           md5     e8a6e8d0d5ef9d1709dfb567724525ae \
-                    sha1    1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 \
-                    rmd160  4c21cad6613772f4104c65ac3d8d9a42e3c4afe1
+checksums           rmd160  4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 \
+                    sha256  a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4
 
 depends_build       bin:perl:perl5 \
                     port:pkgconfig
@@ -48,6 +47,11 @@
                     patch-drivers-pndriv.c.diff \
                     patch-proccom.c.diff
 
+# See #37551
+if { [string match *64 ${build_arch}] } {
+    patchfiles-append patch-64bit.diff
+}
+
 # Tell the compiler not to treat backslash characters as C-style escape sequences.
 configure.fcflags-append -fno-backslash
 
@@ -211,7 +215,6 @@
 
 variant x11 conflicts no_x11 {
     depends_lib-append      port:xorg-libX11
-    depends_build-append    port:pkgconfig
 }
 
 variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
@@ -279,6 +282,6 @@
     depends_build-append bin:pdflatex:texlive
 
     post-build {
-        system "cd ${build.dir} && pdflatex pgplot-routines.tex && pdflatex pgplot-routines.tex"
+        system -W ${build.dir} "pdflatex pgplot-routines.tex && pdflatex pgplot-routines.tex"
     }
 }

Added: trunk/dports/graphics/pgplot/files/patch-64bit.diff
===================================================================
--- 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)
@@ -0,0 +1,46 @@
+--- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140419/22f97db8/attachment.html>