Index: head/deskutils/abacus/Makefile
===================================================================
--- head/deskutils/abacus/Makefile	(revision 228832)
+++ head/deskutils/abacus/Makefile	(revision 228833)
@@ -1,64 +1,64 @@
 # New ports collection makefile for:	abacus
 # Date created:				18 August 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
 PORTNAME=	abacus
 PORTVERSION=	0.9.13
 PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://kdbio.inesc-id.pt/~aml/abacus/
 
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	steve
 PATCHFILES=	${PORTNAME}-${PORTVERSION}.patch.gz
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Spread sheet for X Window System
 
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
-		tk82.1:${PORTSDIR}/x11-toolkits/tk82
-
 USE_GMAKE=	yes
 USE_XORG=	x11
+USE_TK=		82
+USE_TCL=	82
+
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 CFLAGS+=	-I$(LOCALBASE)/include \
 		-I$(LOCALBASE)/include/tcl8.2 \
 		-I$(LOCALBASE)/include/tk8.2
 CXXFLAGS+=	-Wno-deprecated
 LDFLAGS+=	-L$(LOCALBASE)/lib
 ALL_TARGET=	dep tcl_interf/nxlc
 
 MAN1=		abacus.1
 
 post-extract:
 	@(cd ${WRKSRC}; ${FIND} -d . -name RCS -exec ${RM} -rf {} \;)
 	@(cd ${WRKSRC}; ${RM} canvas; ${LN} -sf canvas-tcl8.2.2 canvas)
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/abacus
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/abacus ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/abacus.1 ${PREFIX}/man/man1
 	@${MKDIR} ${PREFIX}/share/abacus
 	@${MKDIR} ${PREFIX}/share/abacus/display
 	${INSTALL_DATA} ${WRKSRC}/display/*.tcl ${PREFIX}/share/abacus/display
 	@${MKDIR} ${PREFIX}/share/abacus/graphics
 	${INSTALL_DATA} ${WRKSRC}/graphics/*.tcl ${PREFIX}/share/abacus/graphics
 	@${MKDIR} ${PREFIX}/share/abacus/runlib
 	${INSTALL_DATA} ${WRKSRC}/runlib/*.tcl ${PREFIX}/share/abacus/runlib
 	${INSTALL_DATA} ${WRKSRC}/runlib/version ${PREFIX}/share/abacus/runlib
 	@${MKDIR} ${PREFIX}/share/abacus/runlib/bitmaps
 	${INSTALL_DATA} ${WRKSRC}/runlib/bitmaps/* ${PREFIX}/share/abacus/runlib/bitmaps
 	@${MKDIR} ${PREFIX}/share/abacus/tcl_interf
 	${INSTALL_PROGRAM} ${WRKSRC}/tcl_interf/nxlc ${PREFIX}/share/abacus/tcl_interf
 	@${MKDIR} ${PREFIX}/share/abacus/doc
 	${TAR} -C ${WRKSRC} --exclude abacus.1 -cf - doc | \
 		${TAR} -C ${PREFIX}/share/abacus --unlink -xf -
 	@${MKDIR} ${PREFIX}/share/examples/abacus
 	${INSTALL_DATA} ${WRKSRC}/regressive/* ${PREFIX}/share/examples/abacus
 
 .include <bsd.port.mk>

Property changes on: head/deskutils/abacus/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.33
\ No newline at end of property
+1.34
\ No newline at end of property
Index: head/irc/zircon/Makefile
===================================================================
--- head/irc/zircon/Makefile	(revision 228832)
+++ head/irc/zircon/Makefile	(revision 228833)
@@ -1,47 +1,44 @@
 # New ports collection makefile for:	zircon
 # Date created:		19 Aug 1995
 # Whom:			jkh / pst
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zircon
 PORTVERSION=	1.18.256
 PORTREVISION=	2
 CATEGORIES=	irc tk
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dinoex
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An X11 interface to Internet Relay Chat
 
 # zircon will start with tk84, but a lot of functions won't work
 # a lot of variable names conflicts with new functions.
 .if defined(ZIRCON_WITH_TCL84) || defined(ZIRCON_WITH_TK84)
-RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
+USE_TK=		84
+USE_TCL=	84
 .else
-RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
+USE_TK=		83
+USE_TCL=	83
 .endif
 
 NO_BUILD=	yes
-.if defined(ZIRCON_WITH_TCL84) || defined(ZIRCON_WITH_TK84)
-TCL_VER=	8.4
-.else
-TCL_VER=	8.3
-.endif
 
 do-configure:
 	${REINPLACE_CMD} -e 's=%%WISH%%=wish${TCL_VER}=' \
 		-e 's=%%TCLSH%%=tclsh${TCL_VER}=' \
 		${WRKSRC}/installZircon
 	${REINPLACE_CMD} -e 's=%%WISH%%=wish${TCL_VER}=' \
 		-e 's=%%TCL_INCLUDE%%=${LOCALBASE}/include/tcl${TCL_VER}=' \
 		-e 's=/usr/local=${PREFIX}=' \
 		${WRKSRC}/installer/unix.tcl
 
 do-install:
 	${ECHO_CMD} "set go {Yes}" >>${WRKSRC}/install.in
 	(cd ${WRKSRC} && ./installZircon NoGui)
 
 .include <bsd.port.mk>

Property changes on: head/irc/zircon/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.72
\ No newline at end of property
+1.73
\ No newline at end of property