mirror of
https://git.freebsd.org/ports.git
synced 2025-04-29 01:56:37 -04:00
43808d10e2
This is in preparation for the import of screen 5.0.0. I've tried screen-devel (5.0.0 prelrelease). There were some bugs and inconsistencies with screen 4.9.1. So we move screen to screen49 to maintain a version of screen that is known to work. This implements the concept of a master screen port by renaming it to screen49 and creating a slave port called screen. The idea of this is similar in concept used with the cfengine or krb5 family of ports. Users should never need to change port origins when a new stable version of screen is committed. People can install the screen port or package as before. However if they choose to use the other screen port/package they may remove screen and install the versioned "master" port/package directly. This is in preparation for import of screen 5.0.0 into the ports collection. Unfortunately my initial testing of screen 5.0.0 using the screen-devel port uncovered an annoying (to me) bug, which I have opened an issue with our upstream. I have not found the time to test their patches enough to feel comfortalbe replacing the existing screen 4.9.1 with 5.0.0. When 5.0.0 will be imported as sysutils/screen50, it will not become the default master port until we believe it won't become a source of many bugzilla bugs.
75 lines
1.9 KiB
Text
75 lines
1.9 KiB
Text
--- configure.ac.orig 2023-08-15 17:29:26.000000000 -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 <curses.h>
|
|
@@ -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 <stdlib.h>
|
|
-], [
|
|
- 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 <time.h> /* to get time_t on SCO */
|
|
#include <sys/types.h>
|
|
-#if defined(SVR4) && !defined(DGUX)
|
|
+#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__)
|
|
#include <utmpx.h>
|
|
#define utmp utmpx
|
|
#else
|
|
@@ -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 <time.h>
|
|
#include <sys/types.h>
|
|
-#if defined(SVR4) && !defined(DGUX)
|
|
+#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__)
|
|
#include <utmpx.h>
|
|
#define utmp utmpx
|
|
#else
|
|
@@ -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 <time.h>
|
|
#include <sys/types.h>
|
|
-#if defined(SVR4) && !defined(DGUX)
|
|
+#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__)
|
|
#include <utmpx.h>
|
|
#define utmp utmpx
|
|
#else
|