Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 13 Jan 2014 10:44:50 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r339581 - in head/textproc/tkxmlive: . files
Message-ID:  <201401131044.s0DAioU8024995@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gahr
Date: Mon Jan 13 10:44:50 2014
New Revision: 339581
URL: http://svnweb.freebsd.org/changeset/ports/339581

Log:
  - Convert to USES=tk
  - STAGE-clean
  - Fix a run-time error when no LANG environment variable is defined

Modified:
  head/textproc/tkxmlive/Makefile   (contents, props changed)
  head/textproc/tkxmlive/files/patch-interface.tcl   (contents, props changed)
  head/textproc/tkxmlive/pkg-plist   (contents, props changed)

Modified: head/textproc/tkxmlive/Makefile
==============================================================================
--- head/textproc/tkxmlive/Makefile	Mon Jan 13 10:43:51 2014	(r339580)
+++ head/textproc/tkxmlive/Makefile	Mon Jan 13 10:44:50 2014	(r339581)
@@ -14,12 +14,10 @@ COMMENT=		Tcl/Tk XML intelligence visual
 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>

Modified: head/textproc/tkxmlive/files/patch-interface.tcl
==============================================================================
--- head/textproc/tkxmlive/files/patch-interface.tcl	Mon Jan 13 10:43:51 2014	(r339580)
+++ head/textproc/tkxmlive/files/patch-interface.tcl	Mon Jan 13 10:44:50 2014	(r339581)
@@ -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 } {
+ 

Modified: head/textproc/tkxmlive/pkg-plist
==============================================================================
--- head/textproc/tkxmlive/pkg-plist	Mon Jan 13 10:43:51 2014	(r339580)
+++ head/textproc/tkxmlive/pkg-plist	Mon Jan 13 10:44:50 2014	(r339581)
@@ -48,4 +48,4 @@ bin/tkxmlive
 @dirrm %%DATADIR%%/library
 @dirrm %%DATADIR%%/sample/article
 @dirrm %%DATADIR%%/sample
-@dirrm %%DATADIR%%/
+@dirrm %%DATADIR%%

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401131044.s0DAioU8024995>