Attachment #206916 for bug #239832





PORTNAME=	secpanel
PORTVERSION=	0.6.1
PORTREVISION=	4
PORTEPOCH=	1
CATEGORIES=	security tcl tk
MASTER_SITES=	SF/${PORTNAME} \


RUN_DEPENDS=	ssh-askpass:security/openssh-askpass

USES=		tk:wrapper

OPTIONS_RADIO=	TERMINAL
OPTIONS_RADIO_TERMINAL=	GNOME-TERMINAL  MATE-TERMINAL
OPTIONS_DEFAULT=	GNOME-TERMINAL

GNOME-TERMINAL_DESC=	build with gnome-terminal
MATE-TERMINAL_DESC=	build with mate-terminal (you need mate-desktop)
GNOME-TERMINAL_RUN_DEPENDS=	gnome-terminal>=3.0.0:x11/gnome-terminal
MATE-TERMINAL_RUN_DEPENDS=	mate-terminal:x11/mate-terminal

WRKSRC=		${WRKDIR}/${PREFIX}
NO_BUILD=	yes

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MMATE-TERMINAL}
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:MMATE-TERMINAL}
	${REINPLACE_CMD} 's|set configs(termver) "Xterm"|set configs(termver) "MATE-Terminal"|' \
		${WRKSRC}/bin/secpanel
.endif

	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
	@(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
	@${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config

Lines 14-20 Link Here

(-)files/patch-bin_secpanel (-1 / +1 lines)
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




--- lib/secpanel/termdefs.txt.orig	2019-08-20 12:50:45 UTC
+++ lib/secpanel/termdefs.txt
@@ -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(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"

Return to bug 239832

Lines 3-9 Link Here

(-)Makefile (-4 / +24 lines)
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
		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	GNOME-TERMINAL_RUN_DEPENDS= gnome-terminal>=3.0.0:x11/gnome-terminal
		32	MATE-TERMINAL_RUN_DEPENDS= mate-terminal:x11/mate-terminal
		33
		34	WRKSRC= ${WRKDIR}/${PREFIX}
24	NO_BUILD= yes	35	NO_BUILD= yes
25		36
26	USES= tk:wrapper	37	.include <bsd.port.options.mk>
27		38
28	DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" false	39	.if ${PORT_OPTIONS:MMATE-TERMINAL}
		40	USE_MATE= desktop
		41	.endif
29		42
		43	DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" ${FALSE}
		44
30	post-patch:	45	post-patch:
31	@${REINPLACE_CMD} \	46	@${REINPLACE_CMD} \
32	-e 's\|\[file dirname \[info script\]\]/../lib/secpanel\|${DATADIR}\|' \	47	-e 's\|\[file dirname \[info script\]\]/../lib/secpanel\|${DATADIR}\|' \
Lines 33-38 Link Here
33	${WRKSRC}/bin/secpanel	48	${WRKSRC}/bin/secpanel
34		49
35	do-install:	50	do-install:
		51	.if ${PORT_OPTIONS:MMATE-TERMINAL}
		52	${REINPLACE_CMD} 's\|set configs(termver) "Xterm"\|set configs(termver) "MATE-Terminal"\|' \
		53	${WRKSRC}/bin/secpanel
		54	.endif
		55
36	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/	56	${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
37	@(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})	57	@(cd ${WRKSRC}/lib/secpanel && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
38	@${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config	58	@${CHMOD} u+rw ${STAGEDIR}${DATADIR}/default.config

Lines 1-6 Link Here

(-)files/patch-lib_secpanel_termdefs.txt (-2 / +11 lines)
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"