3 files changed, 13 insertions, 59 deletions

diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 1871f275c940..e5f4fe720fa0 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -7,16 +7,17 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits tk82
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	martin@matuska.org
 COMMENT=	Graphical toolkit for TCL
 
-LIB_DEPENDS=	tcl82.1:${PORTSDIR}/${TCL82_PORT}
+USE_TCL=	82
+USE_TCL_BUILD=	82
 
 LATEST_LINK=	tk82
 USE_XLIB=	yes
@@ -34,9 +35,16 @@ PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.wish
 TCL82_PORT?=	lang/tcl82
 MANCOMPRESSED=	no
 
+OPTIONS=	TK82_MAN "Install tk 8.2 manpages" on \
+		WISH_WRAPPER "Require wish wrapper from ports" off
+
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TK82_MAN)
+.if defined(WITH_WISH_WRAPPER)
+RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
+.endif
+
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK82_MAN)
 
 MAN1=	wish.1
 MAN3=	3DBorder.3 BindTable.3 CanvPsY.3 CanvTkwin.3 CanvTxtInfo.3 \
@@ -312,7 +320,7 @@ post-configure:
 	${REINPLACE_CMD} \
 		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
 		${WRKSRC}/tkConfig.sh
-.if !defined(WITH_TK82_MAN)
+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK82_MAN)
 	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
 		${WRKSRC}/Makefile
 .endif
diff --git a/x11-toolkits/tk82/pkg-deinstall.wish b/x11-toolkits/tk82/pkg-deinstall.wish
deleted file mode 100644
index 20ca9e8436c4..000000000000
--- a/x11-toolkits/tk82/pkg-deinstall.wish
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-#
-# Remove the ${PREFIX}/bin/wish script that gets installed by INSTALL.wish
-# if we are the last wish installation to be pkg_delete'd.
-#
-# $FreeBSD$
-#
-
-#
-# Explicitly listing /usr/X11R6/bin here is debatable.
-#
-BINDIR="${PKG_PREFIX}/bin /usr/X11R6/bin"
-WISH=${PKG_PREFIX}/bin/wish
-
-wishes=$(/bin/ls ${BINDIR} 2> /dev/null | \
-    egrep '^o?wish(step)?(x|([0-9]+\.[0-9]+))([a-z][a-z])?$')
-
-if [ "$wishes" = "" -a -f ${WISH} ] && \
-    (head -3 ${WISH} | grep awieYJFnsuILOnfsYEW) > /dev/null 2>&1
-then
-	rm -f ${PKG_PREFIX}/bin/wish
-fi
diff --git a/x11-toolkits/tk82/pkg-install.wish b/x11-toolkits/tk82/pkg-install.wish
deleted file mode 100644
index d526f076a498..000000000000
--- a/x11-toolkits/tk82/pkg-install.wish
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# The user may have a wish they want to preserve
-ver=`grep -a awieYJFnsuILOnfsYEW ${PKG_PREFIX}/bin/wish 2> /dev/null \
-    | sed -e 's/.*\*\*//'`
-if [ ! -e ${PKG_PREFIX}/bin/wish ] || [ "$ver" != "" -a "$ver" -lt 001 ]
-then
-	[ -f ${PKG_PREFIX}/bin/wish ] && chmod u+w ${PKG_PREFIX}/bin/wish
-
-	mkdir -p ${PKG_PREFIX}/bin
-	cat > ${PKG_PREFIX}/bin/wish <<'EOF'
-#!/bin/sh
-# Installed by ports system.  id: awieYJFnsuILOnfsYEW**001
- 
-(
-echo "In FreeBSD, wish is named with a version number.  This is because"
-echo "different versions of wish are not compatible with each other and"
-echo "they can not all be called \"wish\"!  You may need multiple versions"
-echo "installed because a given port may depend on a specific version."
-echo
-echo "On your system, wish is installed under at least the following names:"
-echo
-for name in $(/bin/ls $(echo $PATH | sed 's/:/ /g') 2> /dev/null | egrep '^wish(step)?(x|([0-9]+\.[0-9]+))([a-z][a-z])?$')
-do
-	echo $name
-done
-[ "$name" = "" ] && echo "No wish installations found, sorry."
-) 1>&2
-exit 1
-EOF
-	chmod a+rx ${PKG_PREFIX}/bin/wish
-fi