git: 9edb6f7cb095 - main - sysutils/screen: Replace sysutils/screen with sysutils/screen50
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 09 Jun 2025 06:15:17 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9edb6f7cb095776f328686649b37e52c8429a6d6
commit 9edb6f7cb095776f328686649b37e52c8429a6d6
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-06-09 06:04:45 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-06-09 06:15:01 +0000
sysutils/screen: Replace sysutils/screen with sysutils/screen50
Remove sysutils/screen and rename sysutils/screen50 to sysutils/screen.
---
MOVED | 1 +
sysutils/Makefile | 1 -
sysutils/screen/Makefile | 102 +++++++++++++++++++-
sysutils/{screen50 => screen}/distinfo | 0
.../files/patch-doc__Makefile.in | 0
.../{screen50 => screen}/files/patch-doc_screen.1 | 0
sysutils/{screen50 => screen}/files/patch-misc.c | 0
sysutils/{screen50 => screen}/files/patch-os.h | 0
sysutils/{screen50 => screen}/files/patch-socket.c | 0
.../files/patch-terminfo__checktc.c | 0
sysutils/{screen50 => screen}/files/patch-utmp.c | 0
.../{screen50 => screen}/files/screenrc.sample | 0
sysutils/{screen50 => screen}/pkg-descr | 0
sysutils/{screen50 => screen}/pkg-message | 0
sysutils/{screen50 => screen}/pkg-plist | 0
sysutils/screen50/Makefile | 104 ---------------------
16 files changed, 99 insertions(+), 109 deletions(-)
diff --git a/MOVED b/MOVED
index 3f7d2b781610..d028fac742ba 100644
--- a/MOVED
+++ b/MOVED
@@ -4501,3 +4501,4 @@ audio/id3tool||2025-06-06|Has expired: Can't read ID3v2 tags which have been aro
science/py-pysal||2025-06-06|Has expired: Depends on expired math/py-spvcm
textproc/xincluder||2025-06-06|Has expired: Depends on expiring java/jdom
math/py-spvcm||2025-06-06|Has expired: Upstream repository has been archived on Jul 9, 2024
+sysutils/screen50|sysutils/screen|2025-06-09|Replace the screen metaport with screen50, renaming screen50 to screen
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 4846ce07ab25..40616fea392e 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1260,7 +1260,6 @@
SUBDIR += schilyutils
SUBDIR += screen
SUBDIR += screen-devel
- SUBDIR += screen50
SUBDIR += screenfetch
SUBDIR += screenie
SUBDIR += scterc
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 6f21f4002217..f2c30dfefb7a 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -1,6 +1,100 @@
-VERSIONS= 50
-SCREEN_VERSION?= 50
+PORTNAME= screen
+DISTVERSION= 5.0.1
+PORTREVISION= 4
+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
-MASTERDIR= ${.CURDIR}/../screen${SCREEN_VERSION}
+MAINTAINER= cy@FreeBSD.org
+COMMENT= Multi-screen window manager
+WWW= https://www.gnu.org/software/screen/
-.include "${MASTERDIR}/Makefile"
+CONFLICTS+= screen-devel
+
+LICENSE= GPLv3
+
+OPTIONS_DEFINE= INFO SYSTEM_SCREENRC MULTIUSER \
+ NOSOCKETDIR
+OPTIONS_DEFAULT= INFO SYSTEM_SCREENRC \
+ NCURSES_DEFAULT MULTIUSER
+OPTIONS_SINGLE= NCURSES
+OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT
+SYSTEM_SCREENRC_DESC= Install system screenrc with helpful status line
+MULTIUSER_DESC= Install setuid-root screen to support multiuser
+MULTIUSER_PLIST_SUB= MULTISUID="@(,,4555) "
+MULTIUSER_PLIST_SUB_OFF=MULTISUID="@(,,0555) "
+NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base)
+NCURSES_BASE_DESC= Depend on ncurses in base
+NCURSES_PORT_DESC= Depend on devel/ncurses in ports
+NOSOCKETDIR_DESC= Use ~/.screen instead of socketdir
+
+NCURSES_DEFAULT_USES= ncurses
+NCURSES_BASE_USES= ncurses:base
+NCURSES_PORT_USES= ncurses:port
+
+OPTIONS_SUB=
+
+USES= autoreconf:build gmake cpe
+CONFIGURE_ARGS= --with-system_screenrc=${ETCDIR}/screenrc
+MAKE_ARGS+= WITH_MAN=1
+
+CPE_VENDOR= gnu
+
+.include <bsd.port.options.mk>
+
+GNU_CONFIGURE= yes
+GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
+CFLAGS+= -I${NCURSESINC} -DSVR4 -DGETUTENT
+LDFLAGS+= -L${NCURSESLIB}
+
+.if ${PORT_OPTIONS:MINFO}
+INFO= screen
+MAKE_ARGS+= WITH_INFO=1
+USES+= makeinfo
+.endif
+
+# Enables support for 256 colour xterm. Note that you may need to
+# set up a custom termcap entry or .screenrc which modifies termcap
+# to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm
+#
+.if ${PORT_OPTIONS:MNOSOCKETDIR}
+CONFIGURE_ARGS+= --disable-socket-dir
+.endif
+
+.if defined(SCREEN_SOCKET_DIR)
+CONFIGURE_ARGS+= --enable-socket-dir=${SCREEN_SOCKET_DIR}
+.endif
+
+# Bug 191029: Users can choose whether to use sockets or named pipes.
+# Choose sockets if you don't know what the difference is.
+# Choose named pipes if your environment is heterogeneous,
+# using both screen 4.0.3 and 4.2.1.
+# Bug 191017
+
+pre-configure:
+ cd ${WRKSRC} && ./autogen.sh
+
+ETCDIR?= ${PREFIX}/etc
+
+post-install:
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
+ ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1
+ ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
+ ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
+.if ${PORT_OPTIONS:MSYSTEM_SCREENRC}
+ ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
+ ${STAGEDIR}${ETCDIR}/screenrc.sample
+.else
+ ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
+ ${STAGEDIR}${ETCDIR}/screenrc.sample
+.endif
+
+.include <bsd.port.mk>
diff --git a/sysutils/screen50/distinfo b/sysutils/screen/distinfo
similarity index 100%
rename from sysutils/screen50/distinfo
rename to sysutils/screen/distinfo
diff --git a/sysutils/screen50/files/patch-doc__Makefile.in b/sysutils/screen/files/patch-doc__Makefile.in
similarity index 100%
rename from sysutils/screen50/files/patch-doc__Makefile.in
rename to sysutils/screen/files/patch-doc__Makefile.in
diff --git a/sysutils/screen50/files/patch-doc_screen.1 b/sysutils/screen/files/patch-doc_screen.1
similarity index 100%
rename from sysutils/screen50/files/patch-doc_screen.1
rename to sysutils/screen/files/patch-doc_screen.1
diff --git a/sysutils/screen50/files/patch-misc.c b/sysutils/screen/files/patch-misc.c
similarity index 100%
rename from sysutils/screen50/files/patch-misc.c
rename to sysutils/screen/files/patch-misc.c
diff --git a/sysutils/screen50/files/patch-os.h b/sysutils/screen/files/patch-os.h
similarity index 100%
rename from sysutils/screen50/files/patch-os.h
rename to sysutils/screen/files/patch-os.h
diff --git a/sysutils/screen50/files/patch-socket.c b/sysutils/screen/files/patch-socket.c
similarity index 100%
rename from sysutils/screen50/files/patch-socket.c
rename to sysutils/screen/files/patch-socket.c
diff --git a/sysutils/screen50/files/patch-terminfo__checktc.c b/sysutils/screen/files/patch-terminfo__checktc.c
similarity index 100%
rename from sysutils/screen50/files/patch-terminfo__checktc.c
rename to sysutils/screen/files/patch-terminfo__checktc.c
diff --git a/sysutils/screen50/files/patch-utmp.c b/sysutils/screen/files/patch-utmp.c
similarity index 100%
rename from sysutils/screen50/files/patch-utmp.c
rename to sysutils/screen/files/patch-utmp.c
diff --git a/sysutils/screen50/files/screenrc.sample b/sysutils/screen/files/screenrc.sample
similarity index 100%
rename from sysutils/screen50/files/screenrc.sample
rename to sysutils/screen/files/screenrc.sample
diff --git a/sysutils/screen50/pkg-descr b/sysutils/screen/pkg-descr
similarity index 100%
rename from sysutils/screen50/pkg-descr
rename to sysutils/screen/pkg-descr
diff --git a/sysutils/screen50/pkg-message b/sysutils/screen/pkg-message
similarity index 100%
rename from sysutils/screen50/pkg-message
rename to sysutils/screen/pkg-message
diff --git a/sysutils/screen50/pkg-plist b/sysutils/screen/pkg-plist
similarity index 100%
rename from sysutils/screen50/pkg-plist
rename to sysutils/screen/pkg-plist
diff --git a/sysutils/screen50/Makefile b/sysutils/screen50/Makefile
deleted file mode 100644
index 5ea9c2b6b113..000000000000
--- a/sysutils/screen50/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-PORTNAME= screen
-DISTVERSION= 5.0.1
-PORTREVISION= 4
-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
-.if !defined(MASTERDIR)
-PKGNAMESUFFIX= 50
-CONFLICTS= screen-* screen49*
-.endif
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= Multi-screen window manager
-WWW= https://www.gnu.org/software/screen/
-
-CONFLICTS+= screen-devel
-
-LICENSE= GPLv3
-
-OPTIONS_DEFINE= INFO SYSTEM_SCREENRC MULTIUSER \
- NOSOCKETDIR
-OPTIONS_DEFAULT= INFO SYSTEM_SCREENRC \
- NCURSES_DEFAULT MULTIUSER
-OPTIONS_SINGLE= NCURSES
-OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT
-SYSTEM_SCREENRC_DESC= Install system screenrc with helpful status line
-MULTIUSER_DESC= Install setuid-root screen to support multiuser
-MULTIUSER_PLIST_SUB= MULTISUID="@(,,4555) "
-MULTIUSER_PLIST_SUB_OFF=MULTISUID="@(,,0555) "
-NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base)
-NCURSES_BASE_DESC= Depend on ncurses in base
-NCURSES_PORT_DESC= Depend on devel/ncurses in ports
-NOSOCKETDIR_DESC= Use ~/.screen instead of socketdir
-
-NCURSES_DEFAULT_USES= ncurses
-NCURSES_BASE_USES= ncurses:base
-NCURSES_PORT_USES= ncurses:port
-
-OPTIONS_SUB=
-
-USES= autoreconf:build gmake cpe
-CONFIGURE_ARGS= --with-system_screenrc=${ETCDIR}/screenrc
-MAKE_ARGS+= WITH_MAN=1
-
-CPE_VENDOR= gnu
-
-.include <bsd.port.options.mk>
-
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
-CFLAGS+= -I${NCURSESINC} -DSVR4 -DGETUTENT
-LDFLAGS+= -L${NCURSESLIB}
-
-.if ${PORT_OPTIONS:MINFO}
-INFO= screen
-MAKE_ARGS+= WITH_INFO=1
-USES+= makeinfo
-.endif
-
-# Enables support for 256 colour xterm. Note that you may need to
-# set up a custom termcap entry or .screenrc which modifies termcap
-# to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm
-#
-.if ${PORT_OPTIONS:MNOSOCKETDIR}
-CONFIGURE_ARGS+= --disable-socket-dir
-.endif
-
-.if defined(SCREEN_SOCKET_DIR)
-CONFIGURE_ARGS+= --enable-socket-dir=${SCREEN_SOCKET_DIR}
-.endif
-
-# Bug 191029: Users can choose whether to use sockets or named pipes.
-# Choose sockets if you don't know what the difference is.
-# Choose named pipes if your environment is heterogeneous,
-# using both screen 4.0.3 and 4.2.1.
-# Bug 191017
-
-pre-configure:
- cd ${WRKSRC} && ./autogen.sh
-
-ETCDIR?= ${PREFIX}/etc
-
-post-install:
- @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
- ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1
- ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
- ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2
- @${MKDIR} ${STAGEDIR}${ETCDIR}
-.if ${PORT_OPTIONS:MSYSTEM_SCREENRC}
- ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
- ${STAGEDIR}${ETCDIR}/screenrc.sample
-.else
- ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
- ${STAGEDIR}${ETCDIR}/screenrc.sample
-.endif
-
-.include <bsd.port.mk>