- update to mrxvt-0.5.4
- specify license marker - drop maintainership (any takers?)
This commit is contained in:
ajacoutot
parent
a328ae38b2
commit
6b62d3dd0e
@ -1,17 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2008/10/28 14:29:14 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2008/12/06 19:17:28 ajacoutot Exp $
|
||||
|
||||
COMMENT= multi-tabbed terminal emulator
|
||||
|
||||
DISTNAME= mrxvt-0.5.3
|
||||
PKGNAME= ${DISTNAME}p1
|
||||
DISTNAME= mrxvt-0.5.4
|
||||
CATEGORIES= x11
|
||||
|
||||
HOMEPAGE= http://materm.sourceforge.net
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=materm/}
|
||||
|
||||
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
|
||||
|
||||
# GPL
|
||||
# GPLv2
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (mrxvt-0.5.3.tar.gz) = Daw5vvY6Smnqs1wCfoxb3w==
|
||||
RMD160 (mrxvt-0.5.3.tar.gz) = dvu9W6ICFd13her6B9rpCQKRlOw=
|
||||
SHA1 (mrxvt-0.5.3.tar.gz) = RCAG8deX6lRkxcSdJtDN7PeRYPQ=
|
||||
SHA256 (mrxvt-0.5.3.tar.gz) = 4jJ7f98ds/IVLXy9pWT2OOwRpL7Rf2nm3phciIq11BE=
|
||||
SIZE (mrxvt-0.5.3.tar.gz) = 592897
|
||||
MD5 (mrxvt-0.5.4.tar.gz) = AjLIhoSEdR3Lkxoo8HVvaQ==
|
||||
RMD160 (mrxvt-0.5.4.tar.gz) = F1zlxVTCZ62k794Y4icE/xtojaw=
|
||||
SHA1 (mrxvt-0.5.4.tar.gz) = 9Q6a0vZS1CErCsUkG5GTctnkN0Q=
|
||||
SHA256 (mrxvt-0.5.4.tar.gz) = 9AOtWpCPzTilXtCn4bhVhMt3voeBGZZTo5uK8amtENc=
|
||||
SIZE (mrxvt-0.5.4.tar.gz) = 603978
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-doc_mrxvt_1,v 1.1 2007/11/24 10:55:27 ajacoutot Exp $
|
||||
--- doc/mrxvt.1.orig Sat Nov 24 11:38:48 2007
|
||||
+++ doc/mrxvt.1 Sat Nov 24 11:36:51 2007
|
||||
$OpenBSD: patch-doc_mrxvt_1,v 1.2 2008/12/06 19:17:28 ajacoutot Exp $
|
||||
--- doc/mrxvt.1.orig Sat Dec 6 10:25:35 2008
|
||||
+++ doc/mrxvt.1 Sat Dec 6 10:41:52 2008
|
||||
@@ -137,7 +137,7 @@ X display name, the X server to contact
|
||||
geometry at startup
|
||||
.Op Cm geometry
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-doc_mrxvt_1,v 1.1 2007/11/24 10:55:27 ajacoutot Exp $
|
||||
Tabbar background image. Pseudo transparency must be turned off.
|
||||
.Op Cm tabbarPixmap
|
||||
.
|
||||
@@ -843,7 +843,7 @@ Greek keyboard mapping:
|
||||
@@ -835,7 +835,7 @@ Greek keyboard mapping:
|
||||
.
|
||||
.Bl -tag -width 4n
|
||||
.
|
||||
@ -43,7 +43,7 @@ $OpenBSD: patch-doc_mrxvt_1,v 1.1 2007/11/24 10:55:27 ajacoutot Exp $
|
||||
Menubar definition file.
|
||||
.Op Cm menu
|
||||
.
|
||||
@@ -1616,7 +1616,7 @@ and not
|
||||
@@ -1630,7 +1630,7 @@ and not
|
||||
as you would with the argument of
|
||||
.Fl blc .
|
||||
.\" ------------------------------------------------------------
|
||||
@ -52,16 +52,16 @@ $OpenBSD: patch-doc_mrxvt_1,v 1.1 2007/11/24 10:55:27 ajacoutot Exp $
|
||||
Open a new tab.
|
||||
.Ar N
|
||||
specifies the profile number. If omitted, profile 0 is used. If only
|
||||
@@ -1693,7 +1693,7 @@ Copy selection into clipboard (not implemented).
|
||||
@@ -1732,7 +1732,7 @@ the system bell. Additionally it is possible to execut
|
||||
.Ic monitorCommand
|
||||
option.
|
||||
.\" ------------------------------------------------------------
|
||||
.It Ic Paste
|
||||
Pasete selection into active tab.
|
||||
-.It Ic ToggleSubwin Op Oo Ar + Ns | Ns Ar - Oc Ns Op Ar b Ns | Ns Ar m Ns | Ns Ar s Ns | Ns Ar t
|
||||
+.It Ic ToggleSubwin Ar [[+|-][b|m|s|t]]
|
||||
Toggle visibility of sub-windows. If the argument begins with a
|
||||
.Sq +
|
||||
the subwindow is shown. If it begins with a
|
||||
@@ -1706,7 +1706,7 @@ and
|
||||
@@ -1745,7 +1745,7 @@ and
|
||||
.Sq Ar t
|
||||
represent the tabbar buttons, menubar, scrollbar and tabbar respectively. NOTE: Currently you can only toggle one subwindow at a time.
|
||||
.\" ------------------------------------------------------------
|
||||
@ -70,7 +70,7 @@ $OpenBSD: patch-doc_mrxvt_1,v 1.1 2007/11/24 10:55:27 ajacoutot Exp $
|
||||
Resize the font. With Xft,
|
||||
.Ar N
|
||||
represents the size increment of the xft font. Without Xft,
|
||||
@@ -1777,7 +1777,7 @@ should be
|
||||
@@ -1824,7 +1824,7 @@ should be
|
||||
.Sy 0 , 1 , -1
|
||||
to disable, enable or toggle respectively.
|
||||
.\" ------------------------------------------------------------
|
||||
|
||||
@ -1,63 +0,0 @@
|
||||
$OpenBSD: patch-src_init_c,v 1.3 2008/05/14 08:27:42 jasper Exp $
|
||||
--- src/init.c.orig Wed May 14 10:18:05 2008
|
||||
+++ src/init.c Wed May 14 10:21:24 2008
|
||||
@@ -1030,38 +1030,40 @@ rxvt_init_resources(rxvt_t* r, int argc, const char *c
|
||||
/*
|
||||
* Open display, get options/resources and create the window
|
||||
*/
|
||||
- if (IS_NULL(rs[Rs_display_name] = getenv("DISPLAY")))
|
||||
- rs[Rs_display_name] = ":0";
|
||||
|
||||
rxvt_get_options( r, r_argc, r_argv );
|
||||
rxvt_free( r_argv ); /* XXX memory leak? */
|
||||
|
||||
#ifdef LOCAL_X_IS_UNIX
|
||||
if( rs[Rs_display_name][0] == ':' )
|
||||
+ /*
|
||||
+ * 2008-04-29 gi1242: Force UNIX sockets for security (Gentoo Bug #219750)
|
||||
+ */
|
||||
+ if( IS_NULL( rs[Rs_display_name] ) )
|
||||
+ rs[Rs_display_name] = getenv( "DISPLAY" );
|
||||
+
|
||||
+ if( rs[Rs_display_name] && rs[Rs_display_name][0] == ':' )
|
||||
{
|
||||
- int l = 5 + STRLEN(rs[Rs_display_name]);
|
||||
+ char *val;
|
||||
+ int l = 5 + STRLEN(rs[Rs_display_name]);
|
||||
if (l <= 0 || l > 1024) /* possible integer overflow */
|
||||
l = 1024;
|
||||
+
|
||||
val = rxvt_malloc(l);
|
||||
- STRCPY(val, "unix");
|
||||
- STRNCAT(val, rs[Rs_display_name], l-5);
|
||||
- val[l-1] = (char) 0;
|
||||
- rxvt_msg (DBG_INFO, DBG_INIT, "Open X display %s\n", val);
|
||||
- r->Xdisplay = XOpenDisplay(val);
|
||||
- rxvt_free(val);
|
||||
+ STRCPY( val, "unix");
|
||||
+ STRNCAT( val, rs[Rs_display_name], l-5);
|
||||
+
|
||||
+ rs[Rs_display_name] = val;
|
||||
}
|
||||
-#endif
|
||||
+#endif /* LOCAL_X_IS_UNIX */
|
||||
|
||||
- if (IS_NULL(r->Xdisplay))
|
||||
+ rxvt_msg( DBG_INFO, DBG_INIT, "Open X display %s\n", rs[Rs_display_name] );
|
||||
+ r->Xdisplay = XOpenDisplay( rs[Rs_display_name] );
|
||||
+ if( IS_NULL(r->Xdisplay) )
|
||||
{
|
||||
- rxvt_msg (DBG_INFO, DBG_INIT, "Open X display %s\n",
|
||||
- rs[Rs_display_name] ? rs[Rs_display_name] : "nil");
|
||||
- r->Xdisplay = XOpenDisplay( rs[Rs_display_name] );
|
||||
- if (IS_NULL(r->Xdisplay))
|
||||
- {
|
||||
- rxvt_msg (DBG_ERROR, DBG_INIT, "can't open display %s", rs[Rs_display_name] );
|
||||
- exit( EXIT_FAILURE );
|
||||
- }
|
||||
+ rxvt_msg( DBG_ERROR, DBG_INIT, "Error opening display %s\n",
|
||||
+ rs[Rs_display_name] );
|
||||
+ exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2007/11/24 10:55:27 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2008/12/06 19:17:28 ajacoutot Exp $
|
||||
@mode g+s
|
||||
@group utmp
|
||||
bin/mrxvt
|
||||
@bin bin/mrxvt
|
||||
@mode
|
||||
@group
|
||||
@man man/man1/mrxvt.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user