diff --git a/sysutils/screen50/Makefile b/sysutils/screen50/Makefile index 2cc390901d9b..137529c420a2 100644 --- a/sysutils/screen50/Makefile +++ b/sysutils/screen50/Makefile @@ -1,122 +1,133 @@ PORTNAME= screen -DISTVERSION= 5.0.0 +DISTVERSION= 5.0.1 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= 50 CONFLICTS= screen-* screen49* .endif MAINTAINER= cy@FreeBSD.org COMMENT= Multi-screen window manager WWW= https://www.gnu.org/software/screen/ CONFLICTS+= screen-devel +GIT_TAGNAME= v.${DISTVERSION} + +WRKSRC= ${WRKDIR}/${PORTNAME}-${GIT_TAGNAME}-ad9db35/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 GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CFLAGS+= -I${NCURSESINC} +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: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/screen50/distinfo b/sysutils/screen50/distinfo index 94c47f76c8ea..9e15a22d3ae3 100644 --- a/sysutils/screen50/distinfo +++ b/sysutils/screen50/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724900361 -SHA256 (screen-5.0.0.tar.gz) = f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 -SIZE (screen-5.0.0.tar.gz) = 895882 +TIMESTAMP = 1747082803 +SHA256 (screen-5.0.1.tar.gz) = 0ac9682fcfca3c02d84e8402c49396eb7ace9383234aeb62a4c267a8480bf35b +SIZE (screen-5.0.1.tar.gz) = 723528 diff --git a/sysutils/screen50/files/patch-misc.h b/sysutils/screen50/files/patch-misc.h deleted file mode 100644 index 818c716ad6cf..000000000000 --- a/sysutils/screen50/files/patch-misc.h +++ /dev/null @@ -1,12 +0,0 @@ ---- misc.h.orig 2024-03-26 16:41:57.000000000 -0700 -+++ misc.h 2024-04-03 11:30:19.350562000 -0700 -@@ -28,6 +28,9 @@ - int AddXChar (char *, int); - int AddXChars (char *, int, char *); - -+time_t SessionCreationTime(const char *fifo); -+ -+ - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - - #endif /* SCREEN_MISC_H */ diff --git a/sysutils/screen50/pkg-plist b/sysutils/screen50/pkg-plist index 827afbb2d2d1..aabb61708efd 100644 --- a/sysutils/screen50/pkg-plist +++ b/sysutils/screen50/pkg-plist @@ -1,27 +1,27 @@ bin/screen -%%MULTISUID%%bin/screen-5.0.0 +%%MULTISUID%%bin/screen-5.0.1 share/man/man1/screen.1.gz %%DATADIR%%/utf8encodings/01 %%DATADIR%%/utf8encodings/02 %%DATADIR%%/utf8encodings/03 %%DATADIR%%/utf8encodings/04 %%DATADIR%%/utf8encodings/18 %%DATADIR%%/utf8encodings/19 %%DATADIR%%/utf8encodings/a1 %%DATADIR%%/utf8encodings/a3 %%DATADIR%%/utf8encodings/bf %%DATADIR%%/utf8encodings/c2 %%DATADIR%%/utf8encodings/c3 %%DATADIR%%/utf8encodings/c4 %%DATADIR%%/utf8encodings/c6 %%DATADIR%%/utf8encodings/c7 %%DATADIR%%/utf8encodings/c8 %%DATADIR%%/utf8encodings/cc %%DATADIR%%/utf8encodings/cd %%DATADIR%%/utf8encodings/d6 @comment We always install the same screenrc it just depends on if we @comment are installing the the one bundled with source, or the one from @comment FILESDIR/screenrc.sample @sample %%ETCDIR%%/screenrc.sample %%EXAMPLESDIR%%/screenrc.sample-1 %%EXAMPLESDIR%%/screenrc.sample-2