View | Details | Raw Unified | Return to bug 239832 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-4 / +35 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	secpanel
4
PORTNAME=	secpanel
5
PORTVERSION=	0.6.1
5
PORTVERSION=	0.6.1
6
PORTREVISION=	3
6
PORTREVISION=	4
7
PORTEPOCH=	1
7
PORTEPOCH=	1
8
CATEGORIES=	security tcl tk
8
CATEGORIES=	security tcl tk
9
MASTER_SITES=	SF/${PORTNAME} \
9
MASTER_SITES=	SF/${PORTNAME} \
Lines 20-32 Link Here
20
20
21
RUN_DEPENDS=	ssh-askpass:security/openssh-askpass
21
RUN_DEPENDS=	ssh-askpass:security/openssh-askpass
22
22
23
WRKSRC=		${WRKDIR}/usr/local
23
USES=		tk:wrapper
24
25
OPTIONS_RADIO=	TERMINAL
26
OPTIONS_RADIO_TERMINAL=	GNOME-TERMINAL MATE-TERMINAL XTERM
27
OPTIONS_DEFAULT=	GNOME-TERMINAL
28
29
GNOME-TERMINAL_DESC=	build with gnome-terminal
30
MATE-TERMINAL_DESC=	build with mate-terminal (you need mate-desktop)
31
XTERM_DESC=		build with xterm
32
GNOME-TERMINAL_RUN_DEPENDS=	gnome-terminal>=3.0.0:x11/gnome-terminal
33
MATE-TERMINAL_RUN_DEPENDS=	mate-terminal:x11/mate-terminal
34
XTERM_RUN_DEPENDS=		xterm:x11/xterm
35
36
WRKSRC=		${WRKDIR}/${PREFIX}
24
NO_BUILD=	yes
37
NO_BUILD=	yes
38
SUB_FILES=	pkg-message
25
39
26
USES=		tk:wrapper
40
.include <bsd.port.options.mk>
27
41
28
DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" false
42
.if ${PORT_OPTIONS:MMATE-TERMINAL}
43
USE_MATE=	desktop
44
.endif
29
45
46
DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" ""  ${FALSE}
47
30
post-patch:
48
post-patch:
31
	@${REINPLACE_CMD} \
49
	@${REINPLACE_CMD} \
32
		-e 's|\[file dirname \[info script\]\]/../lib/secpanel|${DATADIR}|' \
50
		-e 's|\[file dirname \[info script\]\]/../lib/secpanel|${DATADIR}|' \
Lines 33-41 Link Here
33
			${WRKSRC}/bin/secpanel
51
			${WRKSRC}/bin/secpanel
34
52
35
do-install:
53
do-install:
54
.if ${PORT_OPTIONS:MMATE-TERMINAL}
55
	${REINPLACE_CMD} 's|set configs(termver) "Xterm"|set configs(termver) "MATE-Terminal"|' \
56
		${WRKSRC}/bin/secpanel
57
	${REINPLACE_CMD} 's|Xterm|MATE-Terminal|' \
58
		${WRKSRC}/lib/secpanel/default.config
59
.elif ${PORT_OPTIONS:MGNOME-TERMINAL}
60
	${REINPLACE_CMD} 's|set configs(termver) "Xterm"|set configs(termver) "GNOME-Terminal"|' \
61
		${WRKSRC}/bin/secpanel
62
	${REINPLACE_CMD} 's|Xterm|GNOME-Terminal|' \
63
		${WRKSRC}/lib/secpanel/default.config
64
.endif
65
36
	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
66
	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
37
	@(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
67
	@(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
38
	@${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config
68
	@${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config
69
	${MV} ${STAGEDIR}${DATADIR}/default.config ${STAGEDIR}${DATADIR}/default.config.sample
39
70
40
	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
71
	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
41
72
(-)files/patch-bin_secpanel (-1 / +1 lines)
Lines 14-20 Link Here
14
     foreach {bintag binprog} \
14
     foreach {bintag binprog} \
15
 	{sshbin ssh keygenbin ssh-keygen agentbin ssh-agent \
15
 	{sshbin ssh keygenbin ssh-keygen agentbin ssh-agent \
16
-	     addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla termver Xterm browserbin firefox \
16
-	     addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla termver Xterm browserbin firefox \
17
+	     addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla Thunar termver Xterm browserbin firefox \
17
+	     addbin ssh-add askpassbin ssh-askpass scpbin scp sftpbin Filezilla Thunar thunar termver Xterm browserbin firefox \
18
 	     } {
18
 	     } {
19
 		 if {! [info exists configs($bintag)]} {
19
 		 if {! [info exists configs($bintag)]} {
20
 		     set configs($bintag) $binprog
20
 		     set configs($bintag) $binprog
(-)files/patch-default.config (+17 lines)
Line 0 Link Here
1
--- lib/secpanel/default.config.orig	2019-08-26 09:10:20 UTC
2
+++ lib/secpanel/default.config
3
@@ -1,2 +1,14 @@
4
+set configs(sshbin) "ssh"
5
+set configs(keygenbin) "ssh-keygen"
6
+set configs(agentbin) "ssh-agent"
7
+set configs(addbin) "ssh-add"
8
+set configs(askpassbin) "ssh-askpass"
9
+set configs(scpbin) "scp"
10
+set configs(browserbin) "firefox"
11
+set configs(sshver) "OpenSSH"
12
+set configs(termver) "Xterm" 
13
+set configs(sftpbin) "Filezilla"
14
+set launcher 0
15
 set configs(entback) #fefefe
16
 set configs(listback) #ffffff
17
+set configs(protectdata) "0"
(-)files/patch-lib_secpanel_termdefs.txt (-2 / +11 lines)
Lines 1-6 Link Here
1
--- lib/secpanel/termdefs.txt.orig	2017-04-08 17:52:46 UTC
1
--- lib/secpanel/termdefs.txt.orig	2019-08-20 12:50:45 UTC
2
+++ lib/secpanel/termdefs.txt
2
+++ lib/secpanel/termdefs.txt
3
@@ -56,7 +56,7 @@ set termtype(XFCE-Terminal_titlepar) "--title"
3
@@ -56,10 +56,16 @@ set termtype(XFCE-Terminal_titlepar) "--
4
 set termtype(XFCE-Terminal_quotepar) ""
4
 set termtype(XFCE-Terminal_quotepar) ""
5
 set termtype(XFCE-Terminal_iconpar) ""
5
 set termtype(XFCE-Terminal_iconpar) ""
6
 set termtype(XFCE-Terminal_execpar) "-x"
6
 set termtype(XFCE-Terminal_execpar) "-x"
Lines 9-11 Link Here
9
 
9
 
10
 set termtype(Putty's-Terminal_titlepar) "-title"
10
 set termtype(Putty's-Terminal_titlepar) "-title"
11
 set termtype(Putty's-Terminal_quotepar) ""
11
 set termtype(Putty's-Terminal_quotepar) ""
12
 set termtype(Putty's-Terminal_iconpar) ""
13
 set termtype(Putty's-Terminal_execpar) "-e"
14
 set termtype(Putty's-Terminal_path) "pterm"
15
+
16
+set termtype(Mate-Terminal_titlepar) "--title"
17
+set termtype(Mate-Terminal_quotepar) ""
18
+set termtype(Mate-Terminal_iconpar) ""
19
+set termtype(Mate-Terminal_execpar) "-e"
20
+set termtype(Mate-Terminal_path) "mate-terminal"
(-)files/pkg-message.in (+13 lines)
Line 0 Link Here
1
2
3
################################################################################################################
4
5
6
If you don't have already a default.config file, you have to copy "/usr/local/share/secpanel/default.config.sample"
7
to "/usr/local/share/secpanel/default.config" Change it as you need or use the config-panel to make changes.
8
9
10
#################################################################################################################
11
12
13
(-)pkg-plist (-1 / +1 lines)
Lines 2-8 Link Here
2
share/pixmaps/secpanel.png
2
share/pixmaps/secpanel.png
3
%%DATADIR%%/convert_history.tcl
3
%%DATADIR%%/convert_history.tcl
4
%%DATADIR%%/convert_profile.tcl
4
%%DATADIR%%/convert_profile.tcl
5
%%DATADIR%%/default.config
5
%%DATADIR%%/default.config.sample
6
%%DATADIR%%/default.profile
6
%%DATADIR%%/default.profile
7
%%DATADIR%%/dppw.tcl
7
%%DATADIR%%/dppw.tcl
8
%%DATADIR%%/export_profiles.tcl
8
%%DATADIR%%/export_profiles.tcl

Return to bug 239832