diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-14 10:00:14 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-14 10:00:14 +0000 |
| commit | 8e343fe5d52e655dc839f791ce445c3eaaae8baf (patch) | |
| tree | 454114d5b16529b57d3594f36e4b6ff769556237 /graphics/togl | |
| parent | 61b725c3823b94ae55cbec5659cee422a02ea4e1 (diff) | |
| download | ports-8e343fe5d52e655dc839f791ce445c3eaaae8baf.tar.gz ports-8e343fe5d52e655dc839f791ce445c3eaaae8baf.zip | |
- Unbroke with threaded Mesa;
- use tcl/tk 8.3 instead of obsolete 8.2.
Submitted by: bento
Notes
Notes:
svn path=/head/; revision=46233
Diffstat (limited to 'graphics/togl')
| -rw-r--r-- | graphics/togl/Makefile | 12 | ||||
| -rw-r--r-- | graphics/togl/files/patch-aa | 17 | ||||
| -rw-r--r-- | graphics/togl/pkg-plist | 10 |
3 files changed, 22 insertions, 17 deletions
diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile index 1203cec901c9..1d8fa8767eee 100644 --- a/graphics/togl/Makefile +++ b/graphics/togl/Makefile @@ -7,20 +7,22 @@ PORTNAME= togl PORTVERSION= 1.5 -CATEGORIES= graphics tk82 +CATEGORIES= graphics tk83 MASTER_SITES= ftp://ftp.mesa3d.org/mesa/misc/ \ ftp://ftp.cs.umd.edu/pub/faculty/bederson/ DISTNAME= Togl-${PORTVERSION} MAINTAINER= aa8vb@ipass.net -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ - tcl82.1:${PORTSDIR}/lang/tcl82 +LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \ + tcl83.1:${PORTSDIR}/lang/tcl83 USE_MESA= yes ALL_TARGET= default +MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" \ + PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" -TOGL_INSTDIR= ${PREFIX}/lib/tk8.2/${DISTNAME} +TOGL_INSTDIR= ${PREFIX}/lib/tk8.3/${DISTNAME} .include <bsd.port.pre.mk> @@ -30,6 +32,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.2/${DISTNAME}/pkgIndex.tcl + > ${PREFIX}/lib/tk8.3/${DISTNAME}/pkgIndex.tcl .include <bsd.port.post.mk> diff --git a/graphics/togl/files/patch-aa b/graphics/togl/files/patch-aa index 1d1d262e8f5b..dabd0a90f2e7 100644 --- a/graphics/togl/files/patch-aa +++ b/graphics/togl/files/patch-aa @@ -1,5 +1,8 @@ ---- Makefile.orig Thu Mar 12 13:11:26 1998 -+++ Makefile Thu Aug 10 21:13:42 2000 + +$FreeBSD$ + +--- Makefile.orig Thu Mar 12 06:11:26 1998 ++++ Makefile Tue Aug 14 12:52:23 2001 @@ -58,26 +58,30 @@ @@ -24,9 +27,9 @@ -# 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.2 \ -+ -I${LOCALBASE}/include/tk8.2 \ -+ -I${LOCALBASE}/include/tk8.2/generic \ ++INCLUDES = -I${LOCALBASE}/include/tcl8.3 \ ++ -I${LOCALBASE}/include/tk8.3 \ ++ -I${LOCALBASE}/include/tk8.3/generic \ + -I${X11BASE}/include # Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries: @@ -36,7 +39,7 @@ # Libraries to link with (-ldl for Linux only?): -LIBS = -ltk -ltcl -lGLU -lGL -L/usr/X11/lib -lX11 -lXmu -lXext -lXt -lm -ldl -+LIBS = -ltk82 -ltcl82 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm ++LIBS = -ltk83 -ltcl83 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm $(PTHREAD_LIBS) TK_FLAGS = @@ -45,7 +48,7 @@ -CFLAGS = $(COPTS) $(INCLUDES) $(TK_FLAGS) -+CFLAGS += $(COPTS) $(INCLUDES) $(TK_FLAGS) ++CFLAGS += $(COPTS) $(INCLUDES) $(TK_FLAGS) $(PTHREAD_CFLAGS) LFLAGS = $(LIBDIRS) diff --git a/graphics/togl/pkg-plist b/graphics/togl/pkg-plist index 8e3f283ae0a9..9e471a055f6a 100644 --- a/graphics/togl/pkg-plist +++ b/graphics/togl/pkg-plist @@ -1,5 +1,5 @@ -lib/tk8.2/Togl-1.5/Togl.so -lib/tk8.2/Togl-1.5/pkgIndex.tcl -lib/tk8.2/Togl-1.5/togl.h -lib/tk8.2/Togl-1.5/togl.o -@dirrm lib/tk8.2/Togl-1.5 +lib/tk8.3/Togl-1.5/Togl.so +lib/tk8.3/Togl-1.5/pkgIndex.tcl +lib/tk8.3/Togl-1.5/togl.h +lib/tk8.3/Togl-1.5/togl.o +@dirrm lib/tk8.3/Togl-1.5 |