diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index 5a336a1301f5..6da3765b708e 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -31,6 +31,8 @@ PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
 .else
 PATCH_DIST_ARGS=-d ${TOPDIR} --forward --quiet -E ${PATCH_DIST_STRIP}
 .endif
+PKGINSTALL=	${PORTSDIR}/x11-toolkits/tk82/pkg/INSTALL.wish
+PKGDEINSTALL=	${PORTSDIR}/x11-toolkits/tk82/pkg/DEINSTALL.wish
 
 TCLVERSION=	8.0
 TOPDIR=		${WRKDIR}/${DISTNAME}
@@ -46,5 +48,8 @@ post-install:
 		README.TkStep README.step changes.TkSTEPjp ${PORTDOCDIR}
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.if exists(${PKGINSTALL})
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 88ea0cdfda69..acdddfeecac3 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -22,6 +22,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=${TK_LIB_FILE}
 PKGINSTALL=	${PKGDIR}/INSTALL.wish
+PKGDEINSTALL=	${PKGDIR}/DEINSTALL.wish
 
 SHLIB_MAJOR=    1
 SHLIB_MINOR=    4
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 7344789d1824..1ff09a44a06d 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -21,6 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1
 PKGINSTALL=     ${PKGDIR}/INSTALL.wish
+PKGDEINSTALL=	${PKGDIR}/DEINSTALL.wish
 
 PLIST_SUB=	TK_VER=8.2 SHORT_TK_VER=82
 
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 2e572e15cc98..08f7b077c1be 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -23,6 +23,7 @@ CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1
 MAKE_ENV=	SHORT_TK_VER=83
 PKGINSTALL=     ${PKGDIR}/INSTALL.wish
+PKGDEINSTALL=	${PKGDIR}/DEINSTALL.wish
 
 PLIST_SUB=	TK_VER=8.3 SHORT_TK_VER=83
 
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 2e572e15cc98..08f7b077c1be 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -23,6 +23,7 @@ CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.3
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk83.so.1
 MAKE_ENV=	SHORT_TK_VER=83
 PKGINSTALL=     ${PKGDIR}/INSTALL.wish
+PKGDEINSTALL=	${PKGDIR}/DEINSTALL.wish
 
 PLIST_SUB=	TK_VER=8.3 SHORT_TK_VER=83
 
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index 3148b73da8d2..e6c2c9feedbc 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -29,6 +29,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --enable-xpm --enable-step --enable-dnd \
 		 --enable-tiff --with-optimize="${CFLAGS} -I${PREFIX}/include"
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+PKGINSTALL=	${PORTSDIR}/x11-toolkits/tk82/pkg/INSTALL.wish
+PKGDEINSTALL=	${PORTSDIR}/x11-toolkits/tk82/pkg/DEINSTALL.wish
 
 post-install:
 	@${RM} ${PREFIX}/lib/tkstep8.0/demos/*.orig
@@ -40,13 +42,11 @@ post-install:
 .endif
 	${LN} -sf ${PREFIX}/lib/libtkstep80.so.1  ${PREFIX}/lib/libtkstep80.so
 	${LDCONFIG} -m ${PREFIX}/lib
-.if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
-	${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
+.if exists(${PKGINSTALL})
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
 
 test:
 	cd ${WRKSRC}; make test
 
 .include <bsd.port.mk>
-
-PKG_ARGS+=      -i ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish