Updated to geomview-1.8.1.

1.8.1	March, 2001

   This is a bugfix release.

   * No segfaults at startup on linux.
   * Toggle buttons are visible again.
   * Binary I/O on linux works.

Changelog:

2001-03-24  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>

	* configure.in: Do not add -XSVR4 and -common to CFLAGS when
	configuring with IRIX cc.

2001-03-21  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>

	* doc/Makefile.am (EXTRA_DIST): Remove motion.pdf.

	* configure.in: Set revision to 1.8.1.

	* m4/geom_local.m4 (GEOM_FIND_I_OPTION): Respect prior setting of
	$CPPFLAGS while probing.

2001-03-19  Mark Phillips  <mbp@geomtech.com>

	* doc/motion.tex: new file added to release; documents the
	  mathematics behind Geomview's motion model.  For use by
	  developers (not needed by regular users).

2001-02-21  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>

	* configure.in: Add AC_FUNC_SETPGRP.

2001-02-18  Steve M. Robbins  <steve@nyongwa.montreal.qc.ca>

	* configure.in: Add option --with-build-path.  Use AC_PATH_XTRA.
	Correct the X library link order.  Make sure to check
	/usr/local/lib for all libraries that check /usr/local/include.
	Check for <forms.h> in $x_includes and $x_includes/X11.  Make sure
	both the includes and the libs are correct before using FORMS.
	Announce whether Xmu is found.  General tidying up.

2001-02-17  Steve Robbins  <steve@nyongwa.montreal.qc.ca>

	* acconfig.h: Close comment above define for HAVE_FMEMOPEN.

	* configure.in: Check endianness and check for header netinet/in.h.

	* doc/Makefile.am: Only build "geomview.pdf" on target "pdf".

2001-02-11  Steve Robbins  <steve@nyongwa.montreal.qc.ca>

	* m4/geom_local.m4 (GEOM_CHECK_XFORMS): New.  If XFORMS library is
	available, set variables for finding includes and libraries, emit
	warning if XFORMS is not available.


2001-01-16  Steve Robbins  <steve@nyongwa.montreal.qc.ca>

	* configure.in: removed redundant --with-forms argument; its
	effects got overwritten by --with-xforms, anyway.

2000-11-23  Steve Robbins  <steve@nyongwa.montreal.qc.ca>

	* src/Makefile.am (geomview): look for "gvx" in $(moduledir)
	rather than $(bindir).
	(CLEANFILES): clean geomview script.

5 files changed, 221 insertions, 98 deletions

diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 3306a138535..e5efd934e2b 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2001/02/23 20:10:10 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/29 00:02:18 jtb Exp $
 
-DISTNAME=		geomview-1.8.0
+DISTNAME=		geomview-1.8.1
 CATEGORIES=		graphics math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=geomview/}
 
@@ -21,4 +21,18 @@ CONFIGURE_ENV+=		"CPPFLAGS=-Dunix -Dalloca=__builtin_alloca"
 
 INFO_FILES=		geomview
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/geomview
+	${INSTALL_DATA} ${WRKSRC}/doc/geomview.pdf			\
+	${PREFIX}/share/doc/geomview
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/geomview
+	${INSTALL_DATA} ${WRKSRC}/doc/example*				\
+	${PREFIX}/share/examples/geomview
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/geomview
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html 			\
+	${PREFIX}/share/doc/html/geomview
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/geomview/pix
+	${INSTALL_DATA} ${WRKSRC}/doc/html/pix/*			\
+	${PREFIX}/share/doc/html/geomview/pix
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/geomview/files/md5 b/graphics/geomview/files/md5
index 49cd192e3e8..98a05b59a67 100644
--- a/graphics/geomview/files/md5
+++ b/graphics/geomview/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/02/09 03:27:02 jtb Exp $
+$NetBSD: md5,v 1.2 2001/03/29 00:02:18 jtb Exp $
 
-MD5 (geomview-1.8.0.tar.gz) = f925e7cf057ff9ea5bbecdc2331e3822
+SHA1 (geomview-1.8.1.tar.gz) = 026a22ecba471f7d55c407de4fc409213d166477
diff --git a/graphics/geomview/files/patch-sum b/graphics/geomview/files/patch-sum
index 7640770bcbd..8827821d847 100644
--- a/graphics/geomview/files/patch-sum
+++ b/graphics/geomview/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.2 2001/02/09 18:11:24 jtb Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/29 00:02:18 jtb Exp $
 
-MD5 (patch-aa) = c1281e6fe4cbc73d8aa99a75bd4cf851
-MD5 (patch-ab) = 4c001c45aaf9c50a8e6185d7b53ca10c
-MD5 (patch-ac) = d0895462c3d932a04c91b51d6ef769a5
-MD5 (patch-ad) = c6d9ae858cec55cd0e86a80d3847818d
-MD5 (patch-ae) = d1f43c237ab79b60f0f98fe0b40d94a0
-MD5 (patch-af) = 2d8ade926eb4de9cb830a96c23d52f18
+SHA1 (patch-aa) = a9ee95f1ee26a4533a3f34a05a5b5314eaddc4f3
+SHA1 (patch-ab) = 706b10ccfb3ba02baa48b461123707cdd9cbfdff
+SHA1 (patch-ac) = dfc755b29ad0bb37311ad6d46022f2afcc56ccd9
+SHA1 (patch-ad) = 9db6fb9ffae5939f80bfcae8aa5da389437d627c
+SHA1 (patch-ae) = f9b721883520a701ae66ab28f4e4b7e6e307fea7
+SHA1 (patch-af) = a9eab9b45dfaed20d08472b56d1b1fb880081a0e
diff --git a/graphics/geomview/patches/patch-aa b/graphics/geomview/patches/patch-aa
index 2b69f13270f..8a0cf974efb 100644
--- a/graphics/geomview/patches/patch-aa
+++ b/graphics/geomview/patches/patch-aa
@@ -1,88 +1,79 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/09 03:27:02 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/29 00:02:18 jtb Exp $
 
---- configure.orig	Sun Nov 19 23:20:25 2000
+--- configure.orig	Mon Mar 26 05:23:02 2001
 +++ configure
-@@ -2020,7 +2020,7 @@
- for geom_z in $geom_dirs ; do
-   geom_z=`eval echo $geom_z`
-   if test "$geom_z" != "" ; then
--    geom_l_option="-L$geom_z"
-+    geom_l_option="-R$geom_z -L$geom_z"
-   else
-     geom_l_option=""
-   fi
-@@ -2069,7 +2069,7 @@
- for geom_z in $geom_dirs ; do
-   geom_z=`eval echo $geom_z`
-   if test "$geom_z" != "" ; then
--    geom_l_option="-L$geom_z"
-+    geom_l_option="-R$geom_z -L$geom_z"
-   else
-     geom_l_option=""
-   fi
-@@ -2122,7 +2122,7 @@
- for geom_z in $geom_dirs ; do
-   geom_z=`eval echo $geom_z`
-   if test "$geom_z" != "" ; then
--    geom_l_option="-L$geom_z"
-+    geom_l_option="-R$geom_z -L$geom_z"
-   else
-     geom_l_option=""
-   fi
-@@ -2190,7 +2190,7 @@
+@@ -2028,7 +2028,7 @@
+ 
+   # 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"
++    X_LIBS="$X_LIBS -Wl,-R$x_libraries -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
+@@ -2563,7 +2563,7 @@
+ 
+   # Check for libraries that X11R6 Xt/Xaw programs need.
+   ac_save_LDFLAGS="$LDFLAGS"
+-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
++  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -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.
+@@ -2643,7 +2643,7 @@
  for geom_z in $geom_dirs ; do
    geom_z=`eval echo $geom_z`
-   if test "$geom_z" != "" ; then
--    geom_l_option="-L$geom_z"
-+    geom_l_option="-R$geom_z -L$geom_z"
-   else
-     geom_l_option=""
-   fi
-@@ -2336,7 +2336,7 @@
+   geom_l_option=
+-  test -n "$geom_z" && geom_l_option="-L$geom_z"
++  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
+   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
+   echo "configure:2649: checking for $geom_func with $geom_l_option" >&5
+   cat > conftest.$ac_ext <<EOF
+@@ -2781,7 +2781,7 @@
  for geom_z in $geom_dirs ; do
    geom_z=`eval echo $geom_z`
-   if test "$geom_z" != "" ; then
--    geom_l_option="-L$geom_z"
-+    geom_l_option="--R$geom_z L$geom_z"
-   else
-     geom_l_option=""
-   fi
-@@ -2470,7 +2470,7 @@
+   geom_l_option=
+-  test -n "$geom_z" && geom_l_option="-L$geom_z"
++  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
+   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
+   echo "configure:2787: checking for $geom_func with $geom_l_option" >&5
+   cat > conftest.$ac_ext <<EOF
+@@ -2910,7 +2910,7 @@
  for geom_z in $geom_dirs ; do
    geom_z=`eval echo $geom_z`
-   if test "$geom_z" != "" ; then
--    geom_l_option="-L$geom_z"
-+    geom_l_option="-R$geom_z -L$geom_z"
-   else
-     geom_l_option=""
-   fi
-@@ -2527,7 +2527,7 @@
+   geom_l_option=
+-  test -n "$geom_z" && geom_l_option="-L$geom_z"
++  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
+   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
+   echo "configure:2916: checking for $geom_func with $geom_l_option" >&5
+   cat > conftest.$ac_ext <<EOF
+@@ -2964,7 +2964,7 @@
  for geom_z in $geom_dirs ; do
    geom_z=`eval echo $geom_z`
-   if test "$geom_z" != "" ; then
--    geom_l_option="-L$geom_z"
-+    geom_l_option="-R$geom_z -L$geom_z"
-   else
-     geom_l_option=""
-   fi
-@@ -2690,7 +2690,7 @@
+   geom_l_option=
+-  test -n "$geom_z" && geom_l_option="-L$geom_z"
++  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
+   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
+   echo "configure:2970: checking for $geom_func with $geom_l_option" >&5
+   cat > conftest.$ac_ext <<EOF
+@@ -3106,7 +3106,7 @@
  for geom_z in $geom_dirs ; do
    geom_z=`eval echo $geom_z`
-   if test "$geom_z" != "" ; then
--    geom_l_option="-L$geom_z"
-+    geom_l_option="-R$geom_z -L$geom_z"
-   else
-     geom_l_option=""
-   fi
-@@ -3118,6 +3118,7 @@
+   geom_l_option=
+-  test -n "$geom_z" && geom_l_option="-L$geom_z"
++  test -n "$geom_z" && geom_l_option="-Wl,-R$geom_z -L$geom_z"
+   LIBS="$geom_l_option $geom_lib $geom_otherlibs"
+   echo "configure:3112: checking for $geom_func with $geom_l_option" >&5
+   cat > conftest.$ac_ext <<EOF
+@@ -3462,6 +3462,7 @@
  cat > conftest.$ac_ext <<EOF
- #line 3120 "configure"
+ #line 3464 "configure"
  #include "confdefs.h"
 +#include <stdio.h>
   #include <sys/socket.h> 
  int main() {
   int s = socket(AF_UNIX, SOCK_STREAM, 0); 
-@@ -3362,7 +3363,7 @@
+@@ -3865,7 +3866,7 @@
  moduledir="\$(exec_prefix)/bin"
  
  
diff --git a/graphics/geomview/pkg/PLIST b/graphics/geomview/pkg/PLIST
index cc2e0ca8f3d..fa884083427 100644
--- a/graphics/geomview/pkg/PLIST
+++ b/graphics/geomview/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/02/09 03:27:00 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/03/29 00:02:19 jtb Exp $
 bin/.geomview-animate
 bin/.geomview-drawbdy
 bin/animate
@@ -18,6 +18,139 @@ bin/polymerge
 bin/togeomview
 bin/ucdtooff
 bin/vrml2oogl
+@unexec install-info --delete --info-dir=%D/info %D/info/geomview
+info/geomview
+info/geomview-1
+info/geomview-2
+info/geomview-3
+info/geomview-4
+info/geomview-5
+info/geomview-6
+info/geomview-7
+@exec install-info --info-dir=%D/info %D/info/geomview
+man/man1/anytooff.1
+man/man1/anytoucd.1
+man/man1/bdy.1
+man/man1/bez2mesh.1
+man/man1/clip.1
+man/man1/geomview.1
+man/man1/math2oogl.1
+man/man1/offconsol.1
+man/man1/oogl2rib.1
+man/man1/oogl2vrml.1
+man/man1/polymerge.1
+man/man1/togeomview.1
+man/man1/ucdtooff.1
+man/man1/vrml2oogl.1
+share/doc/geomview/geomview.pdf
+share/doc/html/geomview/geomview_1.html
+share/doc/html/geomview/geomview_10.html
+share/doc/html/geomview/geomview_11.html
+share/doc/html/geomview/geomview_12.html
+share/doc/html/geomview/geomview_13.html
+share/doc/html/geomview/geomview_14.html
+share/doc/html/geomview/geomview_15.html
+share/doc/html/geomview/geomview_16.html
+share/doc/html/geomview/geomview_17.html
+share/doc/html/geomview/geomview_18.html
+share/doc/html/geomview/geomview_19.html
+share/doc/html/geomview/geomview_2.html
+share/doc/html/geomview/geomview_20.html
+share/doc/html/geomview/geomview_21.html
+share/doc/html/geomview/geomview_22.html
+share/doc/html/geomview/geomview_3.html
+share/doc/html/geomview/geomview_23.html
+share/doc/html/geomview/geomview_24.html
+share/doc/html/geomview/geomview_25.html
+share/doc/html/geomview/geomview_26.html
+share/doc/html/geomview/geomview_27.html
+share/doc/html/geomview/geomview_28.html
+share/doc/html/geomview/geomview_29.html
+share/doc/html/geomview/geomview_30.html
+share/doc/html/geomview/geomview_31.html
+share/doc/html/geomview/geomview_32.html
+share/doc/html/geomview/geomview_33.html
+share/doc/html/geomview/geomview_34.html
+share/doc/html/geomview/geomview_35.html
+share/doc/html/geomview/geomview_36.html
+share/doc/html/geomview/geomview_37.html
+share/doc/html/geomview/geomview_38.html
+share/doc/html/geomview/geomview_39.html
+share/doc/html/geomview/geomview_4.html
+share/doc/html/geomview/geomview_40.html
+share/doc/html/geomview/geomview_41.html
+share/doc/html/geomview/geomview_42.html
+share/doc/html/geomview/geomview_43.html
+share/doc/html/geomview/geomview_44.html
+share/doc/html/geomview/geomview_45.html
+share/doc/html/geomview/geomview_46.html
+share/doc/html/geomview/geomview_47.html
+share/doc/html/geomview/geomview_48.html
+share/doc/html/geomview/geomview_49.html
+share/doc/html/geomview/geomview_5.html
+share/doc/html/geomview/geomview_50.html
+share/doc/html/geomview/geomview_51.html
+share/doc/html/geomview/geomview_52.html
+share/doc/html/geomview/geomview_53.html
+share/doc/html/geomview/geomview_54.html
+share/doc/html/geomview/geomview_55.html
+share/doc/html/geomview/geomview_56.html
+share/doc/html/geomview/geomview_57.html
+share/doc/html/geomview/geomview_58.html
+share/doc/html/geomview/geomview_59.html
+share/doc/html/geomview/geomview_6.html
+share/doc/html/geomview/geomview_60.html
+share/doc/html/geomview/geomview_61.html
+share/doc/html/geomview/geomview_62.html
+share/doc/html/geomview/geomview_63.html
+share/doc/html/geomview/geomview_64.html
+share/doc/html/geomview/geomview_65.html
+share/doc/html/geomview/geomview_66.html
+share/doc/html/geomview/geomview_67.html
+share/doc/html/geomview/geomview_68.html
+share/doc/html/geomview/geomview_69.html
+share/doc/html/geomview/geomview_7.html
+share/doc/html/geomview/geomview_70.html
+share/doc/html/geomview/geomview_71.html
+share/doc/html/geomview/geomview_72.html
+share/doc/html/geomview/geomview_73.html
+share/doc/html/geomview/geomview_74.html
+share/doc/html/geomview/geomview_75.html
+share/doc/html/geomview/geomview_76.html
+share/doc/html/geomview/geomview_77.html
+share/doc/html/geomview/geomview_78.html
+share/doc/html/geomview/geomview_79.html
+share/doc/html/geomview/geomview_8.html
+share/doc/html/geomview/geomview_80.html
+share/doc/html/geomview/geomview_81.html
+share/doc/html/geomview/geomview_82.html
+share/doc/html/geomview/geomview_83.html
+share/doc/html/geomview/geomview_84.html
+share/doc/html/geomview/geomview_85.html
+share/doc/html/geomview/geomview_86.html
+share/doc/html/geomview/geomview_9.html
+share/doc/html/geomview/geomview_toc.html
+share/doc/html/geomview/index.html
+share/doc/html/geomview/pix/ap.gif
+share/doc/html/geomview/pix/cam.gif
+share/doc/html/geomview/pix/color.gif
+share/doc/html/geomview/pix/command.gif
+share/doc/html/geomview/pix/fig2.gif
+share/doc/html/geomview/pix/initial.gif
+share/doc/html/geomview/pix/light.gif
+share/doc/html/geomview/pix/load.gif
+share/doc/html/geomview/pix/main.gif
+share/doc/html/geomview/pix/mat.gif
+share/doc/html/geomview/pix/myfilelist.gif
+share/doc/html/geomview/pix/save.gif
+share/doc/html/geomview/pix/secondlinelist.gif
+share/doc/html/geomview/pix/tools.gif
+share/doc/html/geomview/pix/trefdodecinter.gif
+share/doc/html/geomview/pix/world.gif
+share/examples/geomview/example1.c
+share/examples/geomview/example2.c
+share/examples/geomview/example3.c
+share/examples/geomview/example4.tcl
 share/geomview/data/.geomview
 share/geomview/data/cmap.fmap
 share/geomview/data/geom/HingeCube
@@ -138,25 +271,10 @@ share/geomview/data/geom/xwyezed.vect
 share/geomview/data/geom/xyz.grp
 share/geomview/data/geom/xyz.vect
 share/geomview/data/geom/ztent.mesh
-@unexec install-info --delete --info-dir=%D/info %D/info/geomview
-info/geomview
-info/geomview-1
-info/geomview-2
-info/geomview-3
-info/geomview-4
-info/geomview-5
-info/geomview-6
-info/geomview-7
-@exec install-info --info-dir=%D/info %D/info/geomview
-man/man1/anytooff.1
-man/man1/anytoucd.1
-man/man1/bdy.1
-man/man1/clip.1
-man/man1/geomview.1
-man/man1/offconsol.1
-man/man1/polymerge.1
-man/man1/togeomview.1
-man/man1/ucdtooff.1
+@dirrm share/examples/geomview
+@dirrm share/doc/geomview
+@dirrm share/doc/html/geomview/pix
+@dirrm share/doc/html/geomview
 @dirrm share/geomview/data/geom/textured
 @dirrm share/geomview/data/geom/spherical
 @dirrm share/geomview/data/geom/polyhedra