diff options
author | jtb <jtb> | 2003-07-10 08:55:03 +0000 |
---|---|---|
committer | jtb <jtb> | 2003-07-10 08:55:03 +0000 |
commit | 3794c1bd9804a64d73fd25ea0bfd12ff5191fae9 (patch) | |
tree | d6032446561704d27a0d52124d6e75910f63d2ba /graphics/plplot | |
parent | 9bd9fe85f98d410f2a47d9e9e60dab7a170b969c (diff) | |
download | pkgsrc-3794c1bd9804a64d73fd25ea0bfd12ff5191fae9.tar.gz |
Update to 5.2.1.
Now supports building a shared library with libtool, dynamic
device drivers, and many other improvements.
Over 1000 commits since previous release.
Diffstat (limited to 'graphics/plplot')
-rw-r--r-- | graphics/plplot/Makefile | 96 | ||||
-rw-r--r-- | graphics/plplot/PLIST | 612 | ||||
-rw-r--r-- | graphics/plplot/buildlink2.mk | 22 | ||||
-rw-r--r-- | graphics/plplot/distinfo | 20 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-aa | 29 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-ac | 24 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-ae | 24 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-af | 24 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-ag | 17 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-ah | 16 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-ai | 26 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-aj | 14 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-ak | 47 | ||||
-rw-r--r-- | graphics/plplot/patches/patch-al | 40 |
14 files changed, 385 insertions, 626 deletions
diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile index a8cf1b3b443..5c1b5ae6ffb 100644 --- a/graphics/plplot/Makefile +++ b/graphics/plplot/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2003/07/03 19:01:08 seb Exp $ +# $NetBSD: Makefile,v 1.27 2003/07/10 08:55:03 jtb Exp $ -DISTNAME= plplot-5.0.4 +DISTNAME= plplot-5.2.1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=plplot/} @@ -8,71 +8,65 @@ MAINTAINER= tech-pkg@netbsd.org HOMEPAGE= http://plplot.sourceforge.net/ COMMENT= Scientific plotting package -DEPENDS+= tcl>=8.3.0:../../lang/tcl -DEPENDS+= tk>=8.3.0:../../x11/tk BUILD_DEPENDS+= m4>=1.4:../../devel/m4 -AUTOCONF_REQD= 2.13 -GNU_CONFIGURE= #defined -USE_GMAKE= #defined -USE_FORTRAN= #defined -USE_X11= #defined +USE_BUILDLINK2= # defined +GNU_CONFIGURE= # defined +USE_GMAKE= # defined +USE_FORTRAN= # defined +USE_X11= # defined USE_PERL5= build +USE_LIBTOOL= # defined +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -EVAL_PREFIX+= TK_PREFIX=tk -TCL_PREFIX_DEFAULT= ${LOCALBASE} -EVAL_PREFIX+= TCL_PREFIX=tcl +CONFIGURE_ENV+= GDINCDIR=${BUILDLINK_PREFIX.gd}/include +CONFIGURE_ENV+= GDLIBDIR=${BUILDLINK_PREFIX.gd}/lib +CONFIGURE_ENV+= PNGINCDIR=${BUILDLINK_PREFIX.png}/include +CONFIGURE_ENV+= PNGLIBDIR=${BUILDLINK_PREFIX.png}/lib +CONFIGURE_ENV+= JPEGINCDIR=${BUILDLINK_PREFIX.jpeg}/include +CONFIGURE_ENV+= JPEGLIBDIR=${BUILDLINK_PREFIX.jpeg}/lib +CONFIGURE_ENV+= ZLIBINCDIR=${BUILDLINK_PREFIX.zlib}/include +CONFIGURE_ENV+= ZLIBLIBDIR=${BUILDLINK_PREFIX.zlib}/lib +CONFIGURE_ENV+= TCLINCDIR=${BUILDLINK_PREFIX.tcl}/include +CONFIGURE_ENV+= TCLPRIVATEINCDIR=${BUILDLINK_PREFIX.tcl}/include/tcl/generic +CONFIGURE_ENV+= TCLLIBDIR=${BUILDLINK_PREFIX.tcl}/lib +CONFIGURE_ENV+= TKINCDIR=${BUILDLINK_PREFIX.tk}/include +CONFIGURE_ENV+= TKPRIVATEINCDIR=${BUILDLINK_PREFIX.tk}/include/tk/generic +CONFIGURE_ENV+= TKLIBDIR=${BUILDLINK_PREFIX.tk}/lib -CONFIGURE_ENV+= BIN_DIR="${PREFIX}/bin" -CONFIGURE_ENV+= LIB_DIR="${PREFIX}/lib" -CONFIGURE_ENV+= INCLUDE_DIR="${PREFIX}/include/plplot" -CONFIGURE_ENV+= DATA_DIR="${PREFIX}/libdata/plplot" -CONFIGURE_ENV+= DOC_DIR="${PREFIX}/share/doc/plplot" -CONFIGURE_ENV+= DEMOS_DIR="${PREFIX}/share/examples/plplot" -CONFIGURE_ENV+= TCL_DIR="${PREFIX}/lib/tcl/plplot" -CONFIGURE_ENV+= TKINCDIR="${TK_PREFIX}/include" -CONFIGURE_ENV+= TKLIBDIR="${TK_PREFIX}/lib" -CONFIGURE_ENV+= TCLINCDIR="${TCL_PREFIX}/include" -CONFIGURE_ENV+= TCLLIBDIR="${TCL_PREFIX}/lib" -CONFIGURE_ENV+= USER_FLAGS_C="${CFLAGS}" -CONFIGURE_ENV+= USER_FLAGS_LC="${LDFLAGS}" -CONFIGURE_ENV+= USER_FLAGS_CXX="${CXXFLAGS}" -CONFIGURE_ENV+= USER_FLAGS_LCXX="${LDFLAGS}" -CONFIGURE_ENV+= USER_FLAGS_F="${FFLAGS}" -CONFIGURE_ENV+= USER_FLAGS_LF="${LDLAGS}" - -CONFIGURE_ARGS+= --with-double -CONFIGURE_ARGS+= --enable-xwin +CONFIGURE_ARGS+= --enable-drivers +CONFIGURE_ARGS+= --enable-dyndrivers +CONFIGURE_ARGS+= --enable-cxx +CONFIGURE_ARGS+= --enable-f77 +CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --enable-tcl -CONFIGURE_ARGS+= --enable-tk -CONFIGURE_ARGS+= --without-shlib +CONFIGURE_ARGS+= --disable-itcl +CONFIGURE_ARGS+= --disable-java +CONFIGURE_ARGS+= --disable-octave CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-itcl CONFIGURE_ARGS+= --disable-dp - -USE_NEW_TEXINFO= YES -INFO_FILES= plplotdoc.info - -post-extract: - @cd ${WRKSRC}/doc; ${GTAR} zxf plplotdoc-info-0.4.1.tar.gz +CONFIGURE_ARGS+= --without-freetype +CONFIGURE_ARGS+= --without-pthreads +CONFIGURE_ARGS+= --without-qhull +CONFIGURE_ARGS+= --without-csa post-patch: ${MV} -f ${WRKSRC}/src/plctrl.c ${WRKSRC}/src/plctrl.c.dist ${SED} -e 's:@PREFIX@:'${PREFIX}':g' ${WRKSRC}/src/plctrl.c.dist \ > ${WRKSRC}/src/plctrl.c -pre-configure: - cd ${WRKSRC}/cf && ${AUTOCONF} - ${CP} ${WRKSRC}/cf/configure ${WRKSRC} - post-install: - cd ${WRKSRC}/doc/plplotdoc-info-0.4.1/; \ - ${INSTALL_DATA} plplotdoc.info plplotdoc.info-* ${PREFIX}/info - ${INSTALL_DATA} ${WRKSRC}/doc/plplotdoc-0.4.1.dvi \ - ${PREFIX}/share/doc/plplot - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/plplot - ${INSTALL_DATA} ${WRKSRC}/doc/plplotdoc-html-0.4.1/*.html \ - ${PREFIX}/share/doc/html/plplot + cd ${PREFIX}/bin && ${LN} -fs libtool plplot_libtool +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/gd/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../devel/libtool/buildlink2.mk" +.include "../../x11/tk/buildlink2.mk" +.include "../../lang/tcl/buildlink2.mk" .include "../../mk/autoconf.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plplot/PLIST b/graphics/plplot/PLIST index c09e513479a..b56460f0d1d 100644 --- a/graphics/plplot/PLIST +++ b/graphics/plplot/PLIST @@ -1,14 +1,17 @@ -@comment $NetBSD: PLIST,v 1.3 2003/07/03 19:01:08 seb Exp $ -bin/plplot-config +@comment $NetBSD: PLIST,v 1.4 2003/07/10 08:55:03 jtb Exp $ +bin/plm2gif +bin/plplot_libtool +bin/plpr bin/plrender bin/plserver bin/pltcl bin/pltek +bin/pstex2eps +include/plplot/disptab.h include/plplot/drivers.h include/plplot/pdf.h include/plplot/plConfig.h include/plplot/plDevs.h -include/plplot/plcdemos.h include/plplot/pldebug.h include/plplot/plevent.h include/plplot/plplot.h @@ -19,360 +22,267 @@ include/plplot/pltcl.h include/plplot/pltk.h include/plplot/plxwd.h include/plplot/tclMatrix.h -info/plplotdoc.info -info/plplotdoc.info-1 -info/plplotdoc.info-2 -info/plplotdoc.info-3 -info/plplotdoc.info-4 -info/plplotdoc.info-5 -info/plplotdoc.info-6 -info/plplotdoc.info-7 -info/plplotdoc.info-8 -lib/libplcxxd.a +lib/libplplotcxxd.a +lib/libplplotcxxd.la +lib/libplplotcxxd.so +lib/libplplotcxxd.so.8 +lib/libplplotcxxd.so.8.0 lib/libplplotd.a +lib/libplplotd.la +lib/libplplotd.so +lib/libplplotd.so.8 +lib/libplplotd.so.8.0 +lib/libplplotf77d.a +lib/libplplotf77d.la +lib/libplplotf77d.so +lib/libplplotf77d.so.8 +lib/libplplotf77d.so.8.0 +lib/libplplottcltkd.a +lib/libplplottcltkd.la +lib/libplplottcltkd.so +lib/libplplottcltkd.so.8 +lib/libplplottcltkd.so.8.0 lib/libtclmatrixd.a -lib/tcl/plplot/FileSelector.tcl -lib/tcl/plplot/PLWin.itk -lib/tcl/plplot/PLXWin.itk -lib/tcl/plplot/Pltkwin.tcl -lib/tcl/plplot/about.tcl -lib/tcl/plplot/cmap0a.pal -lib/tcl/plplot/cmap1a.pal -lib/tcl/plplot/cmap1b.pal -lib/tcl/plplot/cmap1c.pal -lib/tcl/plplot/cmap1d.pal -lib/tcl/plplot/help_gui.tcl -lib/tcl/plplot/help_keys.tcl -lib/tcl/plplot/help_tcltk.tcl -lib/tcl/plplot/plclient.tcl -lib/tcl/plplot/plcolor.tcl -lib/tcl/plplot/plconfig.tcl -lib/tcl/plplot/pldefaults.tcl -lib/tcl/plplot/plplot.tcl -lib/tcl/plplot/plserver.tcl -lib/tcl/plplot/pltools.tcl -lib/tcl/plplot/plwidget.tcl -lib/tcl/plplot/tclIndex -libdata/plplot/cglobe.map -libdata/plplot/globe.map -libdata/plplot/plstnd5.fnt -libdata/plplot/plxtnd5.fnt -libdata/plplot/usa.map -libdata/plplot/usaglobe.map -share/doc/html/plplot/acquiring-plplot.html -share/doc/html/plplot/advanced.html -share/doc/html/plplot/annotation.html -share/doc/html/plplot/api-c.html -share/doc/html/plplot/api-fortran.html -share/doc/html/plplot/api.html -share/doc/html/plplot/arguments.html -share/doc/html/plplot/bibliography.html -share/doc/html/plplot/c.html -share/doc/html/plplot/characters.html -share/doc/html/plplot/color.html -share/doc/html/plplot/contour-plots.html -share/doc/html/plplot/copyrights.html -share/doc/html/plplot/cpluscplus-design.html -share/doc/html/plplot/cpluscplus-specializing.html -share/doc/html/plplot/cpluscplus-status.html -share/doc/html/plplot/cplusplus.html -share/doc/html/plplot/credits.html -share/doc/html/plplot/custom-extensions-tcl.html -share/doc/html/plplot/drawing.html -share/doc/html/plplot/driver-functions.html -share/doc/html/plplot/error.html -share/doc/html/plplot/escape-sequences.html -share/doc/html/plplot/extended-wish.html -share/doc/html/plplot/extensions-tcl.html -share/doc/html/plplot/familying.html -share/doc/html/plplot/fill-pattern.html -share/doc/html/plplot/finishing.html -share/doc/html/plplot/fortran.html -share/doc/html/plplot/gui.html -share/doc/html/plplot/index.html -share/doc/html/plplot/initializing.html -share/doc/html/plplot/installing.html -share/doc/html/plplot/interactive-devices.html -share/doc/html/plplot/intro.html -share/doc/html/plplot/introduction-itcl.html -share/doc/html/plplot/introduction-tk.html -share/doc/html/plplot/labelling.html -share/doc/html/plplot/line-attributes.html -share/doc/html/plplot/metafiles-plrender.html -share/doc/html/plplot/organization.html -share/doc/html/plplot/os-notes.html -share/doc/html/plplot/output-devices.html -share/doc/html/plplot/output-drivers.html -share/doc/html/plplot/p133.html -share/doc/html/plplot/p1862.html -share/doc/html/plplot/p2391.html -share/doc/html/plplot/p42.html -share/doc/html/plplot/perl.html -share/doc/html/plplot/pl_setcontlabelformat.html -share/doc/html/plplot/pladv.html -share/doc/html/plplot/plaxes.html -share/doc/html/plplot/plbin.html -share/doc/html/plplot/plbop.html -share/doc/html/plplot/plbox.html -share/doc/html/plplot/plbox3.html -share/doc/html/plplot/plclear.html -share/doc/html/plplot/plclr.html -share/doc/html/plplot/plcol.html -share/doc/html/plplot/plcol0.html -share/doc/html/plplot/plcol1.html -share/doc/html/plplot/plcon1.html -share/doc/html/plplot/plcon2.html -share/doc/html/plplot/plcont.html -share/doc/html/plplot/plcontfortran.html -share/doc/html/plplot/plcpstrm.html -share/doc/html/plplot/plend.html -share/doc/html/plplot/plend1.html -share/doc/html/plplot/plenv.html -share/doc/html/plplot/pleop.html -share/doc/html/plplot/plerrx.html -share/doc/html/plplot/plerry.html -share/doc/html/plplot/plexit.html -share/doc/html/plplot/plfamadv.html -share/doc/html/plplot/plfill.html -share/doc/html/plplot/plfill3.html -share/doc/html/plplot/plflush.html -share/doc/html/plplot/plfont.html -share/doc/html/plplot/plfontld.html -share/doc/html/plplot/plgchr.html -share/doc/html/plplot/plgcol0.html -share/doc/html/plplot/plgcolbg.html -share/doc/html/plplot/plgcompression.html -share/doc/html/plplot/plgdev.html -share/doc/html/plplot/plgdidev.html -share/doc/html/plplot/plgdiori.html -share/doc/html/plplot/plgdiplt.html -share/doc/html/plplot/plgfam.html -share/doc/html/plplot/plgfile.html -share/doc/html/plplot/plgfnam.html -share/doc/html/plplot/plglevel.html -share/doc/html/plplot/plgpage.html -share/doc/html/plplot/plgra.html -share/doc/html/plplot/plgspa.html -share/doc/html/plplot/plgstrm.html -share/doc/html/plplot/plgver.html -share/doc/html/plplot/plgxax.html -share/doc/html/plplot/plgyax.html -share/doc/html/plplot/plgzax.html -share/doc/html/plplot/plhist.html -share/doc/html/plplot/plhls.html -share/doc/html/plplot/plinit.html -share/doc/html/plplot/pljoin.html -share/doc/html/plplot/pllab.html -share/doc/html/plplot/pllightsource.html -share/doc/html/plplot/plline.html -share/doc/html/plplot/plline3.html -share/doc/html/plplot/pllsty.html -share/doc/html/plplot/plmesh.html -share/doc/html/plplot/plmeshfortran.html -share/doc/html/plplot/plmkstrm.html -share/doc/html/plplot/plmtex.html -share/doc/html/plplot/plot3d.html -share/doc/html/plplot/plot3dfortran.html -share/doc/html/plplot/plotsh3d.html -share/doc/html/plplot/plp_getinitdriverlist.html -share/doc/html/plplot/plpage.html -share/doc/html/plplot/plpat.html -share/doc/html/plplot/plpoin.html -share/doc/html/plplot/plpoin3.html -share/doc/html/plplot/plpoly3.html -share/doc/html/plplot/plprec.html -share/doc/html/plplot/plpsty.html -share/doc/html/plplot/plptex.html -share/doc/html/plplot/plreplot.html -share/doc/html/plplot/plrgb.html -share/doc/html/plplot/plrgb1.html -share/doc/html/plplot/plschr.html -share/doc/html/plplot/plscmap0.html -share/doc/html/plplot/plscmap0n.html -share/doc/html/plplot/plscmap1.html -share/doc/html/plplot/plscmap1l.html -share/doc/html/plplot/plscmap1n.html -share/doc/html/plplot/plscol0.html -share/doc/html/plplot/plscolbg.html -share/doc/html/plplot/plscolor.html -share/doc/html/plplot/plscompression.html -share/doc/html/plplot/plsdev.html -share/doc/html/plplot/plsdidev.html -share/doc/html/plplot/plsdimap.html -share/doc/html/plplot/plsdiori.html -share/doc/html/plplot/plsdiplt.html -share/doc/html/plplot/plsdiplz.html -share/doc/html/plplot/plsesc.html -share/doc/html/plplot/plsescfortran.html -share/doc/html/plplot/plsfam.html -share/doc/html/plplot/plsfile.html -share/doc/html/plplot/plsfnam.html -share/doc/html/plplot/plshade.html -share/doc/html/plplot/plshade1.html -share/doc/html/plplot/plshades.html -share/doc/html/plplot/plsmaj.html -share/doc/html/plplot/plsmin.html -share/doc/html/plplot/plsori.html -share/doc/html/plplot/plspage.html -share/doc/html/plplot/plspause.html -share/doc/html/plplot/plsstrm.html -share/doc/html/plplot/plssub.html -share/doc/html/plplot/plssym.html -share/doc/html/plplot/plstar.html -share/doc/html/plplot/plstart.html -share/doc/html/plplot/plstripa.html -share/doc/html/plplot/plstripc.html -share/doc/html/plplot/plstripd.html -share/doc/html/plplot/plstyl.html -share/doc/html/plplot/plsvpa.html -share/doc/html/plplot/plsxax.html -share/doc/html/plplot/plsyax.html -share/doc/html/plplot/plsym.html -share/doc/html/plplot/plszax.html -share/doc/html/plplot/pltext.html -share/doc/html/plplot/pltr0.html -share/doc/html/plplot/pltr1.html -share/doc/html/plplot/pltr2.html -share/doc/html/plplot/plvasp.html -share/doc/html/plplot/plvpas.html -share/doc/html/plplot/plvpor.html -share/doc/html/plplot/plvsta.html -share/doc/html/plplot/plw3d.html -share/doc/html/plplot/plwid.html -share/doc/html/plplot/plwind.html -share/doc/html/plplot/plxormod.html -share/doc/html/plplot/python.html -share/doc/html/plplot/scales.html -share/doc/html/plplot/simple.html -share/doc/html/plplot/specifying-devices.html -share/doc/html/plplot/standard-window.html -share/doc/html/plplot/tcl-contouring.html -share/doc/html/plplot/tcl-extension.html -share/doc/html/plplot/tcl-overview.html -share/doc/html/plplot/tcl-understanding.html -share/doc/html/plplot/tcl.html -share/doc/html/plplot/tk-driver.html -share/doc/html/plplot/tri-d-plots.html -share/doc/html/plplot/viewports.html -share/doc/html/plplot/windows.html -share/doc/html/plplot/x-drivers.html -share/doc/plplot/CHANGES +lib/libtclmatrixd.la +lib/libtclmatrixd.so +lib/libtclmatrixd.so.8 +lib/libtclmatrixd.so.8.0 +lib/pkgconfig/plplot.pc +lib/plplot${PKGVERSION}/data/cglobe.map +lib/plplot${PKGVERSION}/data/globe.map +lib/plplot${PKGVERSION}/data/plstnd5.fnt +lib/plplot${PKGVERSION}/data/plxtnd5.fnt +lib/plplot${PKGVERSION}/data/usa.map +lib/plplot${PKGVERSION}/data/usaglobe.map +lib/plplot${PKGVERSION}/driversd/dg300.la +lib/plplot${PKGVERSION}/driversd/dg300.rc +lib/plplot${PKGVERSION}/driversd/dg300.so +lib/plplot${PKGVERSION}/driversd/gd.la +lib/plplot${PKGVERSION}/driversd/gd.rc +lib/plplot${PKGVERSION}/driversd/gd.so +lib/plplot${PKGVERSION}/driversd/hpgl.la +lib/plplot${PKGVERSION}/driversd/hpgl.rc +lib/plplot${PKGVERSION}/driversd/hpgl.so +lib/plplot${PKGVERSION}/driversd/impress.la +lib/plplot${PKGVERSION}/driversd/impress.rc +lib/plplot${PKGVERSION}/driversd/impress.so +lib/plplot${PKGVERSION}/driversd/ljii.la +lib/plplot${PKGVERSION}/driversd/ljii.rc +lib/plplot${PKGVERSION}/driversd/ljii.so +lib/plplot${PKGVERSION}/driversd/ljiip.la +lib/plplot${PKGVERSION}/driversd/ljiip.rc +lib/plplot${PKGVERSION}/driversd/ljiip.so +lib/plplot${PKGVERSION}/driversd/mem.la +lib/plplot${PKGVERSION}/driversd/mem.rc +lib/plplot${PKGVERSION}/driversd/mem.so +lib/plplot${PKGVERSION}/driversd/ntk.la +lib/plplot${PKGVERSION}/driversd/ntk.rc +lib/plplot${PKGVERSION}/driversd/ntk.so +lib/plplot${PKGVERSION}/driversd/null.la +lib/plplot${PKGVERSION}/driversd/null.rc +lib/plplot${PKGVERSION}/driversd/null.so +lib/plplot${PKGVERSION}/driversd/pbm.la +lib/plplot${PKGVERSION}/driversd/pbm.rc +lib/plplot${PKGVERSION}/driversd/pbm.so +lib/plplot${PKGVERSION}/driversd/plmeta.la +lib/plplot${PKGVERSION}/driversd/plmeta.rc +lib/plplot${PKGVERSION}/driversd/plmeta.so +lib/plplot${PKGVERSION}/driversd/ps.la +lib/plplot${PKGVERSION}/driversd/ps.rc +lib/plplot${PKGVERSION}/driversd/ps.so +lib/plplot${PKGVERSION}/driversd/pstex.la +lib/plplot${PKGVERSION}/driversd/pstex.rc +lib/plplot${PKGVERSION}/driversd/pstex.so +lib/plplot${PKGVERSION}/driversd/tek.la +lib/plplot${PKGVERSION}/driversd/tek.rc +lib/plplot${PKGVERSION}/driversd/tek.so +lib/plplot${PKGVERSION}/driversd/tk.la +lib/plplot${PKGVERSION}/driversd/tk.rc +lib/plplot${PKGVERSION}/driversd/tk.so +lib/plplot${PKGVERSION}/driversd/tkwin.la +lib/plplot${PKGVERSION}/driversd/tkwin.rc +lib/plplot${PKGVERSION}/driversd/tkwin.so +lib/plplot${PKGVERSION}/driversd/xfig.la +lib/plplot${PKGVERSION}/driversd/xfig.rc +lib/plplot${PKGVERSION}/driversd/xfig.so +lib/plplot${PKGVERSION}/driversd/xwin.la +lib/plplot${PKGVERSION}/driversd/xwin.rc +lib/plplot${PKGVERSION}/driversd/xwin.so +lib/plplot${PKGVERSION}/examples/c++/Makefile +lib/plplot${PKGVERSION}/examples/c++/x01cc.cc +lib/plplot${PKGVERSION}/examples/c/Makefile +lib/plplot${PKGVERSION}/examples/c/lena.pgm +lib/plplot${PKGVERSION}/examples/c/plcdemos.h +lib/plplot${PKGVERSION}/examples/c/tutor.c +lib/plplot${PKGVERSION}/examples/c/x01c.c +lib/plplot${PKGVERSION}/examples/c/x02c.c +lib/plplot${PKGVERSION}/examples/c/x03c.c +lib/plplot${PKGVERSION}/examples/c/x04c.c +lib/plplot${PKGVERSION}/examples/c/x05c.c +lib/plplot${PKGVERSION}/examples/c/x06c.c +lib/plplot${PKGVERSION}/examples/c/x07c.c +lib/plplot${PKGVERSION}/examples/c/x08c.c +lib/plplot${PKGVERSION}/examples/c/x09c.c +lib/plplot${PKGVERSION}/examples/c/x10c.c +lib/plplot${PKGVERSION}/examples/c/x11c.c +lib/plplot${PKGVERSION}/examples/c/x12c.c +lib/plplot${PKGVERSION}/examples/c/x13c.c +lib/plplot${PKGVERSION}/examples/c/x14c.c +lib/plplot${PKGVERSION}/examples/c/x15c.c +lib/plplot${PKGVERSION}/examples/c/x16c.c +lib/plplot${PKGVERSION}/examples/c/x17c.c +lib/plplot${PKGVERSION}/examples/c/x18c.c +lib/plplot${PKGVERSION}/examples/c/x19c.c +lib/plplot${PKGVERSION}/examples/c/x20c.c +lib/plplot${PKGVERSION}/examples/c/x21c.c +lib/plplot${PKGVERSION}/examples/f77/Makefile +lib/plplot${PKGVERSION}/examples/f77/x01f.f +lib/plplot${PKGVERSION}/examples/f77/x02f.f +lib/plplot${PKGVERSION}/examples/f77/x03f.f +lib/plplot${PKGVERSION}/examples/f77/x04f.f +lib/plplot${PKGVERSION}/examples/f77/x05f.f +lib/plplot${PKGVERSION}/examples/f77/x06f.f +lib/plplot${PKGVERSION}/examples/f77/x07f.f +lib/plplot${PKGVERSION}/examples/f77/x08f.f +lib/plplot${PKGVERSION}/examples/f77/x09f.f +lib/plplot${PKGVERSION}/examples/f77/x10f.f +lib/plplot${PKGVERSION}/examples/f77/x11f.f +lib/plplot${PKGVERSION}/examples/f77/x12f.f +lib/plplot${PKGVERSION}/examples/f77/x13f.f +lib/plplot${PKGVERSION}/examples/f77/x16f.f +lib/plplot${PKGVERSION}/examples/plplot-test.sh +lib/plplot${PKGVERSION}/examples/tcl/README.tcldemos +lib/plplot${PKGVERSION}/examples/tcl/plgrid.tcl +lib/plplot${PKGVERSION}/examples/tcl/plot.dat +lib/plplot${PKGVERSION}/examples/tcl/plot.tcl +lib/plplot${PKGVERSION}/examples/tcl/r.dat +lib/plplot${PKGVERSION}/examples/tcl/stats.log +lib/plplot${PKGVERSION}/examples/tcl/tclIndex +lib/plplot${PKGVERSION}/examples/tcl/tcldemos.tcl +lib/plplot${PKGVERSION}/examples/tcl/x01 +lib/plplot${PKGVERSION}/examples/tcl/x01.tcl +lib/plplot${PKGVERSION}/examples/tcl/x02 +lib/plplot${PKGVERSION}/examples/tcl/x02.tcl +lib/plplot${PKGVERSION}/examples/tcl/x03 +lib/plplot${PKGVERSION}/examples/tcl/x03.tcl +lib/plplot${PKGVERSION}/examples/tcl/x04 +lib/plplot${PKGVERSION}/examples/tcl/x04.tcl +lib/plplot${PKGVERSION}/examples/tcl/x05 +lib/plplot${PKGVERSION}/examples/tcl/x05.tcl +lib/plplot${PKGVERSION}/examples/tcl/x06 +lib/plplot${PKGVERSION}/examples/tcl/x06.tcl +lib/plplot${PKGVERSION}/examples/tcl/x07 +lib/plplot${PKGVERSION}/examples/tcl/x07.tcl +lib/plplot${PKGVERSION}/examples/tcl/x08 +lib/plplot${PKGVERSION}/examples/tcl/x08.tcl +lib/plplot${PKGVERSION}/examples/tcl/x09 +lib/plplot${PKGVERSION}/examples/tcl/x09.tcl +lib/plplot${PKGVERSION}/examples/tcl/x10 +lib/plplot${PKGVERSION}/examples/tcl/x10.tcl +lib/plplot${PKGVERSION}/examples/tcl/x11 +lib/plplot${PKGVERSION}/examples/tcl/x11.tcl +lib/plplot${PKGVERSION}/examples/tcl/x12 +lib/plplot${PKGVERSION}/examples/tcl/x12.tcl +lib/plplot${PKGVERSION}/examples/tcl/x13 +lib/plplot${PKGVERSION}/examples/tcl/x13.tcl +lib/plplot${PKGVERSION}/examples/tcl/x14 +lib/plplot${PKGVERSION}/examples/tcl/x14.tcl +lib/plplot${PKGVERSION}/examples/tcl/x15 +lib/plplot${PKGVERSION}/examples/tcl/x15.tcl +lib/plplot${PKGVERSION}/examples/tcl/x16 +lib/plplot${PKGVERSION}/examples/tcl/x16.tcl +lib/plplot${PKGVERSION}/examples/tcl/x17 +lib/plplot${PKGVERSION}/examples/tcl/x17.tcl +lib/plplot${PKGVERSION}/examples/tcl/x18 +lib/plplot${PKGVERSION}/examples/tcl/x18.tcl +lib/plplot${PKGVERSION}/examples/tcl/x19 +lib/plplot${PKGVERSION}/examples/tcl/x19.tcl +lib/plplot${PKGVERSION}/examples/test_c.sh +lib/plplot${PKGVERSION}/examples/test_cxx.sh +lib/plplot${PKGVERSION}/examples/test_f77.sh +lib/plplot${PKGVERSION}/examples/test_tcl.sh +lib/plplot${PKGVERSION}/examples/tk/Makefile +lib/plplot${PKGVERSION}/examples/tk/README.tkdemos +lib/plplot${PKGVERSION}/examples/tk/runAllDemos.tcl +lib/plplot${PKGVERSION}/examples/tk/runExtendedDemos.tcl +lib/plplot${PKGVERSION}/examples/tk/tclIndex +lib/plplot${PKGVERSION}/examples/tk/tk01 +lib/plplot${PKGVERSION}/examples/tk/tk02 +lib/plplot${PKGVERSION}/examples/tk/tk03 +lib/plplot${PKGVERSION}/examples/tk/tk04 +lib/plplot${PKGVERSION}/examples/tk/tkdemos.tcl +lib/plplot${PKGVERSION}/examples/tk/x01.tcl +lib/plplot${PKGVERSION}/examples/tk/x02.tcl +lib/plplot${PKGVERSION}/examples/tk/x03.tcl +lib/plplot${PKGVERSION}/examples/tk/x04.tcl +lib/plplot${PKGVERSION}/examples/tk/x05.tcl +lib/plplot${PKGVERSION}/examples/tk/x06.tcl +lib/plplot${PKGVERSION}/examples/tk/x07.tcl +lib/plplot${PKGVERSION}/examples/tk/x08.tcl +lib/plplot${PKGVERSION}/examples/tk/x09.tcl +lib/plplot${PKGVERSION}/examples/tk/x10.tcl +lib/plplot${PKGVERSION}/examples/tk/x11.tcl +lib/plplot${PKGVERSION}/examples/tk/x12.tcl +lib/plplot${PKGVERSION}/examples/tk/x13.tcl +lib/plplot${PKGVERSION}/examples/tk/x14.tcl +lib/plplot${PKGVERSION}/examples/tk/x15.tcl +lib/plplot${PKGVERSION}/examples/tk/x16.tcl +lib/plplot${PKGVERSION}/examples/tk/x17.tcl +lib/plplot${PKGVERSION}/examples/tk/x18.tcl +lib/plplot${PKGVERSION}/examples/tk/x19.tcl +lib/plplot${PKGVERSION}/examples/tk/xtk01.c +lib/plplot${PKGVERSION}/examples/tk/xtk02.c +lib/plplot${PKGVERSION}/examples/tk/xtk04.c +lib/plplot${PKGVERSION}/pkgIndex.tcl +lib/plplot${PKGVERSION}/tcl/FileSelector.tcl +lib/plplot${PKGVERSION}/tcl/PLWin.itk +lib/plplot${PKGVERSION}/tcl/PLXWin.itk +lib/plplot${PKGVERSION}/tcl/Pltkwin.tcl +lib/plplot${PKGVERSION}/tcl/about.tcl +lib/plplot${PKGVERSION}/tcl/cmap0a.pal +lib/plplot${PKGVERSION}/tcl/cmap1a.pal +lib/plplot${PKGVERSION}/tcl/cmap1a1.pal +lib/plplot${PKGVERSION}/tcl/cmap1b.pal +lib/plplot${PKGVERSION}/tcl/cmap1c.pal +lib/plplot${PKGVERSION}/tcl/cmap1d.pal +lib/plplot${PKGVERSION}/tcl/help_gui.tcl +lib/plplot${PKGVERSION}/tcl/help_keys.tcl +lib/plplot${PKGVERSION}/tcl/help_tcltk.tcl +lib/plplot${PKGVERSION}/tcl/plclient.tcl +lib/plplot${PKGVERSION}/tcl/plcolor.tcl +lib/plplot${PKGVERSION}/tcl/plconfig.tcl +lib/plplot${PKGVERSION}/tcl/pldefaults.tcl +lib/plplot${PKGVERSION}/tcl/plplot.tcl +lib/plplot${PKGVERSION}/tcl/plserver.tcl +lib/plplot${PKGVERSION}/tcl/pltools.tcl +lib/plplot${PKGVERSION}/tcl/plwidget.tcl +lib/plplot${PKGVERSION}/tcl/tclIndex +man/man1/plm2gif.1 +man/man1/plplot_libtool.1 +man/man1/plpr.1 +man/man1/plrender.1 +man/man1/plserver.1 +man/man1/pltcl.1 +man/man1/pltek.1 +man/man1/pstex2eps.1 +share/doc/plplot/AUTHORS share/doc/plplot/COPYING.LIB +share/doc/plplot/ChangeLog share/doc/plplot/Copyright share/doc/plplot/FAQ share/doc/plplot/NEWS +share/doc/plplot/PROBLEMS share/doc/plplot/README -share/doc/plplot/README.local -share/doc/plplot/ToDo -share/doc/plplot/mklinks -share/doc/plplot/plplotdoc-0.4.1.dvi -share/examples/plplot/Makefile -share/examples/plplot/c++/Makefile -share/examples/plplot/c++/x01cc.cc -share/examples/plplot/c/Makefile -share/examples/plplot/c/tutor.c -share/examples/plplot/c/x01c.c -share/examples/plplot/c/x02c.c -share/examples/plplot/c/x03c.c -share/examples/plplot/c/x04c.c -share/examples/plplot/c/x05c.c -share/examples/plplot/c/x06c.c -share/examples/plplot/c/x07c.c -share/examples/plplot/c/x08c.c -share/examples/plplot/c/x09c.c -share/examples/plplot/c/x10c.c -share/examples/plplot/c/x11c.c -share/examples/plplot/c/x12c.c -share/examples/plplot/c/x13c.c -share/examples/plplot/c/x14c.c -share/examples/plplot/c/x15c.c -share/examples/plplot/c/x16c.c -share/examples/plplot/c/x17c.c -share/examples/plplot/c/x18c.c -share/examples/plplot/c/x19c.c -share/examples/plplot/f77/Makefile -share/examples/plplot/f77/x01f.f -share/examples/plplot/f77/x02f.f -share/examples/plplot/f77/x03f.f -share/examples/plplot/f77/x04f.f -share/examples/plplot/f77/x05f.f -share/examples/plplot/f77/x06f.f -share/examples/plplot/f77/x07f.f -share/examples/plplot/f77/x08f.f -share/examples/plplot/f77/x09f.f -share/examples/plplot/f77/x10f.f -share/examples/plplot/f77/x11f.f -share/examples/plplot/f77/x12f.f -share/examples/plplot/f77/x13f.f -share/examples/plplot/f77/x16f.f -share/examples/plplot/plplot-test.sh -share/examples/plplot/tcl/README.tcldemos -share/examples/plplot/tcl/plgrid.tcl -share/examples/plplot/tcl/plot.dat -share/examples/plplot/tcl/plot.tcl -share/examples/plplot/tcl/r.dat -share/examples/plplot/tcl/stats.log -share/examples/plplot/tcl/tcldemos.tcl -share/examples/plplot/tcl/x01.tcl -share/examples/plplot/tcl/x02.tcl -share/examples/plplot/tcl/x03.tcl -share/examples/plplot/tcl/x04.tcl -share/examples/plplot/tcl/x05.tcl -share/examples/plplot/tcl/x06.tcl -share/examples/plplot/tcl/x07.tcl -share/examples/plplot/tcl/x08.tcl -share/examples/plplot/tcl/x09.tcl -share/examples/plplot/tcl/x10.tcl -share/examples/plplot/tcl/x11.tcl -share/examples/plplot/tcl/x12.tcl -share/examples/plplot/tcl/x13.tcl -share/examples/plplot/tcl/x14.tcl -share/examples/plplot/tcl/x15.tcl -share/examples/plplot/tcl/x16.tcl -share/examples/plplot/tcl/x17.tcl -share/examples/plplot/tcl/x18.tcl -share/examples/plplot/test_c.sh -share/examples/plplot/test_cxx.sh -share/examples/plplot/test_f77.sh -share/examples/plplot/test_octave.sh -share/examples/plplot/test_python.sh -share/examples/plplot/test_tcl.sh -share/examples/plplot/tk/Makefile -share/examples/plplot/tk/README.tkdemos -share/examples/plplot/tk/tk01 -share/examples/plplot/tk/tk02 -share/examples/plplot/tk/tk03 -share/examples/plplot/tk/tk04 -share/examples/plplot/tk/tkdemos.tcl -share/examples/plplot/tk/x01.tcl -share/examples/plplot/tk/x02.tcl -share/examples/plplot/tk/x03.tcl -share/examples/plplot/tk/x04.tcl -share/examples/plplot/tk/x05.tcl -share/examples/plplot/tk/x06.tcl -share/examples/plplot/tk/x07.tcl -share/examples/plplot/tk/x08.tcl -share/examples/plplot/tk/x09.tcl -share/examples/plplot/tk/x10.tcl -share/examples/plplot/tk/x11.tcl -share/examples/plplot/tk/x12.tcl -share/examples/plplot/tk/x13.tcl -share/examples/plplot/tk/x14.tcl -share/examples/plplot/tk/x15.tcl -share/examples/plplot/tk/x16.tcl -share/examples/plplot/tk/x17.tcl -share/examples/plplot/tk/x18.tcl -share/examples/plplot/tk/xtk01.c -share/examples/plplot/tk/xtk02.c -share/examples/plplot/tk/xtk04.c -@dirrm share/examples/plplot/tk -@dirrm share/examples/plplot/tcl -@dirrm share/examples/plplot/f77 -@dirrm share/examples/plplot/c++ -@dirrm share/examples/plplot/c -@dirrm share/examples/plplot +share/doc/plplot/README.drivers @dirrm share/doc/plplot -@dirrm share/doc/html/plplot -@dirrm libdata/plplot -@dirrm lib/tcl/plplot +@dirrm lib/plplot${PKGVERSION}/tcl +@dirrm lib/plplot${PKGVERSION}/examples/tk +@dirrm lib/plplot${PKGVERSION}/examples/tcl +@dirrm lib/plplot${PKGVERSION}/examples/f77 +@dirrm lib/plplot${PKGVERSION}/examples/c++ +@dirrm lib/plplot${PKGVERSION}/examples/c +@dirrm lib/plplot${PKGVERSION}/examples +@dirrm lib/plplot${PKGVERSION}/driversd +@dirrm lib/plplot${PKGVERSION}/data +@dirrm lib/plplot${PKGVERSION} @dirrm include/plplot diff --git a/graphics/plplot/buildlink2.mk b/graphics/plplot/buildlink2.mk new file mode 100644 index 00000000000..1668974370c --- /dev/null +++ b/graphics/plplot/buildlink2.mk @@ -0,0 +1,22 @@ +# $NetBSD: buildlink2.mk,v 1.1 2003/07/10 08:55:04 jtb Exp $ +# +# This Makefile fragment is included by packages that use plplot. +# + +.if !defined(PLPLOT_BUILDLINK2_MK) +PLPLOT_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= plplot +BUILDLINK_DEPENDS.plplot?= plplot>=5.2.1 +BUILDLINK_PKGSRCDIR.plplot?= ../../graphics/plplot + +EVAL_PREFIX+= BUILDLINK_PREFIX.plplot=plplot +BUILDLINK_PREFIX.plplot_DEFAULT=${LOCALBASE} +BUILDLINK_FILES.plplot+= include/plplot/* +BUILDLINK_FILES.plplot+= lib/libplplot.* + +BUILDLINK_TARGETS+= plplot-buildlink + +plplot-buildlink: _BUILDLINK_USE + +.endif # PLPLOT_BUILDLINK2_MK diff --git a/graphics/plplot/distinfo b/graphics/plplot/distinfo index 0c7fcd1616e..b5e58bb379c 100644 --- a/graphics/plplot/distinfo +++ b/graphics/plplot/distinfo @@ -1,16 +1,10 @@ -$NetBSD: distinfo,v 1.3 2001/06/20 12:55:11 jtb Exp $ +$NetBSD: distinfo,v 1.4 2003/07/10 08:55:04 jtb Exp $ -SHA1 (plplot-5.0.4.tar.gz) = 9d9d28b271d4c75a2d5e04ea43f85f78ca0892d4 -Size (plplot-5.0.4.tar.gz) = 2967518 bytes -SHA1 (patch-aa) = 5fe9e2c82d187ef2dfd38f11d37f712e43928e13 +SHA1 (plplot-5.2.1.tar.gz) = e69c4e2a22409f23e0c9f40f7d5cac7dda5d4ec2 +Size (plplot-5.2.1.tar.gz) = 4625477 bytes +SHA1 (patch-aa) = cdc22b1371b42364d03adaf0f338267d9d724689 SHA1 (patch-ab) = 9edefeed3f64d1ae01b85009af289de59e281a44 -SHA1 (patch-ac) = 16372142dcb28277fff66c1b33fa620b53da3ebb +SHA1 (patch-ac) = 718ed2e4e2f2e7de7b512b416f125ee77222f4dc SHA1 (patch-ad) = 2b2ab27e59c0ab884e055edbfa778acecb3b9f41 -SHA1 (patch-ae) = 8dee61b5cebbeff4ad291ba9f09d79c47c9f680d -SHA1 (patch-af) = db7974b44e6d0d5c653c77d6e69dffe89b6f92e5 -SHA1 (patch-ag) = e2599c588c8b2c9fff0f9a6214abca2dc06e87dc -SHA1 (patch-ah) = d209fe090477a4f4dcae31af579912fdfea8bc6f -SHA1 (patch-ai) = 71242436e7557705c9786f7edbe2d0a35931a37a -SHA1 (patch-aj) = 2251cf39fd6bedad3a2f670074cb6dae46c74ec1 -SHA1 (patch-ak) = fa9890a6e468b772f23beef4663d96ffffd074b6 -SHA1 (patch-al) = ef35ffd9a8675d8137fb3f376dd134d824a89499 +SHA1 (patch-ae) = 19d970e496817ae909cbc1be241373e41aa1a3c9 +SHA1 (patch-af) = 84c799efdabf5a1ba2e92f4089635c966a3e7006 diff --git a/graphics/plplot/patches/patch-aa b/graphics/plplot/patches/patch-aa index d5279e1be0b..bfe8ea66c08 100644 --- a/graphics/plplot/patches/patch-aa +++ b/graphics/plplot/patches/patch-aa @@ -1,16 +1,15 @@ -$NetBSD: patch-aa,v 1.5 2001/06/20 12:51:53 jtb Exp $ +$NetBSD: patch-aa,v 1.6 2003/07/10 08:55:05 jtb Exp $ ---- doc/plplotdoc-info-0.4.1/plplotdoc.info.orig Wed Jun 20 12:44:22 2001 -+++ doc/plplotdoc-info-0.4.1/plplotdoc.info -@@ -1,6 +1,11 @@ - This is info/plplotdoc.info, produced by makeinfo version 4.0 from - plplotdoc.texi. - -+INFO-DIR-SECTION Plotting -+START-INFO-DIR-ENTRY -+* PLplot: (plplotdoc). The PLplot plotting library -+END-INFO-DIR-ENTRY -+ - - Indirect: - plplotdoc.info-1: 84 +--- bindings/f77/Makefile.in.orig ++++ bindings/f77/Makefile.in +@@ -391,8 +391,8 @@ + LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) +-LTF77COMPILE = $(LIBTOOL) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) +-F77LD = $(F77) ++LTF77COMPILE = $(LIBTOOL) --mode=compile $(CC) $(AM_FFLAGS) $(FFLAGS) ++F77LD = $(CC) + F77LINK = $(LIBTOOL) --mode=link $(F77LD) $(AM_FFLAGS) $(FFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + DIST_SOURCES = $(libplplotf77@LIB_TAG@_la_SOURCES) diff --git a/graphics/plplot/patches/patch-ac b/graphics/plplot/patches/patch-ac index 25bb9fdddf9..7fa4538337d 100644 --- a/graphics/plplot/patches/patch-ac +++ b/graphics/plplot/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.3 2001/01/29 01:15:35 jtb Exp $ +$NetBSD: patch-ac,v 1.4 2003/07/10 08:55:05 jtb Exp $ ---- cf/init.in.orig Wed Jan 10 06:31:08 2001 -+++ cf/init.in -@@ -21,7 +21,7 @@ - OCC = @OCC@ - F77 = @F77@ - LDF = @LDF@ --M4 = m4 -+M4 = gm4 - - # Force everything. If unsure, test for existence first. - # Redefine these as needed in system-specific setup. +--- Makefile.in.orig ++++ Makefile.in +@@ -802,7 +802,7 @@ + + install-data-am: install-docDATA + +-install-exec-am: install-binSCRIPTS ++install-exec-am: + + install-info: install-info-recursive + diff --git a/graphics/plplot/patches/patch-ae b/graphics/plplot/patches/patch-ae index 37202af11e0..aafbc07ca3b 100644 --- a/graphics/plplot/patches/patch-ae +++ b/graphics/plplot/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.4 2001/01/29 01:15:35 jtb Exp $ +$NetBSD: patch-ae,v 1.5 2003/07/10 08:55:05 jtb Exp $ ---- cf/sysconf.in.orig Sun Jan 28 21:59:55 2001 -+++ cf/sysconf.in -@@ -78,7 +78,7 @@ - - # Defaults - --M4=m4 -+M4=gm4 - - # Double precision - # Note that because there is no standard way to invoke double +--- bindings/tk/Makefile.in.orig ++++ bindings/tk/Makefile.in +@@ -144,7 +144,7 @@ + LIBLTDL = @LIBLTDL@ + LIBOBJS = @LIBOBJS@ + LIBRARY_VERSION = @LIBRARY_VERSION@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lX11 + LIBTOOL = @LIBTOOL@ + LIB_DIR = @LIB_DIR@ + LIB_TAG = @LIB_TAG@ diff --git a/graphics/plplot/patches/patch-af b/graphics/plplot/patches/patch-af index 75d341eab33..f99ed6ecb2d 100644 --- a/graphics/plplot/patches/patch-af +++ b/graphics/plplot/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.5 2001/01/29 01:15:35 jtb Exp $ +$NetBSD: patch-af,v 1.6 2003/07/10 08:55:05 jtb Exp $ ---- cf/aclocal.m4.orig Thu Jan 11 07:20:36 2001 -+++ cf/aclocal.m4 -@@ -447,7 +447,7 @@ - define([ADD_TO_LIBS],[ - LIBSW="" - if test "$1" != "default"; then -- LIBSW="-L$1" -+ LIBSW="-Wl,-R$1 -L$1" - fi - for dir in $$4; do - if test "$1" = "$dir"; then +--- utils/Makefile.in.orig ++++ utils/Makefile.in +@@ -143,7 +143,7 @@ + LIBLTDL = @LIBLTDL@ + LIBOBJS = @LIBOBJS@ + LIBRARY_VERSION = @LIBRARY_VERSION@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lX11 + LIBTOOL = @LIBTOOL@ + LIB_DIR = @LIB_DIR@ + LIB_TAG = @LIB_TAG@ diff --git a/graphics/plplot/patches/patch-ag b/graphics/plplot/patches/patch-ag deleted file mode 100644 index 70ccab1b555..00000000000 --- a/graphics/plplot/patches/patch-ag +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2001/01/29 01:15:35 jtb Exp $ - ---- cf/initlib.in.orig Thu Jan 4 21:52:12 2001 -+++ cf/initlib.in -@@ -69,9 +69,9 @@ - - # These are what we link against. - --PLLIB_LDC = -L$(PLLIB_DIR) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK) --PLLIB_LDCXX = -L$(PLLIB_DIR) $(CXX_LINK) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK) --PLLIB_LDF = -L$(PLLIB_DIR) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK) -+PLLIB_LDC = -Wl,-R$(PLLIB_DIR) -L$(PLLIB_DIR) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK) -+PLLIB_LDCXX = -Wl,-R$(PLLIB_DIR) -L$(PLLIB_DIR) $(CXX_LINK) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK) -+PLLIB_LDF = -Wl,-R$(PLLIB_DIR) -L$(PLLIB_DIR) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK) - - # Header file dependencies for demos. - # Done this way to only pick up the dependency during development, and not diff --git a/graphics/plplot/patches/patch-ah b/graphics/plplot/patches/patch-ah deleted file mode 100644 index 991c19fa8d6..00000000000 --- a/graphics/plplot/patches/patch-ah +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2001/03/30 20:26:23 jtb Exp $ - ---- cf/sysloc.in.orig Mon Mar 26 08:10:40 2001 -+++ cf/sysloc.in -@@ -19,9 +19,9 @@ - # appended to them though. - - ITKLIBSTR=-litk --TKLIBSTR=-ltk -+TKLIBSTR=-ltk83 - ITCLLIBSTR=-litcl --TCLLIBSTR=-ltcl -+TCLLIBSTR=-ltcl83 - XLIBSTR=-lX11 - GDLIBSTR=-lgd - PNGLIBSTR=-lpng diff --git a/graphics/plplot/patches/patch-ai b/graphics/plplot/patches/patch-ai deleted file mode 100644 index 916e2c5ed4e..00000000000 --- a/graphics/plplot/patches/patch-ai +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2001/02/14 11:19:17 jtb Exp $ - ---- cf/pkg_cxx.in.orig Wed Feb 14 07:45:57 2001 -+++ cf/pkg_cxx.in -@@ -32,17 +32,17 @@ - # Targets - - install_cxx_includes: -- @-cd $(top_srcdir)/bindings/c++; $(CP) plstream.h $(INCLUDE_DIR) -+ -$(BSD_INSTALL_DATA) $(top_srcdir)/bindings/c++/plstream.h $(INCLUDE_DIR) - - install_cxx_demos: -- @-if test ! -d $(DEMOS_DIR)/c++; then mkdir -p $(DEMOS_DIR)/c++; fi; \ -+ -$(BSD_INSTALL_DATA_DIR) $(DEMOS_DIR)/c++; \ - $(LN) ../Makefile $(DEMOS_DIR)/c++; \ -- cd $(top_srcdir)/examples/c++; $(CP) *.cc $(DEMOS_DIR)/c++ -+ $(BSD_INSTALL_DATA) $(top_srcdir)/examples/c++/*.cc $(DEMOS_DIR)/c++ - - install_cxx: install_cxx_includes install_cxx_demos - - install_cxxlib: -- @-$(CP) $(CXXLIB_BASE)* $(LIB_DIR); \ -+ -$(BSD_INSTALL_DATA) $(CXXLIB_BASE)* $(LIB_DIR); \ - if test -r $(CXXLIB_BASE)$(LIB_TAG)$A; then \ - $(RANLIB) $(LIB_DIR)/$(CXXLIB_BASE)$(LIB_TAG)$A; \ - fi diff --git a/graphics/plplot/patches/patch-aj b/graphics/plplot/patches/patch-aj deleted file mode 100644 index 27b1e464c75..00000000000 --- a/graphics/plplot/patches/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2001/03/30 20:26:23 jtb Exp $ - ---- cf/pkg_f77.in.orig Sat Mar 3 12:47:38 2001 -+++ cf/pkg_f77.in -@@ -46,7 +46,7 @@ - - # Require dependency on FDEMOS_SOURCES because these are generated files - install_f77: $(FDEMOS_SOURCES) -- @-if test ! -d $(DEMOS_DIR)/f77; then mkdir -p $(DEMOS_DIR)/f77; fi; \ -+ -$(BSD_INSTALL_DATA_DIR) $(DEMOS_DIR)/f77; \ - $(LN) ../Makefile $(DEMOS_DIR)/f77; \ -- cd $(top_srcdir)/examples/f77; $(CP) *.f $(DEMOS_DIR)/f77 -+ $(BSD_INSTALL_DATA) $(top_srcdir)/examples/f77/*.f $(DEMOS_DIR)/f77 - diff --git a/graphics/plplot/patches/patch-ak b/graphics/plplot/patches/patch-ak deleted file mode 100644 index 3c4cc5cdb23..00000000000 --- a/graphics/plplot/patches/patch-ak +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2001/03/30 20:26:23 jtb Exp $ - ---- cf/pkg_tcl.in.orig Wed Mar 7 16:18:11 2001 -+++ cf/pkg_tcl.in -@@ -54,32 +54,31 @@ - @$(MAKEINDEX) - - install_pltcl: -- @-if test $(SHARED) = 1; then \ -+ -if test $(SHARED) = 1; then \ - $(LDC) $(LDC_FLAGS) pltcl$O $(LIB_INSTALL) \ - -o pltcl$E $(LDC_LIBS) $(INSTALL_RPATH); \ - fi; \ -- strip pltcl$E; $(CP) pltcl$E $(BIN_DIR) -+ $(BSD_INSTALL_PROGRAM) pltcl$E $(BIN_DIR) - - install_tcl_index: -- @-if test ! -d $(TCL_DIR); then mkdir -p $(TCL_DIR); fi; \ -- $(CP) tclIndex $(TCL_DIR) -+ -$(BSD_INSTALL_DATA_DIR) $(TCL_DIR); \ -+ $(BSD_INSTALL_DATA) tclIndex $(TCL_DIR) - - install_tcl_includes: -- @-cd $(top_srcdir)/bindings/tcl; \ -- $(CP) pltcl.h $(INCLUDE_DIR) -+ -$(BSD_INSTALL_DATA) $(top_srcdir)/bindings/tcl/pltcl.h $(INCLUDE_DIR) - - install_tcl_demos: -- @-if test ! -d $(DEMOS_DIR)/tcl; then mkdir -p $(DEMOS_DIR)/tcl; fi; \ -- cd $(top_srcdir)/examples/tcl; $(CP) $(TCL_DEMOS) $(DEMOS_DIR)/tcl -+ -$(BSD_INSTALL_DATA_DIR) $(DEMOS_DIR)/tcl; \ -+ cd $(top_srcdir)/examples/tcl; $(BSD_INSTALL_DATA) $(TCL_DEMOS) $(DEMOS_DIR)/tcl -+ - - install_tcl: install_pltcl install_tcl_index install_tcl_includes install_tcl_demos - - install_mat_includes: -- @-cd $(top_srcdir)/bindings/tcl; \ -- $(CP) tclMatrix.h $(INCLUDE_DIR) -+ -$(BSD_INSTALL_DATA) $(top_srcdir)/bindings/tcl/tclMatrix.h $(INCLUDE_DIR) - - install_matlib: -- @-$(CP) $(MATLIB_BASE)* $(LIB_DIR); \ -+ -$(BSD_INSTALL_DATA) $(MATLIB_BASE)* $(LIB_DIR); \ - if test -r $(MATLIB_BASE)$(LIB_TAG)$A; then \ - $(RANLIB) $(LIB_DIR)/$(MATLIB_BASE)$(LIB_TAG)$A; \ - fi diff --git a/graphics/plplot/patches/patch-al b/graphics/plplot/patches/patch-al deleted file mode 100644 index a7d0efc89df..00000000000 --- a/graphics/plplot/patches/patch-al +++ /dev/null @@ -1,40 +0,0 @@ -$NetBSD: patch-al,v 1.2 2001/02/14 11:19:17 jtb Exp $ - ---- cf/pkg_tk.in.orig Wed Feb 14 07:53:54 2001 -+++ cf/pkg_tk.in -@@ -22,28 +22,27 @@ - # Targets - - install_plserver: -- @-if test ! -d $(TCL_DIR); then mkdir -p $(TCL_DIR); fi; \ -+ -$(BSD_INSTALL_DATA_DIR) $(TCL_DIR); \ - if test $(SHARED) = 1; then \ - $(LDC) $(LDC_FLAGS) plserver$O $(LIB_INSTALL) \ - -o plserver$E $(LDC_LIBS) $(INSTALL_RPATH); \ - fi; \ -- strip plserver$E; \ -- $(CP) plserver$E $(BIN_DIR) -+ $(BSD_INSTALL_PROGRAM) plserver$E $(BIN_DIR) - - - install_tk_scripts: -- @-cd $(top_srcdir)/bindings/tk; \ -- $(CP) pltk.h $(INCLUDE_DIR); \ -- $(CP) *.itk *.tcl *.pal $(TCL_DIR) -+ -cd $(top_srcdir)/bindings/tk; \ -+ $(BSD_INSTALL_DATA) pltk.h $(INCLUDE_DIR); \ -+ $(BSD_INSTALL_DATA) *.itk *.tcl *.pal $(TCL_DIR) - - # N.B. this target depends on install_tcl_demos to work properly because the - # symbolic links below are set up by real files in tcl/x??.tcl that must - # exist. However, AWI hesitates to put in the dependence because it might - # just simply mean the rules for install_tcl_demos got executed twice. - install_tk_demos: -- @-if test ! -d $(DEMOS_DIR)/tk; then mkdir -p $(DEMOS_DIR)/tk; fi; \ -+ -$(BSD_INSTALL_DATA_DIR) $(DEMOS_DIR)/tk; \ - $(LN) ../Makefile $(DEMOS_DIR)/tk; \ -- cd $(top_srcdir)/examples/tk; $(CP) $(TK_DEMOS) $(DEMOS_DIR)/tk ; \ -+ cd $(top_srcdir)/examples/tk; $(BSD_INSTALL_DATA) $(TK_DEMOS) $(DEMOS_DIR)/tk ; \ - cd $(DEMOS_DIR)/tk ; \ - for filename in ../tcl/x??.tcl ; \ - do \ |