diff options
| -rw-r--r-- | graphics/togl/Makefile | 13 | ||||
| -rw-r--r-- | graphics/togl/files/patch-aa | 8 |
2 files changed, 11 insertions, 10 deletions
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile index 62e6878b58c9..988b8fa5e7a2 100644 --- a/graphics/togl/Makefile +++ b/graphics/togl/Makefile @@ -7,23 +7,24 @@ PORTNAME= togl PORTVERSION= 1.5 -CATEGORIES= graphics tk83 +PORTREVISION= 1 +CATEGORIES= graphics tk84 MASTER_SITES= ftp://ftp.mesa3d.org/mesa/misc/ \ ftp://ftp.cs.umd.edu/pub/faculty/bederson/ DISTNAME= Togl-${PORTVERSION} -MAINTAINER= aa8vb@ipass.net +MAINTAINER= ports@FreeBSD.org COMMENT= A Tk OpenGL widget -LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \ - tcl83.1:${PORTSDIR}/lang/tcl83 +LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 \ + tcl84.1:${PORTSDIR}/lang/tcl84 USE_MESA= yes ALL_TARGET= default MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" -TOGL_INSTDIR= ${PREFIX}/lib/tk8.3/${DISTNAME} +TOGL_INSTDIR= ${PREFIX}/lib/tk8.4/${DISTNAME} .include <bsd.port.pre.mk> @@ -33,6 +34,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/togl.h ${TOGL_INSTDIR} ${INSTALL_DATA} ${WRKSRC}/togl.o ${TOGL_INSTDIR} ${ECHO} 'package ifneeded Togl 1.5 [list load [file join $$dir Togl.so]]'\ - > ${PREFIX}/lib/tk8.3/${DISTNAME}/pkgIndex.tcl + > ${PREFIX}/lib/tk8.4/${DISTNAME}/pkgIndex.tcl .include <bsd.port.post.mk> diff --git a/graphics/togl/files/patch-aa b/graphics/togl/files/patch-aa index dabd0a90f2e7..ccac2e12d4c2 100644 --- a/graphics/togl/files/patch-aa +++ b/graphics/togl/files/patch-aa @@ -27,9 +27,9 @@ $FreeBSD$ -# Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc: -INCLUDES = -I/usr/local/include -I/usr/include/tcl +# Where to find tc.hl, tk.h, OpenGL/Mesa headers, etc: -+INCLUDES = -I${LOCALBASE}/include/tcl8.3 \ -+ -I${LOCALBASE}/include/tk8.3 \ -+ -I${LOCALBASE}/include/tk8.3/generic \ ++INCLUDES = -I${LOCALBASE}/include/tcl8.4 \ ++ -I${LOCALBASE}/include/tk8.4 \ ++ -I${LOCALBASE}/include/tk8.4/generic \ + -I${X11BASE}/include # Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries: @@ -39,7 +39,7 @@ $FreeBSD$ # Libraries to link with (-ldl for Linux only?): -LIBS = -ltk -ltcl -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl -+LIBS = -ltk83 -ltcl83 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm $(PTHREAD_LIBS) ++LIBS = -ltk84 -ltcl84 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm $(PTHREAD_LIBS) TK_FLAGS = |