summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorBill Fenner <fenner@FreeBSD.org>2002-11-22 20:44:29 +0000
committerBill Fenner <fenner@FreeBSD.org>2002-11-22 20:44:29 +0000
commit4664f6012229891397b1026c6878bc51e0b69aef (patch)
tree1aa18e590ff18bb0b52ec72d12d2b59f809fa8dd /graphics
parentgsubedit should have been repo copied from graphics/gsubedit, not (diff)
Upgrade to 1.8.1 .
It's not quite completely unbroken, but it's certainly less broken than 1.6 was.
Notes
Notes: svn path=/head/; revision=70766
Diffstat (limited to 'graphics')
-rw-r--r--graphics/geomview/Makefile28
-rw-r--r--graphics/geomview/distinfo2
-rw-r--r--graphics/geomview/files/patch-aa67
-rw-r--r--graphics/geomview/files/patch-ab29
-rw-r--r--graphics/geomview/files/patch-ac19
-rw-r--r--graphics/geomview/files/patch-ae32
-rw-r--r--graphics/geomview/files/patch-af41
-rw-r--r--graphics/geomview/files/patch-ag61
-rw-r--r--graphics/geomview/files/patch-ah11
-rw-r--r--graphics/geomview/files/patch-ai11
-rw-r--r--graphics/geomview/files/patch-aj14
-rw-r--r--graphics/geomview/files/patch-ak11
-rw-r--r--graphics/geomview/files/patch-configure.in36
-rw-r--r--graphics/geomview/files/patch-lisp.c11
-rw-r--r--graphics/geomview/files/patch-streampool.h11
15 files changed, 77 insertions, 307 deletions
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index fdc2ecf536b9..088c8c87cca8 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -6,23 +6,23 @@
#
PORTNAME= geomview
-PORTVERSION= 1.6.1
-CATEGORIES= graphics tk82
-MASTER_SITES= ftp://ftp.geom.umn.edu/pub/software/geomview/ \
- ftp://ftp-sfb288.math.tu-berlin.de/pub/geomview/
-DISTFILES= geomview-1.6.1-src.tar.gz
+PORTVERSION= 1.8.1
+CATEGORIES= graphics tk83
+MASTER_SITES= http://ftp1.sourceforge.net/geomview/ \
+ ftp://ftp1.sourceforge.net/pub/sourceforge/geomview/
MAINTAINER= fenner@freebsd.org
-BROKEN= "Does not build"
+LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
+# can't get autoconf to like forms.h, punt for now
+#forms.1:${PORTSDIR}/x11-toolkits/xforms \
-LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
- tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
-WRKSRC= ${WRKDIR}/Geomview
USE_MOTIF= yes
USE_X_PREFIX= yes
USE_MESA= yes
+USE_AUTOCONF= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-opengl=${X11BASE}
MAN1= addbbox.1 animate.1 anytooff.1 anytoucd.1 bdy.1 clip.1 \
cplxview.1 crayola.1 example.1 flythrough.1 geomview.1 \
@@ -37,6 +37,14 @@ MAN5= discgrp.5 geomview.5 oogl.5
# Allow user to specify "make install MAPLE_LIB=foo" as geomview wants
MAKE_ENV= CPU=FreeBSD MAPLE_LIB=${MAPLE_LIB}
+#
+# Don't let automake/autoconf try to rebuild everything.
+AC_FAKE_FILES= aclocal.m4 config.h.in stamp-h stamp-h.in
+
+post-configure:
+ cd ${WRKSRC}; ${TOUCH} ${AC_FAKE_FILES}
+ find ${WRKSRC} -name Makefile.in | xargs ${TOUCH}
+
pre-install:
${MKDIR} ${PREFIX}/share/geomview
diff --git a/graphics/geomview/distinfo b/graphics/geomview/distinfo
index b83e1e788d6f..77c265dbcf40 100644
--- a/graphics/geomview/distinfo
+++ b/graphics/geomview/distinfo
@@ -1 +1 @@
-MD5 (geomview-1.6.1-src.tar.gz) = b974a850835035f1cc84d4e9bfb3825a
+MD5 (geomview-1.8.1.tar.gz) = 1cb0e07a6552e9fe122491af70171536
diff --git a/graphics/geomview/files/patch-aa b/graphics/geomview/files/patch-aa
deleted file mode 100644
index ef5c8bc62565..000000000000
--- a/graphics/geomview/files/patch-aa
+++ /dev/null
@@ -1,67 +0,0 @@
---- makefiles/mk.FreeBSD.orig Tue Dec 10 16:39:02 1996
-+++ makefiles/mk.FreeBSD Thu Dec 19 11:34:22 1996
-@@ -6,7 +6,7 @@
- # A machine-specific makefile is included by all other makefiles.
- #
-
--#CPU = FreeBSD
-+CPU = FreeBSD
- MACHTYPE = x11
- RANLIB = ranlib
- CC = gcc
-@@ -17,22 +17,24 @@
-
- # Add the location of the Motif (Xm/*.h) include files to the path.
- # (Or, add a /usr/include/Xm sym-link and remove this -I option.)
--SYSCOPTS = -pipe -DBSD -Dalloca=alloca -I/usr/include/X11
-+SYSCOPTS = -pipe -DBSD -Dalloca=alloca -I${X11BASE}/include
-
--SYSXLIBDIR = /usr/X11R6/lib
--SYSMOTIFLIBS = -L${SYSXLIBDIR} -lXm
-+SYSXLIBDIR = ${X11BASE}/lib
-+SYSMOTIFLIBS = ${MOTIFLIB}
- SYSXLIBS = -L${SYSXLIBDIR} -lXt -lXext -lXmu -lX11
-
- # If you have the FORMS library, uncomment these lines and edit:
- # set FORMSLIBS to the list of all libs needed
- # and FORMSINC to the relevant -I options:
--# FORMSLIBS = -L/usr/local/lib -lforms -L${SYSXLIBDIR} -lX11
--# FORMSINC = -I/u/share/include/XForms
-+#
-+# XForms is available from /usr/ports/x11/xforms.
-+FORMSLIBS = -L${X11BASE}/lib -lxforms -lX11
-+FORMSINC = -I${X11BASE}/include
-
- # If you have Tcl/Tk libraries (tk 4.0 or later), uncomment and edit:
- # indicate cc options to find tk-related libraries and include-files.
--# TKLIBS = -L/usr/local/lib -ltk -ltcl -L${SYSXLIBDIR} -lX11
--# TKINC = -I/u/share/include
-+TKLIBS = -L${LOCALBASE}/lib -ltk82 -ltcl82 -L${SYSXLIBDIR} -lX11
-+TKINC = -I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
-
-
- # Choose or adapt one of the following sets of definitions.
-@@ -43,9 +45,11 @@
- # MGLIBS =
-
- # for OpenGL using Mesa libraries:
-+#
-+# Mesa is available from /usr/ports/graphics/Mesa.
- MGTYPE = -DMGOPENGL
--MGLIBS = -lMesaGL -lMesaGLU
--MGINC = # -IMesa-include-file directory
-+MGLIBS = -L${X11BASE}/lib -lMesaGL -lMesaGLU
-+MGINC = -I${X11BASE}/include/Mesa
-
- # If the above stuff sets MGTYPE = -DMGOPENGL, and MGINC = whatever's needed
- # for Open GL compilation, then you can also use MGMESAOPTS and/or MGC3DOPTS
-@@ -66,6 +70,6 @@
- # you can still do the following. Define MGX11OPTS to get a separate
- # gvx.X11 geomview executable which uses our own software renderer.
- # It's typically faster than the Mesa renderer, but less capable.
--# MGX11OPTS = MGTYPE="-DMGX11" \
--# MGLIBS= \
--# MGINC=
-+MGX11OPTS = MGTYPE="-DMGX11" \
-+ MGLIBS= \
-+ MGINC=
diff --git a/graphics/geomview/files/patch-ab b/graphics/geomview/files/patch-ab
deleted file mode 100644
index 9fe07948bba2..000000000000
--- a/graphics/geomview/files/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
---- makefiles/mk.site.default.orig Wed Oct 30 22:25:12 1996
-+++ makefiles/mk.site.default Sun Dec 15 10:34:46 1996
-@@ -12,7 +12,7 @@
- # running 'make install'.
- # TAKE CARE that no blank characters follow after the name you enter here.
-
--GEOMROOT=
-+GEOMROOT= ${PREFIX}/share/geomview
-
- # NOTE: The variable MACHTYPE has already been set by the time this file
- # is read; it's the type of computer we're on ("sgi" or "next").
-@@ -22,7 +22,7 @@
- # programs are to be installed. This should be a directory that is on
- # users' $path, like /usr/local/bin.
-
--BINDIR = /usr/local/bin
-+BINDIR= ${PREFIX}/bin
-
- # MMAPACKAGEDIR should be the pathname of the directory into which the
- # Mathematica packages (OOGL.m, etc.) are to be installed. This should be some
-@@ -48,7 +48,7 @@
- # manual pages are to be installed. The man pages will actually go into
- # subdirectories of this directory with names like "man1", "cat1", etc.
-
--MANDIR = /usr/local/man
-+MANDIR= ${PREFIX}/man
-
- # NOTE:
- #
diff --git a/graphics/geomview/files/patch-ac b/graphics/geomview/files/patch-ac
deleted file mode 100644
index 7be561b3dd30..000000000000
--- a/graphics/geomview/files/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/bin/geomview/x11/O.x11/Makefile.orig Wed Oct 30 17:50:16 1996
-+++ src/bin/geomview/x11/O.x11/Makefile Sun Dec 15 10:34:46 1996
-@@ -5,6 +5,16 @@
- include ../Makedefs
- include ../../common/Makedefs.common
-
-+gvcamui-x11.o:
-+ rm -f $@ ${@:.o=.c}
-+ ${LNSRC} ../gvcamui.c gvcamui-x11.c
-+ ${CC} -I.. -DMGX11 ${CFLAGS} -c ${@:.o=.c}
-+
-+gvcamui-mesa.o:
-+ rm -f $@ ${@:.o=.c}
-+ ${LNSRC} ../gvcamui.c gvcamui-mesa.c
-+ ${CC} -I.. -DMGOPENGL ${CFLAGS} -c ${@:.o=.c}
-+
- include ${GEOM}/makefiles/Makerules.obj
- include ${MKDEPFILE}
-
diff --git a/graphics/geomview/files/patch-ae b/graphics/geomview/files/patch-ae
deleted file mode 100644
index 648705684399..000000000000
--- a/graphics/geomview/files/patch-ae
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./src/bin/geomview/x11/Makefile.orig Sat Mar 14 00:42:39 1998
-+++ ./src/bin/geomview/x11/Makefile Tue Aug 15 03:41:13 2000
-@@ -24,9 +24,9 @@
- install: all install_script install_others
-
- install_others: all
-- if [ -f gvx.MESA ]; then ${INSTALL} -m 775 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.MESA; fi
-- if [ -f gvx.C3D ]; then ${INSTALL} -m 775 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.C3D; fi
-- if [ -f gvx.X11 ]; then ${INSTALL} -m 775 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.X11; fi
-+ if [ -f gvx.MESA ]; then ${INSTALL} -m 755 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.MESA; fi
-+ if [ -f gvx.C3D ]; then ${INSTALL} -m 755 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.C3D; fi
-+ if [ -f gvx.X11 ]; then ${INSTALL} -m 755 -O -v -F ${GEOM}/bin/${MACHTYPE} gvx.X11; fi
-
- _always:
-
-@@ -40,10 +40,13 @@
- MESA C3D X11:
- cd O.${MACHTYPE}; ${MAKE} $@
-
--install_script: demand_GEOMROOT geomview
-+install_script: demand_GEOMROOT
- sed -e 's|^GEOMROOT=.*$$|GEOMROOT=${GEOMROOT}|' \
-- -e 's/^MACHTYPE=.*/MACHTYPE=${MACHTYPE}/' < geomview-x11 > geomview
-- ${INSTALL} -m 775 -O -v -F ${BINDIR} geomview
-+ -e 's/^MACHTYPE=.*/MACHTYPE=${MACHTYPE}/' \
-+ -e '/_GVX/s|$${GEOMROOT}|${PREFIX}/libexec/geomview|' \
-+ -e '/_EMODULE/s|$${GEOMROOT}|${PREFIX}/libexec/geomview|' \
-+ < geomview-x11 > geomview
-+ ${INSTALL} -m 755 -O -v -F ${BINDIR} geomview
-
- clang: _always
- @echo "lisp2c ..."
diff --git a/graphics/geomview/files/patch-af b/graphics/geomview/files/patch-af
deleted file mode 100644
index ed5ad7e827e3..000000000000
--- a/graphics/geomview/files/patch-af
+++ /dev/null
@@ -1,41 +0,0 @@
---- doc/Makefile.orig Tue Jan 18 16:01:19 2000
-+++ doc/Makefile Tue Jan 18 16:03:03 2000
-@@ -28,22 +28,22 @@
- # Alas, man pages which originate in the doc directory need special handling,
- # lest "formatman" overwrite them.
- ourmans:
-- @mans="${OURMANS}"; mandir=${MANDIR}; \
-- if nroff </dev/null >/dev/null 2>&1; then \
-- for f in $$mans ; do \
-- page=`expr "$$f" : "\(.*\).man"` ; \
-- dirno=`expr "$$f" : ".*\([0-9]\)"` ; \
-- cdir=$$mandir/cat$$dirno; \
-- mdir=$$mandir/man$$dirno; \
-- test -d $$mdir || ${GEOM}/tools/insuredir $$mdir; \
-- rm -f $$cdir/$$page $$mdir/$$page ; \
-- echo "cp $$f $$mdir/$$page"; \
-- cp $$f $$mdir/$$page; \
-- echo "nroff -man $$f | col -b > $$page" ; \
-- nroff -man $$f | col -b > $$page; \
-- ${INSTALL} -O -v -m 644 -F $$cdir $$page; \
-- done; \
-- fi
-+# @mans="${OURMANS}"; mandir=${MANDIR}; \
-+# if nroff </dev/null >/dev/null 2>&1; then \
-+# for f in $$mans ; do \
-+# page=`expr "$$f" : "\(.*\).man"` ; \
-+# dirno=`expr "$$f" : ".*\([0-9]\)"` ; \
-+# cdir=$$mandir/cat$$dirno; \
-+# mdir=$$mandir/man$$dirno; \
-+# test -d $$mdir || ${GEOM}/tools/insuredir $$mdir; \
-+# rm -f $$cdir/$$page $$mdir/$$page ; \
-+# echo "cp $$f $$mdir/$$page"; \
-+# cp $$f $$mdir/$$page; \
-+# echo "nroff -man $$f | col -b > $$page" ; \
-+# nroff -man $$f | col -b > $$page; \
-+# ${INSTALL} -O -v -m 644 -F $$cdir $$page; \
-+# done; \
-+# fi
-
- OOGL.m.doc: _always
- ( ${MAKE} header_message ; \
diff --git a/graphics/geomview/files/patch-ag b/graphics/geomview/files/patch-ag
deleted file mode 100644
index 66ec0c5e3c3b..000000000000
--- a/graphics/geomview/files/patch-ag
+++ /dev/null
@@ -1,61 +0,0 @@
---- makefiles/Makerules.allsrc.orig Fri Nov 1 11:44:17 1996
-+++ makefiles/Makerules.allsrc Tue Aug 15 03:20:24 2000
-@@ -10,7 +10,7 @@
- for h in $$incs ; do \
- cmp -s $$h ${GEOM}/include/$$h || i="$$i $$h" ; \
- done; \
-- test -n "$$i" && ${INSTALL} -O -v -m 664 -F ${GEOM}/include $$i || :)
-+ test -n "$$i" && ${INSTALL} -O -v -m 644 -F ${GEOM}/include $$i || :)
- @for d in ${DIRS_THIS_MACH_NO_OBJ}; do (${CDd}; ${MAKE} SITE=${SITE} $@); done
-
-
-@@ -65,34 +65,34 @@
- # Copy ${MANDIR} to a shell variable in case it includes trailing blanks.
-
- formatman:
-- @mans="${MANS}"; mandir=${MANDIR}; \
-- if nroff </dev/null >/dev/null 2>&1; then \
-- for f in $$mans ; do \
-- cdir=$$mandir/cat`expr "$$f" : ".*\(.\)"` ; \
-- ${GEOM}/tools/insuredir $$cdir; \
-- rm -f $$cdir/$$f ; \
-- echo "nroff -man $$f | col -b > $$cdir/$$f" ; \
-- nroff -man $$f | col -b > $$cdir/$$f; \
-- rm -f ${GEOM}/doc/$$f ; \
-- cp $$cdir/$$f ${GEOM}/doc; \
-- done; \
-- fi
-+# @mans="${MANS}"; mandir=${MANDIR}; \
-+# if nroff </dev/null >/dev/null 2>&1; then \
-+# for f in $$mans ; do \
-+# cdir=$$mandir/cat`expr "$$f" : ".*\(.\)"` ; \
-+# ${GEOM}/tools/insuredir $$cdir; \
-+# rm -f $$cdir/$$f ; \
-+# echo "nroff -man $$f | col -b > $$cdir/$$f" ; \
-+# nroff -man $$f | col -b > $$cdir/$$f; \
-+# rm -f ${GEOM}/doc/$$f ; \
-+# cp $$cdir/$$f ${GEOM}/doc; \
-+# done; \
-+# fi
-
- installman:
- @mans="${MANS}"; mandir=${MANDIR}; \
- for f in $$mans ; do \
- mdir=$$mandir/man`expr "$$f" : ".*\(.\)"` ; \
-- ${INSTALL} -O -v -m 664 -F $$mdir $$f || : ; \
-+ ${INSTALL} -O -v -m 644 -F $$mdir $$f || : ; \
- done;
-
- installmma: ${MMAPKGS}
- @if [ "${MMAPKGS}" ] ; then \
-- ${INSTALL} -m 664 -O -v -F ${MMAPACKAGEDIR} ${MMAPKGS} \
-+ ${INSTALL} -m 644 -O -v -F ${MMAPACKAGEDIR} ${MMAPKGS} \
- ; fi
-
- installdoc: ${DOCS}
- @if [ "${DOCS}" ] ; then \
-- ${INSTALL} -m 664 -O -v -F ${GEOM}/doc ${DOCS} \
-+ ${INSTALL} -m 644 -O -v -F ${GEOM}/doc ${DOCS} \
- ; fi
-
- include ${MKFILEDIR}/Makerules.clean
diff --git a/graphics/geomview/files/patch-ah b/graphics/geomview/files/patch-ah
deleted file mode 100644
index f454181a1b08..000000000000
--- a/graphics/geomview/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/geomutil/vrml2oogl/src/QvToWebOOGL.c++.orig Tue Jan 18 18:39:45 2000
-+++ src/bin/geomutil/vrml2oogl/src/QvToWebOOGL.c++ Tue Jan 18 18:39:55 2000
-@@ -76,7 +76,7 @@
- }
-
- static void
--OOGLout(char *text)
-+OOGLout(const char *text)
- {
- if (OOGLfout == NULL) return;
-
diff --git a/graphics/geomview/files/patch-ai b/graphics/geomview/files/patch-ai
deleted file mode 100644
index 830a40a0b802..000000000000
--- a/graphics/geomview/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefiles/Makerules.allobj.orig Tue Aug 15 03:17:24 2000
-+++ makefiles/Makerules.allobj Tue Aug 15 03:17:39 2000
-@@ -44,7 +44,7 @@
- echo -rm -f *.c
-
- installbin: ${TARGETS}
-- ${INSTALL} -m 775 -O -v -F ${BINDIR} ${TARGETS}
-+ ${INSTALL} -m 755 -O -v -F ${BINDIR} ${TARGETS}
-
- include ${MKFILEDIR}/Makedefs.SUBDIRS
- include ${MKFILEDIR}/Makerules.clean
diff --git a/graphics/geomview/files/patch-aj b/graphics/geomview/files/patch-aj
deleted file mode 100644
index 226be7e22233..000000000000
--- a/graphics/geomview/files/patch-aj
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./src/bin/flythrough/Makefile.orig Tue Aug 15 03:39:22 2000
-+++ ./src/bin/flythrough/Makefile Tue Aug 15 03:39:30 2000
-@@ -15,9 +15,9 @@
- installdata:
- case ${INSTALL} in ..*) install=../${INSTALL} ;; *) install=${INSTALL} ;; esac; \
- cd data; \
-- $$install -O -v -m 664 -F ${GEOM}/../data/geom \
-+ $$install -O -v -m 644 -F ${GEOM}/../data/geom \
- flythrough_diagram.gv dodec.vect ; \
-- $$install -O -v -m 664 -F ${GEOM}/../data/groups *.?.gv *.tlist
-+ $$install -O -v -m 644 -F ${GEOM}/../data/groups *.?.gv *.tlist
-
-
- SED = sed \
diff --git a/graphics/geomview/files/patch-ak b/graphics/geomview/files/patch-ak
deleted file mode 100644
index 45b561cc7128..000000000000
--- a/graphics/geomview/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bin/geomview/x11/Makefile.obj.orig Tue Aug 15 03:42:07 2000
-+++ src/bin/geomview/x11/Makefile.obj Tue Aug 15 03:42:14 2000
-@@ -23,7 +23,7 @@
- # "geomview" script expects it in the former location.
- install_bin: gvx
- ${INSTALL} -O -v -F ${GEOM}/bin/${MACHTYPE} gvx
-- ( cd ${GEOM}/bin/${MACHTYPE} ; chmod 775 gvx )
-+ ( cd ${GEOM}/bin/${MACHTYPE} ; chmod 755 gvx )
-
- ${COMMON_OBJS} :
- rm -f $@ ${@:o=c}
diff --git a/graphics/geomview/files/patch-configure.in b/graphics/geomview/files/patch-configure.in
new file mode 100644
index 000000000000..0ac72663638b
--- /dev/null
+++ b/graphics/geomview/files/patch-configure.in
@@ -0,0 +1,36 @@
+--- configure.in.orig Sun Mar 25 17:56:01 2001
++++ configure.in Mon Aug 12 18:07:49 2002
+@@ -433,6 +433,10 @@
+ AC_DEFINE(unix, 1)
+ AC_DEFINE(alloca, __alloca)
+ ;;
++*freebsd*) MACHTYPE=$target_os
++ AC_DEFINE_UNQUOTED(MACHTYPE, "$MACHTYPE")
++ AC_DEFINE(alloca, alloca) dnl work around flawed GNU assumption
++ ;;
+ *) MACHTYPE=$target_os
+ AC_DEFINE_UNQUOTED(MACHTYPE, "$MACHTYPE")
+ ;;
+@@ -471,7 +471,8 @@
+
+
+ AC_MSG_CHECKING([whether we need to link -lsocket to get socket()])
+-AC_TRY_LINK([ #include <sys/socket.h> ],
++AC_TRY_LINK([ #include <sys/types.h>
++ #include <sys/socket.h> ],
+ [ int s = socket(AF_UNIX, SOCK_STREAM, 0); ],
+ [ SOCKETLIBS=""
+ AC_MSG_RESULT([no]) ],
+@@ -491,10 +492,10 @@
+
+ AC_CHECK_HEADERS(fpu_control.h i386/fpu_control.h netinet/in.h)
+
+-moduledir="\$(exec_prefix)/bin"
++moduledir="\$(exec_prefix)/libexec/geomview/modules"
+ AC_SUBST(moduledir)
+
+-geomdatadir="\$(prefix)/data"
++geomdatadir="\$(prefix)/share/geomview/data"
+ AC_SUBST(geomdatadir)
+
+ # cache 'moduledir' and 'geomdatadir' so individual module configure scripts
diff --git a/graphics/geomview/files/patch-lisp.c b/graphics/geomview/files/patch-lisp.c
new file mode 100644
index 000000000000..d498452c8429
--- /dev/null
+++ b/graphics/geomview/files/patch-lisp.c
@@ -0,0 +1,11 @@
+--- src/lib/oogl/lisp/lisp.c.orig Fri Sep 1 15:38:16 2000
++++ src/lib/oogl/lisp/lisp.c Mon Aug 12 17:02:09 2002
+@@ -2110,7 +2110,7 @@
+ va_list *a_list;
+ unsigned long *x;
+ {
+- *x = va_arg(*a_list, ulong);
++ *x = va_arg(*a_list, unsigned long);
+ }
+
+ LObject *ulongparse(Lake *lake)
diff --git a/graphics/geomview/files/patch-streampool.h b/graphics/geomview/files/patch-streampool.h
new file mode 100644
index 000000000000..d5cfcaaccd16
--- /dev/null
+++ b/graphics/geomview/files/patch-streampool.h
@@ -0,0 +1,11 @@
+--- src/lib/oogl/refcomm/streampool.h.orig Mon Aug 12 17:15:10 2002
++++ src/lib/oogl/refcomm/streampool.h Mon Aug 12 17:15:15 2002
+@@ -29,7 +29,7 @@
+ #include "config.h"
+ #endif
+
+-#ifdef AIX
++#if AIX
+ # include <sys/select.h> /* RS-6000 needs this */
+ #endif
+