diff options
| -rw-r--r-- | graphics/plotutils-nox11/DESCR | 22 | ||||
| -rw-r--r-- | graphics/plotutils-nox11/Makefile | 32 | ||||
| -rw-r--r-- | graphics/plotutils-nox11/PLIST | 61 | ||||
| -rw-r--r-- | graphics/plotutils-nox11/buildlink3.mk | 15 | ||||
| -rw-r--r-- | graphics/plotutils/Makefile | 33 | ||||
| -rw-r--r-- | graphics/plotutils/buildlink3.mk | 8 | ||||
| -rw-r--r-- | graphics/plotutils/options.mk | 17 |
7 files changed, 38 insertions, 150 deletions
diff --git a/graphics/plotutils-nox11/DESCR b/graphics/plotutils-nox11/DESCR deleted file mode 100644 index 209c27f1a50..00000000000 --- a/graphics/plotutils-nox11/DESCR +++ /dev/null @@ -1,22 +0,0 @@ -The GNU plotutils package contains programs for plotting scientific data, -and a function library for drawing vector graphics and doing vector graphics -animations. The package includes: -* GNU graph, which does two-dimensional plotting in real time. It's designed - for command-line use, and can be used in shell scripts. It produces output - on an X Window System display, in Illustrator format, in Postscript format, - in PCL 5 format, in HP-GL/2 format, in Fig format (editable with the xfig - drawing editor), in Tektronix format, or in GNU Metafile format. Output in - Postscript format may be edited with the idraw drawing editor. -* GNU plot, which translates GNU Metafile format to any of the other formats. -* GNU tek2plot, for translating legacy Tektronix data to any of the above - formats. -* GNU plotfont, for displaying character maps of the fonts that are available - in the above formats. -* GNU spline, which does spline interpolation of data. -* GNU ode, which numerically integrates a system consisting of one or more - ordinary differential equations. - -The programs graph, plot, tek2plot, and plotfont are based on GNU libplot, a C -function library for device-independent two-dimensional vector graphics. GNU -libplot is compatible with the traditional Unix libplot library, but is much -more powerful. It is installed as part of the package. diff --git a/graphics/plotutils-nox11/Makefile b/graphics/plotutils-nox11/Makefile deleted file mode 100644 index adbe6c6acba..00000000000 --- a/graphics/plotutils-nox11/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $NetBSD: Makefile,v 1.22 2011/01/13 13:36:11 wiz Exp $ -# - -DISTNAME= plotutils-2.6 -PKGNAME= ${DISTNAME:C/-/-nox11-/} -PKGREVISION= 2 -CATEGORIES= devel graphics -MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} - -MAINTAINER= dmcmahill@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html -COMMENT= Programs and library for plotting scientific data - -PKG_DESTDIR_SUPPORT= user-destdir - -CONFLICTS+= plotutils-[0-9]* - -DISTINFO_FILE= ${.CURDIR}/../../graphics/plotutils/distinfo -PATCHDIR= ${.CURDIR}/../../graphics/plotutils/patches - -USE_LANGUAGES= c c++ -USE_TOOLS+= lex - -INFO_FILES= yes -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-libplotter -CONFIGURE_ARGS+= --without-x -MAKE_JOBS_SAFE= no - -.include "../../graphics/png/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/graphics/plotutils-nox11/PLIST b/graphics/plotutils-nox11/PLIST deleted file mode 100644 index 3187a83f1e2..00000000000 --- a/graphics/plotutils-nox11/PLIST +++ /dev/null @@ -1,61 +0,0 @@ -@comment $NetBSD: PLIST,v 1.7 2010/06/30 10:24:37 asau Exp $ -bin/double -bin/graph -bin/hersheydemo -bin/ode -bin/pic2plot -bin/plot -bin/plotfont -bin/spline -bin/tek2plot -include/plot.h -include/plotcompat.h -include/plotter.h -info/plotutils.info -lib/libplot.la -lib/libplotter.la -man/man1/ode.1 -man/man1/plot.1 -man/man1/plotfont.1 -man/man1/spline.1 -man/man1/tek2plot.1 -share/libplot/README -share/libplot/colors.txt -share/libplot/h-fonts.txt -share/libplot/h-glyphs.txt -share/libplot/hershey.bib -share/libplot/kana.txt -share/libplot/kanji.txt -share/ode/README -share/ode/atwoods.ode -share/ode/bead.ode -share/ode/chem.ode -share/ode/coupled.ode -share/ode/ddho.ode -share/ode/dynamo.ode -share/ode/henon.ode -share/ode/limitcycle.ode -share/ode/lorenz.ode -share/ode/lunar.sh -share/ode/orbit.ode -share/ode/population.ode -share/ode/qcd.ode -share/ode/rumor.ode -share/ode/soliton.ode -share/ode/viscous.ode -share/pic2plot/README -share/pic2plot/macros.pic -share/pic2plot/pic0.ps -share/pic2plot/pic1.ps -share/pic2plot/picmacros.ps -share/tek2plot/README -share/tek2plot/aitest.tek -share/tek2plot/dmerc.tek -share/tek2plot/fotest.tek -share/tek2plot/imtesth.tek -share/tek2plot/karney.tek -share/tek2plot/ocpred.tek -share/tek2plot/scale.tek -share/tek2plot/skymap.tek -share/tek2plot/skymap2.tek -share/tek2plot/usmap.tek diff --git a/graphics/plotutils-nox11/buildlink3.mk b/graphics/plotutils-nox11/buildlink3.mk deleted file mode 100644 index 5ae895ba817..00000000000 --- a/graphics/plotutils-nox11/buildlink3.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2011/01/13 13:36:11 wiz Exp $ - -BUILDLINK_TREE+= plotutils-nox11 - -.if !defined(PLOTUTILS_NOX11_BUILDLINK3_MK) -PLOTUTILS_NOX11_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.plotutils-nox11+= plotutils-nox11>=2.4.1 -BUILDLINK_ABI_DEPENDS.plotutils-nox11?= plotutils-nox11>=2.6nb2 -BUILDLINK_PKGSRCDIR.plotutils-nox11?= ../../graphics/plotutils-nox11 - -.include "../../graphics/png/buildlink3.mk" -.endif # PLOTUTILS_NOX11_BUILDLINK3_MK - -BUILDLINK_TREE+= -plotutils-nox11 diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index 7c51d93c756..73eb291859d 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -1,34 +1,29 @@ -# $NetBSD: Makefile,v 1.46 2011/01/13 13:36:05 wiz Exp $ -# +# $NetBSD: Makefile,v 1.47 2011/02/08 13:08:06 adam Exp $ -DISTNAME= plotutils-2.6 -PKGREVISION= 2 -CATEGORIES= devel graphics x11 -MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} +DISTNAME= plotutils-2.6 +PKGREVISION= 3 +CATEGORIES= devel graphics +MASTER_SITES= ${MASTER_SITE_GNU:=plotutils/} -MAINTAINER= dmcmahill@NetBSD.org -HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html -COMMENT= Programs and library for plotting scientific data -LICENSE= gnu-gpl-v3 +MAINTAINER= dmcmahill@NetBSD.org +HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html +COMMENT= Programs and library for plotting scientific data +LICENSE= gnu-gpl-v3 -CONFLICTS+= plotutils-nox11-[0-9]* +CONFLICTS+= plotutils-nox11-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c c++ -USE_TOOLS+= lex yacc - -INFO_FILES= yes USE_LIBTOOL= yes +USE_TOOLS+= lex yacc GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-libplotter MAKE_JOBS_SAFE= no +INFO_FILES= yes + +.include "options.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../x11/libXaw/buildlink3.mk" -.include "../../x11/libXext/buildlink3.mk" -.include "../../x11/libXp/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk index 582e31c39bc..ab8e8d308f5 100644 --- a/graphics/plotutils/buildlink3.mk +++ b/graphics/plotutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2011/01/13 13:36:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2011/02/08 13:08:06 adam Exp $ BUILDLINK_TREE+= plotutils @@ -9,11 +9,17 @@ BUILDLINK_API_DEPENDS.plotutils+= plotutils>=2.4.1nb2 BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.6nb2 BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils +pkgbase := plotutils +.include "../../mk/pkg-build-options.mk" + .include "../../graphics/png/buildlink3.mk" + +.if !empty(PKG_BUILD_OPTIONS.plotutils:Mx11) .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +.endif .endif # PLOTUTILS_BUILDLINK3_MK BUILDLINK_TREE+= -plotutils diff --git a/graphics/plotutils/options.mk b/graphics/plotutils/options.mk new file mode 100644 index 00000000000..ebf2a868744 --- /dev/null +++ b/graphics/plotutils/options.mk @@ -0,0 +1,17 @@ +# $NetBSD: options.mk,v 1.1 2011/02/08 13:08:06 adam Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.plotutils +PKG_SUPPORTED_OPTIONS= x11 +PKG_SUGGESTED_OPTIONS= x11 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mx11) +.include "../../x11/libXaw/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-x +.endif |