Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Apr 2007 22:16:01 GMT
From:      bf<bf2006a@yahoo.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/111548: [PATCH] update math/gnuplot to gnuplot-4.2.0
Message-ID:  <200704132216.l3DMG1Xt034896@www.freebsd.org>
Resent-Message-ID: <200704132230.l3DMU4cK026109@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         111548
>Category:       ports
>Synopsis:       [PATCH] update math/gnuplot to gnuplot-4.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 13 22:30:03 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     bf
>Release:        6.2-Stable i386
>Organization:
>Environment:
>Description:
diff -ruN gnuplot.old/Makefile gnuplot/Makefile
--- gnuplot.old/Makefile	Wed Mar  7 20:18:31 2007
+++ gnuplot/Makefile	Fri Apr 13 16:56:46 2007
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gnuplot
-PORTVERSION=	4.0.0
-PORTREVISION=	6
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,23 +16,29 @@
 COMMENT=	A command-driven interactive function plotting program
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-tutorial \
+		--enable-thin-splines \
 		--without-linux-vga \
 		--with-lasergnu
 
-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
+OPTIONS=	GD		"Enable GD support"			on \
+		PDF		"Enable PDF support"			on \
+		PLOTUTILS       "Enable plotutils library support" 	off \
+		PNG		"Enable PNG support"			on \
+		READLINE	"Enable readline support"		on \
+		WXT		"Enable wxt, the wxGTK terminal(experimental)"	off
 
 MAN1=		gnuplot.1 lasergnu.1
 INFO=		gnuplot
 
-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
+#if teTeX is installed, allow kpsetool(1) to find fonts for gnuplot
+.if exists(${LOCALBASE}/bin/kpsexpand)
+CONFIGURE_ARGS+=	--with-kpsexpand
+.endif
+
+.if exists(${LOCALBASE}/bin/emacs) || exists(${LOCALBASE}/bin/xemacs)
 USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
+EMACS_PORT_NAME?=	emacs21
 EMACS_NO_BUILD_DEPENDS=	yes
 EMACS_NO_RUN_DEPENDS=	yes
 CONFIGURE_ARGS+=	--with-lisp-files
@@ -45,7 +51,7 @@
 
 .if !defined(WITHOUT_READLINE)
 .if ${OSVERSION} < 500018
-LIB_DEPENDS+=		readline.5:${PORTSDIR}/devel/readline
+LIB_DEPENDS+=		readline.[5-6]:${PORTSDIR}/devel/readline
 CONFIGURE_ARGS+=	--with-readline="${LOCALBASE}"
 .else
 CONFIGURE_ARGS+=	--with-readline=gnu
@@ -74,6 +80,11 @@
 CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE}
 .endif
 
+.if defined(WITH_PLOTUTILS)
+LIB_DEPENDS+=		plot.4:${PORTSDIR}/graphics/plotutils
+CONFIGURE_ARGS+=	--with-plot=${LOCALBASE}
+.endif
+
 .if defined(WITHOUT_PNG)
 CONFIGURE_ARGS+=	--without-png
 .else
@@ -81,18 +92,20 @@
 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_AUTOTOOLS=		autoconf:259
-CONFIGURE_ARGS+=	--enable-datastrings \
-			--enable-histograms
-PLIST_SUB+=		HISTOGRAMS=""
+.if defined(WITH_WXT)
+USE_WX= 	2.4+
 .else
-PLIST_SUB+=		HISTOGRAMS="@comment "
+CONFIGURE_ARGS+=	--disable-wxwidgets
 .endif
 
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you have an emacsen installed, and wish to use gnuplot mode,"
+	@${ECHO_MSG} "hit Ctrl-C now and rebuild after defining the make environment"
+	@${ECHO_MSG} "variable EMACS_PORT_NAME to be the proper value for your system"
+	@${ECHO_MSG} "as defined in Mk/bsd.emacs.mk. The default value is emacs21."
+	@${ECHO_MSG}
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in
@@ -100,22 +113,19 @@
 
 .if !defined(NOPORTDOCS)
 post-build:
-	@cd ${WRKSRC}/docs && ${MAKE} groff html
+	@cd ${WRKSRC}/docs && ${MAKE} groff
 .endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin
-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
-	${INSTALL_DATA} ${WRKSRC}/lisp/gnuplot*.el ${PREFIX}/${EMACS_SITE_LISPDIR}
-.endif
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/demo && ${FIND} . \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	cd ${WRKSRC}/demo/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 	@${MKDIR} ${DOCSDIR}/psdoc
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.html \
+	cd ${WRKSRC}/docs && ${INSTALL_MAN} gnuplot.txt \
 		gnuplot.dvi gnuplot.ps ${DOCSDIR}
-	cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${DOCSDIR}/psdoc
+	cd ${WRKSRC}/docs/psdoc && ${INSTALL_MAN} README ps_* ${DOCSDIR}/psdoc
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN gnuplot.old/distinfo gnuplot/distinfo
--- gnuplot.old/distinfo	Wed Jun  7 17:42:14 2006
+++ gnuplot/distinfo	Fri Apr 13 13:40:16 2007
@@ -1,9 +1,3 @@
-MD5 (gnuplot-4.0.0.tar.gz) = 66258443d9f93cc4f46b147dac33e63a
-SHA256 (gnuplot-4.0.0.tar.gz) = a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48
-SIZE (gnuplot-4.0.0.tar.gz) = 2160918
-MD5 (datastrings_4.0.patch) = 7d2c4015f15f96e3a0f8063c2199ab6f
-SHA256 (datastrings_4.0.patch) = afe36f9c122538a8079da60bdffc97a59780acc82b174881b57efa8824bdf69d
-SIZE (datastrings_4.0.patch) = 77936
-MD5 (histograms_4.0.patch) = ba87f28e4aed68637e7b5160e7151919
-SHA256 (histograms_4.0.patch) = a59436358f845e22a1d740d70cf6a80b6b3e9dfd80550dd5652986f0d229f384
-SIZE (histograms_4.0.patch) = 63433
+MD5 (gnuplot-4.2.0.tar.gz) = f688a578ddb4c376fd7d91ce444a0745
+SHA256 (gnuplot-4.2.0.tar.gz) = ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9
+SIZE (gnuplot-4.2.0.tar.gz) = 2836649
diff -ruN gnuplot.old/files/patch-docs-Makefile.in gnuplot/files/patch-docs-Makefile.in
--- gnuplot.old/files/patch-docs-Makefile.in	Wed Mar  9 14:42:24 2005
+++ gnuplot/files/patch-docs-Makefile.in	Fri Apr 13 15:18:15 2007
@@ -1,16 +1,17 @@
-$FreeBSD: ports/math/gnuplot/files/patch-docs-Makefile.in,v 1.1 2005/03/09 19:42:24 glewis Exp $
-
---- docs/Makefile.in.orig	Wed Mar  9 11:09:11 2005
-+++ docs/Makefile.in	Wed Mar  9 11:09:24 2005
-@@ -332,11 +332,6 @@
- 	@if test ! -f gnuplot.doc ; then \
- 	  cp $(srcdir)/gnuplot.doc. ; \
- 	fi
+--- docs/Makefile.in.orig	Thu Apr 12 21:34:23 2007
++++ docs/Makefile.in	Thu Apr 12 21:57:31 2007
+@@ -350,13 +350,7 @@
+ 
+ # Thanks to Bruce Ravel for doc2texi.el!
+ $(srcdir)/gnuplot.texi: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+-	@echo "Creating texinfo"
 -	@if test "$(EMACS)" != no; then \
--	   $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi; \
+-	   cd $(srcdir) ;  \
+-	   $(EMACS) -batch -l doc2texi.el -f d2t-doc-to-texi ; \
 -	else \
 -	   echo "No emacs found - cannot create texinfo file" ; \
 -	fi
++	@echo "texinfo creation disabled"
  
  # this is how to make OS/2 ipfc documentation
  ipf: gnuplot.ipf
diff -ruN gnuplot.old/files/patch-term-pdf.trm gnuplot/files/patch-term-pdf.trm
--- gnuplot.old/files/patch-term-pdf.trm	Thu Nov  2 13:21:57 2006
+++ gnuplot/files/patch-term-pdf.trm	Wed Dec 31 19:00:00 1969
@@ -1,27 +0,0 @@
-$FreeBSD: ports/math/gnuplot/files/patch-term-pdf.trm,v 1.2 2006/11/02 18:21:57 glewis Exp $
-
---- term/pdf.trm.orig	Sun Oct 15 11:10:22 2006
-+++ term/pdf.trm	Sun Oct 15 11:10:50 2006
-@@ -332,18 +332,13 @@
- TERM_PUBLIC void
- PDF_init ()
- {
--    static TBOOLEAN PDFlib_booted = FALSE;
--    
--    if (!PDFlib_booted) {
--	PDF_boot();
--	PDFlib_booted = TRUE;
--    }
--
-+    extern char *outstr;
-     if (!myPDF)
- 	myPDF = PDF_new();
- 
--    /*open new PDF file */ 
--    if (PDF_open_fp(myPDF, gpoutfile) == -1)
-+    /*open new PDF file */
-+    fclose(gpoutfile);
-+    if (PDF_begin_document(myPDF, outstr, 0, NULL) == -1)
- 	int_error(NO_CARET, "Error:cannot open PDF file .\n");
- 
- #ifdef PDF_DONT_COMPRESS
diff -ruN gnuplot.old/pkg-plist gnuplot/pkg-plist
--- gnuplot.old/pkg-plist	Tue Nov  1 15:46:22 2005
+++ gnuplot/pkg-plist	Fri Apr 13 16:40:02 2007
@@ -1,116 +1,173 @@
 bin/gnuplot
 bin/lasergnu
-%%X11%%libexec/gnuplot_x11
+lib/X11/app-defaults/Gnuplot.app-defaults
+libexec/gnuplot/4.2/gnuplot_x11
+%%EMACS_SITE_LISPDIR%%/gnuplot-gui.el
+%%EMACS_SITE_LISPDIR%%/gnuplot-gui.elc
+%%EMACS_SITE_LISPDIR%%/gnuplot.el
+%%EMACS_SITE_LISPDIR%%/gnuplot.elc
+%%EMACS_SITE_LISPDIR%%/info-look.20.2.el
+%%EMACS_SITE_LISPDIR%%/info-look.20.3.el
+%%DATADIR%%/4.2/PostScript/8859-1.ps
+%%DATADIR%%/4.2/PostScript/8859-15.ps
+%%DATADIR%%/4.2/PostScript/8859-2.ps
+%%DATADIR%%/4.2/PostScript/cp1250.ps
+%%DATADIR%%/4.2/PostScript/cp437.ps
+%%DATADIR%%/4.2/PostScript/cp850.ps
+%%DATADIR%%/4.2/PostScript/cp852.ps
+%%DATADIR%%/4.2/PostScript/koi8r.ps
+%%DATADIR%%/4.2/PostScript/koi8u.ps
+%%DATADIR%%/4.2/PostScript/prologue.ps
+%%DATADIR%%/4.2/gnuplot.gih
+share/texmf-local/tex/latex/gnuplot/gnuplot.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.bin
+%%PORTDOCS%%%%EXAMPLESDIR%%/sine.bin
+%%PORTDOCS%%%%EXAMPLESDIR%%/using.bin
+%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/world.cor
 %%PORTDOCS%%%%EXAMPLESDIR%%/1.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/2.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/3.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am.in
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/asciimat.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/battery.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/big_peak.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/candlesticks.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/clip14in.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/ctg-y2.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/finance.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/glass.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/hemisphr.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/immigration.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/klein.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/lcdemo.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/moli3.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/rgb_variable.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/silver.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/soundvel.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/srl.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/steps.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/table.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/triangle.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/using.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/whale.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/world.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/airfoil.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/all.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/animate2.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/animate.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/battery.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/big_peak.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/binary.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/binary1
-%%PORTDOCS%%%%EXAMPLESDIR%%/binary2
-%%PORTDOCS%%%%EXAMPLESDIR%%/binary3
 %%PORTDOCS%%%%EXAMPLESDIR%%/bivariat.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/borders.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/candlesticks.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/candlesticks.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/charset.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/clip14in.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/colorwheel.dem
 %%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%%/dashcolor.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/datastrings.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/discrete.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/electron.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/enhancedtext.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/epslatex.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/fillbetween.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fillcrvs.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fillstyle.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/finance.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fit.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fontfile.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fontfile_latex.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/glass.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.rot
-%%PORTDOCS%%%%EXAMPLESDIR%%/hemisphr.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/hexa.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/hidden2.dem
 %%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%%/histograms2.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/histograms.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/image.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/key.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/layout.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/macros.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/mgr.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/moli3.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/molecule.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/mouselab_1.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/mouselab_2.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/mouselabels.dem
 %%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
+%%PORTDOCS%%%%EXAMPLESDIR%%/pm3d.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/pm3dgamma.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/pointsize.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/polar.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/poldat.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/prob.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/prob2.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/prob.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/rainbow.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/random.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/reflect.fnc
-%%PORTDOCS%%%%EXAMPLESDIR%%/reread.bor
+%%PORTDOCS%%%%EXAMPLESDIR%%/rectangle.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/rgb_variable.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/scatter.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/silver.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/singulr.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/sound.par
-%%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%%/starmap.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/steps.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/stringvar.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
+%%PORTDOCS%%%%EXAMPLESDIR%%/tics.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/triangle.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/using.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/using.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/utf8.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/vector.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/webify.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/whale.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/world.cor
-%%PORTDOCS%%%%EXAMPLESDIR%%/world.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/world2.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/world.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo.edf
+%%PORTDOCS%%%%EXAMPLESDIR%%/density.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/hexa.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/line.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/reflect.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/stat.inc
+%%PORTDOCS%%%%EXAMPLESDIR%%/nearmap.csv
+%%PORTDOCS%%%%EXAMPLESDIR%%/GM1_sugar.pdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/labelplot.pdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/GM1_bonds.r3d
+%%PORTDOCS%%%%EXAMPLESDIR%%/blutux.rgb
+%%PORTDOCS%%%%EXAMPLESDIR%%/sound.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/sound2.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/start.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.rot
+%%PORTDOCS%%%%EXAMPLESDIR%%/html/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/html/gnuplot_demo.css
+%%PORTDOCS%%%%EXAMPLESDIR%%/html/index.save
+%%PORTDOCS%%%%EXAMPLESDIR%%/html/webify.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary1
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary2
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary3
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.dvi
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.ps
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.txt
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/README
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_file.doc
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_fontfile_doc.tex
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_guide.ps
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_symbols.gpi
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.dvi
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.html
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.ps
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.txt
-%%EMACS_SITE_LISPDIR%%/gnuplot-gui.el
-%%EMACS_SITE_LISPDIR%%/gnuplot.el
-%%DATADIR%%/4.0/gnuplot.gih
-@dirrm %%DATADIR%%/4.0
-@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DATADIR%%/4.2/PostScript
+%%PORTDOCS%%@dirrm %%DATADIR%%/4.2
+%%PORTDOCS%%@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/html
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/psdoc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/texmf-local/tex/latex/gnuplot
+@dirrm libexec/gnuplot/4.2
+@dirrm libexec/gnuplot

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN gnuplot.old/Makefile gnuplot/Makefile
--- gnuplot.old/Makefile	Wed Mar  7 20:18:31 2007
+++ gnuplot/Makefile	Fri Apr 13 16:56:46 2007
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gnuplot
-PORTVERSION=	4.0.0
-PORTREVISION=	6
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	math graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,23 +16,29 @@
 COMMENT=	A command-driven interactive function plotting program
 
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-tutorial \
+		--enable-thin-splines \
 		--without-linux-vga \
 		--with-lasergnu
 
-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
+OPTIONS=	GD		"Enable GD support"			on \
+		PDF		"Enable PDF support"			on \
+		PLOTUTILS       "Enable plotutils library support" 	off \
+		PNG		"Enable PNG support"			on \
+		READLINE	"Enable readline support"		on \
+		WXT		"Enable wxt, the wxGTK terminal(experimental)"	off
 
 MAN1=		gnuplot.1 lasergnu.1
 INFO=		gnuplot
 
-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
+#if teTeX is installed, allow kpsetool(1) to find fonts for gnuplot
+.if exists(${LOCALBASE}/bin/kpsexpand)
+CONFIGURE_ARGS+=	--with-kpsexpand
+.endif
+
+.if exists(${LOCALBASE}/bin/emacs) || exists(${LOCALBASE}/bin/xemacs)
 USE_EMACS=	yes
-EMACS_PORT_NAME=	emacs21
+EMACS_PORT_NAME?=	emacs21
 EMACS_NO_BUILD_DEPENDS=	yes
 EMACS_NO_RUN_DEPENDS=	yes
 CONFIGURE_ARGS+=	--with-lisp-files
@@ -45,7 +51,7 @@
 
 .if !defined(WITHOUT_READLINE)
 .if ${OSVERSION} < 500018
-LIB_DEPENDS+=		readline.5:${PORTSDIR}/devel/readline
+LIB_DEPENDS+=		readline.[5-6]:${PORTSDIR}/devel/readline
 CONFIGURE_ARGS+=	--with-readline="${LOCALBASE}"
 .else
 CONFIGURE_ARGS+=	--with-readline=gnu
@@ -74,6 +80,11 @@
 CONFIGURE_ARGS+=	--with-pdf=${LOCALBASE}
 .endif
 
+.if defined(WITH_PLOTUTILS)
+LIB_DEPENDS+=		plot.4:${PORTSDIR}/graphics/plotutils
+CONFIGURE_ARGS+=	--with-plot=${LOCALBASE}
+.endif
+
 .if defined(WITHOUT_PNG)
 CONFIGURE_ARGS+=	--without-png
 .else
@@ -81,18 +92,20 @@
 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_AUTOTOOLS=		autoconf:259
-CONFIGURE_ARGS+=	--enable-datastrings \
-			--enable-histograms
-PLIST_SUB+=		HISTOGRAMS=""
+.if defined(WITH_WXT)
+USE_WX= 	2.4+
 .else
-PLIST_SUB+=		HISTOGRAMS="@comment "
+CONFIGURE_ARGS+=	--disable-wxwidgets
 .endif
 
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you have an emacsen installed, and wish to use gnuplot mode,"
+	@${ECHO_MSG} "hit Ctrl-C now and rebuild after defining the make environment"
+	@${ECHO_MSG} "variable EMACS_PORT_NAME to be the proper value for your system"
+	@${ECHO_MSG} "as defined in Mk/bsd.emacs.mk. The default value is emacs21."
+	@${ECHO_MSG}
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|)/@PACKAGE@/@PKG_MAJOR@|)|g' ${WRKSRC}/src/Makefile.in
@@ -100,22 +113,19 @@
 
 .if !defined(NOPORTDOCS)
 post-build:
-	@cd ${WRKSRC}/docs && ${MAKE} groff html
+	@cd ${WRKSRC}/docs && ${MAKE} groff
 .endif
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/src/lasergnu ${PREFIX}/bin
-.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
-	${INSTALL_DATA} ${WRKSRC}/lisp/gnuplot*.el ${PREFIX}/${EMACS_SITE_LISPDIR}
-.endif
+
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/demo && ${FIND} . \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
+	cd ${WRKSRC}/demo/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 	@${MKDIR} ${DOCSDIR}/psdoc
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.html \
+	cd ${WRKSRC}/docs && ${INSTALL_MAN} gnuplot.txt \
 		gnuplot.dvi gnuplot.ps ${DOCSDIR}
-	cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${DOCSDIR}/psdoc
+	cd ${WRKSRC}/docs/psdoc && ${INSTALL_MAN} README ps_* ${DOCSDIR}/psdoc
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN gnuplot.old/distinfo gnuplot/distinfo
--- gnuplot.old/distinfo	Wed Jun  7 17:42:14 2006
+++ gnuplot/distinfo	Fri Apr 13 13:40:16 2007
@@ -1,9 +1,3 @@
-MD5 (gnuplot-4.0.0.tar.gz) = 66258443d9f93cc4f46b147dac33e63a
-SHA256 (gnuplot-4.0.0.tar.gz) = a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48
-SIZE (gnuplot-4.0.0.tar.gz) = 2160918
-MD5 (datastrings_4.0.patch) = 7d2c4015f15f96e3a0f8063c2199ab6f
-SHA256 (datastrings_4.0.patch) = afe36f9c122538a8079da60bdffc97a59780acc82b174881b57efa8824bdf69d
-SIZE (datastrings_4.0.patch) = 77936
-MD5 (histograms_4.0.patch) = ba87f28e4aed68637e7b5160e7151919
-SHA256 (histograms_4.0.patch) = a59436358f845e22a1d740d70cf6a80b6b3e9dfd80550dd5652986f0d229f384
-SIZE (histograms_4.0.patch) = 63433
+MD5 (gnuplot-4.2.0.tar.gz) = f688a578ddb4c376fd7d91ce444a0745
+SHA256 (gnuplot-4.2.0.tar.gz) = ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9
+SIZE (gnuplot-4.2.0.tar.gz) = 2836649
diff -ruN gnuplot.old/files/patch-docs-Makefile.in gnuplot/files/patch-docs-Makefile.in
--- gnuplot.old/files/patch-docs-Makefile.in	Wed Mar  9 14:42:24 2005
+++ gnuplot/files/patch-docs-Makefile.in	Fri Apr 13 15:18:15 2007
@@ -1,16 +1,17 @@
-$FreeBSD: ports/math/gnuplot/files/patch-docs-Makefile.in,v 1.1 2005/03/09 19:42:24 glewis Exp $
-
---- docs/Makefile.in.orig	Wed Mar  9 11:09:11 2005
-+++ docs/Makefile.in	Wed Mar  9 11:09:24 2005
-@@ -332,11 +332,6 @@
- 	@if test ! -f gnuplot.doc ; then \
- 	  cp $(srcdir)/gnuplot.doc. ; \
- 	fi
+--- docs/Makefile.in.orig	Thu Apr 12 21:34:23 2007
++++ docs/Makefile.in	Thu Apr 12 21:57:31 2007
+@@ -350,13 +350,7 @@
+ 
+ # Thanks to Bruce Ravel for doc2texi.el!
+ $(srcdir)/gnuplot.texi: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
+-	@echo "Creating texinfo"
 -	@if test "$(EMACS)" != no; then \
--	   $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi; \
+-	   cd $(srcdir) ;  \
+-	   $(EMACS) -batch -l doc2texi.el -f d2t-doc-to-texi ; \
 -	else \
 -	   echo "No emacs found - cannot create texinfo file" ; \
 -	fi
++	@echo "texinfo creation disabled"
  
  # this is how to make OS/2 ipfc documentation
  ipf: gnuplot.ipf
diff -ruN gnuplot.old/files/patch-term-pdf.trm gnuplot/files/patch-term-pdf.trm
--- gnuplot.old/files/patch-term-pdf.trm	Thu Nov  2 13:21:57 2006
+++ gnuplot/files/patch-term-pdf.trm	Wed Dec 31 19:00:00 1969
@@ -1,27 +0,0 @@
-$FreeBSD: ports/math/gnuplot/files/patch-term-pdf.trm,v 1.2 2006/11/02 18:21:57 glewis Exp $
-
---- term/pdf.trm.orig	Sun Oct 15 11:10:22 2006
-+++ term/pdf.trm	Sun Oct 15 11:10:50 2006
-@@ -332,18 +332,13 @@
- TERM_PUBLIC void
- PDF_init ()
- {
--    static TBOOLEAN PDFlib_booted = FALSE;
--    
--    if (!PDFlib_booted) {
--	PDF_boot();
--	PDFlib_booted = TRUE;
--    }
--
-+    extern char *outstr;
-     if (!myPDF)
- 	myPDF = PDF_new();
- 
--    /*open new PDF file */ 
--    if (PDF_open_fp(myPDF, gpoutfile) == -1)
-+    /*open new PDF file */
-+    fclose(gpoutfile);
-+    if (PDF_begin_document(myPDF, outstr, 0, NULL) == -1)
- 	int_error(NO_CARET, "Error:cannot open PDF file .\n");
- 
- #ifdef PDF_DONT_COMPRESS
diff -ruN gnuplot.old/pkg-plist gnuplot/pkg-plist
--- gnuplot.old/pkg-plist	Tue Nov  1 15:46:22 2005
+++ gnuplot/pkg-plist	Fri Apr 13 16:40:02 2007
@@ -1,116 +1,173 @@
 bin/gnuplot
 bin/lasergnu
-%%X11%%libexec/gnuplot_x11
+lib/X11/app-defaults/Gnuplot.app-defaults
+libexec/gnuplot/4.2/gnuplot_x11
+%%EMACS_SITE_LISPDIR%%/gnuplot-gui.el
+%%EMACS_SITE_LISPDIR%%/gnuplot-gui.elc
+%%EMACS_SITE_LISPDIR%%/gnuplot.el
+%%EMACS_SITE_LISPDIR%%/gnuplot.elc
+%%EMACS_SITE_LISPDIR%%/info-look.20.2.el
+%%EMACS_SITE_LISPDIR%%/info-look.20.3.el
+%%DATADIR%%/4.2/PostScript/8859-1.ps
+%%DATADIR%%/4.2/PostScript/8859-15.ps
+%%DATADIR%%/4.2/PostScript/8859-2.ps
+%%DATADIR%%/4.2/PostScript/cp1250.ps
+%%DATADIR%%/4.2/PostScript/cp437.ps
+%%DATADIR%%/4.2/PostScript/cp850.ps
+%%DATADIR%%/4.2/PostScript/cp852.ps
+%%DATADIR%%/4.2/PostScript/koi8r.ps
+%%DATADIR%%/4.2/PostScript/koi8u.ps
+%%DATADIR%%/4.2/PostScript/prologue.ps
+%%DATADIR%%/4.2/gnuplot.gih
+share/texmf-local/tex/latex/gnuplot/gnuplot.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.bin
+%%PORTDOCS%%%%EXAMPLESDIR%%/sine.bin
+%%PORTDOCS%%%%EXAMPLESDIR%%/using.bin
+%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.cfg
+%%PORTDOCS%%%%EXAMPLESDIR%%/world.cor
 %%PORTDOCS%%%%EXAMPLESDIR%%/1.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/2.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/3.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am.in
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.in
+%%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/asciimat.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/battery.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/big_peak.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/candlesticks.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/clip14in.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/ctg-y2.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/finance.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/glass.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/hemisphr.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/immigration.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/klein.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/lcdemo.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/moli3.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/rgb_variable.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/silver.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/soundvel.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/srl.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/steps.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/table.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/triangle.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/using.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/whale.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/world.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/airfoil.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/all.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/animate2.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/animate.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/battery.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/big_peak.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/binary.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/binary1
-%%PORTDOCS%%%%EXAMPLESDIR%%/binary2
-%%PORTDOCS%%%%EXAMPLESDIR%%/binary3
 %%PORTDOCS%%%%EXAMPLESDIR%%/bivariat.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/borders.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/candlesticks.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/candlesticks.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/charset.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/clip14in.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/colorwheel.dem
 %%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%%/dashcolor.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/datastrings.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/discrete.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/electron.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/enhancedtext.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/epslatex.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/fillbetween.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fillcrvs.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fillstyle.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/finance.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fit.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fontfile.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/fontfile_latex.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/glass.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.rot
-%%PORTDOCS%%%%EXAMPLESDIR%%/hemisphr.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/hexa.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/hidden2.dem
 %%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%%/histograms2.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/histograms.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/image.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/key.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/layout.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/macros.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/mgr.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/moli3.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/molecule.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/mouselab_1.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/mouselab_2.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/mouselabels.dem
 %%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
+%%PORTDOCS%%%%EXAMPLESDIR%%/pm3d.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/pm3dgamma.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/pointsize.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/polar.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/poldat.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/prob.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/prob2.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/prob.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/rainbow.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/random.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/reflect.fnc
-%%PORTDOCS%%%%EXAMPLESDIR%%/reread.bor
+%%PORTDOCS%%%%EXAMPLESDIR%%/rectangle.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/rgb_variable.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/scatter.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/silver.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/simple.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/singulr.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/sound.par
-%%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%%/starmap.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/steps.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/stringvar.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
+%%PORTDOCS%%%%EXAMPLESDIR%%/tics.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/triangle.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/using.dat
 %%PORTDOCS%%%%EXAMPLESDIR%%/using.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/utf8.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/vector.dem
-%%PORTDOCS%%%%EXAMPLESDIR%%/webify.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/whale.dat
-%%PORTDOCS%%%%EXAMPLESDIR%%/world.cor
-%%PORTDOCS%%%%EXAMPLESDIR%%/world.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/world2.dem
 %%PORTDOCS%%%%EXAMPLESDIR%%/world.dem
+%%PORTDOCS%%%%EXAMPLESDIR%%/demo.edf
+%%PORTDOCS%%%%EXAMPLESDIR%%/density.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/hexa.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/line.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/reflect.fnc
+%%PORTDOCS%%%%EXAMPLESDIR%%/stat.inc
+%%PORTDOCS%%%%EXAMPLESDIR%%/nearmap.csv
+%%PORTDOCS%%%%EXAMPLESDIR%%/GM1_sugar.pdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/labelplot.pdb
+%%PORTDOCS%%%%EXAMPLESDIR%%/GM1_bonds.r3d
+%%PORTDOCS%%%%EXAMPLESDIR%%/blutux.rgb
+%%PORTDOCS%%%%EXAMPLESDIR%%/sound.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/sound2.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/start.par
+%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.rot
+%%PORTDOCS%%%%EXAMPLESDIR%%/html/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/html/gnuplot_demo.css
+%%PORTDOCS%%%%EXAMPLESDIR%%/html/index.save
+%%PORTDOCS%%%%EXAMPLESDIR%%/html/webify.pl
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary1
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary2
+%%PORTDOCS%%%%EXAMPLESDIR%%/binary3
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.dvi
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.ps
+%%PORTDOCS%%%%DOCSDIR%%/gnuplot.txt
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/README
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_file.doc
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_fontfile_doc.tex
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_guide.ps
 %%PORTDOCS%%%%DOCSDIR%%/psdoc/ps_symbols.gpi
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.dvi
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.html
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.ps
-%%PORTDOCS%%%%DOCSDIR%%/gnuplot.txt
-%%EMACS_SITE_LISPDIR%%/gnuplot-gui.el
-%%EMACS_SITE_LISPDIR%%/gnuplot.el
-%%DATADIR%%/4.0/gnuplot.gih
-@dirrm %%DATADIR%%/4.0
-@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DATADIR%%/4.2/PostScript
+%%PORTDOCS%%@dirrm %%DATADIR%%/4.2
+%%PORTDOCS%%@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/html
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/psdoc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm share/texmf-local/tex/latex/gnuplot
+@dirrm libexec/gnuplot/4.2
+@dirrm libexec/gnuplot

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704132216.l3DMG1Xt034896>