From owner-svn-ports-all@FreeBSD.ORG Sun Nov 11 12:07:10 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3D023887; Sun, 11 Nov 2012 12:07:10 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 214548FC0A; Sun, 11 Nov 2012 12:07:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qABC79E6080558; Sun, 11 Nov 2012 12:07:10 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABC79IW080554; Sun, 11 Nov 2012 12:07:09 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201211111207.qABC79IW080554@svn.freebsd.org> From: "Jason E. Hale" Date: Sun, 11 Nov 2012 12:07:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307307 - in head/x11-fm/filerunner: . 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.14 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: Sun, 11 Nov 2012 12:07:10 -0000 Author: jhale Date: Sun Nov 11 12:07:09 2012 New Revision: 307307 URL: http://svnweb.freebsd.org/changeset/ports/307307 Log: - Update to 12.05.23.16 [1] - Remove LICENSE_FILE for standard GPLv2 license [1] - Trim Makefile header [1] - Improve COMMENT - Install data and docs DATADIR and DOCSDIR instead of lib PR: ports/172514 Submitted by: KATO Tsuguru Approved by: makc, avilla (mentors, implicit) Feature safe: yes Added: head/x11-fm/filerunner/files/ head/x11-fm/filerunner/files/patch-fr (contents, props changed) Modified: head/x11-fm/filerunner/Makefile (contents, props changed) head/x11-fm/filerunner/distinfo (contents, props changed) head/x11-fm/filerunner/pkg-plist (contents, props changed) Modified: head/x11-fm/filerunner/Makefile ============================================================================== --- head/x11-fm/filerunner/Makefile Sun Nov 11 11:47:28 2012 (r307306) +++ head/x11-fm/filerunner/Makefile Sun Nov 11 12:07:09 2012 (r307307) @@ -1,39 +1,41 @@ -# New ports collection makefile for: filerunner -# Date created: 3 August 1996 -# Whom: lukin -# +# Created by: lukin # $FreeBSD$ -# PORTNAME= filerunner -PORTVERSION= 12.03.30.12 +PORTVERSION= 12.05.23.16 CATEGORIES= x11-fm tk MASTER_SITES= SF/${PORTNAME}/Release-${PORTVERSION} -DISTNAME= fr-12.3.30.12 +DISTNAME= fr-${PORTVERSION:S/.0/./} MAINTAINER= ports@FreeBSD.org -COMMENT= Filemanager with FTP capabilities. Uses Tcl/Tk +COMMENT= Tcl/Tk-based filemanager with FTP capabilities LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes USE_TK_WRAPPER= yes +PORTDOCS= FAQ HISTORY README *.txt + +.include + do-install: - @${MKDIR} ${PREFIX}/lib/FileRunner -.for file in COPYING FAQ HISTORY README fr frftp tclIndex *.tcl *.txt *.xpm - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/FileRunner + @${MKDIR} ${DATADIR} +.for file in fr frftp tclIndex *.tcl *.xpm + ${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR} .endfor - @${MKDIR} ${PREFIX}/lib/FileRunner/bitmaps -.for file in *.bit - ${INSTALL_DATA} ${WRKSRC}/bitmaps/${file} ${PREFIX}/lib/FileRunner/bitmaps +.for dir in bitmaps packages + @cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${DATADIR} .endfor .for file in fr frftp frcolor.tcl - @${CHMOD} ${BINMODE} ${PREFIX}/lib/FileRunner/${file} + @${CHMOD} ${BINMODE} ${DATADIR}/${file} .endfor - @${LN} -sf ${PREFIX}/lib/FileRunner/fr ${PREFIX}/bin/fr + @${LN} -sf ${DATADIR}/fr ${PREFIX}/bin/fr +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} +.endif .include Modified: head/x11-fm/filerunner/distinfo ============================================================================== --- head/x11-fm/filerunner/distinfo Sun Nov 11 11:47:28 2012 (r307306) +++ head/x11-fm/filerunner/distinfo Sun Nov 11 12:07:09 2012 (r307307) @@ -1,2 +1,2 @@ -SHA256 (fr-12.3.30.12.tar.gz) = 0dfe47e91829eae07cdfc0fb452659d1558dadaa962fd33690d942b6672086dd -SIZE (fr-12.3.30.12.tar.gz) = 392100 +SHA256 (fr-12.5.23.16.tar.gz) = f43e72f3fa97ee9fc5e2efe289f9b9c98e1ad664b7b9258db22e92da16240e78 +SIZE (fr-12.5.23.16.tar.gz) = 426521 Added: head/x11-fm/filerunner/files/patch-fr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/filerunner/files/patch-fr Sun Nov 11 12:07:09 2012 (r307307) @@ -0,0 +1,19 @@ +--- ./fr.orig 2012-10-26 06:24:13.000000000 -0400 ++++ ./fr 2012-10-26 06:25:32.000000000 -0400 +@@ -1,6 +1,6 @@ + #! /bin/sh + # -*- tcl -*- \ +- exec wish "$0" "$@" ++ exec wish "$0" + + #set g } + +@@ -4509,7 +4509,7 @@ + } + + if { ! [info exists glob(doclib_fr)] } { +- set glob(doclib_fr) $glob(lib_fr) ++ set glob(doclib_fr) $glob(lib_fr)/../doc/filerunner + } + foreach pkg [split [read [open $glob(lib_fr)/packages/list ]] "\n" ] { + # puts ">$pkg<" Modified: head/x11-fm/filerunner/pkg-plist ============================================================================== --- head/x11-fm/filerunner/pkg-plist Sun Nov 11 11:47:28 2012 (r307306) +++ head/x11-fm/filerunner/pkg-plist Sun Nov 11 12:07:09 2012 (r307307) @@ -1,50 +1,51 @@ bin/fr -lib/FileRunner/COPYING -lib/FileRunner/FAQ -lib/FileRunner/FontControl.tcl -lib/FileRunner/HISTORY -lib/FileRunner/KnownBugs.txt -lib/FileRunner/QuickStart.txt -lib/FileRunner/README -lib/FileRunner/Tips.txt -lib/FileRunner/To_Do.txt -lib/FileRunner/Users_Guide.txt -lib/FileRunner/balloon.tcl -lib/FileRunner/bitmaps/cross.bit -lib/FileRunner/bitmaps/frterm.bit -lib/FileRunner/bitmaps/larger.bit -lib/FileRunner/bitmaps/left.bit -lib/FileRunner/bitmaps/max.bit -lib/FileRunner/bitmaps/pgdown.bit -lib/FileRunner/bitmaps/pgup.bit -lib/FileRunner/bitmaps/right.bit -lib/FileRunner/bitmaps/smaller.bit -lib/FileRunner/bitmaps/small-equ.bit -lib/FileRunner/bitmaps/small-noeq.bit -lib/FileRunner/bitmaps/small-right.bit -lib/FileRunner/bitmaps/small-left.bit -lib/FileRunner/bitmaps/toggle.bit -lib/FileRunner/bitmaps/tree.bit -lib/FileRunner/bitmaps/up.bit -lib/FileRunner/bitmaps/update.bit -lib/FileRunner/bitmaps/xterm.bit -lib/FileRunner/chmod.tcl -lib/FileRunner/cmd.tcl -lib/FileRunner/config.tcl -lib/FileRunner/dialog.tcl -lib/FileRunner/displays.tcl -lib/FileRunner/editfont.tcl -lib/FileRunner/font.tcl -lib/FileRunner/fr -lib/FileRunner/frcolor.tcl -lib/FileRunner/frftp -lib/FileRunner/frutils.tcl -lib/FileRunner/ftp.tcl -lib/FileRunner/ftp_control.tcl -lib/FileRunner/http.tcl -lib/FileRunner/sftp.tcl -lib/FileRunner/icon.xpm -lib/FileRunner/tclIndex -lib/FileRunner/tclmultilistbox.tcl -@dirrm lib/FileRunner/bitmaps -@dirrm lib/FileRunner +%%DATADIR%%/FontControl.tcl +%%DATADIR%%/balloon.tcl +%%DATADIR%%/bitmaps/bitmapeditor +%%DATADIR%%/bitmaps/cross.bit +%%DATADIR%%/bitmaps/frterm.bit +%%DATADIR%%/bitmaps/larger.bit +%%DATADIR%%/bitmaps/left.bit +%%DATADIR%%/bitmaps/max.bit +%%DATADIR%%/bitmaps/pgdown.bit +%%DATADIR%%/bitmaps/pgup.bit +%%DATADIR%%/bitmaps/right.bit +%%DATADIR%%/bitmaps/small-equ.bit +%%DATADIR%%/bitmaps/small-left.bit +%%DATADIR%%/bitmaps/small-noeq.bit +%%DATADIR%%/bitmaps/small-right.bit +%%DATADIR%%/bitmaps/smaller.bit +%%DATADIR%%/bitmaps/toggle.bit +%%DATADIR%%/bitmaps/tree.bit +%%DATADIR%%/bitmaps/up.bit +%%DATADIR%%/bitmaps/update.bit +%%DATADIR%%/bitmaps/xterm.bit +%%DATADIR%%/chmod.tcl +%%DATADIR%%/cmd.tcl +%%DATADIR%%/config.tcl +%%DATADIR%%/cript.tcl +%%DATADIR%%/dialog.tcl +%%DATADIR%%/displays.tcl +%%DATADIR%%/editfont.tcl +%%DATADIR%%/font.tcl +%%DATADIR%%/fr +%%DATADIR%%/frcolor.tcl +%%DATADIR%%/frftp +%%DATADIR%%/frutils.tcl +%%DATADIR%%/ftp.tcl +%%DATADIR%%/ftp_control.tcl +%%DATADIR%%/http.tcl +%%DATADIR%%/icon.xpm +%%DATADIR%%/packages/ftp/ftp.tcl +%%DATADIR%%/packages/ftp/pkgIndex.tcl +%%DATADIR%%/packages/list +%%DATADIR%%/packages/log/log.tcl +%%DATADIR%%/packages/log/pkgIndex.tcl +%%DATADIR%%/sftp.tcl +%%DATADIR%%/tclIndex +%%DATADIR%%/tclmultilistbox.tcl +@dirrm %%DATADIR%%/packages/log +@dirrm %%DATADIR%%/packages/ftp +@dirrm %%DATADIR%%/packages +@dirrm %%DATADIR%%/bitmaps +@dirrm %%DATADIR%%