diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/geomview/Makefile | 5 | ||||
| -rw-r--r-- | graphics/geomview/files/patch-aa | 4 | ||||
| -rw-r--r-- | graphics/graphviz/Makefile | 4 | ||||
| -rw-r--r-- | graphics/libimg/Makefile | 8 | ||||
| -rw-r--r-- | graphics/libimg/files/patch-aa | 8 | ||||
| -rw-r--r-- | graphics/libimg/pkg-plist | 5 | ||||
| -rw-r--r-- | graphics/py-opengl/Makefile | 2 | ||||
| -rw-r--r-- | graphics/py-opengl/files/Setup.add.togl | 4 | ||||
| -rw-r--r-- | graphics/py-opengl/files/Setup.base | 4 | ||||
| -rw-r--r-- | graphics/togl/Makefile | 10 | ||||
| -rw-r--r-- | graphics/togl/files/patch-aa | 8 | ||||
| -rw-r--r-- | graphics/togl/pkg-plist | 6 |
12 files changed, 35 insertions, 33 deletions
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index 7c378759f740..6b2d098cb8cc 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -4,9 +4,10 @@ # Whom: fenner # # $FreeBSD$ +# DISTNAME= geomview-1.6.1 -CATEGORIES= graphics tk80 +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 @@ -15,7 +16,7 @@ MAINTAINER= fenner@freebsd.org LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms \ MesaGL.14:${PORTSDIR}/graphics/Mesa3 \ - tk80.1:${PORTSDIR}/x11-toolkits/tk80 + tk82.1:${PORTSDIR}/x11-toolkits/tk82 WRKSRC= ${WRKDIR}/Geomview REQUIRES_MOTIF= yes diff --git a/graphics/geomview/files/patch-aa b/graphics/geomview/files/patch-aa index 8f9026969a27..ef5c8bc62565 100644 --- a/graphics/geomview/files/patch-aa +++ b/graphics/geomview/files/patch-aa @@ -36,8 +36,8 @@ # 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 -ltk80 -ltcl80 -L${SYSXLIBDIR} -lX11 -+TKINC = -I${LOCALBASE}/include/tcl8.0 -I${LOCALBASE}/include/tk8.0 ++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. diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index e21b7c20c2e1..061a51a56f11 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -8,13 +8,13 @@ DISTNAME= gviz15 PKGNAME= graphviz-1.5 -CATEGORIES= graphics tk80 +CATEGORIES= graphics tk82 MASTER_SITES= http://www.research.att.com/sw/tools/graphviz/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 FETCH_ARGS= -b WRKSRC= ${WRKDIR}/gv1.5 diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index ae11ab1dd7a8..0592ca14fe17 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -8,12 +8,12 @@ DISTNAME= img1.2.2 PKGNAME= libimg-1.2.2 -CATEGORIES= graphics tk80 +CATEGORIES= graphics tk82 MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.2/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \ +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ png.3:${PORTSDIR}/graphics/png \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff @@ -23,11 +23,11 @@ WRKSRC= ${WRKDIR}/img1.2.2 ALL_TARGET= default GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.0 --with-tk=${PREFIX}/lib/tk8.0 \ +CONFIGURE_ARGS= --with-tcl=${PREFIX}/lib/tcl8.2 --with-tk=${PREFIX}/lib/tk8.2 \ --disable-stubs post-install: - ${LN} -sf ${PREFIX}/lib/Img1.2/libimg1.2.so.1 ${PREFIX}/lib/libimg.so.1 + ${LN} -sf ${PREFIX}/lib/Img1.2/libimg82.so.1 ${PREFIX}/lib/libimg.so.1 ${LN} -sf ${PREFIX}/lib/libimg.so.1 ${PREFIX}/lib/libimg.so .include <bsd.port.mk> diff --git a/graphics/libimg/files/patch-aa b/graphics/libimg/files/patch-aa index e1c91b9fab91..3cbccff2d2e4 100644 --- a/graphics/libimg/files/patch-aa +++ b/graphics/libimg/files/patch-aa @@ -6,8 +6,8 @@ TCL_INC_DIR=${TCL_EXEC_PREFIX}/include -elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl.h; then - TCL_INC_DIR=${TCL_EXEC_PREFIX}/include -+elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl8.0/tcl.h; then -+ TCL_INC_DIR=${TCL_EXEC_PREFIX}/include/tcl8.0 ++elif test -d ${TCL_EXEC_PREFIX}/include -a -f ${TCL_EXEC_PREFIX}/include/tcl8.2/tcl.h; then ++ TCL_INC_DIR=${TCL_EXEC_PREFIX}/include/tcl8.2 else TCL_INC_DIR=$prefix/include fi @@ -17,8 +17,8 @@ TK_INC_DIR=${TK_EXEC_PREFIX}/include -elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk.h; then - TK_INC_DIR=${TK_EXEC_PREFIX}/include -+elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk8.0/tk.h; then -+ TK_INC_DIR=${TK_EXEC_PREFIX}/include/tk8.0 ++elif test -d ${TK_EXEC_PREFIX}/include -a -f ${TK_EXEC_PREFIX}/include/tk8.2/tk.h; then ++ TK_INC_DIR=${TK_EXEC_PREFIX}/include/tk8.2 else TK_INC_DIR=$prefix/include fi diff --git a/graphics/libimg/pkg-plist b/graphics/libimg/pkg-plist index c33f5e299748..95f1b27510c4 100644 --- a/graphics/libimg/pkg-plist +++ b/graphics/libimg/pkg-plist @@ -1,6 +1,7 @@ lib/Img1.2/pkgIndex.tcl -lib/Img1.2/libimg1.2.so.1 +lib/Img1.2/libimg82.so.1 lib/libimg.so.1 lib/libimg.so -@dirrm lib/Img1.2 +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@dirrm lib/Img1.2 diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile index ae645b573f04..c6fff53f21a0 100644 --- a/graphics/py-opengl/Makefile +++ b/graphics/py-opengl/Makefile @@ -43,7 +43,7 @@ SETUP_FILES= ${FILESDIR}/Setup.base WITH_TOGL?= yes .if defined(WITH_TOGL) && $(WITH_TOGL) == yes SETUP_FILES+= ${FILESDIR}/Setup.add.togl -LIB_DEPENDS+= tk80.1:${PORTSDIR}/x11-toolkits/tk80 +LIB_DEPENDS+= tk82.1:${PORTSDIR}/x11-toolkits/tk82 .endif .include <bsd.port.pre.mk> diff --git a/graphics/py-opengl/files/Setup.add.togl b/graphics/py-opengl/files/Setup.add.togl index 515627ecf0c3..4468da3a6f16 100644 --- a/graphics/py-opengl/files/Setup.add.togl +++ b/graphics/py-opengl/files/Setup.add.togl @@ -8,8 +8,8 @@ togl \ # This must match the name of the Togl source directory -I./Togl-1.5 \ # These must match the version you have installed - -ILOCALBASE/include/tcl8.0 -ILOCALBASE/include/tk8.0 \ - -LLOCALBASE/lib -ltk80 -ltcl80 \ + -ILOCALBASE/include/tcl8.2 -ILOCALBASE/include/tk8.2 \ + -LLOCALBASE/lib -ltk82 -ltcl82 \ # You'll definitely need these (or maybe edit them for MesaGL/MesaGLU: -IX11BASE/include -LX11BASE/lib \ -lGLU -lGL \ diff --git a/graphics/py-opengl/files/Setup.base b/graphics/py-opengl/files/Setup.base index 307813f557e8..ebd688b1b21f 100644 --- a/graphics/py-opengl/files/Setup.base +++ b/graphics/py-opengl/files/Setup.base @@ -57,8 +57,8 @@ _glutmodule.c # putting this at the end for \ reasons ## # This must match the name of the Togl source directory ## -I./Togl-1.5 \ ## # These must match the version you have installed -## -ILOCALBASE/include/tcl8.0 -ILOCALBASE/include/tk8.0 \ -## -LLOCALBASE/lib -ltk80 -ltcl80 \ +## -ILOCALBASE/include/tcl8.2 -ILOCALBASE/include/tk8.2 \ +## -LLOCALBASE/lib -ltk82 -ltcl82 \ ## # You'll definitely need these (or maybe edit them for MesaGL/MesaGLU: ## -IX11BASE/include -LX11BASE/lib \ ## -lGLU -lGL \ diff --git a/graphics/togl/Makefile b/graphics/togl/Makefile index 5238a0a229e4..b14a683f11fe 100644 --- a/graphics/togl/Makefile +++ b/graphics/togl/Makefile @@ -8,19 +8,19 @@ DISTNAME= Togl-1.5 PKGNAME= togl-1.5 -CATEGORIES= graphics tk80 +CATEGORIES= graphics tk82 MASTER_SITES= ftp://ftp.mesa3d.org/mesa/misc/ \ ftp://ftp.cs.umd.edu/pub/faculty/bederson/ MAINTAINER= aa8vb@ipass.net -LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \ - tcl80.1:${PORTSDIR}/lang/tcl80 \ +LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \ + tcl82.1:${PORTSDIR}/lang/tcl82 \ MesaGL.14:${PORTSDIR}/graphics/Mesa3 ALL_TARGET= default -TOGL_INSTDIR= ${PREFIX}/lib/tk8.0/${DISTNAME} +TOGL_INSTDIR= ${PREFIX}/lib/tk8.2/${DISTNAME} .include <bsd.port.pre.mk> @@ -28,6 +28,6 @@ do-install: ${MKDIR} ${TOGL_INSTDIR} ${INSTALL_DATA} ${WRKSRC}/libtogl.so.1.3 ${TOGL_INSTDIR}/Togl.so ${ECHO} 'package ifneeded Togl 1.5 [list load [file join $$dir Togl.so]]'\ - > ${PREFIX}/lib/tk8.0/${DISTNAME}/pkgIndex.tcl + > ${PREFIX}/lib/tk8.2/${DISTNAME}/pkgIndex.tcl .include <bsd.port.post.mk> diff --git a/graphics/togl/files/patch-aa b/graphics/togl/files/patch-aa index bc5ff3eef199..f822268bc903 100644 --- a/graphics/togl/files/patch-aa +++ b/graphics/togl/files/patch-aa @@ -20,9 +20,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/usr/local/include/tcl8.0 \ -+ -I/usr/local/include/tk8.0 \ -+ -I/usr/local/include/tk8.0/generic \ ++INCLUDES = -I/usr/local/include/tcl8.2 \ ++ -I/usr/local/include/tk8.2 \ ++ -I/usr/local/include/tk8.2/generic \ + -I/usr/X11R6/include \ + -I/usr/include/tcl @@ -33,7 +33,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 = -ltk80 -ltcl80 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm ++LIBS = -ltk82 -ltcl82 -lGLU -lGL -lX11 -lXmu -lXext -lXt -lm TK_FLAGS = diff --git a/graphics/togl/pkg-plist b/graphics/togl/pkg-plist index 6bc36d9d7b00..ac9a7d007722 100644 --- a/graphics/togl/pkg-plist +++ b/graphics/togl/pkg-plist @@ -1,4 +1,4 @@ -lib/tk8.0/Togl-1.5/Togl.so -lib/tk8.0/Togl-1.5/pkgIndex.tcl -@dirrm lib/tk8.0/Togl-1.5 +lib/tk8.2/Togl-1.5/Togl.so +lib/tk8.2/Togl-1.5/pkgIndex.tcl +@dirrm lib/tk8.2/Togl-1.5 |