diff --git a/sysutils/screen-devel/Makefile b/sysutils/screen-devel/Makefile index eba60db63e0c..74ddc9a27acf 100644 --- a/sysutils/screen-devel/Makefile +++ b/sysutils/screen-devel/Makefile @@ -1,130 +1,125 @@ PORTNAME= screen DISTVERSION= 5.0.0.${SCREEN_COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils PKGNAMESUFFIX= -devel MASTER_SITES= # MAINTAINER= cy@FreeBSD.org COMMENT= Multi-screen window manager WWW= https://www.gnu.org/software/screen/ CONFLICTS= screen-[0-9]* GIT_TAGNAME= 0f2370a SCREEN_COMMIT_DATE= 20240727 WRKSRC= ${WRKDIR}/${PORTNAME}-${GIT_TAGNAME}/src LICENSE= GPLv3 OPTIONS_DEFINE= INFO NETHACK XTERM_256 SYSTEM_SCREENRC MULTIUSER \ NOSOCKETDIR OPTIONS_DEFAULT= INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \ NCURSES_DEFAULT MULTIUSER OPTIONS_SINGLE= IPC NCURSES OPTIONS_SINGLE_IPC= SOCKETS NAMED_PIPES OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT NETHACK_DESC= Enable nethack-style messages XTERM_256_DESC= Enable support for 256 colour xterm SOCKETS_DESC= Use new (4.2.1+) sockets for IPC (default) NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override) 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 MAKE_ARGS+= WITH_MAN=1 CPE_VENDOR= gnu .include -.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || \ - ${ARCH} == i386 || ${ARCH:Mpowerpc*} -SSP_CFLAGS?= -fno-stack-protector -.endif - GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CFLAGS+= -I${NCURSESINC} 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:MXTERM_256} CFLAGS+= -DCOLORS256 .endif .if ! ${PORT_OPTIONS:MNETHACK} CFLAGS+= -DNONETHACK .endif .if ${PORT_OPTIONS:MNOSOCKETDIR} CONFIGURE_ARGS+= --disable-socket-dir .endif .if defined(SCREEN_SOCKET_DIR) CONFIGURE_ARGS+= --with-socket-dir=${SCREEN_SOCKET_DIR} .endif do-fetch: @cd ${DISTDIR} && \ if [ ! -f ${DISTNAME}${EXTRACT_SUFX} ]; then \ fetch -o ${DISTNAME}${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* # 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 post-configure-NAMED_PIPES-on: @${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h @${ECHO_CMD} User selected named pipes override set. 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 diff --git a/sysutils/screen-devel/files/patch-os.h b/sysutils/screen-devel/files/patch-os.h index bb7356858388..a03d22029f93 100644 --- a/sysutils/screen-devel/files/patch-os.h +++ b/sysutils/screen-devel/files/patch-os.h @@ -1,10 +1,19 @@ ---- os.h.orig 2024-03-26 16:41:57.000000000 -0700 -+++ os.h 2024-04-03 07:39:11.395526000 -0700 +--- os.h.orig 2024-07-27 07:09:11.000000000 -0700 ++++ os.h 2024-08-19 08:47:21.152670000 -0700 +@@ -148,7 +148,7 @@ + */ + + #ifndef TERMCAP_BUFSIZE +-# define TERMCAP_BUFSIZE 1023 ++# define TERMCAP_BUFSIZE 1024 + #endif + + /* @@ -161,6 +161,6 @@ /* Changing those you won't be able to attach to your old sessions * when changing those values in official tree don't forget to bump * MSG_VERSION */ -#define MAXTERMLEN 32 +#define MAXTERMLEN 63 #define MAXLOGINLEN 256 diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index a6958eede5f7..f963b853b839 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -1,124 +1,119 @@ PORTNAME= screen PORTVERSION= 4.9.1 -PORTREVISION= 4 +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 MAINTAINER= cy@FreeBSD.org COMMENT= Multi-screen window manager WWW= https://www.gnu.org/software/screen/ CONFLICTS= screen-devel* LICENSE= GPLv3 OPTIONS_DEFINE= INFO NETHACK XTERM_256 SYSTEM_SCREENRC MULTIUSER \ NOSOCKETDIR OPTIONS_DEFAULT= INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \ NCURSES_DEFAULT MULTIUSER OPTIONS_SINGLE= IPC NCURSES OPTIONS_SINGLE_IPC= SOCKETS NAMED_PIPES OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT NETHACK_DESC= Enable nethack-style messages XTERM_256_DESC= Enable support for 256 colour xterm SOCKETS_DESC= Use new (4.2.1+) sockets for IPC (default) NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override) 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 MAKE_ARGS+= WITH_MAN=1 CPE_VENDOR= gnu .include -.if ${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || \ - ${ARCH} == i386 || ${ARCH:Mpowerpc*} -SSP_CFLAGS?= -fno-stack-protector -.endif - GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CFLAGS+= -I${NCURSESINC} 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:MXTERM_256} CFLAGS+= -DCOLORS256 .endif .if ! ${PORT_OPTIONS:MNETHACK} CFLAGS+= -DNONETHACK .endif .if ${PORT_OPTIONS:MNOSOCKETDIR} CONFIGURE_ARGS+= --disable-socket-dir .endif .if defined(SCREEN_SOCKET_DIR) CONFIGURE_ARGS+= --with-socket-dir=${SCREEN_SOCKET_DIR} .endif post-patch: @${RM} ${WRKSRC}/doc/screen.info* # 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 post-configure-NAMED_PIPES-on: @${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h @${ECHO_CMD} User selected named pipes override set. 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 diff --git a/sysutils/screen/files/patch-os.h b/sysutils/screen/files/patch-os.h index 8ba9963d0e49..80e7ec3c0bcb 100644 --- a/sysutils/screen/files/patch-os.h +++ b/sysutils/screen/files/patch-os.h @@ -1,24 +1,33 @@ --- os.h.orig 2019-10-01 15:08:00.000000000 -0700 +++ os.h 2019-10-28 19:37:41.585526000 -0700 @@ -250,9 +250,11 @@ #endif #if defined(UTMPOK) || defined(BUGGYGETLOGIN) -# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) +# if (defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)) || defined(__FreeBSD_version) # include -# define UTMPFILE UTMPX_FILE +# ifdef UTMPX_FILE /* GNU extension */ +# define UTMPFILE UTMPX_FILE +# endif # define utmp utmpx # define getutent getutxent # define getutid getutxid +@@ -507,7 +509,7 @@ typedef struct fd_set { int fds_bits[1]; } fd_set; + */ + + #ifndef TERMCAP_BUFSIZE +-# define TERMCAP_BUFSIZE 1023 ++# define TERMCAP_BUFSIZE 1024 + #endif + + #ifndef MAXPATHLEN @@ -524,6 +526,6 @@ /* Changing those you won't be able to attach to your old sessions * when changing those values in official tree don't forget to bump * MSG_VERSION */ -#define MAXTERMLEN 32 +#define MAXTERMLEN 63 #define MAXLOGINLEN 256