diff options
author | Bill Fenner <fenner@FreeBSD.org> | 1999-02-12 03:08:46 +0000 |
---|---|---|
committer | Bill Fenner <fenner@FreeBSD.org> | 1999-02-12 03:08:46 +0000 |
commit | b3b497548802bee8510ef80f11d0d940b4214e9f (patch) | |
tree | 4082d5cd07ae911ce29029516df39d2fa5be5aa1 /graphics/geomview/files | |
parent | New checksum. (diff) |
Update the geomview-1.6.1 to use the current tarball, which turns
out to be different than the one that the port was written for.
Notes
Notes:
svn path=/head/; revision=16644
Diffstat (limited to 'graphics/geomview/files')
-rw-r--r-- | graphics/geomview/files/patch-aa | 29 | ||||
-rw-r--r-- | graphics/geomview/files/patch-af | 19 | ||||
-rw-r--r-- | graphics/geomview/files/patch-ag | 27 |
3 files changed, 20 insertions, 55 deletions
diff --git a/graphics/geomview/files/patch-aa b/graphics/geomview/files/patch-aa index 7284cba19d89..8f9026969a27 100644 --- a/graphics/geomview/files/patch-aa +++ b/graphics/geomview/files/patch-aa @@ -20,7 +20,7 @@ -SYSMOTIFLIBS = -L${SYSXLIBDIR} -lXm +SYSXLIBDIR = ${X11BASE}/lib +SYSMOTIFLIBS = ${MOTIFLIB} - SYSXLIBS = -L${SYSXLIBDIR} -lXt -lXext -lX11 + 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 @@ -36,21 +36,32 @@ # 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 -ltk42 -ltcl76 -L${SYSXLIBDIR} -lX11 -+TKINC = -I${LOCALBASE}/include/tcl7.6 -I${LOCALBASE}/include/tk4.2 ++TKLIBS = -L${LOCALBASE}/lib -ltk80 -ltcl80 -L${SYSXLIBDIR} -lX11 ++TKINC = -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0 # Choose or adapt one of the following sets of definitions. -@@ -43,6 +45,9 @@ +@@ -43,9 +45,11 @@ # MGLIBS = # for OpenGL using Mesa libraries: --MGTYPE = -DMGOPENGL --MGLIBS = -lMesaGL -lMesaGLU --MGINC = # -IMesa-include-file directory +# +# Mesa is available from /usr/ports/graphics/Mesa. -+#MGTYPE = -DMGOPENGL -+# The port auto-builds both types. + 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-af b/graphics/geomview/files/patch-af deleted file mode 100644 index b21b7d3e240b..000000000000 --- a/graphics/geomview/files/patch-af +++ /dev/null @@ -1,19 +0,0 @@ ---- src/bin/geomview/x11/Makedefs.orig Wed Oct 30 23:17:07 1996 -+++ src/bin/geomview/x11/Makedefs Sun Dec 15 10:34:47 1996 -@@ -1,11 +1,14 @@ - SRCS = gvmain.c gvmnpanel.c gvcamui.c gvtoolui.c gvappear.c gvmaterial.c\ - gvcredits.c gvlights.c gvcameras.c gvfiles.c gvload.c gvsave.c \ - gvcommands.c gvcolor.c gvui.c gvevent.c --OBJS = gvmain.o gvmnpanel.o gvcamui.o gvtoolui.o gvappear.o gvmaterial.o\ -+COMMONOBJS = gvmain.o gvmnpanel.o gvtoolui.o gvappear.o gvmaterial.o\ - gvcredits.o gvlights.o gvcameras.o gvfiles.o gvload.o gvsave.o \ - gvcommands.o gvcolor.o gvui.o gvevent.o -+GVXOBJS = ${COMMONOBJS} gvcamui-x11.o -+GVXOGLOBJS = ${COMMONOBJS} gvcamui-mesa.o -+OBJS = ${COMMONOBJS} gvcamui-x11.o gvcamui-mesa.o - --TARGETS = gvx -+TARGETS = gvx gvx.OGL - - UIPATH = -I/usr/local/include - diff --git a/graphics/geomview/files/patch-ag b/graphics/geomview/files/patch-ag deleted file mode 100644 index 4a0a9447b2b5..000000000000 --- a/graphics/geomview/files/patch-ag +++ /dev/null @@ -1,27 +0,0 @@ ---- src/lib/mg/opengl/Makefile.orig Thu Oct 31 22:42:36 1996 -+++ src/lib/mg/opengl/Makefile Sun Dec 15 10:34:47 1996 -@@ -8,14 +8,15 @@ - include ${GEOM}/makefiles/Makerules.allsrc - - all lib install ${TARGETS} ${LIB} ${COMMONLIB}: _always -- @case "${MGTYPE}" in \ -- *OPENGL*) \ -- for d in ${DIRS_THIS_MACH}; do (${CDd}; ${MAKE} SITE=${SITE} $@); done ;; \ -- *) \ -- echo "***"; \ -- echo "*** MGTYPE (from makefiles/mk.${CPU}) isn't set to -DMGOPENGL, so"; \ -- echo "*** won't attempt to compile mg OpenGL library."; \ -- echo "***" ;; \ -- esac -+# @case "${MGTYPE}" in \ -+# *OPENGL*) \ -+# for d in ${DIRS_THIS_MACH}; do (${CDd}; ${MAKE} SITE=${SITE} $@); done ;; \ -+# *) \ -+# echo "***"; \ -+# echo "*** MGTYPE (from makefiles/mk.${CPU}) isn't set to -DMGOPENGL, so"; \ -+# echo "*** won't attempt to compile mg OpenGL library."; \ -+# echo "***" ;; \ -+# esac -+ for d in ${DIRS_THIS_MACH}; do (${CDd}; ${MAKE} SITE=${SITE} $@); done - - install: formatman installman |