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.

14 files changed, 240 insertions, 46 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 90aa8d4fe2d..37058734c83 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.243 2003/04/29 08:19:25 rh Exp $
+# $NetBSD: Makefile,v 1.244 2003/06/07 17:39:23 jschauma Exp $
 #
 
 COMMENT=	Graphics tools and libraries
@@ -95,6 +95,7 @@ SUBDIR+=	gnome-iconedit
 SUBDIR+=	gnome-pixmaps
 SUBDIR+=	gnome2-pixmaps
 SUBDIR+=	gnuplot
+SUBDIR+=	gnuplot-nox11
 SUBDIR+=	gpaint
 SUBDIR+=	gphoto
 SUBDIR+=	gphoto2
@@ -180,6 +181,7 @@ SUBDIR+=	ploticus
 SUBDIR+=	ploticus-examples
 SUBDIR+=	plotmtv
 SUBDIR+=	plotutils
+SUBDIR+=	plotutils-nox11
 SUBDIR+=	plplot
 SUBDIR+=	png
 SUBDIR+=	png2html
diff --git a/graphics/gnuplot-nox11/DESCR b/graphics/gnuplot-nox11/DESCR
new file mode 100644
index 00000000000..da8d2d54d48
--- /dev/null
+++ b/graphics/gnuplot-nox11/DESCR
@@ -0,0 +1,12 @@
+Gnuplot is a command-line driven interactive function plotting utility
+for UNIX, MSDOS, and VMS platforms.  The software is copyrighted but
+freely distributed (i.e., you don't have to pay for it).  It was
+originally intended as graphical program which would allow scientists
+and students to visualize mathematical functions and data.  Gnuplot
+supports many different types of terminals, plotters, and printers
+(including many color devices, and pseudo-devices like LaTeX) and is
+easily extensible to include new devices.  [ The "GNU" in gnuplot is
+NOT related to the Free Software Foundation, the naming is just a
+coincidence (and a long story). Thus gnuplot is not covered by the Gnu
+copyleft, but rather by its own copyright statement, included in all
+source code files.]
diff --git a/graphics/gnuplot-nox11/Makefile b/graphics/gnuplot-nox11/Makefile
new file mode 100644
index 00000000000..8b2a0a7ff24
--- /dev/null
+++ b/graphics/gnuplot-nox11/Makefile
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1 2003/06/07 17:39:25 jschauma Exp $
+#
+
+DISTNAME=		gnuplot-3.7.3
+SVR4_PKGNAME=		gplot
+PKGNAME=                ${DISTNAME:C/-/-nox11-/}
+CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
+			ftp://ftp.ucc.ie/pub/gnuplot/ \
+			ftp://ftp.cc.monash.edu.au/pub/gnuplot/
+
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://sourceforge.net/projects/gnuplot/
+COMMENT=		gnuplot is a nice plotting utility
+
+CONFLICTS+=             ${DISTNAME:C/-[0-9].*//}
+
+USE_BUILDLINK2=		YES
+# because of missing rl_complete_with_tilde_expansion and rl_terminal_name
+USE_GNU_READLINE=	YES
+GNU_CONFIGURE=		YES
+
+CONFIGURE_ARGS+=	--with-pdf
+CONFIGURE_ARGS+=	--with-plot=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
+CONFIGURE_ARGS+=	--without-x
+
+.include "../../devel/readline/buildlink2.mk"
+.include "../../graphics/plotutils-nox11/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../print/pdflib/buildlink2.mk"
+.include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnuplot-nox11/PLIST b/graphics/gnuplot-nox11/PLIST
new file mode 100644
index 00000000000..67f67a0cfbe
--- /dev/null
+++ b/graphics/gnuplot-nox11/PLIST
@@ -0,0 +1,7 @@
+@comment $NetBSD: PLIST,v 1.1 2003/06/07 17:39:25 jschauma Exp $
+bin/gnuplot
+@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gnuplot.info
+info/gnuplot.info
+@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gnuplot.info
+man/man1/gnuplot.1
+share/gnuplot.gih
diff --git a/graphics/gnuplot-nox11/distinfo b/graphics/gnuplot-nox11/distinfo
new file mode 100644
index 00000000000..7e177b7b89d
--- /dev/null
+++ b/graphics/gnuplot-nox11/distinfo
@@ -0,0 +1,4 @@
+$NetBSD: distinfo,v 1.1 2003/06/07 17:39:25 jschauma Exp $
+
+SHA1 (gnuplot-3.7.3.tar.gz) = 8e077efa1b6804020adfce62b4c5a1c391ca3d2d
+Size (gnuplot-3.7.3.tar.gz) = 1418889 bytes
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index f230f1b2b5a..fa78f9fd846 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,38 +1,30 @@
-# $NetBSD: Makefile,v 1.20 2003/06/06 14:41:29 jschauma Exp $
+# $NetBSD: Makefile,v 1.21 2003/06/07 17:39:25 jschauma Exp $
 #
 
-DISTNAME=	gnuplot-3.7.3
-SVR4_PKGNAME=	gplot
-CATEGORIES=	graphics x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
-		ftp://ftp.ucc.ie/pub/gnuplot/ \
-		ftp://ftp.cc.monash.edu.au/pub/gnuplot/
+DISTNAME=		gnuplot-3.7.3
+SVR4_PKGNAME=		gplot
+PKGREVISION=		1
+CATEGORIES=		graphics x11
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gnuplot/} \
+			ftp://ftp.ucc.ie/pub/gnuplot/ \
+			ftp://ftp.cc.monash.edu.au/pub/gnuplot/
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://sourceforge.net/projects/gnuplot/
-COMMENT=	gnuplot is a nice plotting utility
+MAINTAINER=		root@garbled.net
+HOMEPAGE=		http://sourceforge.net/projects/gnuplot/
+COMMENT=		gnuplot is a nice plotting utility
 
+CONFLICTS+=             ${DISTNAME:C/-[0-9].*//}
+
+GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 # because of missing rl_complete_with_tilde_expansion and rl_terminal_name
 USE_GNU_READLINE=	YES
-GNU_CONFIGURE=		YES
+USE_X11=		YES
 
 CONFIGURE_ARGS+=	--with-pdf
 CONFIGURE_ARGS+=	--with-plot=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if exists(${X11BASE})
-PKGNAME=                ${DISTNAME:C/-/-x11-/}
-CONFLICTS+=             ${DISTNAME:C/-[0-9].*//}
-USE_X11=		YES
-PLIST_SUBST+=		XCOMM=""
-.else
-CONFLICTS+=             ${DISTNAME:C/-[0-9].*/-x11/}
-PLIST_SUBST+=		XCOMM="@comment "
-.endif
-
 .include "../../devel/readline/buildlink2.mk"
 .include "../../graphics/plotutils/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index 5329e29f97f..f01575710d7 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2003/06/04 21:34:08 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/06/07 17:39:25 jschauma Exp $
 bin/gnuplot
-${XCOMM}bin/gnuplot_x11
+bin/gnuplot_x11
 @unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gnuplot.info
 info/gnuplot.info
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/gnuplot.info
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
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 858232d2aa9..c8ad4f828fe 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2003/06/06 14:39:06 jschauma Exp $
+# $NetBSD: Makefile,v 1.25 2003/06/07 17:39:24 jschauma Exp $
 #
 
 DISTNAME=		plotutils-2.4.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel graphics x11
 MASTER_SITES=		${MASTER_SITE_GNU:=plotutils/}
 
@@ -10,27 +10,18 @@ MAINTAINER=		dmcmahill@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/plotutils/plotutils.html
 COMMENT=		Programs and library for plotting scientific data
 
-USE_BUILDLINK2=		yes
-USE_GCC_SHLIB=		yes
+CONFLICTS+=		${DISTNAME:C/-[0-9].*/-nox11/}
 
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		YES
+USE_GCC_SHLIB=		YES
+USE_X11=		YES
+
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-libplotter
 
-USE_LIBTOOL=		yes
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig
 
-.include "../../mk/bsd.prefs.mk"
-
-# this package works with and without X11, but if X11 is present, we need the
-# necessary compile and ld flags
-.if exists(${X11BASE})
-PKGNAME=		${DISTNAME:C/-/-x11-/}
-CONFLICTS+=		${DISTNAME:C/-[0-9].*//}
-USE_X11=                YES
-.else
-CONFLICTS+=		${DISTNAME:C/-[0-9].*/-x11/}
-.endif
-
 .include "../../graphics/png/buildlink2.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plotutils/buildlink2.mk b/graphics/plotutils/buildlink2.mk
index a9dad08f3ae..3cf6e12ff97 100644
--- a/graphics/plotutils/buildlink2.mk
+++ b/graphics/plotutils/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/01/25 12:06:27 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.2 2003/06/07 17:39:24 jschauma Exp $
 
 .if !defined(PLOTUTILS_BUILDLINK2_MK)
 PLOTUTILS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		plotutils
-BUILDLINK_DEPENDS.plotutils?=	plotutils>=2.4.1nb1
+BUILDLINK_DEPENDS.plotutils?=	plotutils>=2.4.1nb2
 BUILDLINK_PKGSRCDIR.plotutils?=	../../graphics/plotutils
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.plotutils=plotutils