Initial import of gri.

Gri is a language for scientific graphics applications.  By 'language'
I mean that it is a command-driven application, as opposed to a
click/point application.  It is analogous to latex or tex, and shares
the property that extensive power is the reward for tolerating a
modest learning curve.  Gri output is in industry-standard PostScript,
suitable for incorporation in documents prepared by various text
processors.

Gri can make x-y graphs, contour-graphs, and image graphs.  In
addition to high-level capabilities, it has enough low-level
capabilities to allow users to achieve a high degree of customization.
Precise control is extended to all aspects of drawing, including
line-widths, colors, and fonts.  Text includes a subset of the tex
language, so that it is easy to incorporate Greek letters and
mathematical symbols in labels.

9 files changed, 794 insertions, 0 deletions

diff --git a/graphics/gri/DESCR b/graphics/gri/DESCR
new file mode 100644
index 00000000000..4776ae5efb1
--- /dev/null
+++ b/graphics/gri/DESCR
@@ -0,0 +1,15 @@
+Gri is a language for scientific graphics applications.  By 'language'
+I mean that it is a command-driven application, as opposed to a
+click/point application.  It is analogous to latex or tex, and shares
+the property that extensive power is the reward for tolerating a
+modest learning curve.  Gri output is in industry-standard PostScript,
+suitable for incorporation in documents prepared by various text
+processors.
+
+Gri can make x-y graphs, contour-graphs, and image graphs.  In
+addition to high-level capabilities, it has enough low-level
+capabilities to allow users to achieve a high degree of customization.
+Precise control is extended to all aspects of drawing, including
+line-widths, colors, and fonts.  Text includes a subset of the tex
+language, so that it is easy to incorporate Greek letters and
+mathematical symbols in labels.
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
new file mode 100644
index 00000000000..48b9148d081
--- /dev/null
+++ b/graphics/gri/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/05/03 23:45:10 jtb Exp $
+
+DISTNAME=		gri-2.8.7
+CATEGORIES=		graphics
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gri/}
+EXTRACT_SUFX=		.tgz
+
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://gri.sourceforge.net
+COMMENT=		language for scientific graphics applications
+
+BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
+BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
+BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
+BUILD_DEPENDS+=		ghostscript-[6-9]*:../../print/ghostscript
+
+GNU_CONFIGURE=		# defined
+USE_GMAKE=		# defined
+USE_BUILDLINK_ONLY= 	# defined
+INFO_FILES=		gri.info
+REPLACE_PERL=		${WRKSRC}/gri_merge ${WRKSRC}/gri_unpage
+
+pre-configure:
+	cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
+
+.include "../../devel/netcdf/buildlink.mk"
+.include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gri/PLIST b/graphics/gri/PLIST
new file mode 100644
index 00000000000..c140e162d58
--- /dev/null
+++ b/graphics/gri/PLIST
@@ -0,0 +1,343 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/03 23:45:14 jtb Exp $
+bin/gri
+bin/${PKGNAME}
+bin/gri_merge
+bin/gri_unpage
+@unexec ${INSTALL_INFO} --delete %D/info/gri.info %D/info/dir
+info/gri.info
+info/gri.info-1
+info/gri.info-10
+info/gri.info-11
+info/gri.info-12
+info/gri.info-13
+info/gri.info-2
+info/gri.info-3
+info/gri.info-4
+info/gri.info-5
+info/gri.info-6
+info/gri.info-7
+info/gri.info-8
+info/gri.info-9
+@exec   ${INSTALL_INFO}          %D/info/gri.info %D/info/dir
+share/doc/html/gri/AboutGriMode.html
+share/doc/html/gri/Acknowledgments.html
+share/doc/html/gri/AdjustingCharacterPosition.html
+share/doc/html/gri/Archiving.html
+share/doc/html/gri/Assert.html
+share/doc/html/gri/AxisLabels.html
+share/doc/html/gri/AxisLength.html
+share/doc/html/gri/AxisPosition.html
+share/doc/html/gri/AxisRange.html
+share/doc/html/gri/AxisScaling.html
+share/doc/html/gri/Beos-install.html
+share/doc/html/gri/BinaryOperators.html
+share/doc/html/gri/BoxPlots.html
+share/doc/html/gri/Bugs.html
+share/doc/html/gri/BuiltinIndex.html
+share/doc/html/gri/Cd.html
+share/doc/html/gri/ChangeableCommandArguments.html
+share/doc/html/gri/Close.html
+share/doc/html/gri/ColumnAlgebra.html
+share/doc/html/gri/CombiningColumns.html
+share/doc/html/gri/CommandIndex.html
+share/doc/html/gri/CommandSyntax.html
+share/doc/html/gri/Commands.html
+share/doc/html/gri/CommandsOverview.html
+share/doc/html/gri/ComplicatedNewCommand.html
+share/doc/html/gri/ConceptIndex.html
+share/doc/html/gri/ContourPlots.html
+share/doc/html/gri/ContouringExample.html
+share/doc/html/gri/Convert.html
+share/doc/html/gri/Create.html
+share/doc/html/gri/Debug.html
+share/doc/html/gri/Debugging.html
+share/doc/html/gri/Defaults.html
+share/doc/html/gri/Delete.html
+share/doc/html/gri/Development_Version.html
+share/doc/html/gri/Differentiate.html
+share/doc/html/gri/DiscussionGroup.html
+share/doc/html/gri/Draw.html
+share/doc/html/gri/Emacs.html
+share/doc/html/gri/Emacs4.html
+share/doc/html/gri/Emacs5.html
+share/doc/html/gri/EmacsFeatures.html
+share/doc/html/gri/EmbeddedSynonyms.html
+share/doc/html/gri/Environment.html
+share/doc/html/gri/ErrorMessages.html
+share/doc/html/gri/Examples.html
+share/doc/html/gri/Expecting.html
+share/doc/html/gri/Extras.html
+share/doc/html/gri/FAQ.html
+share/doc/html/gri/FEM-tiny.png
+share/doc/html/gri/FEM.html
+share/doc/html/gri/FEM.png
+share/doc/html/gri/FancyPlot.html
+share/doc/html/gri/Filter.html
+share/doc/html/gri/Flip.html
+share/doc/html/gri/Fonts.html
+share/doc/html/gri/GetEnv.html
+share/doc/html/gri/GettingMoreControl.html
+share/doc/html/gri/GriModeCodeFragments.html
+share/doc/html/gri/GriModeCommandNames.html
+share/doc/html/gri/GriModeCompletionVarSyn.html
+share/doc/html/gri/GriModeCompletions.html
+share/doc/html/gri/GriModeCompletions2.html
+share/doc/html/gri/GriModeEditing.html
+share/doc/html/gri/GriModeScreenshots.html
+share/doc/html/gri/GriModeUserCommands.html
+share/doc/html/gri/GriModeUserInterface.html
+share/doc/html/gri/HandlingData.html
+share/doc/html/gri/HandlingHeaders.html
+share/doc/html/gri/Heal.html
+share/doc/html/gri/Help.html
+share/doc/html/gri/Hints.html
+share/doc/html/gri/History.html
+share/doc/html/gri/If.html
+share/doc/html/gri/IfStatements.html
+share/doc/html/gri/Ignore.html
+share/doc/html/gri/IgnoringColumns.html
+share/doc/html/gri/ImageExample.html
+share/doc/html/gri/ImageWithContours.html
+share/doc/html/gri/Images.html
+share/doc/html/gri/Input.html
+share/doc/html/gri/Insert.html
+share/doc/html/gri/Installation.html
+share/doc/html/gri/InstallingGriMode.html
+share/doc/html/gri/Interpolate.html
+share/doc/html/gri/Introduction.html
+share/doc/html/gri/InvokingGri.html
+share/doc/html/gri/KillingBugs.html
+share/doc/html/gri/KnownBugs.html
+share/doc/html/gri/Legend.html
+share/doc/html/gri/License.html
+share/doc/html/gri/List.html
+share/doc/html/gri/ListOfGriCommands.html
+share/doc/html/gri/LogAndLinearAxes.html
+share/doc/html/gri/LongCommandLines.html
+share/doc/html/gri/Loops.html
+share/doc/html/gri/Ls.html
+share/doc/html/gri/MajorGriModeCommands.html
+share/doc/html/gri/ManipulatingColumns.html
+share/doc/html/gri/Mask.html
+share/doc/html/gri/MathematicalText.html
+share/doc/html/gri/Mathematics.html
+share/doc/html/gri/MissingValues.html
+share/doc/html/gri/New.html
+share/doc/html/gri/NewCommands.html
+share/doc/html/gri/Newpage.html
+share/doc/html/gri/NonEnglishText.html
+share/doc/html/gri/OnlineHelp.html
+share/doc/html/gri/Open.html
+share/doc/html/gri/OperatingSystem.html
+share/doc/html/gri/PDFDiagram.html
+share/doc/html/gri/ParsingSynonyms.html
+share/doc/html/gri/PenColor.html
+share/doc/html/gri/Plans.html
+share/doc/html/gri/PlottingSeveralColumns.html
+share/doc/html/gri/Polygons.html
+share/doc/html/gri/PostScript.html
+share/doc/html/gri/Programming.html
+share/doc/html/gri/PurposeOfSynonyms.html
+share/doc/html/gri/Pwd.html
+share/doc/html/gri/Query.html
+share/doc/html/gri/Quit.html
+share/doc/html/gri/RPNexamples.html
+share/doc/html/gri/Read.html
+share/doc/html/gri/Regress.html
+share/doc/html/gri/Reorder.html
+share/doc/html/gri/ReportingBugs.html
+share/doc/html/gri/Rescale.html
+share/doc/html/gri/Resize.html
+share/doc/html/gri/ResourceFile.html
+share/doc/html/gri/Return.html
+share/doc/html/gri/ReversePolishMath.html
+share/doc/html/gri/Rewind.html
+share/doc/html/gri/RpnFunction.html
+share/doc/html/gri/Rpnfunction.html
+share/doc/html/gri/RunningMeans.html
+share/doc/html/gri/ScreenShot1.html
+share/doc/html/gri/ScreenShot2.html
+share/doc/html/gri/ScreenShot3.html
+share/doc/html/gri/ScreenShot4.html
+share/doc/html/gri/Set.html
+share/doc/html/gri/Show.html
+share/doc/html/gri/SimpleExample.html
+share/doc/html/gri/SimpleExampleRevisited.html
+share/doc/html/gri/SimpleNewCommand.html
+share/doc/html/gri/Skip.html
+share/doc/html/gri/Sleep.html
+share/doc/html/gri/Smooth.html
+share/doc/html/gri/SolitaryOperators.html
+share/doc/html/gri/Source.html
+share/doc/html/gri/Sprintf.html
+share/doc/html/gri/StableStream.html
+share/doc/html/gri/StackOperators.html
+share/doc/html/gri/State.html
+share/doc/html/gri/Superuser.html
+share/doc/html/gri/Synonyms.html
+share/doc/html/gri/System.html
+share/doc/html/gri/SystemTools.html
+share/doc/html/gri/TSDiagram.html
+share/doc/html/gri/TertiaryOperators.html
+share/doc/html/gri/TestSuite.html
+share/doc/html/gri/Text.html
+share/doc/html/gri/UnaryOperators.html
+share/doc/html/gri/Unix-install.html
+share/doc/html/gri/Unlink.html
+share/doc/html/gri/UnstableStream.html
+share/doc/html/gri/Variables.html
+share/doc/html/gri/Version_2_2.html
+share/doc/html/gri/Version_2_4.html
+share/doc/html/gri/Version_2_6.html
+share/doc/html/gri/Version_2_8.html
+share/doc/html/gri/While.html
+share/doc/html/gri/Write.html
+share/doc/html/gri/X-Y.html
+share/doc/html/gri/example1-tiny.png
+share/doc/html/gri/example1.html
+share/doc/html/gri/example1.png
+share/doc/html/gri/example10-tiny.png
+share/doc/html/gri/example10.html
+share/doc/html/gri/example10.png
+share/doc/html/gri/example10color-tiny.png
+share/doc/html/gri/example10color.html
+share/doc/html/gri/example10color.png
+share/doc/html/gri/example11-tiny.png
+share/doc/html/gri/example11.html
+share/doc/html/gri/example11.png
+share/doc/html/gri/example12-tiny.png
+share/doc/html/gri/example12.html
+share/doc/html/gri/example12.png
+share/doc/html/gri/example13-tiny.png
+share/doc/html/gri/example13.html
+share/doc/html/gri/example13.png
+share/doc/html/gri/example2-tiny.png
+share/doc/html/gri/example2.html
+share/doc/html/gri/example2.png
+share/doc/html/gri/example3-tiny.png
+share/doc/html/gri/example3.html
+share/doc/html/gri/example3.png
+share/doc/html/gri/example4-tiny.png
+share/doc/html/gri/example4.html
+share/doc/html/gri/example4.png
+share/doc/html/gri/example5-tiny.png
+share/doc/html/gri/example5.html
+share/doc/html/gri/example5.png
+share/doc/html/gri/example6-tiny.png
+share/doc/html/gri/example6.html
+share/doc/html/gri/example6.png
+share/doc/html/gri/example6color-tiny.png
+share/doc/html/gri/example6color.html
+share/doc/html/gri/example6color.png
+share/doc/html/gri/example6histogram-tiny.png
+share/doc/html/gri/example6histogram.html
+share/doc/html/gri/example6histogram.png
+share/doc/html/gri/example7-tiny.png
+share/doc/html/gri/example7.html
+share/doc/html/gri/example7.png
+share/doc/html/gri/example8-tiny.png
+share/doc/html/gri/example8.html
+share/doc/html/gri/example8.png
+share/doc/html/gri/example9-tiny.png
+share/doc/html/gri/example9.html
+share/doc/html/gri/example9.png
+share/doc/html/gri/examples
+share/doc/html/gri/index.html
+share/doc/html/gri/linux-install.html
+share/doc/html/gri/logo.html
+share/doc/html/gri/logo.png
+share/doc/html/gri/mac-install.html
+share/doc/html/gri/msdos-install.html
+share/doc/html/gri/os2-install.html
+share/doc/html/gri/precompiled-unix.html
+share/doc/html/gri/resources/bottom_banner.gif
+share/doc/html/gri/resources/math_symbols.gif
+share/doc/html/gri/resources/pixel.gif
+share/doc/html/gri/resources/sm_bg.gif
+share/doc/html/gri/resources/symbols.gif
+share/doc/html/gri/resources/top_banner.gif
+share/doc/html/gri/screenshots/gri-screenshot-1-tiny.png
+share/doc/html/gri/screenshots/gri-screenshot-1.png
+share/doc/html/gri/screenshots/gri-screenshot-2-tiny.png
+share/doc/html/gri/screenshots/gri-screenshot-2.png
+share/doc/html/gri/screenshots/gri-screenshot-3-tiny.png
+share/doc/html/gri/screenshots/gri-screenshot-3.png
+share/doc/html/gri/screenshots/gri-screenshot-4-tiny.png
+share/doc/html/gri/screenshots/gri-screenshot-4.png
+share/doc/html/gri/tst_suite/tst_IO.html
+share/doc/html/gri/tst_suite/tst_control.html
+share/doc/html/gri/tst_suite/tst_rpn.html
+share/doc/html/gri/tst_suite/tst_var_syn.html
+share/doc/html/gri/uncompiled-unix.html
+share/emacs/site-lisp/gri-mode.el
+share/examples/gri/FEM.gri
+share/examples/gri/FEM.pl
+share/examples/gri/FEM.ps
+share/examples/gri/example1.dat
+share/examples/gri/example1.gri
+share/examples/gri/example1.ps
+share/examples/gri/example10.dat
+share/examples/gri/example10.gri
+share/examples/gri/example10.ps
+share/examples/gri/example10color.gri
+share/examples/gri/example10color.ps
+share/examples/gri/example11.dat
+share/examples/gri/example11.gri
+share/examples/gri/example11.ps
+share/examples/gri/example12.dat
+share/examples/gri/example12.gri
+share/examples/gri/example12.ps
+share/examples/gri/example13.dat
+share/examples/gri/example13.gri
+share/examples/gri/example13.ps
+share/examples/gri/example2.gri
+share/examples/gri/example2.ps
+share/examples/gri/example3.gri
+share/examples/gri/example3.ps
+share/examples/gri/example4.gri
+share/examples/gri/example4.ps
+share/examples/gri/example5.dat
+share/examples/gri/example5.gri
+share/examples/gri/example5.ps
+share/examples/gri/example6.gri
+share/examples/gri/example6.ps
+share/examples/gri/example6color.gri
+share/examples/gri/example6color.ps
+share/examples/gri/example6histogram.gri
+share/examples/gri/example6histogram.ps
+share/examples/gri/example6image.dat
+share/examples/gri/example6mask.dat
+share/examples/gri/example7.gri
+share/examples/gri/example7.ps
+share/examples/gri/example7a.dat
+share/examples/gri/example7b.dat
+share/examples/gri/example7c.dat
+share/examples/gri/example7d.dat
+share/examples/gri/example7e.dat
+share/examples/gri/example7f.dat
+share/examples/gri/example7g.dat
+share/examples/gri/example8.gri
+share/examples/gri/example8.ps
+share/examples/gri/example8a.dat
+share/examples/gri/example8b.dat
+share/examples/gri/example9.gri
+share/examples/gri/example9.ps
+share/examples/gri/example9a.dat
+share/examples/gri/example9b.dat
+share/examples/gri/logo.gri
+share/examples/gri/logo.ps
+share/examples/gri/model.elements
+share/examples/gri/model.nodes
+share/gri/${PKGVERSION}/gri.cmd
+share/gri/${PKGVERSION}/license.txt
+share/gri/${PKGVERSION}/logo.dat
+share/gri/${PKGVERSION}/startup.msg
+@dirrm share/gri/2.8.7
+@dirrm share/gri
+@dirrm share/examples/gri
+@dirrm share/doc/html/gri/tst_suite
+@dirrm share/doc/html/gri/screenshots
+@dirrm share/doc/html/gri/resources
+@dirrm share/doc/html/gri
+@unexec ${RMDIR} %D/share/emacs 2>/dev/null || true
+@unexec ${RMDIR} %D/share/emacs/site-lisp 2>/dev/null || true
diff --git a/graphics/gri/distinfo b/graphics/gri/distinfo
new file mode 100644
index 00000000000..2fa5fef3caa
--- /dev/null
+++ b/graphics/gri/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/05/03 23:45:14 jtb Exp $
+
+SHA1 (gri-2.8.7.tgz) = 2d28f1c398e96d4ff7e34746027ce42bb5f2881a
+Size (gri-2.8.7.tgz) = 1173929 bytes
+SHA1 (patch-aa) = feb09a4ecd2b0d8db2fef8f9613b4e8dc27dbe61
+SHA1 (patch-ab) = f66fb1084bcd65544b63db43b4e2ecc34ddbd7c7
+SHA1 (patch-ac) = b5be8b3b2d9c2ff2ea04fe84cbb2b0d8eea1e164
+SHA1 (patch-ad) = ebcc1fdbc4fe52cdcb0f5788acaa637174be4550
+SHA1 (patch-ae) = b796adf6b5532e64aa105f8cef6afabfc5a15fa5
diff --git a/graphics/gri/patches/patch-aa b/graphics/gri/patches/patch-aa
new file mode 100644
index 00000000000..defed2fc84d
--- /dev/null
+++ b/graphics/gri/patches/patch-aa
@@ -0,0 +1,72 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/05/03 23:45:15 jtb Exp $
+
+--- configure.in.orig	Wed Apr  3 20:09:30 2002
++++ configure.in	Wed May  1 21:20:19 2002
+@@ -229,60 +229,13 @@
+ AC_CHECK_HEADERS(unistd.h)
+ 
+ 
+-dnl     Check for netcdf library.  It might be
+-dnl	in one of several places, so check
+-dnl	several locations, reporting location
+-dnl	if found.
+-AC_MSG_CHECKING(for netcdf library)
+-define(CHECK_FOR_NETCDF, [
+-    if test -d /opt/netcdf/include ; then
+-	#
+-	# Solaris often has it here
+-	CXXFLAGS="$CXXFLAGS -I/opt/netcdf/include"
+-        LIBS="$LIBS -L/opt/netcdf/lib -lnetcdf"
+-	if test $gri_cv_is_sun = yes ; then
+-	    LIBS="$LIBS -lnsl"
+-	fi
+-	AC_DEFINE(HAVE_LIBNETCDF)
+-        echo "yes (in /opt/netcdf/include/netcdf.h and /opt/netcdf/lib/libnetcdf.a)"
+-    else
+-	if test -f /usr/local/include/netcdf.h ; then
+-	    CXXFLAGS="$CPPFLAGS -I/usr/local/include"
+-	    LIBS="$LIBS -L/usr/local/lib -lnetcdf"
+-            if test $gri_cv_is_sun = yes ; then
+-		LIBS="$LIBS -lnsl"
+-	    fi
+-	    AC_DEFINE(HAVE_LIBNETCDF)
+-            echo "yes (in /usr/local/include/netcdf.h and /usr/local/lib/libnetcdf.a)"
+-	else
+-	    #
+-	    # Linux/debian often has it here.
+-	    if test -f /usr/include/netcdf.h ; then
+-                CXXFLAGS="$CPPFLAGS -I/usr/include/netcdf"
+-                LIBS="$LIBS -L/usr/lib/netcdf -lnetcdf"
+-                if test $gri_cv_is_sun = yes ; then
+-                    LIBS="$LIBS -lnsl"
+-                fi
+-                AC_DEFINE(HAVE_LIBNETCDF)
+-                echo "yes (in /usr/include/netcdf.h and /usr/lib/libnetcdf.a)"
+-            else
+-		if test -f /boot/home/lib/netcdf ; then
+-		    CXXFLAGS="$CPPFLAGS -I/boot/home/include/netcdf"
+-		    LIBS="$LIBS -L/boot/home/lib/netcdf -lnetcdf"
+-                    if test $gri_cv_is_sun = yes ; then
+-			LIBS="$LIBS -lnsl"
+-		    fi
+-                    echo "yes (in /boot/home/netcdf)"
+-		    AC_DEFINE(HAVE_LIBNETCDF)
+-		else
+-	            echo "no"
+-		fi
+-            fi
+-        fi
+-    fi
+-])dnl
+-dnl
+-CHECK_FOR_NETCDF
++AC_CHECK_LIB(netcdf, ncvarid, HAVE_LIBNETCDF="YES", HAVE_LIBNETCDF="")
++[
++if test -n "$HAVE_LIBNETCDF" ; then
++   ] AC_DEFINE(HAVE_LIBNETCDF) [
++   LIBS="-lnetcdf $LIBS"
++fi
++]
+ 
+ AC_CHECK_LIB(m,sin)
+ AC_SUBST(EXTRA_CXXFLAGS)
diff --git a/graphics/gri/patches/patch-ab b/graphics/gri/patches/patch-ab
new file mode 100644
index 00000000000..6967c8b86be
--- /dev/null
+++ b/graphics/gri/patches/patch-ab
@@ -0,0 +1,99 @@
+$NetBSD: patch-ab,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
+
+--- Makefile.in.orig	Wed Apr  3 20:09:30 2002
++++ Makefile.in	Wed May  1 22:59:25 2002
+@@ -5,6 +5,7 @@
+ DESTDIR=
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ LIBS = @LIBS@
+ # ************************************************************
+@@ -17,12 +18,15 @@
+ DEFS = -DVERSION=\"$(VERSION)\" -DDEFAULT_GRI_DIR=\"$(libdir)\" $(HAVE_LINUX) @DEFS@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+-CXXFLAGS = -g @CXXFLAGS@
++CXXFLAGS = @CXXFLAGS@
+ EXTRA_CFLAGS = @EXTRA_CFLAGS@ $(LINUX_EXTRA_CFLAGS)
+ EXTRA_CFLAGS_TEMPLATE = @EXTRA_CFLAGS_TEMPLATE@ $(LINUX_EXTRA_CFLAGS)
++LDFLAGS = @LDFLAGS@
++
+ prefix = @prefix@
+ bindir = $(prefix)/bin
+ libdir = $(prefix)/share/gri/$(VERSION)
++elispdir = $(prefix)/share/emacs/site-lisp
+ #### End of system configuration section. ####
+ 
+ OBJS = G_string.o GriColor.o GriPath.o GriState.o assert.o chopword.o \
+@@ -100,21 +104,22 @@
+ # links and creating new links as necessary.
+ install: all install-bin
+ 	@echo "Installing into '$(prefix)' directory"
+-	cd doc; prefix=$(prefix) make install INSTALL='$(INSTALL)' 
++	cd doc; prefix=$(prefix) $(MAKE) install INSTALL='$(INSTALL)' 
+ 
+ install-bin:
+ 	cat startup.msg | sed -e s,VSN,${VERSION}, -e s,PREFIX,$(prefix), > tmp
+-	$(INSTALL_PROGRAM) -d $(libdir)
+-	$(INSTALL_DATA) tmp $(libdir)/startup.msg
++	$(BSD_INSTALL_DATA_DIR) $(libdir)
++	$(BSD_INSTALL_DATA) tmp $(libdir)/startup.msg
+ 	rm -f tmp
+-	$(INSTALL_DATA)         gri.cmd         $(libdir)/gri.cmd
+-	$(INSTALL_DATA)         logo.dat        $(libdir)/logo.dat
+-	$(INSTALL_DATA)         license.txt     $(libdir)/license.txt
+-	$(INSTALL_PROGRAM) -d                   $(prefix)/bin
+-	$(INSTALL_PROGRAM)      gri             $(prefix)/bin/gri-$(VERSION)
++	$(BSD_INSTALL_DATA) gri.cmd $(libdir)/gri.cmd
++	$(BSD_INSTALL_DATA) logo.dat $(libdir)/logo.dat
++	$(BSD_INSTALL_DATA) license.txt $(libdir)/license.txt
++	$(BSD_INSTALL_PROGRAM) gri $(prefix)/bin/gri-$(VERSION)
+ 	(cd $(prefix)/bin/ ; rm -f gri ; ln -sf gri-$(VERSION) gri)
+-	$(INSTALL_PROGRAM)      gri_merge       $(prefix)/bin/gri_merge
+-	$(INSTALL_PROGRAM)      gri_unpage      $(prefix)/bin/gri_unpage
++	$(BSD_INSTALL_SCRIPT) gri_merge $(prefix)/bin/gri_merge
++	$(BSD_INSTALL_SCRIPT) gri_unpage $(prefix)/bin/gri_unpage
++	$(BSD_INSTALL_DATA_DIR) $(elispdir)
++	$(BSD_INSTALL_DATA) gri-mode.el $(elispdir)
+ 
+ debian-lib = $(debian)/usr/share/gri/$(VERSION)
+ install_linux_debian: gri
+@@ -173,13 +178,13 @@
+ 
+ 
+ all: force
+-	make gri
+-	make doc
++	$(MAKE) gri
++	$(MAKE) doc
+ 
+ force:
+ 
+ doc: force
+-	cd doc; make info html
++	cd doc; $(MAKE) info html
+ 
+ TAGS:
+ 	etags *.cc *.hh
+@@ -197,8 +202,8 @@
+ 
+ 
+ distclean:
+-	make clean
+-	cd doc ; make clean
++	$(MAKE) clean
++	cd doc ; $(MAKE) clean
+ 	rm -f Makefile
+ 
+ # Source distribution
+@@ -275,7 +280,7 @@
+ 	chmod a+r $(DEST_DIR)/$(SOURCE_NAME).tgz
+ 
+ source-arch-indep: source-copy
+-	cd $(SOURCE_NAME)/doc; make refcard.ps cmdrefcard.ps info html
++	cd $(SOURCE_NAME)/doc; $(MAKE) refcard.ps cmdrefcard.ps info html
+ 	tar -c -f $(SOURCE_NAME)-arch-indep.tar $(SOURCE_NAME)
+ 	rm -rf $(SOURCE_NAME)
+ 	gzip -f --best $(SOURCE_NAME)-arch-indep.tar
diff --git a/graphics/gri/patches/patch-ac b/graphics/gri/patches/patch-ac
new file mode 100644
index 00000000000..3759a5449d0
--- /dev/null
+++ b/graphics/gri/patches/patch-ac
@@ -0,0 +1,198 @@
+$NetBSD: patch-ac,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
+
+--- doc/Makefile.orig	Wed Apr  3 20:09:30 2002
++++ doc/Makefile	Wed May  1 23:00:29 2002
+@@ -1,8 +1,8 @@
+ # Makefile for Gri documentation files.
+ 
+-            DOC_DIR = $(prefix)/share/gri/doc
+-           HTML_DIR = $(DOC_DIR)/html
+-       EXAMPLES_DIR = $(DOC_DIR)/examples
++            DOC_DIR = $(prefix)/share/doc/gri
++           HTML_DIR = $(prefix)/share/doc/html/gri
++       EXAMPLES_DIR = $(prefix)/share/examples/gri
+                  RM = rm -f
+             REFCARD = refcard
+         CMD_REFCARD = cmdrefcard
+@@ -13,12 +13,12 @@
+ FORCE:
+ 
+ all:
+-	make info
+-	make html
++	$(MAKE) info
++	$(MAKE) html
+ 
+ install:
+-	make info-install
+-	make html-install
++	$(MAKE) info-install
++	$(MAKE) html-install
+ 
+ read:
+ 	chmod a+r Makefile
+@@ -31,25 +31,25 @@
+ 	lynx -dump FAQ.html > FAQ
+ 
+ the_resources:
+-	cd resources ; make
++	cd resources ; $(MAKE)
+ 
+ test:
+ 	cat test.texi | texinfo2HTML > test.html
+ 
+ html: gri.texi gri.info texinfo2HTML HTML_subdivide
+-	cd examples ; make png
++	cd examples ; $(MAKE) png
+ 	-cp examples/*.png ./
+-	cd examples ; make html
++	cd examples ; $(MAKE) html
+ 	cp examples/*.html ./
+-	cd tst_suite ; make html
+-	cd screenshots; make png
++	cd tst_suite ; $(MAKE) html
++	cd screenshots; $(MAKE) png
+ 	cat gri.texi     		>  TMP
+ 	perl make_html_index		>> TMP
+ 	perl make_html_commandindex	>> TMP
+ 	perl make_html_builtinindex	>> TMP
+ 	cat TMP | perl texinfo2HTML	>  $(HTML_LONG_NAME)
+ 	rm -f TMP
+-	make read
++	$(MAKE) read
+ 	rm -f gri[1-9]*.html
+ 	perl HTML_subdivide  $(HTML_LONG_NAME) "The Gri graphing language"
+ 	rm -f $(HTML_LONG_NAME)
+@@ -63,43 +63,28 @@
+ 	$(INSTALL) -m 644 cmdrefcard.ps $(CARD_DIR)
+ 
+ html-tar: html
+-	make html-install DOC_DIR=./gridoc
++	$(MAKE) html-install DOC_DIR=./gridoc
+ 	tar -c -f gridoc.tar ./gridoc
+ 	gzip -f --best gridoc.tar
+ 
+ html-install:	html
+-	$(INSTALL) -d          $(HTML_DIR)
+-	chmod a+rx             $(HTML_DIR)
+-	$(INSTALL) -d          $(HTML_DIR)/resources
+-	chmod a+rx             $(HTML_DIR)/resources
+-	cp resources/*.gif     $(HTML_DIR)/resources
+-	chmod 644              $(HTML_DIR)/resources/*.gif
+-	$(INSTALL) -d          $(HTML_DIR)/tst_suite
+-	chmod a+rx             $(HTML_DIR)/tst_suite
+-	cp tst_suite/*html     $(HTML_DIR)/tst_suite
+-	-cp examples/*.png     $(HTML_DIR)/
+-	-chmod 644             $(HTML_DIR)/*.png
+-	$(INSTALL) -d          $(HTML_DIR)/screenshots
+-	chmod a+rx             $(HTML_DIR)/screenshots
+-	cp screenshots/*.png   $(HTML_DIR)/screenshots
+-	chmod a+rx             $(HTML_DIR)/screenshots
+-	chmod 644              $(HTML_DIR)/screenshots/*.png
+-	cp *.html              $(HTML_DIR)
+-	chmod 644              $(HTML_DIR)/*.html
++	$(BSD_INSTALL_DATA_DIR) $(HTML_DIR)
++	$(BSD_INSTALL_DATA_DIR) $(HTML_DIR)/resources
++	$(BSD_INSTALL_DATA) resources/*.gif $(HTML_DIR)/resources
++	$(BSD_INSTALL_DATA_DIR) $(HTML_DIR)/tst_suite
++	$(BSD_INSTALL_DATA) tst_suite/*html $(HTML_DIR)/tst_suite
++	$(BSD_INSTALL_DATA) examples/*.png $(HTML_DIR)/
++	$(BSD_INSTALL_DATA_DIR) $(HTML_DIR)/screenshots
++	$(BSD_INSTALL_DATA) screenshots/*.png $(HTML_DIR)/screenshots
++	$(BSD_INSTALL_DATA) *.html $(HTML_DIR)
+ #       Now install the examples
+-	$(INSTALL) -d          $(EXAMPLES_DIR)
+-	chmod a+rx             $(EXAMPLES_DIR)
+-	cp examples/model*     $(EXAMPLES_DIR)
+-	chmod 644              $(EXAMPLES_DIR)/model*
+-	cp examples/*.dat      $(EXAMPLES_DIR)
+-	chmod 644              $(EXAMPLES_DIR)/*.dat
+-	cp examples/*.gri      $(EXAMPLES_DIR)
+-	chmod 644              $(EXAMPLES_DIR)/*.gri
+-	cp examples/*.ps       $(EXAMPLES_DIR)
+-	chmod 644              $(EXAMPLES_DIR)/*.ps
+-	cp examples/FEM.pl     $(EXAMPLES_DIR)
+-	chmod 755              $(EXAMPLES_DIR)/FEM.pl
+-	(cd $(HTML_DIR); rm -rf examples ; ln -sf ../examples)
++	$(BSD_INSTALL_DATA_DIR) $(EXAMPLES_DIR)
++	$(BSD_INSTALL_DATA) examples/model* $(EXAMPLES_DIR)
++	$(BSD_INSTALL_DATA) examples/*.dat      $(EXAMPLES_DIR)
++	$(BSD_INSTALL_DATA) examples/*.gri      $(EXAMPLES_DIR)
++	$(BSD_INSTALL_DATA) examples/*.ps       $(EXAMPLES_DIR)
++	$(BSD_INSTALL_DATA) examples/FEM.pl     $(EXAMPLES_DIR)
++	(cd $(HTML_DIR); ln -sf ../../examples/gri examples)
+ 
+ card-clean:
+ 	-rm -f refcard.dvi refcard.log refcard.ps
+@@ -125,10 +110,7 @@
+ 	makeinfo gri.texi
+ 
+ info-install:
+-	$(INSTALL) -d $(INFO_DIR)
+-	cp gri.info* $(INFO_DIR)
+-	(cd $(INFO_DIR) ; gzip -f --best gri.info gri.info-[0-9] gri.info-[0-9][0-9])
+-	chmod 644 $(INFO_DIR)/gri.info*
++	$(BSD_INSTALL_DATA) gri.info* $(INFO_DIR)
+ 
+ info-install-solaris:
+ 	$(INSTALL) -d $(INFO_DIR_SOLARIS)
+@@ -161,10 +143,10 @@
+ 		gri.vr gri.vrs 		\
+ 		FAQ cmdrefcard.ps refcard.ps
+ 	$(RM) gri.texi
+-	(cd examples    ; make clean)
+-	(cd screenshots ; make clean)
+-#	(cd resources   ; make clean)
+-	(cd tst_suite   ; make clean)
++	(cd examples    ; $(MAKE) clean)
++	(cd screenshots ; $(MAKE) clean)
++#	(cd resources   ; $(MAKE) clean)
++	(cd tst_suite   ; $(MAKE) clean)
+ 	-rm -rf gridoc
+ 	-rm -f gridoc.tar.gz
+ 
+@@ -173,15 +155,15 @@
+ 	@grep '^[^ ]*:' Makefile | sed -e "s/^/  make /" -e "s/:.*//"
+ 
+ linux_redhat:
+-	make info
+-	make html
+-	make refcard.ps
+-	make cmdrefcard.ps
++	$(MAKE) info
++	$(MAKE) html
++	$(MAKE) refcard.ps
++	$(MAKE) cmdrefcard.ps
+ 
+ gri.ps: gri.texi
+-	cd examples    ; make eps
+-	cd screenshots ; make eps
+-	cd tst_suite   ; make texi
++	cd examples    ; $(MAKE) eps
++	cd screenshots ; $(MAKE) eps
++	cd tst_suite   ; $(MAKE) texi
+ 	tex gri.texi
+ 	texindex gri.cp
+ 	texindex gri.fn
+@@ -193,9 +175,9 @@
+ 	dvips -o gri.ps -t letter gri.dvi
+ 
+ gri.pdf: gri.texi
+-	cd examples    ; make pdf
+-	cd screenshots ; make pdf
+-	cd tst_suite   ; make texi
++	cd examples    ; $(MAKE) pdf
++	cd screenshots ; $(MAKE) pdf
++	cd tst_suite   ; $(MAKE) texi
+ 	pdftex gri.texi
+ 	texindex gri.cp
+ 	texindex gri.fn
+@@ -213,7 +195,7 @@
+ # make debian-html DOC_DIR=../debian/gri-html-doc/usr/share/doc/gri
+ # builds and installs under $(DOC_DIR)
+ debian-html:
+-	make html-install
++	$(MAKE) html-install
+ 
+ # make debian-ps DOC_DIR=../debian/gri-ps-doc/usr/share/doc/gri
+ # builds and installs under $(DOC_DIR)
diff --git a/graphics/gri/patches/patch-ad b/graphics/gri/patches/patch-ad
new file mode 100644
index 00000000000..d34aca52275
--- /dev/null
+++ b/graphics/gri/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
+
+--- doc/examples/Makefile.orig	Wed May  1 21:42:17 2002
++++ doc/examples/Makefile	Wed May  1 21:43:42 2002
+@@ -23,9 +23,9 @@
+ 	-convert example10color.ps example10color.eps
+ 
+ all:
+-	make eps
+-	make html
+-	make png
++	$(MAKE) eps
++	$(MAKE) html
++	$(MAKE) png
+ 
+ html:	FEM.html example1.html example2.html example3.html example4.html \
+ 	example5.html example6.html example6color.html example6histogram.html \
diff --git a/graphics/gri/patches/patch-ae b/graphics/gri/patches/patch-ae
new file mode 100644
index 00000000000..571fb5a86cc
--- /dev/null
+++ b/graphics/gri/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
+
+--- startup.msg.orig	Wed May  1 23:22:02 2002
++++ startup.msg	Wed May  1 23:22:26 2002
+@@ -4,6 +4,6 @@
+  Type `help' to view list of commands.
+  Type `show license' to view license. 
+ 
+- Examples at:     PREFIX/share/doc/gri/examples
+- Manual at:       PREFIX/share/doc/gri/html/index.html
++ Examples at:     PREFIX/share/examples/gri
++ Manual at:       PREFIX/share/doc/html/gri/index.html
+  Info Manual at:  gri