Catch up once again with bsd.lib.mk -- rename SHLIBDIR to LIBDIR -- to

fix installation/packaging on -current. Default to TCL 8.4 -- still
overwritable.

Submitted by:	kris

2 files changed, 7 insertions, 7 deletions

diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index 9077cbed4c17..54f1e4389cd5 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Gdtclft
 PORTVERSION=	2.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics tcl${TCL_DVER}
 MASTER_SITES=	ftp://ftp.graphviz.org/pub/
 DISTNAME=	${PORTNAME}${PORTVERSION}
@@ -18,7 +18,7 @@ COMMENT=	A TCL interface to the Thomas Boutell's Gd library
 LIB_DEPENDS=	tcl${TCL_DVER}.1:${PORTSDIR}/lang/tcl${TCL_DVER} \
 		gd:${PORTSDIR}/graphics/gd
 
-TCL_VER=	8.3
+TCL_VER?=	8.4
 TCL_DVER=	${TCL_VER:S/.//}
 
 MAKEFILE=	${FILESDIR}/Makefile.bsd
diff --git a/graphics/gdtclft/files/Makefile.bsd b/graphics/gdtclft/files/Makefile.bsd
index 608b464a1f87..3ccfcedaaca4 100644
--- a/graphics/gdtclft/files/Makefile.bsd
+++ b/graphics/gdtclft/files/Makefile.bsd
@@ -29,16 +29,16 @@ pkgIndex.tcl:
 	echo 'package ifneeded $(PACKAGE) $(VERSION) [list load [file join $$dir $(SHLIB_NAME)] $(PACKAGE)]' > pkgIndex.tcl
 
 DIR		= lib/tcl${TCL_VER}/gdtclft
-SHLIBDIR	= ${PREFIX}/${DIR}
+LIBDIR	= ${PREFIX}/${DIR}
 MANDIR		= ${PREFIX}/man/man
 
-${SHLIBDIR}:
-	${MKDIR} ${SHLIBDIR}
+${LIBDIR}:
+	${MKDIR} ${LIBDIR}
 
 env:
 	@${ECHO} SHLIB_NAME=${SHLIB_NAME} SHLIB_LINK=${SHLIB_LINK} DIR=${DIR}
 
-beforeinstall: ${SHLIBDIR}
-	${INSTALL_DATA} pkgIndex.tcl ${SHLIBDIR}
+beforeinstall: ${LIBDIR}
+	${INSTALL_DATA} pkgIndex.tcl ${LIBDIR}
 
 .include <bsd.lib.mk>