- Make gnuplot support compatible with gnuplot 4.0

PR:		ports/76190
Submitted by:	Yuichiro AIZAWA <yaizawa@mdbl.sfc.keio.ac.jp> (maintainer)

2 files changed, 76 insertions, 2 deletions

diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index 4f1776ae58fc..8568f2b552eb 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quickml
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://namazu.org/%7esatoru/quickml/
 
@@ -56,7 +56,7 @@ post-fetch:
 
 post-patch:
 .if !defined(WITHOUT_LIMIT)
-	${PATCH} ${PATCH_DIST_ARGS} < ${DISTDIR}/${PORTNAME}-${PORTVERSION}-limited.patch
+	@${PATCH} ${PATCH_DIST_ARGS} < ${DISTDIR}/${PORTNAME}-${PORTVERSION}-limited.patch
 .endif
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/quickml.sh > ${WRKDIR}/quickml.sh
diff --git a/mail/quickml/files/patch-quickml-analog.in b/mail/quickml/files/patch-quickml-analog.in
new file mode 100644
index 000000000000..7790b94d6183
--- /dev/null
+++ b/mail/quickml/files/patch-quickml-analog.in
@@ -0,0 +1,74 @@
+*** quickml-analog.in.orig	2004-06-07 17:50:59.000000000 +0900
+--- quickml-analog.in	2005-01-07 19:11:59.000000000 +0900
+***************
+*** 15,20 ****
+--- 15,21 ----
+  require 'ftools'
+  require 'time'
+  require 'cgi'
++ require 'open3'
+  
+  class Array
+    def tail (n)
+***************
+*** 395,413 ****
+    end
+  
+    def add_basic (f)
+!     f.print '
+!     set grid
+!     set timefmt "%y%m%d%H"
+!     set xdata time
+!     set size ratio 0.76
+!     set linestyle 1 linetype 1 linewidth 5
+!     set linestyle 2 linetype 3 linewidth 5
+!     set linestyle 3 linetype 2 linewidth 5
+!     set linestyle 4 linetype 4 linewidth 5
+!     set linestyle 5 linetype 5 linewidth 5
+!     set linestyle 6 linetype 7 linewidth 5
+  
+!     '.gsub(/^    /, "")
+    end
+  
+    def add_chart (f, default, lang, chart_prefix, stat_files, type, 
+--- 396,435 ----
+    end
+  
+    def add_basic (f)
+!     Open3.popen3( "gnuplot" ) { |stdin, stdout, stderr|
+!       stdin.puts "show version"
+!       stdin.close
+!       stderr.read[/[Vv]ersion (\d+\.\d+)/]
+!     }
+!     if ( Float( $1 ) < 4.0 ) then
+!       f.print '
+!       set grid
+!       set timefmt "%y%m%d%H"
+!       set xdata time
+!       set size ratio 0.76
+!       set linestyle 1 linetype 1 linewidth 5
+!       set linestyle 2 linetype 3 linewidth 5
+!       set linestyle 3 linetype 2 linewidth 5
+!       set linestyle 4 linetype 4 linewidth 5
+!       set linestyle 5 linetype 5 linewidth 5
+!       set linestyle 6 linetype 7 linewidth 5
+  
+!       '.gsub(/^    /, "")
+!     else
+!        f.print '
+!        set grid
+!        set timefmt "%y%m%d%H"
+!        set xdata time
+!        set size ratio 0.76
+!        set style line 1 linetype 1 linewidth 5
+!        set style line 2 linetype 3 linewidth 5
+!        set style line 3 linetype 2 linewidth 5
+!        set style line 4 linetype 4 linewidth 5
+!        set style line 5 linetype 5 linewidth 5
+!        set style line 6 linetype 7 linewidth 5
+! 
+!        '.gsub(/^    /, "")
+!     end
+    end
+  
+    def add_chart (f, default, lang, chart_prefix, stat_files, type,