1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00

x11/rxvt-unicode: upgrade to 9.25

Changelog at
	<http://lists.schmorp.de/pipermail/rxvt-unicode/2021q2/002606.html>.

PR:		234276
This commit is contained in:
Thierry Thomas 2021-05-14 19:26:05 +02:00
parent 122c3ecb51
commit 34e89e40c1
14 changed files with 48 additions and 69 deletions

View File

@ -1,8 +1,7 @@
# Created by: gpalmer@FreeBSD.org
PORTNAME= rxvt-unicode
PORTVERSION= 9.22
PORTREVISION= 4
PORTVERSION= 9.25
CATEGORIES= x11
MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
MASTER_SITE_SUBDIR= . Attic
@ -21,7 +20,6 @@ USE_XORG= x11 xft xmu xpm xrender xt
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -lutil
CONFIGURE_ENV= TIC=${LOCALBASE}/bin/tic
CONFIGURE_ARGS= --enable-everything --with-term=rxvt
CPE_VENDOR= marc_lehmann

View File

@ -1,2 +1,3 @@
SHA256 (rxvt-unicode-9.22.tar.bz2) = e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd
SIZE (rxvt-unicode-9.22.tar.bz2) = 931198
TIMESTAMP = 1621003273
SHA256 (rxvt-unicode-9.25.tar.bz2) = 0c79c6c0056d51528ac8f96916794959b7fe0a0f785795f2130e2e8b99e12146
SIZE (rxvt-unicode-9.25.tar.bz2) = 900910

View File

@ -1,12 +1,12 @@
--- configure.orig
--- configure.orig 2021-05-14 13:50:48 UTC
+++ configure
@@ -4436,42 +4436,6 @@
@@ -4886,43 +4886,6 @@ if test "$ac_prog_cxx_stdcxx" != cxx11; then
fi
LINKER="$CXX"
-if test x$GCC = xyes && test x$GXX = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working libsupc++" >&5
-$as_echo_n "checking for working libsupc++... " >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working libsupc++" >&5
-printf %s "checking for working libsupc++... " >&6; }
- save_CXX="$CXX"
- save_LIBS="$LIBS"
- CXX="$CC"
@ -16,26 +16,27 @@
-/* end confdefs.h. */
-struct test { }; void f() try { throw new test; } catch (...) { throw; }
-int
-main ()
-main (void)
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-if ac_fn_cxx_try_link "$LINENO"
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
- LINKER="$CC"
-else
-else $as_nop
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5
-$as_echo "no, making everything bigger and slower" >&6; }
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, making everything bigger and slower" >&5
-printf "%s\n" "no, making everything bigger and slower" >&6; }
- LIBS="$save_LIBS"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
- conftest$ac_exeext conftest.$ac_ext
- CXX="$save_CXX"
-fi

View File

@ -1,10 +1,13 @@
--- doc/Makefile.in.orig 2010-09-26 22:34:30.000000000 +0200
+++ doc/Makefile.in 2010-09-26 22:33:53.000000000 +0200
@@ -94,6 +94,7 @@
--- doc/Makefile.in.orig 2014-12-31 14:09:25 UTC
+++ doc/Makefile.in
@@ -96,9 +96,9 @@ install: all
$(INSTALL) -d $(DESTDIR)$(man7dir)
$(INSTALL_DATA) rxvt.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME).$(man1ext)
$(INSTALL_DATA) rxvtc.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)c.$(man1ext)
+ $(INSTALL_DATA) urxvtcd.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)cd.$(man1ext)
$(INSTALL_DATA) rxvtd.1.man $(DESTDIR)$(man1dir)/$(RXVTNAME)d.$(man1ext)
$(INSTALL_DATA) rxvt.7.man $(DESTDIR)$(man7dir)/$(RXVTNAME).$(man7ext)
@IF_PERL@ $(INSTALL) -d $(DESTDIR)$(man3dir)
- @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo
distdepend: alldoc

View File

@ -1,5 +1,5 @@
--- doc/urxvtcd.1.man.orig 2010-09-26 22:16:01.000000000 +0200
+++ doc/urxvtcd.1.man 2010-09-26 22:16:01.000000000 +0200
--- doc/urxvtcd.1.man.orig 2021-05-14 16:08:01 UTC
+++ doc/urxvtcd.1.man
@@ -0,0 +1,23 @@
+.TH rxvt-unicode 1 "2006-04-27"
+.SH NAME

View File

@ -1,10 +0,0 @@
--- doc/Makefile.in.orig 2014-12-31 14:09:25 UTC
+++ doc/Makefile.in
@@ -98,7 +98,6 @@ 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)
- @TIC@ $(srcdir)/etc/rxvt-unicode.terminfo
distdepend: alldoc

View File

@ -1,5 +1,5 @@
--- libptytty/src/ptytty.C.orig 2016-07-22 21:10:56.246647000 +0300
+++ libptytty/src/ptytty.C 2016-07-22 21:33:18.005377000 +0300
--- libptytty/src/ptytty.C.orig 2015-05-11 22:24:03 UTC
+++ libptytty/src/ptytty.C
@@ -56,6 +56,11 @@
# define O_NOCTTY 0
#endif
@ -12,7 +12,7 @@
/////////////////////////////////////////////////////////////////////////////
/* ------------------------------------------------------------------------- *
@@ -395,7 +400,17 @@
@@ -395,7 +400,17 @@ ptytty_unix::get ()
int fd_stdin = dup (STDIN_FILENO);
dup2 (tty, STDIN_FILENO);

View File

@ -1,6 +1,6 @@
--- src/Makefile.in.orig 2013-10-28 15:08:32.000000000 +0100
+++ src/Makefile.in 2013-10-30 22:19:17.000000000 +0100
@@ -14,7 +14,8 @@
--- src/Makefile.in.orig 2021-05-14 13:52:29 UTC
+++ src/Makefile.in
@@ -14,7 +14,8 @@ PODOPTS = quotes => q<"> , center => q<RXVT-UNICODE>,
CXX = @CXX@
PERL = @PERL@
INSTALL = @INSTALL@
@ -10,19 +10,19 @@
INSTALL_DATA = @INSTALL@ -m 644
CXXFLAGS = @CXXFLAGS@
CPPFLAGS = @CPPFLAGS@
@@ -46,6 +47,7 @@
@@ -46,6 +47,7 @@ COMMON_DAEMON = rxvtdaemon.o
RXVT_BINNAME=$(DESTDIR)$(bindir)/$(RXVTNAME)$(EXEEXT)
RXVTC_BINNAME=$(DESTDIR)$(bindir)/$(RXVTNAME)c$(EXEEXT)
+RXVTCD_BINNAME=$(DESTDIR)$(bindir)/$(RXVTNAME)cd$(EXEEXT)
RXVTD_BINNAME=$(DESTDIR)$(bindir)/$(RXVTNAME)d$(EXEEXT)
RCLOCK_BINNAME=$(DESTDIR)$(bindir)/urclock$(EXEEXT)
#
@@ -128,6 +130,7 @@
@@ -130,6 +132,7 @@ install-bin: allbin
$(INSTALL) -d $(DESTDIR)$(bindir)
$(INSTALL_PROGRAM) rxvt $(RXVT_BINNAME)
$(INSTALL_PROGRAM) rxvtc $(RXVTC_BINNAME)
+ $(INSTALL_SCRIPT) urxvtcd $(RXVTCD_BINNAME)
$(INSTALL_PROGRAM) rxvtd $(RXVTD_BINNAME)
$(INSTALL_PROGRAM) rclock $(RCLOCK_BINNAME)
install: install-bin install-perl

View File

@ -1,5 +1,5 @@
--- src/urxvtcd.orig 2010-09-26 22:16:01.000000000 +0200
+++ src/urxvtcd 2010-09-26 22:16:01.000000000 +0200
--- src/urxvtcd.orig 2021-05-14 16:08:01 UTC
+++ src/urxvtcd
@@ -0,0 +1,7 @@
+#!/bin/sh
+

View File

@ -1,5 +1,5 @@
--- src/command.C.orig 2012-01-19 14:34:39.000000000 +0100
+++ src/command.C 2012-01-23 19:28:46.000000000 +0100
--- src/command.C.orig 2021-05-13 19:40:55 UTC
+++ src/command.C
@@ -57,6 +57,7 @@
#endif
@ -8,7 +8,7 @@
#if LINUX_YIELD_HACK
# include <time.h>
@@ -2354,7 +2355,9 @@
@@ -2368,7 +2369,9 @@ rxvt_term::next_char () noexcept
if (len == (size_t)-2)
{
// the mbstate stores incomplete sequences. didn't know this :/

View File

@ -1,5 +1,5 @@
--- ./src/gentables.orig Wed Aug 4 04:59:09 2004
+++ ./src/gentables Tue Aug 10 00:03:21 2004
--- src/gentables.orig 2015-04-11 18:18:26 UTC
+++ src/gentables
@@ -1,4 +1,4 @@
-#!/opt/bin/perl
+#!/usr/bin/env perl

View File

@ -1,6 +1,6 @@
--- ./src/perl/kuake.orig Fri Jul 7 01:46:51 2006
+++ ./src/perl/kuake Mon Jul 17 22:35:22 2006
@@ -11,7 +11,8 @@
--- src/perl/kuake.orig 2021-05-14 16:08:01 UTC
+++ src/perl/kuake
@@ -44,7 +44,8 @@ sub on_start {
$self->{keycode} = $self->XKeysymToKeycode ($self->{keysym})
or urxvt::fatal "cannot convert requested kuake wake-up key '$self->{key}' to keycode, unable to continue.\n";

View File

@ -1,15 +0,0 @@
--- src/rxvtperl.xs.orig 2018-12-23 11:31:59 UTC
+++ src/rxvtperl.xs
@@ -401,9 +401,10 @@ rxvt_perl_interp::init ()
" unshift @INC, '" LIBDIR "';"
"}"
""
- "use urxvt;"
+ "use urxvt;",
+ 0
};
- int argc = ecb_array_length (args);
+ int argc = ecb_array_length (args) - 1;
char **argv = args;
PERL_SYS_INIT3 (&argc, &argv, &environ);

View File

@ -1,3 +1,4 @@
bin/urclock
@(,,4711) bin/urxvt
bin/urxvtc
bin/urxvtcd