- Remove support for lang/tcl-tk-wrapper

- Bump PORTREVISION

Notes: Please read UPDATING

Approved by: maintainer implicit

6 files changed, 12 insertions, 42 deletions

diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index a55116f2f539..922112771aa5 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits tk80
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_0
@@ -33,15 +33,10 @@ SHLIB_MINOR=	4
 MAKEFILE=	makefile
 TK_LIB=		libtk80.so
 
-OPTIONS=	TK80_MAN "Install tk 8.0 manpages" off \
-		WISH_WRAPPER "Require wish wrapper from ports" off
+OPTIONS=	TK80_MAN "Install tk 8.0 manpages" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_WISH_WRAPPER)
-RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
-.endif
-
 .if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK80_MAN)
 
 MAN1=	wish.1
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 7805abead30d..951a80cc5ee5 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.2.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits tk82
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
@@ -33,15 +33,10 @@ PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
 TCL82_PORT?=	lang/tcl82
 MANCOMPRESSED=	no
 
-OPTIONS=	TK82_MAN "Install tk 8.2 manpages" off \
-		WISH_WRAPPER "Require wish wrapper from ports" off
+OPTIONS=	TK82_MAN "Install tk 8.2 manpages" off
 
 .include <bsd.port.pre.mk>
 
-.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
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 6ff36178f575..315169c286b2 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.3.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits tk83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -35,15 +35,10 @@ NOPRECIOUSMAKEVARS=	Too many _MLINKS for README.html
 TCL83_PORT?=	lang/tcl83
 MANCOMPRESSED=	no
 
-OPTIONS=	TK83_MAN "Install tk 8.3 manpages" off \
-		WISH_WRAPPER "Require wish wrapper from ports" off
+OPTIONS=	TK83_MAN "Install tk 8.3 manpages" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_WISH_WRAPPER)
-RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
-.endif
-
 .if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK83_MAN)
 
 MAN1=	wish.1
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index d3b6f66d5d16..45f9c0281978 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.4.14
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -39,8 +39,7 @@ SUB_FILES=	pkgIndex.tcl
 USE_TCL=	84
 USE_TCL_BUILD=	84
 
-OPTIONS=	TK84_MAN "Install tk 8.4 manpages" on \
-		WISH_WRAPPER "Require wish wrapper from ports" off
+OPTIONS=	TK84_MAN "Install tk 8.4 manpages" on
 .else
 USE_TK=		${SHORT_TK_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -61,10 +60,6 @@ LATEST_LINK=		tk85${THREADS_SUFFIX}
 CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER}
 CONFIGURE_ENV+=		ac_cv_path_tclsh="${TCLSH}"
 
-.if defined(WITH_WISH_WRAPPER)
-RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
-.endif
-
 .if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN)
 
 PLIST_SUB+=	INSTMAN='@comment '
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index da1db5bf9001..612ea8985b13 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.5.a.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -37,8 +37,7 @@ SUB_FILES=	pkgIndex.tcl
 USE_TCL=	${SHORT_TK_VER}
 USE_TCL_BUILD=	${SHORT_TK_VER}
 
-OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
-		WISH_WRAPPER "Require wish wrapper from ports" off
+OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off
 .else
 USE_TK=		${SHORT_TK_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -59,10 +58,6 @@ LATEST_LINK=		tk85${THREADS_SUFFIX}
 CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
 			ac_cv_path_tclsh="${TCLSH}"
 
-.if defined(WITH_WISH_WRAPPER)
-RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
-.endif
-
 .if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN)
 
 PLIST_SUB+=	INSTMAN='@comment '
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index da1db5bf9001..612ea8985b13 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.5.a.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -37,8 +37,7 @@ SUB_FILES=	pkgIndex.tcl
 USE_TCL=	${SHORT_TK_VER}
 USE_TCL_BUILD=	${SHORT_TK_VER}
 
-OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
-		WISH_WRAPPER "Require wish wrapper from ports" off
+OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off
 .else
 USE_TK=		${SHORT_TK_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -59,10 +58,6 @@ LATEST_LINK=		tk85${THREADS_SUFFIX}
 CONFIGURE_ARGS+=	--disable-threads --with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
 			ac_cv_path_tclsh="${TCLSH}"
 
-.if defined(WITH_WISH_WRAPPER)
-RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
-.endif
-
 .if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN)
 
 PLIST_SUB+=	INSTMAN='@comment '