Split plotutils and gnuplot into '<pkgname>' and '<pkgname>-nox11' each

(alternatively, we could have renamed one to '<pkgname>-x11', but for the
element of least surprise, the default remains x11 enabled).
This will work much better than the previous attempt to build two packages
from one Makefile, which wasn't all thought out wrt to dependencies, buildlinks etc.
Bump PKGREVISION on plotutils and gnuplot for this.

5 files changed, 153 insertions, 0 deletions

diff --git a/graphics/plotutils-nox11/DESCR b/graphics/plotutils-nox11/DESCR
new file mode 100644
index 00000000000..209c27f1a50
--- /dev/null
+++ b/graphics/plotutils-nox11/DESCR
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 00000000000..b9c39a56c3c
--- /dev/null
+++ b/graphics/plotutils-nox11/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2003/06/07 17:39:24 jschauma Exp $
+#
+
+DISTNAME=		plotutils-2.4.1
+PKGNAME=		${DISTNAME:C/-/-nox11-/}
+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
+
+CONFLICTS+=		${DISTNAME:C/-[0-9].*//}
+
+USE_BUILDLINK2=		yes
+USE_GCC_SHLIB=		yes
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-libplotter
+CONFIGURE_ARGS+=	--without-x
+
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig
+
+.include "../../graphics/png/buildlink2.mk"
+.include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils-nox11/PLIST b/graphics/plotutils-nox11/PLIST
new file mode 100644
index 00000000000..247a1c4fbe8
--- /dev/null
+++ b/graphics/plotutils-nox11/PLIST
@@ -0,0 +1,76 @@
+@comment $NetBSD: PLIST,v 1.1 2003/06/07 17:39:24 jschauma Exp $
+bin/double
+bin/graph
+bin/ode
+bin/pic2plot
+bin/plot
+bin/plotfont
+bin/spline
+bin/tek2plot
+include/plot.h
+include/plotcompat.h
+include/plotter.h
+lib/libplot.a
+lib/libplot.la
+lib/libplot.so
+lib/libplot.so.4
+lib/libplot.so.4.1
+lib/libplotter.a
+lib/libplotter.la
+lib/libplotter.so
+lib/libplotter.so.4
+lib/libplotter.so.4.0
+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/demo-page
+share/libplot/h-demo.c
+share/libplot/h-fonts.doc
+share/libplot/h-glyphs.doc
+share/libplot/hershey.bib
+share/libplot/kana.doc
+share/libplot/kanji.doc
+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
+@unexec ${INSTALL_INFO} --delete %D/info/plotutils.info %D/info/dir
+info/plotutils.info
+@exec ${INSTALL_INFO} %D/info/plotutils.info %D/info/dir
+@dirrm share/libplot
+@dirrm share/ode
+@dirrm share/pic2plot
+@dirrm share/tek2plot
diff --git a/graphics/plotutils-nox11/buildlink2.mk b/graphics/plotutils-nox11/buildlink2.mk
new file mode 100644
index 00000000000..c51247a2bd1
--- /dev/null
+++ b/graphics/plotutils-nox11/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/06/07 17:39:24 jschauma Exp $
+
+.if !defined(PLOTUTILS_BUILDLINK2_MK)
+PLOTUTILS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		plotutils-nox11
+BUILDLINK_DEPENDS.plotutils-nox11?=	plotutils-nox11>=2.4.1
+BUILDLINK_PKGSRCDIR.plotutils-nox11?=	../../graphics/plotutils-nox11
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.plotutils=plotutils
+BUILDLINK_PREFIX.plotutils-nox11_DEFAULT=	${PREFIX}
+BUILDLINK_FILES.plotutils-nox11+=	include/plot.h
+BUILDLINK_FILES.plotutils-nox11+=	include/plotcompat.h
+BUILDLINK_FILES.plotutils-nox11+=	include/plotter.h
+BUILDLINK_FILES.plotutils-nox11+=	lib/libplot.*
+BUILDLINK_FILES.plotutils-nox11+=	lib/libplotter.*
+
+.include "../../graphics/png/buildlink2.mk"
+
+BUILDLINK_TARGETS+=	plotutils-nox11-buildlink
+
+plotutils-nox11-buildlink: _BUILDLINK_USE
+
+.endif	# PLOTUTILS_BUILDLINK2_MK
diff --git a/graphics/plotutils-nox11/distinfo b/graphics/plotutils-nox11/distinfo
new file mode 100644
index 00000000000..4df298e6215
--- /dev/null
+++ b/graphics/plotutils-nox11/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1 2003/06/07 17:39:24 jschauma Exp $
+
+SHA1 (plotutils-2.4.1.tar.gz) = e39ce89048a578683ad76f3284bb79adfb0adc22
+Size (plotutils-2.4.1.tar.gz) = 3316030 bytes