From owner-svn-ports-head@freebsd.org Sat Apr 8 18:00:05 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9E788D33920; Sat, 8 Apr 2017 18:00:05 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 79A71DB3; Sat, 8 Apr 2017 18:00:05 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v38I04Wj077769; Sat, 8 Apr 2017 18:00:04 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v38I04Ii077766; Sat, 8 Apr 2017 18:00:04 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201704081800.v38I04Ii077766@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 8 Apr 2017 18:00:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438057 - in head/security/secpanel: . 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-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Apr 2017 18:00:05 -0000 Author: pi Date: Sat Apr 8 18:00:04 2017 New Revision: 438057 URL: https://svnweb.freebsd.org/changeset/ports/438057 Log: security/secpanel: add xfce4-terminal and Thunar support PR: 213790 Submitted by: Rozhuk Ivan Approved by: nemysis (maintainer timeout) Added: head/security/secpanel/files/ head/security/secpanel/files/patch-bin_secpanel (contents, props changed) head/security/secpanel/files/patch-lib_secpanel_termdefs.txt (contents, props changed) Modified: head/security/secpanel/Makefile Modified: head/security/secpanel/Makefile ============================================================================== --- head/security/secpanel/Makefile Sat Apr 8 17:04:10 2017 (r438056) +++ head/security/secpanel/Makefile Sat Apr 8 18:00:04 2017 (r438057) @@ -3,7 +3,7 @@ PORTNAME= secpanel PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= security tcl tk MASTER_SITES= SF/${PORTNAME} \ @@ -25,8 +25,7 @@ NO_BUILD= yes USES= tk:wrapper -DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" \ - "${PORTNAME}" "" "false" +DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" false post-patch: @${REINPLACE_CMD} \ Added: head/security/secpanel/files/patch-bin_secpanel ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/secpanel/files/patch-bin_secpanel Sat Apr 8 18:00:04 2017 (r438057) @@ -0,0 +1,47 @@ +--- bin/secpanel.orig 2017-04-08 17:52:46 UTC ++++ bin/secpanel +@@ -29,7 +29,7 @@ exec wish "$0" "$@" + + set spversion 0.6.0 + +-set libdir "[file dirname [info script]]/../lib/secpanel" ++set libdir "/usr/local/share/secpanel" + # set libdir "$env(HOME)/secpanel_devel/secpanel-0x/lib" + set sshdir "$env(HOME)/.ssh" + +@@ -142,7 +142,7 @@ proc initconfigs {} { + global configs + foreach {bintag binprog} \ + {sshbin ssh keygenbin ssh-keygen agentbin ssh-agent \ +- addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla termver Xterm browserbin firefox \ ++ addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla Thunar termver Xterm browserbin firefox \ + } { + if {! [info exists configs($bintag)]} { + set configs($bintag) $binprog +@@ -1142,6 +1142,9 @@ proc connect_sftp {} { + "Filezilla" { + set runstring "filezilla -l interactive " + } ++ "Thunar" { ++ set runstring "thunar " ++ } + "GNOME-Nautilus" { + set runstring "nautilus " + } +@@ -2439,6 +2442,7 @@ proc main {argc argv} { + foreach {sftptag sftpprog} { + "KDE-Konqueror" konqueror + "GNOME-Nautilus" nautilus ++ "Thunar" thunar + "Filezilla" filezilla + } { + if {! [catch {exec which "$sftpprog"}]} { +@@ -2498,7 +2502,7 @@ proc main {argc argv} { + .mc1 add command -label "Multi Xterm (not found)" -command "multiconnect multixterm" -state "disabled" + } + +- if {[catch {exec which "filezilla"}] && [catch {exec which "nautilus"}] && [catch {exec which "konqueror"}] ++ if {[catch {exec which "filezilla"}] && [catch {exec which "thunar"}] && [catch {exec which "nautilus"}] && [catch {exec which "konqueror"}] + } { + .top17.fra46.fra26.fra29.fra36.but34 configure -state "disabled" + } Added: head/security/secpanel/files/patch-lib_secpanel_termdefs.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/secpanel/files/patch-lib_secpanel_termdefs.txt Sat Apr 8 18:00:04 2017 (r438057) @@ -0,0 +1,11 @@ +--- lib/secpanel/termdefs.txt.orig 2017-04-08 17:52:46 UTC ++++ lib/secpanel/termdefs.txt +@@ -56,7 +56,7 @@ set termtype(XFCE-Terminal_titlepar) "--title" + set termtype(XFCE-Terminal_quotepar) "" + set termtype(XFCE-Terminal_iconpar) "" + set termtype(XFCE-Terminal_execpar) "-x" +-set termtype(XFCE-Terminal_path) "Terminal" ++set termtype(XFCE-Terminal_path) "xfce4-terminal" + + set termtype(Putty's-Terminal_titlepar) "-title" + set termtype(Putty's-Terminal_quotepar) ""