From 6f2ebda9738f31f6d1349dbc0abb66ca54c37c5c Mon Sep 17 00:00:00 2001 From: dcoppa Date: Mon, 5 Jan 2015 16:09:51 +0000 Subject: [PATCH] Update to rxvt-unicode-9.21 --- x11/rxvt-unicode/Makefile | 7 +++---- x11/rxvt-unicode/distinfo | 4 ++-- x11/rxvt-unicode/patches/patch-doc_Makefile_in | 8 ++++---- .../patches/patch-doc_rxvtd_1_man_in | 16 ++++++++-------- .../patches/patch-libptytty_src_fdpass_C | 16 ---------------- x11/rxvt-unicode/pkg/PLIST | 8 +++----- 6 files changed, 20 insertions(+), 39 deletions(-) delete mode 100644 x11/rxvt-unicode/patches/patch-libptytty_src_fdpass_C diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index ca1c910005f..f5e026b4dff 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.31 2014/07/10 20:27:43 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.32 2015/01/05 16:09:51 dcoppa Exp $ COMMENT = clone of rxvt with Unicode and Xft support -DISTNAME = rxvt-unicode-9.20 -REVISION = 1 +DISTNAME = rxvt-unicode-9.21 CATEGORIES = x11 EXTRACT_SUFX = .tar.bz2 @@ -14,7 +13,7 @@ HOMEPAGE = http://software.schmorp.de/pkg/rxvt-unicode.html MAINTAINER = David Coppa -# GPLv2 +# GPLv3 PERMIT_PACKAGE_CDROM = Yes WANTLIB = X11 Xft Xrender c fontconfig freetype \ diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo index 1d1ab84c908..650de80f298 100644 --- a/x11/rxvt-unicode/distinfo +++ b/x11/rxvt-unicode/distinfo @@ -1,2 +1,2 @@ -SHA256 (rxvt-unicode-9.20.tar.bz2) = 5z4T/mS1n9PI5uIMAPFJ04h0HxQbgVXkcA0+1AqpS04= -SIZE (rxvt-unicode-9.20.tar.bz2) = 916598 +SHA256 (rxvt-unicode-9.21.tar.bz2) = dScO1yvFiVpkodc5K/RaYiIEGSNxw5Zb092XjcCIlWs= +SIZE (rxvt-unicode-9.21.tar.bz2) = 925293 diff --git a/x11/rxvt-unicode/patches/patch-doc_Makefile_in b/x11/rxvt-unicode/patches/patch-doc_Makefile_in index d2432aa1b15..13152e88162 100644 --- a/x11/rxvt-unicode/patches/patch-doc_Makefile_in +++ b/x11/rxvt-unicode/patches/patch-doc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.6 2012/12/28 12:12:38 sthen Exp $ ---- doc/Makefile.in.orig Tue Nov 6 21:54:10 2012 -+++ doc/Makefile.in Thu Dec 27 15:24:07 2012 -@@ -96,7 +96,7 @@ install: all +$OpenBSD: patch-doc_Makefile_in,v 1.7 2015/01/05 16:09:51 dcoppa Exp $ +--- doc/Makefile.in.orig Wed Dec 31 08:09:25 2014 ++++ doc/Makefile.in Mon Jan 5 09:10:23 2015 +@@ -98,7 +98,7 @@ install: all $(INSTALL_DATA) rxvtc.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)c.$(man1ext) $(INSTALL_DATA) rxvtd.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)d.$(man1ext) $(INSTALL_DATA) rxvt.7.man $(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext) diff --git a/x11/rxvt-unicode/patches/patch-doc_rxvtd_1_man_in b/x11/rxvt-unicode/patches/patch-doc_rxvtd_1_man_in index 57b45d66e22..07a0a06cce9 100644 --- a/x11/rxvt-unicode/patches/patch-doc_rxvtd_1_man_in +++ b/x11/rxvt-unicode/patches/patch-doc_rxvtd_1_man_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-doc_rxvtd_1_man_in,v 1.3 2014/04/30 05:04:03 dcoppa Exp $ ---- doc/rxvtd.1.man.in.orig Sat Apr 26 16:29:58 2014 -+++ doc/rxvtd.1.man.in Tue Apr 29 16:45:16 2014 +$OpenBSD: patch-doc_rxvtd_1_man_in,v 1.4 2015/01/05 16:09:51 dcoppa Exp $ +--- doc/rxvtd.1.man.in.orig Wed Dec 31 08:37:40 2014 ++++ doc/rxvtd.1.man.in Mon Jan 5 09:14:22 2015 @@ -142,7 +142,7 @@ @@RXVT_NAME@@d \- @@RXVT_NAME@@ terminal daemon .SH "SYNOPSIS" .IX Header "SYNOPSIS" --\&\fB@@RXVT_NAME@@d\fR [\-q|\-\-quiet] [\-o|\-\-opendisplay] [\-f|\-\-fork] [\-m|\-\-mlock] -+\&\fB@@RXVT_NAME@@d\fR [\-q|\-\-quiet] [\-o|\-\-opendisplay] [\-f|\-\-fork] +-\&\fB@@RXVT_NAME@@d\fR [\-q|\-\-quiet] [\-o|\-\-opendisplay] [\-f|\-\-fork] [\-m|\-\-mlock] [\-e|\-\-eval \fIperlstring\fR] ++\&\fB@@RXVT_NAME@@d\fR [\-q|\-\-quiet] [\-o|\-\-opendisplay] [\-f|\-\-fork] [\-e|\-\-eval \fIperlstring\fR] .PP \&\fB@@RXVT_NAME@@d\fR \-q \-o \-f # for .xsession use .SH "DESCRIPTION" @@ -28,6 +28,6 @@ $OpenBSD: patch-doc_rxvtd_1_man_in,v 1.3 2014/04/30 05:04:03 dcoppa Exp $ -versions) where calloc returns non-zeroed memory when mlockall is in -effect. If you experience crashes or other odd behaviour while using -\&\-\-mlock, try it without it. - .SH "EXAMPLES" - .IX Header "EXAMPLES" - This is a useful invocation of \fB@@RXVT_NAME@@d\fR in a \fI.xsession\fR\-style + .IP "\fB\-e\fR, \fB\-\-eval\fR \fIperlstring\fR" 4 + .IX Item "-e, --eval perlstring" + Evaluate the given perl code after basic initialisation (requires perl diff --git a/x11/rxvt-unicode/patches/patch-libptytty_src_fdpass_C b/x11/rxvt-unicode/patches/patch-libptytty_src_fdpass_C deleted file mode 100644 index 716ce7d7b8a..00000000000 --- a/x11/rxvt-unicode/patches/patch-libptytty_src_fdpass_C +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-libptytty_src_fdpass_C,v 1.1 2013/01/07 08:08:39 dcoppa Exp $ - -Unbreak utmp support. Fix error: -"protocol error while reading pty/tty fds from helper process, aborting." - ---- libptytty/src/fdpass.C.orig Sat May 19 03:57:47 2012 -+++ libptytty/src/fdpass.C Wed Jan 2 17:08:40 2013 -@@ -103,7 +103,7 @@ ptytty::recv_fd (int socket) - - if (recvmsg (socket, &msg, 0) > 0 - && data == 0 -- && msg.msg_controllen >= CMSG_SPACE (sizeof (int))) -+ && msg.msg_controllen >= CMSG_LEN (sizeof (int))) - { - cmsghdr *cmsg = CMSG_FIRSTHDR (&msg); - diff --git a/x11/rxvt-unicode/pkg/PLIST b/x11/rxvt-unicode/pkg/PLIST index f005303b7d6..022e231ccef 100644 --- a/x11/rxvt-unicode/pkg/PLIST +++ b/x11/rxvt-unicode/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2014/04/30 05:04:03 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.10 2015/01/05 16:09:51 dcoppa Exp $ @mode g+s @group utmp @bin bin/urxvt @@ -18,11 +18,10 @@ lib/urxvt/perl/block-graphics-to-ascii lib/urxvt/perl/clipboard-osc lib/urxvt/perl/confirm-paste lib/urxvt/perl/digital-clock +lib/urxvt/perl/eval lib/urxvt/perl/example-refresh-hooks lib/urxvt/perl/keysym-list lib/urxvt/perl/kuake -lib/urxvt/perl/macosx-clipboard -lib/urxvt/perl/macosx-clipboard-native lib/urxvt/perl/matcher lib/urxvt/perl/option-popup lib/urxvt/perl/overlay-osc @@ -44,12 +43,11 @@ lib/urxvt/urxvt.pm @man man/man1/urxvt-clipboard-osc.1 @man man/man1/urxvt-confirm-paste.1 @man man/man1/urxvt-digital-clock.1 +@man man/man1/urxvt-eval.1 @man man/man1/urxvt-example-refresh-hooks.1 @man man/man1/urxvt-extensions.1 @man man/man1/urxvt-keysym-list.1 @man man/man1/urxvt-kuake.1 -@man man/man1/urxvt-macosx-clipboard-native.1 -@man man/man1/urxvt-macosx-clipboard.1 @man man/man1/urxvt-matcher.1 @man man/man1/urxvt-option-popup.1 @man man/man1/urxvt-overlay-osc.1