Date: Thu, 29 Aug 2019 10:21:48 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510151 - in head/security/secpanel: . files Message-ID: <201908291021.x7TALmVX067955@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pi Date: Thu Aug 29 10:21:48 2019 New Revision: 510151 URL: https://svnweb.freebsd.org/changeset/ports/510151 Log: security/secpanel: fix the mate-only case PR: 239832 Submitted by: Walter Schwarzenfeld <w.schwarzenfeld@utanet.at> Reported by: Jim D. <radicleparticles@gmail.com> Added: head/security/secpanel/files/patch-default.config (contents, props changed) head/security/secpanel/files/pkg-message.in (contents, props changed) Modified: head/security/secpanel/Makefile head/security/secpanel/files/patch-bin_secpanel head/security/secpanel/files/patch-lib_secpanel_termdefs.txt head/security/secpanel/pkg-plist Modified: head/security/secpanel/Makefile ============================================================================== --- head/security/secpanel/Makefile Thu Aug 29 09:02:42 2019 (r510150) +++ head/security/secpanel/Makefile Thu Aug 29 10:21:48 2019 (r510151) @@ -3,7 +3,7 @@ PORTNAME= secpanel PORTVERSION= 0.6.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= security tcl tk MASTER_SITES= SF/${PORTNAME} \ @@ -20,22 +20,53 @@ LICENSE= GPLv2 RUN_DEPENDS= ssh-askpass:security/openssh-askpass -WRKSRC= ${WRKDIR}/usr/local +USES= tk:wrapper + +OPTIONS_RADIO= TERMINAL +OPTIONS_RADIO_TERMINAL= GNOMETERMINAL MATETERMINAL XTERM +OPTIONS_DEFAULT= GNOMETERMINAL + +GNOMETERMINAL_DESC= build with gnome-terminal +MATETERMINAL_DESC= build with mate-terminal (you need mate-desktop) +XTERM_DESC= build with xterm +GNOMETERMINAL_RUN_DEPENDS= gnome-terminal>=3.0.0:x11/gnome-terminal +MATETERMINAL_RUN_DEPENDS= mate-terminal:x11/mate-terminal +XTERM_RUN_DEPENDS= xterm:x11/xterm + +WRKSRC= ${WRKDIR}/${PREFIX} NO_BUILD= yes +SUB_FILES= pkg-message -USES= tk:wrapper +.include <bsd.port.options.mk> -DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" false +.if ${PORT_OPTIONS:MMATETERMINAL} +USE_MATE= desktop +.endif +DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" ${FALSE} + post-patch: @${REINPLACE_CMD} \ -e 's|\[file dirname \[info script\]\]/../lib/secpanel|${DATADIR}|' \ ${WRKSRC}/bin/secpanel do-install: +.if ${PORT_OPTIONS:MMATETERMINAL} + ${REINPLACE_CMD} 's|set configs(termver) "Xterm"|set configs(termver) "MATE-Terminal"|' \ + ${WRKSRC}/bin/secpanel + ${REINPLACE_CMD} 's|Xterm|MATE-Terminal|' \ + ${WRKSRC}/lib/secpanel/default.config +.elif ${PORT_OPTIONS:MGNOMETERMINAL} + ${REINPLACE_CMD} 's|set configs(termver) "Xterm"|set configs(termver) "GNOME-Terminal"|' \ + ${WRKSRC}/bin/secpanel + ${REINPLACE_CMD} 's|Xterm|GNOME-Terminal|' \ + ${WRKSRC}/lib/secpanel/default.config +.endif + ${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ @(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) @${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config + ${MV} ${STAGEDIR}${DATADIR}/default.config ${STAGEDIR}${DATADIR}/default.config.sample ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/ Modified: head/security/secpanel/files/patch-bin_secpanel ============================================================================== --- head/security/secpanel/files/patch-bin_secpanel Thu Aug 29 09:02:42 2019 (r510150) +++ head/security/secpanel/files/patch-bin_secpanel Thu Aug 29 10:21:48 2019 (r510151) @@ -14,7 +14,7 @@ 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 \ ++ addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla Thunar thunar termver Xterm browserbin firefox \ } { if {! [info exists configs($bintag)]} { set configs($bintag) $binprog Added: head/security/secpanel/files/patch-default.config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/secpanel/files/patch-default.config Thu Aug 29 10:21:48 2019 (r510151) @@ -0,0 +1,17 @@ +--- lib/secpanel/default.config.orig 2019-08-26 09:10:20 UTC ++++ lib/secpanel/default.config +@@ -1,2 +1,14 @@ ++set configs(sshbin) "ssh" ++set configs(keygenbin) "ssh-keygen" ++set configs(agentbin) "ssh-agent" ++set configs(addbin) "ssh-add" ++set configs(askpassbin) "ssh-askpass" ++set configs(scpbin) "scp" ++set configs(browserbin) "firefox" ++set configs(sshver) "OpenSSH" ++set configs(termver) "Xterm" ++set configs(sftpbin) "Filezilla" ++set launcher 0 + set configs(entback) #fefefe + set configs(listback) #ffffff ++set configs(protectdata) "0" Modified: head/security/secpanel/files/patch-lib_secpanel_termdefs.txt ============================================================================== --- head/security/secpanel/files/patch-lib_secpanel_termdefs.txt Thu Aug 29 09:02:42 2019 (r510150) +++ head/security/secpanel/files/patch-lib_secpanel_termdefs.txt Thu Aug 29 10:21:48 2019 (r510151) @@ -1,6 +1,6 @@ ---- lib/secpanel/termdefs.txt.orig 2017-04-08 17:52:46 UTC +--- lib/secpanel/termdefs.txt.orig 2019-08-20 12:50:45 UTC +++ lib/secpanel/termdefs.txt -@@ -56,7 +56,7 @@ set termtype(XFCE-Terminal_titlepar) "--title" +@@ -56,10 +56,16 @@ set termtype(XFCE-Terminal_titlepar) "-- set termtype(XFCE-Terminal_quotepar) "" set termtype(XFCE-Terminal_iconpar) "" set termtype(XFCE-Terminal_execpar) "-x" @@ -9,3 +9,12 @@ set termtype(Putty's-Terminal_titlepar) "-title" set termtype(Putty's-Terminal_quotepar) "" + set termtype(Putty's-Terminal_iconpar) "" + set termtype(Putty's-Terminal_execpar) "-e" + set termtype(Putty's-Terminal_path) "pterm" ++ ++set termtype(MATE-Terminal_titlepar) "--title" ++set termtype(MATE-Terminal_quotepar) "" ++set termtype(MATE-Terminal_iconpar) "" ++set termtype(MATE-Terminal_execpar) "-e" ++set termtype(MATE-Terminal_path) "mate-terminal" Added: head/security/secpanel/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/secpanel/files/pkg-message.in Thu Aug 29 10:21:48 2019 (r510151) @@ -0,0 +1,13 @@ + + +################################################################################################################ + + +If you don't have already a default.config file, you have to copy "/usr/local/share/secpanel/default.config.sample" +to "/usr/local/share/secpanel/default.config" Change it as you need or use the config-panel to make changes. + + +################################################################################################################# + + + Modified: head/security/secpanel/pkg-plist ============================================================================== --- head/security/secpanel/pkg-plist Thu Aug 29 09:02:42 2019 (r510150) +++ head/security/secpanel/pkg-plist Thu Aug 29 10:21:48 2019 (r510151) @@ -2,7 +2,7 @@ bin/secpanel share/pixmaps/secpanel.png %%DATADIR%%/convert_history.tcl %%DATADIR%%/convert_profile.tcl -%%DATADIR%%/default.config +%%DATADIR%%/default.config.sample %%DATADIR%%/default.profile %%DATADIR%%/dppw.tcl %%DATADIR%%/export_profiles.tcl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908291021.x7TALmVX067955>