diff options
| -rw-r--r-- | graphics/geomview/Makefile | 22 | ||||
| -rw-r--r-- | graphics/geomview/distinfo | 2 | ||||
| -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 | ||||
| -rw-r--r-- | graphics/geomview/pkg-plist | 20 |
6 files changed, 50 insertions, 69 deletions
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index d5fc51583676..ee17e65b21d3 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -3,10 +3,10 @@ # Date created: 5 November 1996 # Whom: fenner # -# $Id: Makefile,v 1.12 1998/12/07 20:46:38 billf Exp $ +# $Id: Makefile,v 1.13 1999/01/07 08:19:38 simokawa Exp $ DISTNAME= geomview-1.6.1 -CATEGORIES= graphics tk42 +CATEGORIES= graphics tk80 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 @@ -15,7 +15,7 @@ MAINTAINER= fenner@freebsd.org LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ MesaGL.14:${PORTSDIR}/graphics/Mesa3 \ - tk42.1:${PORTSDIR}/x11-toolkits/tk42 + tk80.1:${PORTSDIR}/x11-toolkits/tk80 # depends on xforms ONLY_FOR_ARCHS= i386 @@ -57,7 +57,9 @@ DOC_FILES= OOGL.m.doc geomview.tex geomview_toc.html geomview_1.html \ EXAMPLE_FILES= example1.c example2.c example3.c example4.tcl MAN_FILES= geomview.5 oogl.5 SHARE_DIRS= data maple mathematica -LIBEXEC_DIRS= modules bin +SHARE_MODS= tcl +LIBEXEC_DIRS= bin +LIBEXEC_MODS= x11 CHOWN?= /usr/sbin/chown @@ -85,11 +87,23 @@ post-install: ${CP} -pr ${WRKSRC}/${i} ${PREFIX}/share/geomview ${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${PREFIX}/share/geomview/${i} .endfor +.for i in ${SHARE_MODS} + ${RM} -rf ${PREFIX}/share/geomview/modules/${i} + ${MKDIR} ${PREFIX}/share/geomview/modules/${i} + ${CP} -pr ${WRKSRC}/modules/${i} ${PREFIX}/share/geomview/modules + ${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${PREFIX}/share/geomview/modules/${i} +.endfor .for i in ${LIBEXEC_DIRS} ${RM} -rf ${PREFIX}/libexec/geomview/${i} ${MKDIR} ${PREFIX}/libexec/geomview/${i} ${CP} -pr ${WRKSRC}/${i} ${PREFIX}/libexec/geomview/ ${CHOWN} -R ${BINOWN}.${BINGRP} ${PREFIX}/libexec/geomview/${i} .endfor +.for i in ${LIBEXEC_MODS} + ${RM} -rf ${PREFIX}/libexec/geomview/modules/${i} + ${MKDIR} ${PREFIX}/libexec/geomview/modules/${i} + ${CP} -pr ${WRKSRC}/modules/${i} ${PREFIX}/libexec/geomview/modules + ${CHOWN} -R ${BINOWN}.${BINGRP} ${PREFIX}/libexec/geomview/modules/${i} +.endfor .include <bsd.port.mk> diff --git a/graphics/geomview/distinfo b/graphics/geomview/distinfo index 4af80e20658d..b83e1e788d6f 100644 --- a/graphics/geomview/distinfo +++ b/graphics/geomview/distinfo @@ -1 +1 @@ -MD5 (geomview-1.6.1-src.tar.gz) = e6716982a1c8e75229dffddfdfb055b8 +MD5 (geomview-1.6.1-src.tar.gz) = b974a850835035f1cc84d4e9bfb3825a 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 diff --git a/graphics/geomview/pkg-plist b/graphics/geomview/pkg-plist index 15eec1f4170e..5c7fbacd39be 100644 --- a/graphics/geomview/pkg-plist +++ b/graphics/geomview/pkg-plist @@ -21,14 +21,7 @@ info/geomview-3 info/geomview-4 info/geomview-5 libexec/geomview/bin/x11/gvx -libexec/geomview/bin/x11/gvx.OGL -libexec/geomview/modules/tcl/3D-Snapshot -libexec/geomview/modules/tcl/Colormap -libexec/geomview/modules/tcl/Crayola -libexec/geomview/modules/tcl/Labeler -libexec/geomview/modules/tcl/NDdemo -libexec/geomview/modules/tcl/NDview -libexec/geomview/modules/tcl/Slicer +libexec/geomview/bin/x11/gvx.X11 libexec/geomview/modules/x11/.geomview-3D-Snapshot libexec/geomview/modules/x11/.geomview-Colormap libexec/geomview/modules/x11/.geomview-Crayola @@ -59,6 +52,7 @@ libexec/geomview/modules/x11/clipboard libexec/geomview/modules/x11/cplxview libexec/geomview/modules/x11/drawbdy libexec/geomview/modules/x11/emodule_wish +libexec/geomview/modules/x11/emodule_wish.sh libexec/geomview/modules/x11/example libexec/geomview/modules/x11/flythrough libexec/geomview/modules/x11/ginsu @@ -407,13 +401,20 @@ share/geomview/data/things/xyz.vect share/geomview/maple/Makefile share/geomview/maple/README.gvplot share/geomview/maple/gvplot.mapleV3 +share/geomview/maple/gvplot.mapleV4 share/geomview/maple/remotegv share/geomview/mathematica/BezierPlot.m share/geomview/mathematica/Geomview.m share/geomview/mathematica/OOGL.m +share/geomview/modules/tcl/3D-Snapshot +share/geomview/modules/tcl/Colormap +share/geomview/modules/tcl/Crayola +share/geomview/modules/tcl/Labeler +share/geomview/modules/tcl/NDdemo +share/geomview/modules/tcl/NDview +share/geomview/modules/tcl/Slicer @dirrm libexec/geomview/bin/x11 @dirrm libexec/geomview/bin -@dirrm libexec/geomview @dirrm libexec/geomview/modules/tcl @dirrm libexec/geomview/modules/x11 @dirrm libexec/geomview/modules @@ -442,4 +443,5 @@ share/geomview/mathematica/OOGL.m @dirrm share/geomview/data @dirrm share/geomview/maple @dirrm share/geomview/mathematica +@dirrm share/geomview/modules @dirrm share/geomview |