pstoedit, a converter from PostScript and PDF files to

other vector graphic formats, including fig (xfig, transfig),
tgif .obj, DXF (CAD exchange format), PIC (troff), LaTeX2e picture,
and etc.

Some files may not be converted.
International characters may be broken into polylines and splines,
but would be better than nothing.

13 files changed, 1743 insertions, 0 deletions

diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
new file mode 100644
index 00000000000..86d866f731e
--- /dev/null
+++ b/graphics/pstoedit/Makefile
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+DISTNAME=	pstoedit_3_20
+PKGNAME=	pstoedit-3.20
+CATEGORIES=	converters graphics print
+MASTER_SITES=	http://www.geocities.com/SiliconValley/Network/1958/pstoedit/
+EXTRACT_SUFX=	.zip
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://www.geocities.com/SiliconValley/Network/1958/pstoedit/
+
+# Requires C++ support of plotutils.
+DEPENDS+=	plotutils-2.3.0:../../graphics/plotutils
+# Any ghostscript pkg will probably do, if not a font pkg.
+DEPENDS+=	ghostscript-[^f]*:../../print/ghostscript
+
+NO_CDROM+=	"The author writes: If you include this program on a CDROM, please send me a copy of the CD, or if it goes with a book, of the book."
+
+WRKSRC=		${WRKDIR}/pstoedit_3.20/src
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS} -Dunix"
+CONFIGURE_ENV+=	LDLIBS="-Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV+=	AWK=${AWK} GS=${PREFIX}/bin/gs
+CONFIGURE_ARGS+=--datadir=${PREFIX}/share/pstoedit
+CONFIGURE_ARGS+=--libdir=${PREFIX}/lib/pstoedit	# plugin dir -- unused for now
+ALL_TARGET=
+
+post-extract:
+	cd ${WRKSRC} && ${LN} ../config/* .
+
+DOCDIR=		${PREFIX}/share/pstoedit/doc
+DOCSRC=		${WRKSRC}/..
+
+post-install:
+	${MKDIR} ${DOCDIR}
+	${INSTALL_DATA} ${DOCSRC}/*.htm		${DOCDIR}
+	${INSTALL_DATA} ${DOCSRC}/readme.txt	${DOCDIR}
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/pstoedit/files/md5 b/graphics/pstoedit/files/md5
new file mode 100644
index 00000000000..c42a97f89f2
--- /dev/null
+++ b/graphics/pstoedit/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+MD5 (pstoedit_3_20.zip) = b9f113d99004f79208a9b7dea53360ea
diff --git a/graphics/pstoedit/files/patch-sum b/graphics/pstoedit/files/patch-sum
new file mode 100644
index 00000000000..a2f818580ff
--- /dev/null
+++ b/graphics/pstoedit/files/patch-sum
@@ -0,0 +1,9 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+MD5 (patch-aa) = e80680b7153895bc81986d67b9949a2e
+MD5 (patch-ab) = 1816d8678fe7bb396d22a8eabb6cba7e
+MD5 (patch-ac) = 1ff6fe98a5fc21a33d1ca499733881d3
+MD5 (patch-ad) = 68473b3436f420d260be1a99cf5a4952
+MD5 (patch-ae) = 9eb5ac9691c4f62aec53b87c2ea5d7aa
+MD5 (patch-af) = 0cad278fce020e29d01d4952f390421c
+MD5 (patch-ag) = ed7afa580f3f92b04a264a3c0a37c76a
diff --git a/graphics/pstoedit/patches/patch-aa b/graphics/pstoedit/patches/patch-aa
new file mode 100644
index 00000000000..e5abd94a03c
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-aa
@@ -0,0 +1,26 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+--- configure.in.orig	Tue May  2 05:02:00 2000
++++ configure.in	Sat Jun 24 19:30:17 2000
+@@ -18,6 +18,21 @@
+ AC_PROG_INSTALL
+ AC_PATH_PROG(GS,gs,gs)
+ 
++dnl X11 support.  Stolen from plotutils.
++AC_PATH_XTRA
++AC_SUBST(X_CFLAGS)
++AC_SUBST(X_LIBS)
++AC_SUBST(X_TOOLKIT_LIBS)
++AC_SUBST(X_PRE_LIBS)
++AC_SUBST(X_BASIC_LIBS)
++AC_SUBST(X_EXTRA_LIBS)
++
++X_TOOLKIT_LIBS="-lXaw -lXmu -lXt"
++X_BASIC_LIBS="-lXext -lX11"
++
++LDFLAGS="$X_LIBS $LDFLAGS"
++CPPFLAGS="$X_CFLAGS $CPPFLAGS"
++
+ dnl Look for various optional libraries.
+ AC_CHECK_LIB(dl,main,[LDL=-ldl],[LDL=])
+ AC_SUBST(LDL)
diff --git a/graphics/pstoedit/patches/patch-ab b/graphics/pstoedit/patches/patch-ab
new file mode 100644
index 00000000000..090bb099302
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ab
@@ -0,0 +1,1246 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+--- configure.orig	Tue May  2 05:02:04 2000
++++ configure	Sat Jun 24 19:30:59 2000
+@@ -12,6 +12,8 @@
+ ac_default_prefix=/usr/local
+ # Any additions from configure.in:
+ ac_help="$ac_help
++  --with-x                use the X Window System"
++ac_help="$ac_help
+   --enable-wrapper=PROGRAM
+                           Wrap (i.e. prefix) compiler invocations with PROGRAM
+                           (e.g. \"insure\" or \"purify\")"
+@@ -530,7 +532,7 @@
+ # Extract the first word of "gs", so it can be a program name with args.
+ set dummy gs; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:534: checking for $ac_word" >&5
++echo "configure:536: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -593,7 +595,7 @@
+ fi
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:597: checking host system type" >&5
++echo "configure:599: checking host system type" >&5
+ 
+ host_alias=$host
+ case "$host_alias" in
+@@ -626,7 +628,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:630: checking for $ac_word" >&5
++echo "configure:632: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -660,7 +662,7 @@
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:664: checking for $ac_word" >&5
++echo "configure:666: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -692,7 +694,7 @@
+ 
+ 
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:696: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:698: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+ 
+ ac_ext=C
+ # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+@@ -703,12 +705,12 @@
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 707 "configure"
++#line 709 "configure"
+ #include "confdefs.h"
+ 
+ int main(){return(0);}
+ EOF
+-if { (eval echo configure:712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cxx_works=yes
+   # If we can't run a trivial program, we are probably using a cross compiler.
+   if (./conftest; exit) 2>/dev/null; then
+@@ -734,12 +736,12 @@
+   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:738: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:740: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:743: checking whether we are using GNU C++" >&5
++echo "configure:745: checking whether we are using GNU C++" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -748,7 +750,7 @@
+   yes;
+ #endif
+ EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+   ac_cv_prog_gxx=yes
+ else
+   ac_cv_prog_gxx=no
+@@ -767,7 +769,7 @@
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:771: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:773: checking whether ${CXX-g++} accepts -g" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -810,7 +812,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+-echo "configure:814: checking for a BSD compatible install" >&5
++echo "configure:816: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -865,7 +867,7 @@
+ # Extract the first word of "gs", so it can be a program name with args.
+ set dummy gs; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:869: checking for $ac_word" >&5
++echo "configure:871: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_path_GS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -899,23 +901,391 @@
+ fi
+ 
+ 
+-echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
+-echo "configure:904: checking for main in -ldl" >&5
+-ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
++echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
++echo "configure:906: checking how to run the C++ preprocessor" >&5
++if test -z "$CXXCPP"; then
++if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++  CXXCPP="${CXX-g++} -E"
++  cat > conftest.$ac_ext <<EOF
++#line 919 "configure"
++#include "confdefs.h"
++#include <stdlib.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  :
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  CXXCPP=/lib/cpp
++fi
++rm -f conftest*
++  ac_cv_prog_CXXCPP="$CXXCPP"
++ac_ext=C
++# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
++cross_compiling=$ac_cv_prog_cxx_cross
++fi
++fi
++CXXCPP="$ac_cv_prog_CXXCPP"
++echo "$ac_t""$CXXCPP" 1>&6
++
++# If we find X, set shell vars x_includes and x_libraries to the
++# paths, otherwise set no_x=yes.
++# Uses ac_ vars as temps to allow command line to override cache and checks.
++# --without-x overrides everything else, but does not touch the cache.
++echo $ac_n "checking for X""... $ac_c" 1>&6
++echo "configure:953: checking for X" >&5
++
++# Check whether --with-x or --without-x was given.
++if test "${with_x+set}" = set; then
++  withval="$with_x"
++  :
++fi
++
++# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
++if test "x$with_x" = xno; then
++  # The user explicitly disabled X.
++  have_x=disabled
++else
++  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
++    # Both variables are already set.
++    have_x=yes
++  else
++if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  # One or both of the vars are not set, and there is no cached value.
++ac_x_includes=NO ac_x_libraries=NO
++rm -fr conftestdir
++if mkdir conftestdir; then
++  cd conftestdir
++  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
++  cat > Imakefile <<'EOF'
++acfindx:
++	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
++EOF
++  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
++    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
++    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
++    for ac_extension in a so sl; do
++      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
++        test -f $ac_im_libdir/libX11.$ac_extension; then
++        ac_im_usrlibdir=$ac_im_libdir; break
++      fi
++    done
++    # Screen out bogus values from the imake configuration.  They are
++    # bogus both because they are the default anyway, and because
++    # using them would break gcc on systems where it needs fixed includes.
++    case "$ac_im_incroot" in
++	/usr/include) ;;
++	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
++    esac
++    case "$ac_im_usrlibdir" in
++	/usr/lib | /lib) ;;
++	*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
++    esac
++  fi
++  cd ..
++  rm -fr conftestdir
++fi
++
++if test "$ac_x_includes" = NO; then
++  # Guess where to find include files, by looking for this one X11 .h file.
++  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
++
++  # First, try using that file with no special directory specified.
++cat > conftest.$ac_ext <<EOF
++#line 1015 "configure"
++#include "confdefs.h"
++#include <$x_direct_test_include>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:1020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  # We can compile using X headers with no special include directory.
++ac_x_includes=
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  # Look for the header file in a standard set of common directories.
++# Check X11 before X11Rn because it is often a symlink to the current release.
++  for ac_dir in               \
++    /usr/X11/include          \
++    /usr/X11R6/include        \
++    /usr/X11R5/include        \
++    /usr/X11R4/include        \
++                              \
++    /usr/include/X11          \
++    /usr/include/X11R6        \
++    /usr/include/X11R5        \
++    /usr/include/X11R4        \
++                              \
++    /usr/local/X11/include    \
++    /usr/local/X11R6/include  \
++    /usr/local/X11R5/include  \
++    /usr/local/X11R4/include  \
++                              \
++    /usr/local/include/X11    \
++    /usr/local/include/X11R6  \
++    /usr/local/include/X11R5  \
++    /usr/local/include/X11R4  \
++                              \
++    /usr/X386/include         \
++    /usr/x386/include         \
++    /usr/XFree86/include/X11  \
++                              \
++    /usr/include              \
++    /usr/local/include        \
++    /usr/unsupported/include  \
++    /usr/athena/include       \
++    /usr/local/x11r5/include  \
++    /usr/lpp/Xamples/include  \
++                              \
++    /usr/openwin/include      \
++    /usr/openwin/share/include \
++    ; \
++  do
++    if test -r "$ac_dir/$x_direct_test_include"; then
++      ac_x_includes=$ac_dir
++      break
++    fi
++  done
++fi
++rm -f conftest*
++fi # $ac_x_includes = NO
++
++if test "$ac_x_libraries" = NO; then
++  # Check for the libraries.
++
++  test -z "$x_direct_test_library" && x_direct_test_library=Xt
++  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
++
++  # See if we find them without any special options.
++  # Don't add to $LIBS permanently.
++  ac_save_LIBS="$LIBS"
++  LIBS="-l$x_direct_test_library $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1089 "configure"
++#include "confdefs.h"
++
++int main() {
++${x_direct_test_function}()
++; return 0; }
++EOF
++if { (eval echo configure:1096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  LIBS="$ac_save_LIBS"
++# We can link X programs with no special library path.
++ac_x_libraries=
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  LIBS="$ac_save_LIBS"
++# First see if replacing the include by lib works.
++# Check X11 before X11Rn because it is often a symlink to the current release.
++for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
++    /usr/X11/lib          \
++    /usr/X11R6/lib        \
++    /usr/X11R5/lib        \
++    /usr/X11R4/lib        \
++                          \
++    /usr/lib/X11          \
++    /usr/lib/X11R6        \
++    /usr/lib/X11R5        \
++    /usr/lib/X11R4        \
++                          \
++    /usr/local/X11/lib    \
++    /usr/local/X11R6/lib  \
++    /usr/local/X11R5/lib  \
++    /usr/local/X11R4/lib  \
++                          \
++    /usr/local/lib/X11    \
++    /usr/local/lib/X11R6  \
++    /usr/local/lib/X11R5  \
++    /usr/local/lib/X11R4  \
++                          \
++    /usr/X386/lib         \
++    /usr/x386/lib         \
++    /usr/XFree86/lib/X11  \
++                          \
++    /usr/lib              \
++    /usr/local/lib        \
++    /usr/unsupported/lib  \
++    /usr/athena/lib       \
++    /usr/local/x11r5/lib  \
++    /usr/lpp/Xamples/lib  \
++    /lib/usr/lib/X11	  \
++                          \
++    /usr/openwin/lib      \
++    /usr/openwin/share/lib \
++    ; \
++do
++  for ac_extension in a so sl; do
++    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
++      ac_x_libraries=$ac_dir
++      break 2
++    fi
++  done
++done
++fi
++rm -f conftest*
++fi # $ac_x_libraries = NO
++
++if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
++  # Didn't find X anywhere.  Cache the known absence of X.
++  ac_cv_have_x="have_x=no"
++else
++  # Record where we found X for the cache.
++  ac_cv_have_x="have_x=yes \
++	        ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
++fi
++fi
++  fi
++  eval "$ac_cv_have_x"
++fi # $with_x != no
++
++if test "$have_x" != yes; then
++  echo "$ac_t""$have_x" 1>&6
++  no_x=yes
++else
++  # If each of the values was on the command line, it overrides each guess.
++  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
++  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
++  # Update the cache value to reflect the command line values.
++  ac_cv_have_x="have_x=yes \
++		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
++  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
++fi
++
++if test "$no_x" = yes; then
++  # Not all programs may use this symbol, but it does not hurt to define it.
++  cat >> confdefs.h <<\EOF
++#define X_DISPLAY_MISSING 1
++EOF
++
++  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
++else
++  if test -n "$x_includes"; then
++    X_CFLAGS="$X_CFLAGS -I$x_includes"
++  fi
++
++  # It would also be nice to do this for all -L options, not just this one.
++  if test -n "$x_libraries"; then
++    X_LIBS="$X_LIBS -L$x_libraries"
++    # For Solaris; some versions of Sun CC require a space after -R and
++    # others require no space.  Words are not sufficient . . . .
++    case "`(uname -sr) 2>/dev/null`" in
++    "SunOS 5"*)
++      echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
++echo "configure:1202: checking whether -R must be followed by a space" >&5
++      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
++      cat > conftest.$ac_ext <<EOF
++#line 1205 "configure"
++#include "confdefs.h"
++
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:1212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  ac_R_nospace=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_R_nospace=no
++fi
++rm -f conftest*
++      if test $ac_R_nospace = yes; then
++	echo "$ac_t""no" 1>&6
++	X_LIBS="$X_LIBS -R$x_libraries"
++      else
++	LIBS="$ac_xsave_LIBS -R $x_libraries"
++	cat > conftest.$ac_ext <<EOF
++#line 1228 "configure"
++#include "confdefs.h"
++
++int main() {
++
++; return 0; }
++EOF
++if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  ac_R_space=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  ac_R_space=no
++fi
++rm -f conftest*
++	if test $ac_R_space = yes; then
++	  echo "$ac_t""yes" 1>&6
++	  X_LIBS="$X_LIBS -R $x_libraries"
++	else
++	  echo "$ac_t""neither works" 1>&6
++	fi
++      fi
++      LIBS="$ac_xsave_LIBS"
++    esac
++  fi
++
++  # Check for system-dependent libraries X programs must link with.
++  # Do this before checking for the system-independent R6 libraries
++  # (-lICE), since we may need -lsocket or whatever for X linking.
++
++  if test "$ISC" = yes; then
++    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
++  else
++    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
++    # libraries were built with DECnet support.  And karl@cs.umb.edu says
++    # the Alpha needs dnet_stub (dnet does not exist).
++    echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
++echo "configure:1267: checking for dnet_ntoa in -ldnet" >&5
++ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ldl  $LIBS"
++LIBS="-ldnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 912 "configure"
++#line 1275 "configure"
+ #include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dnet_ntoa();
+ 
+ int main() {
+-main()
++dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -930,30 +1300,139 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  LDL=-ldl
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ else
+   echo "$ac_t""no" 1>&6
+-LDL=
+ fi
+ 
++    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
++      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
++echo "configure:1311: checking for dnet_ntoa in -ldnet_stub" >&5
++ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldnet_stub  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1319 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char dnet_ntoa();
+ 
+-echo $ac_n "checking for main in -lplotter""... $ac_c" 1>&6
+-echo "configure:942: checking for main in -lplotter" >&5
+-ac_lib_var=`echo plotter'_'main | sed 'y%./+-%__p_%'`
++int main() {
++dnet_ntoa()
++; return 0; }
++EOF
++if { (eval echo configure:1333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++    fi
++
++    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
++    # to get the SysV transport functions.
++    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
++    # needs -lnsl.
++    # The nsl library prevents programs from opening the X display
++    # on Irix 5.2, according to dickey@clark.net.
++    echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
++echo "configure:1362: checking for gethostbyname" >&5
++if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1367 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char gethostbyname(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char gethostbyname();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
++choke me
++#else
++gethostbyname();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:1393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_gethostbyname=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_gethostbyname=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  :
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++    if test $ac_cv_func_gethostbyname = no; then
++      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
++echo "configure:1414: checking for gethostbyname in -lnsl" >&5
++ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lplotter  $LIBS"
++LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 950 "configure"
++#line 1422 "configure"
+ #include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char gethostbyname();
+ 
+ int main() {
+-main()
++gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -968,70 +1447,473 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  LPLOTTER=-lplotter
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ else
+   echo "$ac_t""no" 1>&6
+-LPLOTTER=
+ fi
+ 
++    fi
++
++    # lieder@skyler.mavd.honeywell.com says without -lsocket,
++    # socket/setsockopt and other routines are undefined under SCO ODT
++    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
++    # on later versions), says simon@lia.di.epfl.ch: it contains
++    # gethostby* variants that don't use the nameserver (or something).
++    # -lsocket must be given before -lnsl if both are needed.
++    # We assume that if connect needs -lnsl, so does gethostbyname.
++    echo $ac_n "checking for connect""... $ac_c" 1>&6
++echo "configure:1466: checking for connect" >&5
++if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1471 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char connect(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char connect();
+ 
++int main() {
+ 
+-echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+-echo "configure:981: checking how to run the C++ preprocessor" >&5
+-if test -z "$CXXCPP"; then
+-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_connect) || defined (__stub___connect)
++choke me
++#else
++connect();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_connect=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_connect=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  :
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++    if test $ac_cv_func_connect = no; then
++      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
++echo "configure:1518: checking for connect in -lsocket" >&5
++ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1526 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char connect();
++
++int main() {
++connect()
++; return 0; }
++EOF
++if { (eval echo configure:1540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++    fi
++
++    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
++    echo $ac_n "checking for remove""... $ac_c" 1>&6
++echo "configure:1564: checking for remove" >&5
++if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  ac_ext=C
+-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cxx_cross
+-  CXXCPP="${CXX-g++} -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 994 "configure"
++#line 1569 "configure"
+ #include "confdefs.h"
+-#include <stdlib.h>
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char remove(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char remove();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_remove) || defined (__stub___remove)
++choke me
++#else
++remove();
++#endif
++
++; return 0; }
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
++if { (eval echo configure:1595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_remove=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_remove=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
+   :
+ else
+-  echo "$ac_err" >&5
++  echo "$ac_t""no" 1>&6
++fi
++
++    if test $ac_cv_func_remove = no; then
++      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
++echo "configure:1616: checking for remove in -lposix" >&5
++ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lposix  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1624 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char remove();
++
++int main() {
++remove()
++; return 0; }
++EOF
++if { (eval echo configure:1638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -rf conftest*
+-  CXXCPP=/lib/cpp
++  eval "ac_cv_lib_$ac_lib_var=no"
+ fi
+ rm -f conftest*
+-  ac_cv_prog_CXXCPP="$CXXCPP"
+-ac_ext=C
+-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cxx_cross
++LIBS="$ac_save_LIBS"
++
+ fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
++else
++  echo "$ac_t""no" 1>&6
+ fi
+-CXXCPP="$ac_cv_prog_CXXCPP"
+-echo "$ac_t""$CXXCPP" 1>&6
++
++    fi
++
++    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++    echo $ac_n "checking for shmat""... $ac_c" 1>&6
++echo "configure:1662: checking for shmat" >&5
++if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1667 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shmat(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char shmat();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shmat) || defined (__stub___shmat)
++choke me
++#else
++shmat();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:1693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_shmat=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_shmat=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  :
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++    if test $ac_cv_func_shmat = no; then
++      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
++echo "configure:1714: checking for shmat in -lipc" >&5
++ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lipc  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1722 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char shmat();
++
++int main() {
++shmat()
++; return 0; }
++EOF
++if { (eval echo configure:1736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++    fi
++  fi
++
++  # Check for libraries that X11R6 Xt/Xaw programs need.
++  ac_save_LDFLAGS="$LDFLAGS"
++  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
++  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
++  # check for ICE first), but we must link in the order -lSM -lICE or
++  # we get undefined symbols.  So assume we have SM if we have ICE.
++  # These have to be linked with before -lX11, unlike the other
++  # libraries we check for below, so use a different variable.
++  #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
++  echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
++echo "configure:1769: checking for IceConnectionNumber in -lICE" >&5
++ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lICE $X_EXTRA_LIBS $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1777 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char IceConnectionNumber();
++
++int main() {
++IceConnectionNumber()
++; return 0; }
++EOF
++if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  LDFLAGS="$ac_save_LDFLAGS"
++
++fi
++
++
++
++
++
++
++
++
++X_TOOLKIT_LIBS="-lXaw -lXmu -lXt"
++X_BASIC_LIBS="-lXext -lX11"
++
++LDFLAGS="$X_LIBS $LDFLAGS"
++CPPFLAGS="$X_CFLAGS $CPPFLAGS"
++
++echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
++echo "configure:1829: checking for main in -ldl" >&5
++ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldl  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1837 "configure"
++#include "confdefs.h"
++
++int main() {
++main()
++; return 0; }
++EOF
++if { (eval echo configure:1844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  LDL=-ldl
++else
++  echo "$ac_t""no" 1>&6
++LDL=
++fi
++
++
++echo $ac_n "checking for main in -lplotter""... $ac_c" 1>&6
++echo "configure:1867: checking for main in -lplotter" >&5
++ac_lib_var=`echo plotter'_'main | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lplotter  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 1875 "configure"
++#include "confdefs.h"
++
++int main() {
++main()
++; return 0; }
++EOF
++if { (eval echo configure:1882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  LPLOTTER=-lplotter
++else
++  echo "$ac_t""no" 1>&6
++LPLOTTER=
++fi
++
++
+ 
+ ac_safe=`echo "plotter.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for plotter.h""... $ac_c" 1>&6
+-echo "configure:1025: checking for plotter.h" >&5
++echo "configure:1907: checking for plotter.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1030 "configure"
++#line 1912 "configure"
+ #include "confdefs.h"
+ #include <plotter.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1055,9 +1937,9 @@
+ 
+ 
+ echo $ac_n "checking for version of "lib plot" ""... $ac_c" 1>&6
+-echo "configure:1059: checking for version of "lib plot" " >&5
++echo "configure:1941: checking for version of "lib plot" " >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 1061 "configure"
++#line 1943 "configure"
+ #include "confdefs.h"
+ #include <plotter.h>
+ 	 	 typedef int Point; 
+@@ -1065,7 +1947,7 @@
+  
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""you seem to have a newer version " 1>&6
+ else
+@@ -1079,16 +1961,16 @@
+ 
+ 
+ echo $ac_n "checking for built-in "bool" datatype""... $ac_c" 1>&6
+-echo "configure:1083: checking for built-in "bool" datatype" >&5
++echo "configure:1965: checking for built-in "bool" datatype" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 1085 "configure"
++#line 1967 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ bool testing_bool; testing_bool=true;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   CXXFLAGS="$CXXFLAGS -DINTERNALBOOL"; echo "$ac_t""yes" 1>&6
+ else
+@@ -1100,7 +1982,7 @@
+ rm -f conftest*
+ 
+ echo $ac_n "checking C++ compiler model""... $ac_c" 1>&6
+-echo "configure:1104: checking C++ compiler model" >&5
++echo "configure:1986: checking C++ compiler model" >&5
+ LINK="$CXX $LDFLAGS"
+ if test "$GXX" = yes; then
+   if test "$host_os" = riscos; then
+@@ -1299,9 +2181,15 @@
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+ s%@INSTALL_DATA@%$INSTALL_DATA%g
++s%@CXXCPP@%$CXXCPP%g
++s%@X_CFLAGS@%$X_CFLAGS%g
++s%@X_PRE_LIBS@%$X_PRE_LIBS%g
++s%@X_LIBS@%$X_LIBS%g
++s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
++s%@X_TOOLKIT_LIBS@%$X_TOOLKIT_LIBS%g
++s%@X_BASIC_LIBS@%$X_BASIC_LIBS%g
+ s%@LDL@%$LDL%g
+ s%@LPLOTTER@%$LPLOTTER%g
+-s%@CXXCPP@%$CXXCPP%g
+ s%@PLOTCOMPILEFLAGS@%$PLOTCOMPILEFLAGS%g
+ s%@SPECIAL_CXXFLAGS@%$SPECIAL_CXXFLAGS%g
+ s%@LDLIBS@%$LDLIBS%g
diff --git a/graphics/pstoedit/patches/patch-ac b/graphics/pstoedit/patches/patch-ac
new file mode 100644
index 00000000000..85ee65dea05
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ac
@@ -0,0 +1,48 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+--- Makefile.in.orig	Mon Jul  3 02:18:37 2000
++++ Makefile.in	Sat Jul 15 01:55:35 2000
+@@ -6,6 +6,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ bindir=@bindir@
++datadir=@datadir@
+ libdir=@libdir@
+ mandir=@mandir@
+ MANEXT=1
+@@ -15,12 +16,16 @@
+ INSTALL=@INSTALL@
+ GS=@GS@
+ 
++X_LIBS=@X_LIBS@ @X_TOOLKIT_LIBS@ @X_PRE_LIBS@ @X_BASIC_LIBS@ @X_EXTRA_LIBS@
++X_CFLAGS=@X_CFLAGS@ 
++
+ # Choose a compiler + linker
+-CXXFLAGS=@CXXFLAGS@
++CXXFLAGS=@CXXFLAGS@ $(X_CFLAGS)
+ CCC=@CXX@ @SPECIAL_CXXFLAGS@
+-LDLIBS=$(LOCALLIBS) @LDLIBS@ -lm @LDL@
++LDLIBS=$(LOCALLIBS) @LDLIBS@ $(X_LIBS) -lm @LDL@
+ LINK=@LINK@
+-CCFLAGS=-DDEFAULTGS=$(GS) $(CXXFLAGS) 
++CCFLAGS=-DDEFAULTGS=$(GS) $(CXXFLAGS)	\
++	-DPATH_DATADIR=\"$(datadir)\" -DPATH_PLUGINDIR=\"$(libdir)\"
+ 
+ # uncommment one of the following CCC lines for Un*x like systems
+ # For users of GNU g++
+@@ -338,11 +343,11 @@
+ 		$(INSTALL_DIR) $(bindir); \
+ 	fi                                    
+ 	$(INSTALL_PROGRAM) pstoedit $(bindir)
+-	if [ ! -d $(libdir) ] ; then \
+-		$(INSTALL_DIR) $(libdir); \
++	if [ ! -d $(datadir) ] ; then \
++		$(INSTALL_DIR) $(datadir); \
+ 	fi
+-	$(INSTALL_DATA) ../misc/mpost.fmp $(libdir)
+-	$(INSTALL_DATA) ../misc/latex2e.fmp $(libdir)
++	$(INSTALL_DATA) ../misc/mpost.fmp $(datadir)
++	$(INSTALL_DATA) ../misc/latex2e.fmp $(datadir)
+ 	if [ ! -d $(MANDIR) ] ; then \
+ 		$(INSTALL_DIR) $(MANDIR); \
+ 	fi
diff --git a/graphics/pstoedit/patches/patch-ad b/graphics/pstoedit/patches/patch-ad
new file mode 100644
index 00000000000..c8e66429d36
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ad
@@ -0,0 +1,53 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+--- miscutil.cpp.orig	Mon Jul  3 02:18:37 2000
++++ miscutil.cpp	Thu Jul 13 21:23:57 2000
+@@ -28,6 +28,10 @@
+ 
+ #if defined(unix) || defined(__unix__) || defined(_unix) || defined(__unix) || defined(__EMX__)
+ #include <unistd.h>
++#include <sys/param.h>
++#if defined(BSD) && BSD >= 199306
++#define HAVE_MKSTEMP
++#endif
+ #else
+ #include <direct.h>
+ #endif
+@@ -113,6 +117,17 @@
+ 
+ char * full_qualified_tempnam(const char * pref)
+ {
++#ifdef HAVE_MKSTEMP
++	char buf[80];
++	int fd;
++
++	/* safer than tempnam(), probably, but, .... */
++	sprintf(buf, "/tmp/%sXXXXXX", pref);
++	if ((fd = mkstemp(buf)) < 0)
++		return NULL;
++	close(fd);
++	return strdup(buf);
++#else
+ #if defined (__BCPLUSPLUS__) || defined (__TCPLUSPLUS__)
+ /* borland has a prototype that expects a char * as second arg */
+ 	char * filename = tempnam(0,(char *) pref);
+@@ -141,6 +156,7 @@
+ 		return filename;
+ 	}
+ #endif
++#endif
+ }
+ 
+ // a strdup which uses new instead of malloc
+@@ -280,7 +296,11 @@
+ 
+ TempFile::TempFile()  
+ { 
++#if 1
++	tempFileName = full_qualified_tempnam("pstmp");
++#else
+ 	tempFileName = tempnam(0,"pstmp"); 
++#endif
+ 	// cout << "constructed " << tempFileName << endl; 
+ }
+ 
diff --git a/graphics/pstoedit/patches/patch-ae b/graphics/pstoedit/patches/patch-ae
new file mode 100644
index 00000000000..0935052de0e
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ae
@@ -0,0 +1,233 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+Don't add spaces at the end of lines
+since fig2dev (in transfig) doesn't like them.
+
+--- drvfig.cpp.orig	Mon Jun  5 03:49:29 2000
++++ drvfig.cpp	Fri Jul 14 08:28:42 2000
+@@ -217,19 +217,19 @@
+   //  const Point & p;
+   for (unsigned int n = 0; n < numberOfElementsInPath(); n++) {
+     const basedrawingelement & elem = pathElement(n);
+-    if (j == 0) { buffer << "\t"; }
++    if (j == 0) { buffer << "\t"; } else buffer << " ";
+     switch(elem.getType()) {
+         case lineto:
+         case moveto: {
+             const Point & p = pathElement(n).getPoint(0);
+ 	    buffer << (int)(PntFig * p.x_) << " "
+-	           << (int)(y_offset - (PntFig * p.y_)) << " ";
++	           << (int)(y_offset - (PntFig * p.y_));
+             }
+             break;
+         case closepath: {
+             const Point & p = pathElement(0).getPoint(0);
+ 	    buffer << (int)(PntFig * p.x_) << " "
+-	           << (int)(y_offset - (PntFig * p.y_)) << " ";
++	           << (int)(y_offset - (PntFig * p.y_));
+             }
+             break;
+         default:
+@@ -248,6 +248,10 @@
+ void drvFIG::prpoint(ostream & os, const Point& p) const {
+ 	os << (int)(PntFig * p.x_) << " " << (int)(y_offset - (PntFig * p.y_)) << " ";
+ }
++
++void drvFIG::prpointnl(ostream & os, const Point& p) const {
++	os << (int)(PntFig * p.x_) << " " << (int)(y_offset - (PntFig * p.y_)) << endl;
++}
+ // print segments without x-splines
+ void drvFIG::print_spline_coords_noxsplines(int linestyle,float localLineWidth)
+ {
+@@ -275,9 +279,8 @@
+        // 4.0 is the gap spec. we could also derive this from the input
+ 		buffer << 2 << "\n\t";
+ 		prpoint(buffer,currentPoint);
+-		prpoint(buffer,p);
++		prpointnl(buffer,p);
+ 		currentPoint=p;
+-		buffer << endl;
+ 		}
+ 		break;
+ 	}
+@@ -295,9 +298,8 @@
+ 		prpoint(buffer,currentPoint);
+ 		prpoint(buffer,elem.getPoint(0));
+ 		prpoint(buffer,elem.getPoint(1));
+-		prpoint(buffer,elem.getPoint(2));
++		prpointnl(buffer,elem.getPoint(2));
+ 		currentPoint=elem.getPoint(2);
+-		buffer <<  endl;
+ 		// 32 buffer << "\n\t0.000 1.000 1.000 0.000" << endl;
+ 	break;
+ 	}
+@@ -312,9 +314,8 @@
+        // 4.0 is the gap spec. we could also derive this from the input
+ 		buffer << 2 << "\n\t";
+ 		prpoint(buffer,currentPoint);
+-		prpoint(buffer,firstPoint);
++		prpointnl(buffer,firstPoint);
+ 		currentPoint=firstPoint;
+-		buffer << endl;
+ 		break;
+ 	}
+ 	break;
+@@ -332,14 +333,14 @@
+   int j = 0;
+ 
+   for (unsigned int n = 0; n < numberOfElementsInPath(); n++) {
+-    if (j == 0) { buffer << "\t"; }
++    if (j == 0) { buffer << "\t"; } else { buffer << " "; }
+     const basedrawingelement & elem = pathElement(n);
+     switch (elem.getType()) {
+       case moveto:
+       case lineto: {
+ 	const Point & p = elem.getPoint(0);
+ 	buffer << (int)(PntFig * p.x_) << " "
+-	       << (int)(y_offset - (PntFig * p.y_)) <<	" ";
++	       << (int)(y_offset - (PntFig * p.y_));
+ 	}
+     	j++; if (j == 5) { j=0; buffer << "\n"; }
+ 	break;
+@@ -347,16 +348,17 @@
+         if ((format == 31)) {
+ 		const Point & p = elem.getPoint(2);
+ 		buffer << (int)(PntFig * p.x_) << " "
+-		       << (int)(y_offset - (PntFig * p.y_)) <<	" ";
++		       << (int)(y_offset - (PntFig * p.y_));
+     		j++; if (j == 5) { j=0; buffer << "\n"; }
+ 	} else {
+ 		// put all points, middle points will have control value 1
+ 		for (unsigned int cp = 0 ; cp < 3; cp++ ) {
+ 			const Point & p = elem.getPoint(cp);
+ 			buffer << (int)(PntFig * p.x_) << " "
+-		       	<< (int)(y_offset - (PntFig * p.y_)) <<	" ";
++		       	<< (int)(y_offset - (PntFig * p.y_));
+     			j++; if (j == 5) { j=0; buffer << "\n"; }
+     			if ((j == 0) && (cp != 2) && ( n+1 != (numberOfElementsInPath()))) { buffer << "\t"; }
++    			if ((j != 0) && (cp != 2) && ( n+1 != (numberOfElementsInPath()))) { buffer << " "; }
+ 		}
+ 	}
+ 	}
+@@ -364,7 +366,7 @@
+       case closepath: {
+ 	const Point & p = pathElement(0).getPoint(0);
+ 	buffer << (int)(PntFig * p.x_) << " "
+-	       << (int)(y_offset - (PntFig * p.y_)) <<	" ";
++	       << (int)(y_offset - (PntFig * p.y_));
+ 	}
+     	j++; if (j == 5) { j=0; buffer << "\n"; }
+ 	break;
+@@ -397,14 +399,14 @@
+     switch (elem.getType()) {
+       case moveto: {
+         if (format == 31) {
+-		buffer << "\t0.0 0.0 ";
++		buffer << "\t0.0 0.0";
+ 	} else {
+-		buffer << " 0 ";
++		buffer << " 0";
+ 	}
+ 	j++; if (j == maxj) { 
+ 		j=0; buffer << "\n"; 
+     		if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; }
+-	}
++	} else if (n+1 != numberOfElementsInPath()) { buffer << " "; }
+ 	lastp = elem.getPoint(0);
+ 	}
+ 	break;
+@@ -412,23 +414,23 @@
+         if (format == 31) {
+ 		const Point & p = elem.getPoint(0);
+ 		buffer << (float)(PntFig * lastp.x_) << " "
+-		       << (float)(y_offset - (PntFig * lastp.y_)) <<  " ";
++		       << (float)(y_offset - (PntFig * lastp.y_));
+ 		j++; if (j == maxj) { 
+ 			j=0; buffer << "\n\t"; 
+-		}
++		} else if (n+1 != numberOfElementsInPath()) { buffer << " "; }
+ 		buffer << (float)(PntFig * p.x_) << " "
+-		       << (float)(y_offset - (PntFig * p.y_)) <<	" ";
++		       << (float)(y_offset - (PntFig * p.y_));
+ 		j++; if (j == maxj) { 
+ 			j=0; buffer << "\n"; 
+     			if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; }
+-		}
++		} else if (n+1 != numberOfElementsInPath()) { buffer << " "; }
+ 		lastp = elem.getPoint(0);
+ 	} else {
+-		buffer << " 0 ";
++		buffer << " 0";
+ 		j++; if (j == maxj) { 
+ 			j=0; buffer << "\n"; 
+     			if ((n+1) != numberOfElementsInPath()) { buffer << "\t"; }
+-		}
++		} else if (n+1 != numberOfElementsInPath()) { buffer << " "; }
+ 	}
+ 	}
+ 	break;
+@@ -436,23 +438,23 @@
+         if (format == 31) {
+ 		const Point & p = pathElement(0).getPoint(0);
+ 		buffer << (float)(PntFig * lastp.x_) << " "
+-		       << (float)(y_offset - (PntFig * lastp.y_)) <<  " ";
++		       << (float)(y_offset - (PntFig * lastp.y_));
+ 		j++; if (j == maxj) { 
+ 			j=0; buffer << "\n\t"; 
+-		}
++		} else buffer << " ";
+ 		buffer << (float)(PntFig * p.x_) << " "
+-		       << (float)(y_offset - (PntFig * p.y_)) <<	" ";
++		       << (float)(y_offset - (PntFig * p.y_));
+ 		j++; if (j == maxj) { 
+ 			j=0; buffer << "\n"; 
+     			if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; }
+-		}
++		} else if (n+1 != numberOfElementsInPath()) { buffer << " "; }
+ 		lastp = pathElement(0).getPoint(0);
+ 	} else {
+-		buffer << " 0 ";
++		buffer << " 0";
+ 		j++; if (j == maxj) { 
+ 			j=0; buffer << "\n"; 
+     			if ( (n+1) != numberOfElementsInPath()) { buffer << "\t"; }
+-		}
++		} else if (n+1 != numberOfElementsInPath()) { buffer << " "; }
+ 	}
+ 	}
+ 	break;
+@@ -461,21 +463,21 @@
+ 	  	for (unsigned int cp = 0 ; cp < 2; cp++ ) {
+ 		    	const Point & p = elem.getPoint(cp);
+ 			    buffer << (float)(PntFig * p.x_) << " "
+-				   << (float)(y_offset - (PntFig * p.y_)) <<  " ";
++				   << (float)(y_offset - (PntFig * p.y_));
+ 		    	j++; if (j == maxj) { 
+ 				j=0; buffer << "\n"; 
+     		    		if (!((cp == 2) && ( (n+1) == numberOfElementsInPath()))) { buffer << "\t"; }
+-		    	}
++		    	} else if (n+1 != numberOfElementsInPath()) { buffer << " "; }
+ 		  }
+ 	} else {
+ 		// put all points, middle points will have control value 1
+ 		const char * sk = "110";
+ 		for (unsigned int i = 0 ; i < 3; i++ ){
+-			buffer << " " << sk[i] << " ";
++			buffer << " " << sk[i];
+ 		    	j++; if (j == maxj) { 
+ 				j=0; buffer << "\n"; 
+     		    		if (!((i == 2) && ((n+1) == numberOfElementsInPath()))) { buffer << "\t"; }
+-		    	}
++		    	} else if (!(i == 2 && n+1 == numberOfElementsInPath())) { buffer << " "; }
+ 		}
+ 	}
+ 	lastp = elem.getPoint(2);
+@@ -488,7 +490,7 @@
+     }
+   }
+   if (format == 31) {
+-  	if (j == maxj) { j=0; buffer << "\n\t"; }
++  	if (j == maxj) { j=0; buffer << "\n\t"; } else buffer << " ";
+   	buffer << "0.0 0.0\n";
+   } else {
+ 	if (j != 0) { buffer << endl; }
diff --git a/graphics/pstoedit/patches/patch-af b/graphics/pstoedit/patches/patch-af
new file mode 100644
index 00000000000..3c4dda26759
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/07/18 07:46:40 itohy Exp $
+
+--- drvfig.h.orig	Sun Aug  8 02:33:38 1999
++++ drvfig.h	Fri Jul 14 07:52:05 2000
+@@ -47,6 +47,7 @@
+ 	void print_polyline_coords();
+ 	void print_spline_coords_noxsplines(int linestyle, float localLineWidth);
+ 	void prpoint(ostream & os, const Point& p) const;
++	void prpointnl(ostream & os, const Point& p) const;
+ 	void print_spline_coords1();
+ 	void print_spline_coords2();
+ 
diff --git a/graphics/pstoedit/patches/patch-ag b/graphics/pstoedit/patches/patch-ag
new file mode 100644
index 00000000000..fe6e2c071d9
--- /dev/null
+++ b/graphics/pstoedit/patches/patch-ag
@@ -0,0 +1,58 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/07/18 07:46:41 itohy Exp $
+
+--- pstoedit.cpp.orig	Mon Jul  3 02:18:38 2000
++++ pstoedit.cpp	Sat Jul 15 00:47:54 2000
+@@ -218,6 +218,12 @@
+ 	}	
+ 
+ 	// also look in the directory where the pstoedit .exe/dll was found
++#ifdef PATH_PLUGINDIR
++	if (strcmp(PATH_PLUGINDIR,plugindir?plugindir:"") != 0) {
++		loadPlugInDrivers(PATH_PLUGINDIR,errstream);
++		pluginsloaded = true;
++	}
++#else
+ 	char szExePath[1000];
+ 	szExePath[0]= '\0';
+ 	const int r = P_GetPathToMyself(progname,szExePath, sizeof(szExePath));
+@@ -230,6 +236,7 @@
+ 			pluginsloaded = true;
+ 		}
+ 	}
++#endif
+ 
+ 	delete [] plugindir;
+ }
+@@ -587,6 +594,14 @@
+ 				// also look in the directory where the pstoedit .exe/dll was found
+ 				char szExePath[1000];
+ 				szExePath[0]= '\0';
++#ifdef PATH_DATADIR
++				RSString test(szExePath);
++				test += PATH_DATADIR;
++				char delim[] = {directoryDelimiter,'\0'};
++				test += delim;
++				test+=drivername;
++				test+=".fmp";
++#else
+ 				const int r = P_GetPathToMyself(argv[0],szExePath, sizeof(szExePath));
+ 				if( r && verbose) {
+ 					errstream << " path to myself: " << szExePath << endl;
+@@ -605,6 +620,7 @@
+ 					test+=drivername;
+ 					test+=".fmp";
+ #endif 
++#endif
+ 					// errstream << test.value() << endl;
+ 					if (fileExists(test.value())) {
+ 						if(verbose) {
+@@ -612,7 +628,9 @@
+ 						}	
+ 						outputdriver->theFontMapper.readMappingTable(errstream,test.value());
+ 					}
++#ifndef PATH_DATADIR
+ 				}
++#endif
+ 			}
+ 
+ 			char * gsoutName = 0;
diff --git a/graphics/pstoedit/pkg/COMMENT b/graphics/pstoedit/pkg/COMMENT
new file mode 100644
index 00000000000..e4b52eff72e
--- /dev/null
+++ b/graphics/pstoedit/pkg/COMMENT
@@ -0,0 +1 @@
+Convert PostScript / PDF into various vector graphic formats
diff --git a/graphics/pstoedit/pkg/DESCR b/graphics/pstoedit/pkg/DESCR
new file mode 100644
index 00000000000..32190453195
--- /dev/null
+++ b/graphics/pstoedit/pkg/DESCR
@@ -0,0 +1,3 @@
+pstoedit converts Postscript(TM) and PDF files to other vector graphic
+formats so that they can be edited graphically. See pstoedit.htm or
+index.htm for more details on which formats are supported by pstoedit.
diff --git a/graphics/pstoedit/pkg/PLIST b/graphics/pstoedit/pkg/PLIST
new file mode 100644
index 00000000000..929cf0f0c9c
--- /dev/null
+++ b/graphics/pstoedit/pkg/PLIST
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/07/18 07:46:41 itohy Exp $
+bin/pstoedit
+man/man1/pstoedit.1
+share/pstoedit/doc/changelog.htm
+share/pstoedit/doc/index.htm
+share/pstoedit/doc/pstoedit.htm
+share/pstoedit/doc/readme.txt
+@dirrm share/pstoedit/doc
+share/pstoedit/latex2e.fmp
+share/pstoedit/mpost.fmp
+@dirrm share/pstoedit