git: 404afe3c9375 - main - x11/rxvt-unicode: upgrade to 9.29

The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=404afe3c9375bc0f4f6b0d86aef958fe4c5142fe

commit 404afe3c9375bc0f4f6b0d86aef958fe4c5142fe
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2021-11-23 19:54:41 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2021-11-23 21:02:59 +0000

    x11/rxvt-unicode: upgrade to 9.29
    
    Changelog at <http://dist.schmorp.de/rxvt-unicode/Changes>.
---
 x11/rxvt-unicode/Makefile                          |  5 ++--
 x11/rxvt-unicode/distinfo                          |  6 ++--
 x11/rxvt-unicode/files/patch-doc-Makefile.in       | 13 ---------
 .../files/patch-libptytty_src_ptytty.C             | 32 ----------------------
 x11/rxvt-unicode/pkg-plist                         |  2 +-
 5 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 95507c4a7102..aa5d7f037fb1 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -1,7 +1,7 @@
 # Created by: gpalmer@FreeBSD.org
 
 PORTNAME=	rxvt-unicode
-PORTVERSION=	9.26
+PORTVERSION=	9.29
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. Attic
@@ -12,7 +12,8 @@ COMMENT=	Clone of the terminal emulator rxvt modified to support Unicode
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:x11-fonts/fontconfig
-LIB_DEPENDS=	libfreetype.so:print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2	\
+		libptytty.so:sysutils/libptytty
 RUN_DEPENDS=	${LOCALBASE}/bin/fc-cache:x11-fonts/fontconfig
 
 USES=			cpe perl5 pkgconfig shebangfix tar:bzip2 xorg
diff --git a/x11/rxvt-unicode/distinfo b/x11/rxvt-unicode/distinfo
index 00d9633500c0..edb97b8cd691 100644
--- a/x11/rxvt-unicode/distinfo
+++ b/x11/rxvt-unicode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621013704
-SHA256 (rxvt-unicode-9.26.tar.bz2) = 643116b9a25d29ad29f4890131796d42e6d2d21312282a613ef66c80c5b8c98b
-SIZE (rxvt-unicode-9.26.tar.bz2) = 904950
+TIMESTAMP = 1637695814
+SHA256 (rxvt-unicode-9.29.tar.bz2) = c18bc9de0c319db1f85748ecc2f255ff9eb2be0fbe9e15fe0eabefc063c4157c
+SIZE (rxvt-unicode-9.29.tar.bz2) = 876330
diff --git a/x11/rxvt-unicode/files/patch-doc-Makefile.in b/x11/rxvt-unicode/files/patch-doc-Makefile.in
deleted file mode 100644
index 14ae5c33e365..000000000000
--- a/x11/rxvt-unicode/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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)
--	@TIC@ $(srcdir)/etc/rxvt-unicode.terminfo
- 
- distdepend: alldoc
- 
diff --git a/x11/rxvt-unicode/files/patch-libptytty_src_ptytty.C b/x11/rxvt-unicode/files/patch-libptytty_src_ptytty.C
deleted file mode 100644
index c174a4818ab1..000000000000
--- a/x11/rxvt-unicode/files/patch-libptytty_src_ptytty.C
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
- 
-+/* We need __FreeBSD_version */
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- /////////////////////////////////////////////////////////////////////////////
- 
- /* ------------------------------------------------------------------------- *
-@@ -395,7 +400,17 @@ ptytty_unix::get ()
-   int fd_stdin = dup (STDIN_FILENO);
-   dup2 (tty, STDIN_FILENO);
- 
-+/*
-+ * FreeBSD base@r202219 phased out utmp and moved to utmpx.
-+ * ttyslot() was eliminated slightly after this, in r202274,
-+ * but __FreeBSD_version wasn't bumped then.  Such discrepance
-+ * should be harmless since we will lose at most an utmp record.
-+ */
-+#if defined(__FreeBSD_version) && __FreeBSD_version >= 900007
-+  utmp_pos = -1;
-+#else
-   utmp_pos = ttyslot ();
-+#endif
- 
-   dup2 (fd_stdin, STDIN_FILENO);
-   close (fd_stdin);
diff --git a/x11/rxvt-unicode/pkg-plist b/x11/rxvt-unicode/pkg-plist
index d01563057d3d..5c6e82130c23 100644
--- a/x11/rxvt-unicode/pkg-plist
+++ b/x11/rxvt-unicode/pkg-plist
@@ -28,6 +28,7 @@ bin/urxvtcd
 %%PERL%%lib/urxvt/perl/urxvt-popup
 %%PERL%%lib/urxvt/perl/xim-onthespot
 %%PERL%%lib/urxvt/urxvt.pm
+man/man1/urclock.1.gz
 %%PERL%%man/man1/urxvt-background.1.gz
 %%PERL%%man/man1/urxvt-bell-command.1.gz
 %%PERL%%man/man1/urxvt-block-graphics-to-ascii.1.gz
@@ -54,7 +55,6 @@ bin/urxvtcd
 %%PERL%%man/man1/urxvt-xim-onthespot.1.gz
 man/man1/urxvt.1.gz
 man/man1/urxvtc.1.gz
-man/man1/urxvtcd.1.gz
 man/man1/urxvtd.1.gz
 %%PERL%%man/man3/urxvtperl.3.gz
 man/man7/urxvt.7.gz