FreeBSD Bugzilla – Attachment 206821 Details for
Bug 239832
security/secpanel hard-coding of "gnome-terminal" fails under mate-only installation
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
svn-diff-secpanel_v6
svn-diff-secpanel (text/plain), 2.31 KB, created by
Walter Schwarzenfeld
on 2019-08-23 11:41:47 UTC
(
hide
)
Description:
svn-diff-secpanel_v6
Filename:
MIME Type:
Creator:
Walter Schwarzenfeld
Created:
2019-08-23 11:41:47 UTC
Size:
2.31 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 509305) >+++ Makefile (working copy) >@@ -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,13 +20,28 @@ > > RUN_DEPENDS= ssh-askpass:security/openssh-askpass > >-WRKSRC= ${WRKDIR}/usr/local >+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 > >-USES= tk:wrapper >+.include <bsd.port.options.mk> > >-DESKTOP_ENTRIES="SecPanel" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" "" false >+.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}|' \ >Index: files/patch-lib_secpanel_termdefs.txt >=================================================================== >--- files/patch-lib_secpanel_termdefs.txt (revision 509305) >+++ files/patch-lib_secpanel_termdefs.txt (working copy) >@@ -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"
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 239832
:
206687
|
206688
|
206689
|
206726
|
206813
|
206821
|
206912
|
206913
|
206914
|
206916
|
206917
|
206918
|
206934
|
206935
|
206936
|
206937
|
206949
|
206974