From owner-svn-ports-all@FreeBSD.ORG Mon Jan 13 10:44:51 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C66EE45; Mon, 13 Jan 2014 10:44:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F02751F28; Mon, 13 Jan 2014 10:44:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0DAioN7025003; Mon, 13 Jan 2014 10:44:50 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0DAioU8024995; Mon, 13 Jan 2014 10:44:50 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401131044.s0DAioU8024995@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 13 Jan 2014 10:44:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339581 - in head/textproc/tkxmlive: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Jan 2014 10:44:51 -0000 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 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 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%%