diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 0ca99d2f6c9a..fe7f443fb75e 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -1,120 +1,121 @@ PORTNAME= screen PORTVERSION= 4.9.1 +PORTREVISION= 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 MAINTAINER= cy@FreeBSD.org COMMENT= Multi-screen window manager WWW= https://www.gnu.org/software/screen/ 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} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386 || \ ${ARCH:Mpowerpc*} SSP_CFLAGS?= -fno-stack-protector .endif GNU_CONFIGURE= yes 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-configure.ac b/sysutils/screen/files/patch-configure.ac index 77608dbebb05..1f32616b3797 100644 --- a/sysutils/screen/files/patch-configure.ac +++ b/sysutils/screen/files/patch-configure.ac @@ -1,55 +1,75 @@ --- configure.ac.orig 2023-08-15 17:29:26.000000000 -0700 -+++ configure.ac 2023-08-19 07:32:42.246552000 -0700 ++++ configure.ac 2024-01-02 18:30:11.205776000 -0800 @@ -669,7 +669,7 @@ tgetent((char *)0, (char *)0); ],, olibs="$LIBS" -LIBS="-lcurses $olibs" +LIBS="-lcurses $olibs"; CC="$CC -I/usr/local/include" AC_CHECKING(libcurses) AC_TRY_LINK([ #include -@@ -900,11 +900,11 @@ +@@ -756,19 +756,6 @@ + fi + fi + +-if test "$cross_compiling" = no ; then +-AC_CHECKING(for SVR4 ptys) +-sysvr4ptys= +-if test -c /dev/ptmx ; then +-AC_TRY_LINK([ +- #include +-], [ +- ptsname(0);grantpt(0);unlockpt(0); +-],[AC_DEFINE(HAVE_SVR4_PTYS) +-sysvr4ptys=1]) +-fi +-fi +- + AC_CHECK_FUNCS(getpt) + + dnl check for openpty() +@@ -900,11 +887,11 @@ dnl dnl **** utmp handling **** dnl -AC_CHECKING(getutent) +AC_CHECKING(getutxent) AC_TRY_LINK([ #include /* to get time_t on SCO */ #include -#if defined(SVR4) && !defined(DGUX) +#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__) #include #define utmp utmpx #else -@@ -917,11 +917,11 @@ +@@ -917,11 +904,11 @@ [int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT), olibs="$LIBS" LIBS="$LIBS -lgen" -AC_CHECKING(getutent with -lgen) +AC_CHECKING(getutxent with -lgen) AC_TRY_LINK([ #include #include -#if defined(SVR4) && !defined(DGUX) +#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__) #include #define utmp utmpx #else -@@ -931,13 +931,13 @@ +@@ -931,13 +918,13 @@ #define pututline _pututline #endif ], -[int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT), LIBS="$olibs") +[int x = DEAD_PROCESS; pututxline((struct utmp *)0); getutxent();], AC_DEFINE(GETUTENT), LIBS="$olibs") ) AC_CHECKING(ut_host) AC_TRY_COMPILE([ #include #include -#if defined(SVR4) && !defined(DGUX) +#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__) #include #define utmp utmpx #else