- Convert to USES=tk

- STAGE-clean
- Fix a run-time error when no LANG environment variable is defined

1 files changed, 5 insertions, 7 deletions

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>