From fernan@pi.iib.unsam.edu.ar  Mon Oct 18 15:00:12 2004
Return-Path: <fernan@pi.iib.unsam.edu.ar>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1B63716A4D2; Mon, 18 Oct 2004 15:00:12 +0000 (GMT)
Received: from smtp.unsam.edu.ar (smtp.unsam.edu.ar [170.210.48.3])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 711FB43D41; Mon, 18 Oct 2004 15:00:07 +0000 (GMT)
	(envelope-from fernan@pi.iib.unsam.edu.ar)
Received: from pi.iib.unsam.edu.ar (pi.iib.unsam.edu.ar [192.168.10.11])
	by smtp.unsam.edu.ar (8.12.6/8.12.6) with ESMTP id i9IF8Els000107;
	Mon, 18 Oct 2004 12:08:14 -0300 (ART)
	(envelope-from fernan@pi.iib.unsam.edu.ar)
Received: from pi.iib.unsam.edu.ar (localhost.iib.unsam.edu.ar [127.0.0.1])
	by pi.iib.unsam.edu.ar (8.12.11/8.12.9) with ESMTP id i9IEwjjC099504;
	Mon, 18 Oct 2004 11:58:45 -0300 (ART)
	(envelope-from fernan@pi.iib.unsam.edu.ar)
Received: (from fernan@localhost)
	by pi.iib.unsam.edu.ar (8.12.11/8.12.11/Submit) id i9IEwiPX099503;
	Mon, 18 Oct 2004 11:58:44 -0300 (ART)
	(envelope-from fernan)
Message-Id: <200410181458.i9IEwiPX099503@pi.iib.unsam.edu.ar>
Date: Mon, 18 Oct 2004 11:58:44 -0300 (ART)
From: Fernan Aguero <fernan@iib.unsam.edu.ar>
Reply-To: Fernan Aguero <fernan@iib.unsam.edu.ar>
To: FreeBSD-gnats-submit@freebsd.org
Cc: glewis@freebsd.org
Subject: [patch] math/gnuplot: provide stacked/clustered histograms
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         72827
>Category:       ports
>Synopsis:       [patch] math/gnuplot: provide stacked/clustered histograms
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    glewis
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 18 15:00:44 GMT 2004
>Closed-Date:    Tue Oct 26 19:52:01 GMT 2004
>Last-Modified:  Tue Oct 26 19:52:01 GMT 2004
>Originator:     Fernan Aguero
>Release:        FreeBSD 4.10-RELEASE i386
>Organization:
IIB-UNSAM
>Environment:

FreeBSD pi.iib.unsam.edu.ar 4.10-RELEASE FreeBSD 4.10-RELEASE #0: Wed May 26 12:56:43 ART 2004 fernan@pi.iib.unsam.edu.ar:/usr/obj/usr/src/sys/PI  i386

	
>Description:
	

	I needed to be able to plot clustered, stacked histograms. There
	are patches by Ethan Merritt that make gnuplot able to plot this
	kind of graphs.
	
	<http://www.bmsc.washington.edu/people/merritt/gnuplot>

	I have modified the FreeBSD gnuplot port so that it is able to
	download and apply the patches. The port has now an additional
	option (WITH_HISTOGRAMS) to select this functionality.

	The patches relevant to this issue (datastrings_4.0 and
	histograms_4.0) have been already applied to the 4.1 development
	tree in CVS so it won't be necessary to patch 4.1 (whenever it is
	released) to have this functionality.

	Not relevant to this update, but, is it possible to include
	readline functionality for FreeBSD-4.x? Perhaps adding something
	like
	.if ${OSVERSION} < 50018
	LIB_DEPENDS+= readline.4:${PORTSDIR}/devel/readline
	.endif
	What are the reasons for having readline only available for
	OSVERSION > 50018?
	
>How-To-Repeat:
	
	
>Fix:

	



--- gnuplot.diff begins here ---
diff -ruN /usr/ports/math/gnuplot/Makefile ./gnuplot/Makefile
--- /usr/ports/math/gnuplot/Makefile	Sat Jul 17 01:11:12 2004
+++ ./gnuplot/Makefile	Mon Oct 18 10:39:12 2004
@@ -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}
@@ -22,7 +22,16 @@
 
 OPTIONS=	GD	"Enable GD support"	on \
 		PDF	"Enable PDF support"	on \
-		PNG	"Enable PNG support"	on
+		PNG	"Enable PNG support"	on \
+		HISTOGRAMS "Enable stacked histograms" off
+
+.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
+.endif
 
 MAN1=		gnuplot.1 lasergnu.1
 INFO=		gnuplot
diff -ruN /usr/ports/math/gnuplot/distinfo ./gnuplot/distinfo
--- /usr/ports/math/gnuplot/distinfo	Wed Jun 16 09:29:11 2004
+++ ./gnuplot/distinfo	Mon Oct 18 11:06:36 2004
@@ -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
--- gnuplot.diff ends here ---

>Release-Note:
>Audit-Trail:

From: Fernan Aguero <fernan@iib.unsam.edu.ar>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: glewis@FreeBSD.org
Subject: Re: ports/72827: [patch] math/gnuplot: provide stacked/clustered histograms
Date: Mon, 18 Oct 2004 13:13:15 -0300

 --+HP7ph2BbKc20aGI
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 +----[ FreeBSD GNATS PR Submission <FreeBSD-gnats-submit@FreeBSD.org> (18.Oct.2004 12:09):
 |
 | http://www.freebsd.org/cgi/query-pr.cgi?pr=72827
 |
 +----]
 
 Regarding the readline issue, I've succesfully built gnuplot
 with readline functionality in FreeBSD-4.10. 
 
 I've included --with-readline=gnu by default into
 CONFIGURE_ARGS and added a LIB_DEPENDS only for OSVERSION <
 50018 (I still don't know why the difference between FreeBSD
 >= 500018 and < 50018, but I assume it should be something
 significant, since it was included in the original port).
 
 Under FreeBSD-4.10, readline-5.0 was built and installed
 before gnuplot, and the resulting gnuplot was now able to
 complete commands (for example filenames).
 
 A diff between the current Makefile and the one including
 these changes and the other changes mentioned in this PR
 (stacked histograms patches) is attached.
 
 Fernan
 
 -- 
 Fernan Aguero -  fernan at iib.unsam.edu.ar
 Phone: +54 11 4580-7255/7 ext 310, Fax: +54 11 4752-9639
 Check http://genoma.unsam.edu.ar/~fernan for more info.
 
 --+HP7ph2BbKc20aGI
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="gnuplot_Makefile.diff"
 
 --- /usr/ports/math/gnuplot/Makefile	Sat Jul 17 01:11:12 2004
 +++ gnuplot/Makefile	Mon Oct 18 13:00:46 2004
 @@ -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,21 @@
  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 \
 +								--with-readline=gnu
  
  OPTIONS=	GD	"Enable GD support"	on \
  		PDF	"Enable PDF support"	on \
 -		PNG	"Enable PNG support"	on
 +		PNG	"Enable PNG support"	on \
 +		HISTOGRAMS "Enable stacked histograms" off
 +
 +.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
 +.endif
  
  MAN1=		gnuplot.1 lasergnu.1
  INFO=		gnuplot
 @@ -39,8 +49,8 @@
  
  .include <bsd.port.pre.mk>
  
 -.if ${OSVERSION} >= 500018
 -CONFIGURE_ARGS+=	--with-readline=gnu
 +.if ${OSVERSION} < 500018
 +LIB_DEPENDS+=		readline.5:${PORTSDIR}/devel/readline
  .endif
  
  .if !defined(WITHOUT_X11)
 
 --+HP7ph2BbKc20aGI--
Responsible-Changed-From-To: freebsd-ports-bugs->glewis 
Responsible-Changed-By: glewis 
Responsible-Changed-When: Tue Oct 19 20:06:47 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72827 
State-Changed-From-To: open->closed 
State-Changed-By: glewis 
State-Changed-When: Tue Oct 26 19:51:20 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

Next time, please check the packing list (it was broken by the histogram 
support). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=72827 
>Unformatted:
