. Add support for stacked histograms (off by default).

. Add readline support (on by default).  This is done a little differently
  from the submitter's patch (the support is optional).

PR:		72827
Submitted by:	Fernan Aguero <fernan@iib.unsam.edu.ar>

3 files changed, 44 insertions, 9 deletions

diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index d82cd3108659..3028f31bc7b0 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnuplot
 PORTVERSION=	4.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,11 +18,15 @@ COMMENT=	A command-driven interactive function plotting program
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--without-tutorial --without-linux-vga --with-lasergnu
+CONFIGURE_ARGS=	--without-tutorial \
+		--without-linux-vga \
+		--with-lasergnu
 
-OPTIONS=	GD	"Enable GD support"	on \
-		PDF	"Enable PDF support"	on \
-		PNG	"Enable PNG support"	on
+OPTIONS=	GD		"Enable GD support"		on \
+		HISTOGRAMS	"Enable stacked histograms"	off \
+		PDF		"Enable PDF support"		on \
+		PNG		"Enable PNG support"		on \
+		READLINE	"Enable readline support"	on
 
 MAN1=		gnuplot.1 lasergnu.1
 INFO=		gnuplot
@@ -39,16 +43,21 @@ CONFIGURE_ARGS+=	--without-lisp-files
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500018
+.if !defined(WITHOUT_READLINE)
+.if ${OSVERSION} < 500018
+LIB_DEPENDS+=		readline.5:${PORTSDIR}/devel/readline
+CONFIGURE_ARGS+=	--with-readline="${LOCALBASE}"
+.else
 CONFIGURE_ARGS+=	--with-readline=gnu
 .endif
+.endif
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=		yes
-PLIST_SUB+=		X11:=""
+PLIST_SUB+=		X11=""
 .else
 CONFIGURE_ARGS+=	--without-x
-PLIST_SUB+=		X11:="@comment "
+PLIST_SUB+=		X11="@comment "
 .endif
 
 .if defined(WITHOUT_GD)
@@ -72,9 +81,22 @@ LIB_DEPENDS+=		png.5:${PORTSDIR}/graphics/png
 CONFIGURE_ARGS+=	--with-png=${LOCALBASE}
 .endif
 
+.if defined(WITH_HISTOGRAMS)
+PATCH_SITES=		http://www.bmsc.washington.edu/people/merritt/gnuplot/
+PATCHFILES=		datastrings_4.0.patch histograms_4.0.patch
+PATCH_DIST_STRIP=	-p1
+USE_AUTOCONF_VER=	259
+CONFIGURE_ARGS+=	--enable-datastrings \
+			--enable-histograms
+PLIST_SUB+=		HISTOGRAMS=""
+.else
+PLIST_SUB+=		HISTOGRAMS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in
+	@${FIND} "${WRKSRC}" -name '*.orig' -delete
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin
diff --git a/math/gnuplot/distinfo b/math/gnuplot/distinfo
index 37ed95ab168f..8b9691b95735 100644
--- a/math/gnuplot/distinfo
+++ b/math/gnuplot/distinfo
@@ -1,2 +1,6 @@
 MD5 (gnuplot-4.0.0.tar.gz) = 66258443d9f93cc4f46b147dac33e63a
 SIZE (gnuplot-4.0.0.tar.gz) = 2160918
+MD5 (datastrings_4.0.patch) = 7d2c4015f15f96e3a0f8063c2199ab6f
+SIZE (datastrings_4.0.patch) = 77936
+MD5 (histograms_4.0.patch) = ba87f28e4aed68637e7b5160e7151919
+SIZE (histograms_4.0.patch) = 63433
diff --git a/math/gnuplot/pkg-plist b/math/gnuplot/pkg-plist
index 4bc689b46a34..801cc3dff705 100644
--- a/math/gnuplot/pkg-plist
+++ b/math/gnuplot/pkg-plist
@@ -1,6 +1,6 @@
 bin/gnuplot
 bin/lasergnu
-%%X11:%%libexec/gnuplot_x11
+%%X11%%libexec/gnuplot_x11
 %%PORTDOCS%%%%EXAMPLESDIR%%/1.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/2.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/3.dat
@@ -27,6 +27,8 @@ bin/lasergnu
 %%PORTDOCS%%%%EXAMPLESDIR%%/clip14in.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/contours.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/controls.dem
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/ctg-y2.dat
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/datastrings.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/density.fnc
 %%PORTDOCS%%%%EXAMPLESDIR%%/discrete.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/electron.dem
@@ -41,7 +43,11 @@ bin/lasergnu
 %%PORTDOCS%%%%EXAMPLESDIR%%/hemisphr.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/hexa.fnc
 %%PORTDOCS%%%%EXAMPLESDIR%%/hidden.dem
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/histograms.dem
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/histograms2.dem
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/immigration.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/klein.dat
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/labelplot.pdb
 %%PORTDOCS%%%%EXAMPLESDIR%%/lcdemo.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/line.fnc
 %%PORTDOCS%%%%EXAMPLESDIR%%/mgr.dem
@@ -49,6 +55,7 @@ bin/lasergnu
 %%PORTDOCS%%%%EXAMPLESDIR%%/mousevariables.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/multimsh.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/multiplt.dem
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/nearmap.csv
 %%PORTDOCS%%%%EXAMPLESDIR%%/param.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/pm3d.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/pm3dcolors.dem
@@ -69,12 +76,14 @@ bin/lasergnu
 %%PORTDOCS%%%%EXAMPLESDIR%%/sound2.par
 %%PORTDOCS%%%%EXAMPLESDIR%%/soundvel.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/spline.dem
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/starmap.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/start.par
 %%PORTDOCS%%%%EXAMPLESDIR%%/stat.inc
 %%PORTDOCS%%%%EXAMPLESDIR%%/steps.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/steps.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/surface1.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/surface2.dem
+%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/table.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/textcolor.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/textrotate.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dat