PKGDEINSTALL=${PORTSDIR}/lang/tcl82/pkg/DEINSTALL.tclsh, or from

${PKGDIR} if DEINSTALL.tclsh exists there.

Also, add INSTALL.tclsh to ja-tcl*, otcl, and itcl.  The latter
two technically don't need it since they depend on another library
which will pull the (DE)?INSTALL.tclsh stuff in, but I'm changing
them anyways as a defensive measure.

8 files changed, 25 insertions, 1 deletions

diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index b761b5e..2c42cbd 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -20,6 +20,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
+PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg/INSTALL.tclsh
+PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg/DEINSTALL.tclsh
 
 VERSION=	${PORTVERSION}jp
 
@@ -50,6 +52,9 @@ post-install:
 .if ${PORTOBJFORMAT} == "aout" 
 	${LN} -sf libtcl76jp.so.1.0 ${PREFIX}/lib/libtcl76jp.so
 .endif
+.if exists(${PKGINSTALL})
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+.endif
 
 test:
 	cd ${WRKSRC} && ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index f347f0a..78f61f98 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -28,6 +28,8 @@ GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--enable-shared
 RANLIB=		ranlib
+PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg/INSTALL.tclsh
+PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg/DEINSTALL.tclsh
 
 .include <bsd.port.pre.mk>
 
@@ -54,6 +56,9 @@ post-install:
 	${LN} -sf libtcl80jp.so.1.5 ${PREFIX}/lib/libtcl80jp.so
 	${RANLIB} ${PREFIX}/lib/libtcl80jp.a
 .endif
+.if exists(${PKGINSTALL})
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+.endif
 	@${CAT}	${PKGDIR}/MESSAGE
 
 test:
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 0544684..61578ba 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -19,6 +19,8 @@ WRKSRC=		${WRKDIR}/itcl3.0.1/itcl/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} ITCL_LIB_FILE=${ITCL_LIB_FILE}
+PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg/INSTALL.tclsh
+PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg/DEINSTALL.tclsh
 
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	1
@@ -47,5 +49,8 @@ post-install:
 	${LN} -sf ${PREFIX}/bin/itclsh3.0 ${PREFIX}/bin/itclsh
 	${LN} -sf ${ITCL_LIB_FILE} ${PREFIX}/lib/${ITCL_LIB}
 	${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/lang/otcl/Makefile b/lang/otcl/Makefile
index c82aedd..19e61b6 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -17,11 +17,16 @@ LIB_DEPENDS=    tk82.1:${PORTSDIR}/x11-toolkits/tk82
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
 USE_AUTOCONF= yes
+PKGINSTALL=	${PORTSDIR}/lang/tcl82/pkg/INSTALL.tclsh
+PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg/DEINSTALL.tclsh
 
 post-install:
 	${LN} -sf libotcl.so ${PREFIX}/lib/libotcl.so.1
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	strip ${PREFIX}/bin/otclsh
 	strip ${PREFIX}/bin/owish
+.if exists(${PKGINSTALL})
+	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+.endif
 
 .include <bsd.port.mk>
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 654bdc3..e3618d6 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -21,6 +21,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 PKGINSTALL=	${PKGDIR}/INSTALL.tclsh
+PKGDEINSTALL=	${PKGDIR}/DEINSTALL.tclsh
 
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	5
diff --git a/lang/tcl81-thread/Makefile b/lang/tcl81-thread/Makefile
index 32349dc..a90c483 100644
--- a/lang/tcl81-thread/Makefile
+++ b/lang/tcl81-thread/Makefile
@@ -22,7 +22,8 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-threads
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
-PKGINSTALL=     ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
+PKGINSTALL=     ${PORTSDIR}/lang/tcl82/pkg/INSTALL.tclsh
+PKGDEINSTALL=	${PORTSDIR}/lang/tcl82/pkg/DEINSTALL.tclsh
 
 MAN1=	tclsh.1
 
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index b663519..82db66c 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -27,6 +27,7 @@ CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 MAKE_ENV=	SHORT_TCL_VER=83
 PKGINSTALL=     ${PKGDIR}/INSTALL.tclsh
+PKGDEINSTALL=	${PKGDIR}/DEINSTALL.tclsh
 
 PLIST_SUB=	TCL_VER=8.3 SHORT_TCL_VER=83
 
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index b663519..82db66c 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -27,6 +27,7 @@ CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 MAKE_ENV=	SHORT_TCL_VER=83
 PKGINSTALL=     ${PKGDIR}/INSTALL.tclsh
+PKGDEINSTALL=	${PKGDIR}/DEINSTALL.tclsh
 
 PLIST_SUB=	TCL_VER=8.3 SHORT_TCL_VER=83