1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

. Update to 4.2.0. This is an initial update I've been working on which

is a little more stripped down than the port has previously been.

  The extras from PR/111548 will be merged in shortly.

PR:		110368
This commit is contained in:
Greg Lewis 2007-04-14 02:48:54 +00:00
parent 4b9d5aee93
commit aaa6f76e74
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=189934
5 changed files with 95 additions and 132 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= gnuplot
PORTVERSION= 4.0.0
PORTREVISION= 6
PORTVERSION= 4.2.0
CATEGORIES= math graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -19,39 +18,18 @@ GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --without-tutorial \
--without-linux-vga \
--with-lasergnu
--with-lasergnu \
--without-lisp-files \
--with-readline=gnu
BUILD_DEPENDS+=latex:${PORTSDIR}/print/teTeX-base
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
PDF "Enable PDF support" on
MAN1= gnuplot.1 lasergnu.1
INFO= gnuplot
.if exists(${PREFIX}/bin/emacs) || exists(${PREFIX}/bin/xemacs)
USE_EMACS= yes
EMACS_PORT_NAME= emacs21
EMACS_NO_BUILD_DEPENDS= yes
EMACS_NO_RUN_DEPENDS= yes
CONFIGURE_ARGS+= --with-lisp-files
.else
PLIST_SUB+= EMACS_SITE_LISPDIR="@comment "
CONFIGURE_ARGS+= --without-lisp-files
.endif
.include <bsd.port.pre.mk>
.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=""
@ -74,25 +52,6 @@ LIB_DEPENDS+= pdf.8:${PORTSDIR}/print/pdflib
CONFIGURE_ARGS+= --with-pdf=${LOCALBASE}
.endif
.if defined(WITHOUT_PNG)
CONFIGURE_ARGS+= --without-png
.else
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_AUTOTOOLS= autoconf: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
@ -100,22 +59,19 @@ post-patch:
.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}
@${MKDIR} ${DOCSDIR}/psdoc
cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.html \
gnuplot.dvi gnuplot.ps ${DOCSDIR}
cd ${WRKSRC}/docs && ${INSTALL_DATA} gnuplot.txt gnuplot.dvi \
gnuplot.ps ${DOCSDIR}
cd ${WRKSRC}/docs/psdoc && ${INSTALL_DATA} README ps_* ${DOCSDIR}/psdoc
.endif
.include <bsd.port.post.mk>
.include <bsd.port.mk>

View File

@ -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

View File

@ -1,16 +0,0 @@
$FreeBSD$
--- 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
- @if test "$(EMACS)" != no; then \
- $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi; \
- else \
- echo "No emacs found - cannot create texinfo file" ; \
- fi
# this is how to make OS/2 ipfc documentation
ipf: gnuplot.ipf

View File

@ -1,27 +0,0 @@
$FreeBSD$
--- 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

View File

@ -1,9 +1,20 @@
bin/gnuplot
bin/lasergnu
%%X11%%libexec/gnuplot_x11
lib/X11/app-defaults/Gnuplot.app-defaults
libexec/gnuplot/4.2/gnuplot_x11
%%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%%%%EXAMPLESDIR%%/1.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/2.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/3.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/GM1_bonds.r3d
%%PORTDOCS%%%%EXAMPLESDIR%%/GM1_sugar.pdb
%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am
%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile.am.in
@ -11,8 +22,10 @@ bin/lasergnu
%%PORTDOCS%%%%EXAMPLESDIR%%/airfoil.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/all.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/animate.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/animate2.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/arrowstyle.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/asciimat.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/battery.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/big_peak.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/binary.dem
@ -20,97 +33,140 @@ bin/lasergnu
%%PORTDOCS%%%%EXAMPLESDIR%%/binary2
%%PORTDOCS%%%%EXAMPLESDIR%%/binary3
%%PORTDOCS%%%%EXAMPLESDIR%%/bivariat.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/blutux.rgb
%%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%%/ctg-y2.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/dashcolor.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/datastrings.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/demo.edf
%%PORTDOCS%%%%EXAMPLESDIR%%/density.fnc
%%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.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/finance.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/fit.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/fontfile.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/fontfile_latex.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/glass.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.cfg
%%PORTDOCS%%%%EXAMPLESDIR%%/gnuplot.rot
%%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%%/hidden2.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/histograms.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/histograms2.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/html/Makefile
%%PORTDOCS%%%%EXAMPLESDIR%%/html/gnuplot_demo.css
%%PORTDOCS%%%%EXAMPLESDIR%%/html/index.save
%%PORTDOCS%%%%EXAMPLESDIR%%/html/webify.pl
%%PORTDOCS%%%%EXAMPLESDIR%%/image.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/immigration.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/key.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/klein.dat
%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/labelplot.pdb
%%PORTDOCS%%%%EXAMPLESDIR%%/labelplot.pdb
%%PORTDOCS%%%%EXAMPLESDIR%%/layout.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/lcdemo.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/line.fnc
%%PORTDOCS%%%%EXAMPLESDIR%%/macros.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/mgr.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/molecule.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/moli3.dat
%%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%%/nearmap.csv
%%PORTDOCS%%%%EXAMPLESDIR%%/param.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/pm3d.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/pm3dcolors.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%%/rainbow.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/random.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/rectangle.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/reflect.fnc
%%PORTDOCS%%%%EXAMPLESDIR%%/reread.bor
%%PORTDOCS%%%%EXAMPLESDIR%%/rgb_variable.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/rgb_variable.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/scatter.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.bin
%%PORTDOCS%%%%EXAMPLESDIR%%/scatter2.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/silver.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/simple.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/sine.bin
%%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%%/srl.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/starmap.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/start.par
%%PORTDOCS%%%%EXAMPLESDIR%%/stat.inc
%%PORTDOCS%%%%EXAMPLESDIR%%/steps.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/steps.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/stringvar.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/surface1.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/surface2.dem
%%HISTOGRAMS%%%%PORTDOCS%%%%EXAMPLESDIR%%/table.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/table.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/textcolor.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/textrotate.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/tics.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/timedat.dem
%%PORTDOCS%%%%EXAMPLESDIR%%/triangle.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/using.bin
%%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%%/world.dem
%%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
%%PORTDOCS%%%%EXAMPLESDIR%%/world2.dem
%%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
@dirrm share/texmf-local/tex/latex/gnuplot
@dirrm share/texmf-local/tex/latex
@dirrm share/texmf-local/tex
@dirrm share/texmf-local
@dirrm %%DATADIR%%/4.2/PostScript
@dirrm %%DATADIR%%/4.2
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/html
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/psdoc
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/gnuplot/4.2
@dirrm libexec/gnuplot
@dirrm lib/X11/app-defaults
@dirrm lib/X11