diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 2b2db876932d..f29f9e1f99ba 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1998/08/07 23:56:28 asami Exp $
+# $Id: Makefile,v 1.24 1998/09/25 10:05:08 asami Exp $
 #
 
 DISTNAME=	tclX8.0.2
@@ -18,8 +18,15 @@ LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --with-tk
-MAN3=   CmdWrite.3 Handles.3 Keylist.3 TclXInit.3
-MANN=   Memory.n TclX.n
+MAN3=   CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \
+	TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \
+	TclX_KeyedListSet.3 TclX_Main.3 TclX_NewKeyedListObj.3 \
+	Tcl_HandleAlloc.3 Tcl_HandleFree.3 Tcl_HandleTblInit.3 \
+	Tcl_HandleTblRelease.3 Tcl_HandleTblUseCount.3 Tcl_HandleWalk.3 \
+	Tcl_HandleXlate.3  Tclx_Init.3  Tclxcmd_Init.3 TkX_Main.3 Tkx_Init.3
+
+MANN=   Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
+	Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
 
 post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/CmdWrite.3 $(PREFIX)/man/man3
@@ -28,7 +35,7 @@ post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclXInit.3 $(PREFIX)/man/man3
 	$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
-	${LDCONFIG} -m ${PREFIX}/lib
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
 	${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
 .endif
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 2b2db876932d..f29f9e1f99ba 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1998/08/07 23:56:28 asami Exp $
+# $Id: Makefile,v 1.24 1998/09/25 10:05:08 asami Exp $
 #
 
 DISTNAME=	tclX8.0.2
@@ -18,8 +18,15 @@ LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --with-tk
-MAN3=   CmdWrite.3 Handles.3 Keylist.3 TclXInit.3
-MANN=   Memory.n TclX.n
+MAN3=   CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \
+	TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \
+	TclX_KeyedListSet.3 TclX_Main.3 TclX_NewKeyedListObj.3 \
+	Tcl_HandleAlloc.3 Tcl_HandleFree.3 Tcl_HandleTblInit.3 \
+	Tcl_HandleTblRelease.3 Tcl_HandleTblUseCount.3 Tcl_HandleWalk.3 \
+	Tcl_HandleXlate.3  Tclx_Init.3  Tclxcmd_Init.3 TkX_Main.3 Tkx_Init.3
+
+MANN=   Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
+	Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
 
 post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/CmdWrite.3 $(PREFIX)/man/man3
@@ -28,7 +35,7 @@ post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclXInit.3 $(PREFIX)/man/man3
 	$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
-	${LDCONFIG} -m ${PREFIX}/lib
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
 	${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
 .endif
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index 2b2db876932d..f29f9e1f99ba 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.23 1998/08/07 23:56:28 asami Exp $
+# $Id: Makefile,v 1.24 1998/09/25 10:05:08 asami Exp $
 #
 
 DISTNAME=	tclX8.0.2
@@ -18,8 +18,15 @@ LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --with-tk
-MAN3=   CmdWrite.3 Handles.3 Keylist.3 TclXInit.3
-MANN=   Memory.n TclX.n
+MAN3=   CmdWrite.3 Handles.3 Keylist.3 TclCommandWriting.3 TclXInit.3 \
+	TclX_KeyedListDelete.3 TclX_KeyedListGet.3 TclX_KeyedListGetKeys.3 \
+	TclX_KeyedListSet.3 TclX_Main.3 TclX_NewKeyedListObj.3 \
+	Tcl_HandleAlloc.3 Tcl_HandleFree.3 Tcl_HandleTblInit.3 \
+	Tcl_HandleTblRelease.3 Tcl_HandleTblUseCount.3 Tcl_HandleWalk.3 \
+	Tcl_HandleXlate.3  Tclx_Init.3  Tclxcmd_Init.3 TkX_Main.3 Tkx_Init.3
+
+MANN=   Memory.n TclX.n Tcl_DisplayMemory.n Tcl_InitMemory.n \
+	Tcl_ValidateAllMemory.n ckalloc.n ckfree.n memory.n
 
 post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/CmdWrite.3 $(PREFIX)/man/man3
@@ -28,7 +35,7 @@ post-install:
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclXInit.3 $(PREFIX)/man/man3
 	$(INSTALL_MAN) $(WRKSRC)/../doc/Memory.n $(PREFIX)/man/mann
 	$(INSTALL_MAN) $(WRKSRC)/../doc/TclX.n $(PREFIX)/man/mann
-	${LDCONFIG} -m ${PREFIX}/lib
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish)
 	${SH} ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
 .endif