git: 29558ea9991d - main - sysutils/screen49: Revert rebasing to upstream git repo

The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=29558ea9991d0970277a337a6785865b2e135ec3

commit 29558ea9991d0970277a337a6785865b2e135ec3
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-05-12 22:49:43 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-05-12 23:04:11 +0000

    sysutils/screen49: Revert rebasing to upstream git repo
    
    Requested by:   diizzy
    
    screen 4.9 contains multiple CVEs. Mark it FORBIDDEN.
    
    Deprecate and expire.
    
    Revert "sysutils/screen49: Fix fetch"
    
    This reverts commit 307e28238343c75228232a726115c16820f29330.
    
    Revert "sysutils/screen49: Update to unversioned 4.9.1 with CVE fixes"
    
    This reverts commit ef4ccfa93a10bc7ed0d4bf87f3968dd92ff63516.
---
 sysutils/screen49/Makefile | 31 +++++++++----------------------
 sysutils/screen49/distinfo |  6 +++---
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/sysutils/screen49/Makefile b/sysutils/screen49/Makefile
index 0de80ae820fa..a7173267826b 100644
--- a/sysutils/screen49/Makefile
+++ b/sysutils/screen49/Makefile
@@ -1,15 +1,15 @@
 PORTNAME=	screen
 PORTVERSION=	4.9.1
-PORTREVISION=	6
+PORTREVISION=	5
 CATEGORIES=	sysutils
-# MASTER_SITES=	GNU \
-# 		ftp://ftp.gnu.org/gnu/screen/ \
-# 		ftp://gnu.mirror.iweb.com/screen/ \
-# 		http://gnu.mirror.iweb.com/screen/ \
-# 		http://mirror.sdunix.com/gnu/ \
-# 		ftp://mirrors.kernel.org/gnu/screen/ \
-# 		http://cschubert.com/distfiles/ \
-# 		LOCAL/cy
+MASTER_SITES=	GNU \
+		ftp://ftp.gnu.org/gnu/screen/ \
+		ftp://gnu.mirror.iweb.com/screen/ \
+		http://gnu.mirror.iweb.com/screen/ \
+		http://mirror.sdunix.com/gnu/ \
+		ftp://mirrors.kernel.org/gnu/screen/ \
+		http://cschubert.com/distfiles/ \
+		LOCAL/cy
 .if !defined(MASTERDIR)
 PKGNAMESUFFIX=	49
 CONFLICTS=	screen-*
@@ -21,12 +21,6 @@ WWW=		https://www.gnu.org/software/screen/
 
 CONFLICTS+=	screen-devel*
 
-GIT_TAGNAME=	161f85b
-
-DISTFILES=	${DISTNAME}-${GIT_TAGNAME}${EXTRACT_SUFX}
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${GIT_TAGNAME}/src
-
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=		INFO NETHACK XTERM_256 SYSTEM_SCREENRC MULTIUSER \
@@ -93,13 +87,6 @@ CONFIGURE_ARGS+=	--disable-socket-dir
 CONFIGURE_ARGS+=	--with-socket-dir=${SCREEN_SOCKET_DIR}
 .endif
 
-do-fetch:
-	@cd ${DISTDIR} && \
-	if [ ! -f ${DISTNAME}-${GIT_TAGNAME}${EXTRACT_SUFX} ]; then \
-		fetch -o ${DISTNAME}-${GIT_TAGNAME}${EXTRACT_SUFX} \
-		    "https://git.savannah.gnu.org/gitweb/?p=screen.git;a=snapshot;h=${GIT_TAGNAME};sf=tgz"; \
-	fi    
-
 post-patch:
 	@${RM} ${WRKSRC}/doc/screen.info*
 
diff --git a/sysutils/screen49/distinfo b/sysutils/screen49/distinfo
index 9266205b5cc5..21d74bb6e156 100644
--- a/sysutils/screen49/distinfo
+++ b/sysutils/screen49/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747085619
-SHA256 (screen-4.9.1-161f85b.tar.gz) = 4d83d115bb0fa355e64eaacf4852682882b9bd1b952f837624d40df5e0403b5f
-SIZE (screen-4.9.1-161f85b.tar.gz) = 807656
+TIMESTAMP = 1692454303
+SHA256 (screen-4.9.1.tar.gz) = 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69
+SIZE (screen-4.9.1.tar.gz) = 1040785