diff --git a/textproc/tkxmlive/Makefile b/textproc/tkxmlive/Makefile
index a305927c1a03..a3e033650a95 100644
--- a/textproc/tkxmlive/Makefile
+++ b/textproc/tkxmlive/Makefile
@@ -14,12 +14,10 @@ COMMENT=		Tcl/Tk XML intelligence visual editor
 RUN_DEPENDS+=		${LOCALBASE}/lib/bwidget/pkgIndex.tcl:${PORTSDIR}/x11-toolkits/bwidget
 
 NO_BUILD=		yes
-
-USE_TK_RUN=		84+
+USES=			tk:run
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 REPLACE_FILES=		${WRKSRC}/interface.tcl \
@@ -48,22 +46,22 @@ do-install: .SILENT
 	cd ${WRKSRC}; \
 	DIRS=$$(${FIND} . ${FIND_ARGS1}); \
 	for DIR in $${DIRS}; do \
-		${MKDIR} ${DATADIR}/$${DIR}; \
+		${MKDIR} ${STAGEDIR}${DATADIR}/$${DIR}; \
 	done; \
 	FILES=$$(${FIND} . ${FIND_ARGS2}); \
 	for FILE in $${FILES}; do \
-		${INSTALL_SCRIPT} $${FILE} ${DATADIR}/$${FILE}; \
+		${INSTALL_SCRIPT} $${FILE} ${STAGEDIR}${DATADIR}/$${FILE}; \
 	done; \
 	FILES=$$(${FIND} -E . ${FIND_ARGS3}); \
 	for FILE in $${FILES}; do \
-		${INSTALL_DATA} $${FILE} ${DATADIR}/$${FILE}; \
+		${INSTALL_DATA} $${FILE} ${STAGEDIR}${DATADIR}/$${FILE}; \
 	done;
 
 # Links to executables
 	cd ${WRKSRC}; \
 	FILES=${PORTNAME}; \
 	for f in $${FILES}; do \
-		${LN} ${LN_OPTS} ${DATADIR}/$${f} ${PREFIX}/bin/$${f}; \
+		${LN} ${LN_OPTS} ${DATADIR}/$${f} ${STAGEDIR}${PREFIX}/bin/$${f}; \
 	done;
 
 .include <bsd.port.post.mk>
diff --git a/textproc/tkxmlive/files/patch-interface.tcl b/textproc/tkxmlive/files/patch-interface.tcl
index 2e1df166284c..587e9a99e65a 100644
--- a/textproc/tkxmlive/files/patch-interface.tcl
+++ b/textproc/tkxmlive/files/patch-interface.tcl
@@ -1,6 +1,5 @@
-$FreeBSD$
---- interface.tcl	Thu May 30 23:56:36 2002
-+++ interface.tcl.new	Fri Feb 20 11:06:41 2004
+--- interface.tcl.orig	2002-05-30 23:56:36.000000000 +0200
++++ interface.tcl	2013-08-07 14:58:22.000000000 +0200
 @@ -1,4 +1,6 @@
 -#!/usr/bin/wish
 +#!/bin/sh
@@ -9,3 +8,18 @@ $FreeBSD$
  
  
  package require msgcat
+@@ -17,9 +19,11 @@
+ source library/scrolled_text.tcl
+ 
+ 
+-set mcDir [file join [file dirname [info script]] gui/msgs]
+-msgcat::mcload $mcDir
+-msgcat::mclocale $env(LANG)
++if {[info exists env(LANG)]} {
++  set mcDir [file join [file dirname [info script]] gui/msgs]
++  msgcat::mcload $mcDir
++  msgcat::mclocale $env(LANG)
++}
+ 
+ proc SetResource { win } {
+ 
diff --git a/textproc/tkxmlive/pkg-plist b/textproc/tkxmlive/pkg-plist
index a5bde0716308..b30e19b14ed8 100644
--- a/textproc/tkxmlive/pkg-plist
+++ b/textproc/tkxmlive/pkg-plist
@@ -48,4 +48,4 @@ bin/tkxmlive
 @dirrm %%DATADIR%%/library
 @dirrm %%DATADIR%%/sample/article
 @dirrm %%DATADIR%%/sample
-@dirrm %%DATADIR%%/
+@dirrm %%DATADIR%%