[118744] trunk/dports/science/gri

[ryandesign at macports.org]

Revision: 118744
          https://trac.macports.org/changeset/118744
Author:   ryandesign at macports.org
Date:     2014-04-10 04:50:51 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
gri: update to 2.12.23 and add upstream patches to fix build with texinfo 5 (#43294) and perl 5.16 too, and rewrite master_sites to avoid redirects

Modified Paths:
--------------
    trunk/dports/science/gri/Portfile

Added Paths:
-----------
    trunk/dports/science/gri/files/
    trunk/dports/science/gri/files/patch-doc-gri.texi.diff
    trunk/dports/science/gri/files/patch-doc-texinfo2HTML.diff

Modified: trunk/dports/science/gri/Portfile
===================================================================
--- trunk/dports/science/gri/Portfile	2014-04-10 11:00:18 UTC (rev 118743)
+++ trunk/dports/science/gri/Portfile	2014-04-10 11:50:51 UTC (rev 118744)
@@ -3,7 +3,7 @@
 PortSystem           1.0
 
 name                 gri
-version              2.12.18
+version             2.12.23
 categories           science graphics
 platforms            darwin
 maintainers          nomaintainer
@@ -20,13 +20,18 @@
 		     line widths, colors, and fonts. A TeX-like syntax \
 		     provides common mathematical symbols.
 homepage             http://gri.sourceforge.net
-master_sites         sourceforge
-checksums           md5 7bcc56936508a112507cbd335001e27e \
-                    sha1 978f7ebcff13bbc830b90a5d58b01acbf0321057 \
-                    rmd160 fbf66ac8c40010749c40ed96bf5f6b0086cfa0e9
+master_sites        sourceforge:project/gri/gri/${version}
 
+checksums           rmd160  9cd7861c88f7db0ec9a23e9cc2a2971a9d763842 \
+                    sha256  a24e703f30250ed705c0a242aa59a24748259ea7355fca52152f367f45bfd2e7
+
 depends_build	    port:ImageMagick \
                     bin:tex:texlive \
                     port:ghostscript \
                     path:bin/perl:perl5
-configure.args	     --infodir=${prefix}/share/info
+
+patchfiles          patch-doc-gri.texi.diff \
+                    patch-doc-texinfo2HTML.diff
+
+# makeinfo: rename gri.info failed: No such file or directory
+use_parallel_build  no

Added: trunk/dports/science/gri/files/patch-doc-gri.texi.diff
===================================================================
--- trunk/dports/science/gri/files/patch-doc-gri.texi.diff	                        (rev 0)
+++ trunk/dports/science/gri/files/patch-doc-gri.texi.diff	2014-04-10 11:50:51 UTC (rev 118744)
@@ -0,0 +1,23 @@
+Fix build with texinfo 5+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718821
+https://github.com/dankelley/gri/commit/93a40c0b444fb5265b21a344b884b1c7bed49b5a
+--- doc/gri.texi.orig
++++ doc/gri.texi
+@@ -18486,7 +18486,7 @@ Versions exist for MSDOS, windows, and Linux operating systems.
+ (Actually, the windows version is just the MSDOS version, which can be
+ run inside an msdos window within windows-95, windows-NT, etc.)
+ 
+- at subsubsection MSDOS Operating System
++ at subsection MSDOS Operating System
+ @cindex compilation under MSDOS
+ @cindex MSDOS compilation
+ 
+@@ -18543,7 +18543,7 @@ To view the output, use a PostScript viewer such as GSview.
+ 
+ 
+ 
+- at subsubsection LINUX Operating System
++ at subsection LINUX Operating System
+ @cindex compilation under Linux
+ @cindex linux compilation
+ @cindex LINUX compilation

Added: trunk/dports/science/gri/files/patch-doc-texinfo2HTML.diff
===================================================================
--- trunk/dports/science/gri/files/patch-doc-texinfo2HTML.diff	                        (rev 0)
+++ trunk/dports/science/gri/files/patch-doc-texinfo2HTML.diff	2014-04-10 11:50:51 UTC (rev 118744)
@@ -0,0 +1,35 @@
+Fix build with perl 5.16+ due to missing ctime.pl:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=724193
+https://github.com/dankelley/gri/commit/58949a199d4b307c8c95751a42ccabe22073d824
+And getopts.pl:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735914
+https://github.com/dankelley/gri/commit/8f6e468636d7d9b32945845f408044af0e095fb7
+--- doc/texinfo2HTML.orig
++++ doc/texinfo2HTML
+@@ -54,18 +54,17 @@ BUGS:
+ 		the end is here} and more blah
+ 	will not get the \@code{} item converted correctly.
+ ";
+-require "ctime.pl";
+-require "getopts.pl";
+-
+-$debug = 0;
+-
+-die if !&Getopts('h');
+-$print_help = 0;
+-$print_help = $opt_h if $opt_h;
+-if ($print_help) {
++#require "ctime.pl";
++use POSIX qw(ctime);
++use Getopt::Std;
++&getopts('h');
++if ($opt_h) {
+     print "$usage";
+     exit 0;
+ }
++$debug = 0;
++
++#$date = &ctime(time);
+ $date = &ctime(time);
+ chop($date);
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140410/f719271c/attachment-0001.html>