Index: head/security/secpanel/Makefile
===================================================================
--- head/security/secpanel/Makefile	(revision 510150)
+++ head/security/secpanel/Makefile	(revision 510151)
@@ -1,42 +1,73 @@
 # Created by: Pete Fritchman <petef@databits.net>
 # $FreeBSD$
 
 PORTNAME=	secpanel
 PORTVERSION=	0.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	security tcl tk
 MASTER_SITES=	SF/${PORTNAME} \
 		SF/nemysisfreebsdp/security/:icons
 DISTFILES=	${DISTNAME}.tgz \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI for managing and running ssh and related utilities
 
 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/
 
 .include <bsd.port.mk>
Index: head/security/secpanel/files/patch-bin_secpanel
===================================================================
--- head/security/secpanel/files/patch-bin_secpanel	(revision 510150)
+++ head/security/secpanel/files/patch-bin_secpanel	(revision 510151)
@@ -1,47 +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 \
++	     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
 @@ -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"
      }
Index: head/security/secpanel/files/patch-default.config
===================================================================
--- head/security/secpanel/files/patch-default.config	(nonexistent)
+++ head/security/secpanel/files/patch-default.config	(revision 510151)
@@ -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"

Property changes on: head/security/secpanel/files/patch-default.config
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/security/secpanel/files/patch-lib_secpanel_termdefs.txt
===================================================================
--- head/security/secpanel/files/patch-lib_secpanel_termdefs.txt	(revision 510150)
+++ head/security/secpanel/files/patch-lib_secpanel_termdefs.txt	(revision 510151)
@@ -1,11 +1,20 @@
---- 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"
 -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) ""
+ 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"
Index: head/security/secpanel/files/pkg-message.in
===================================================================
--- head/security/secpanel/files/pkg-message.in	(nonexistent)
+++ head/security/secpanel/files/pkg-message.in	(revision 510151)
@@ -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.
+
+
+#################################################################################################################
+
+
+

Property changes on: head/security/secpanel/files/pkg-message.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/security/secpanel/pkg-plist
===================================================================
--- head/security/secpanel/pkg-plist	(revision 510150)
+++ head/security/secpanel/pkg-plist	(revision 510151)
@@ -1,21 +1,21 @@
 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
 %%DATADIR%%/gui.tcl
 %%DATADIR%%/images/back.gif
 %%DATADIR%%/images/configs_gr.gif
 %%DATADIR%%/images/connects_gr.gif
 %%DATADIR%%/images/folder.gif
 %%DATADIR%%/images/keys_gr.gif
 %%DATADIR%%/images/profiles_gr.gif
 %%DATADIR%%/images/sscreen_gr.gif
 %%DATADIR%%/images/swinback_gr.gif
 %%DATADIR%%/secpanel.wait
 %%DATADIR%%/secpanel_remoteconf.sh
 %%DATADIR%%/spdistkey
 %%DATADIR%%/termdefs.txt