sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 09:19:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update 4.6.2 --> 4.7.0

Browse source
This commit is contained in:
Cy Schubert 2019-10-08 19:13:02 +00:00
parent 50d2c82e01
commit 5317b01e06
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=514098
5 changed files with 49 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sysutils/screen/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= screen PORTNAME= screen
PORTVERSION= 4.6.2 PORTVERSION= 4.7.0
PORTREVISION= 3
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= GNU \ MASTER_SITES= GNU \
ftp://ftp.gnu.org/gnu/screen/ \ ftp://ftp.gnu.org/gnu/screen/ \

6
sysutils/screen/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1508858980 TIMESTAMP = 1570534280
SHA256 (screen-4.6.2.tar.gz) = 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a SHA256 (screen-4.7.0.tar.gz) = da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1
SIZE (screen-4.6.2.tar.gz) = 845210 SIZE (screen-4.7.0.tar.gz) = 854192

24
sysutils/screen/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig 2014-04-26 03:58:46.000000000 -0700 --- configure.orig 2019-10-01 15:27:14.000000000 -0700
+++ configure 2017-05-13 09:29:58.991277000 -0700 +++ configure 2019-10-08 04:39:00.284009000 -0700
@@ -4858,63 +4858,6 @@ @@ -4756,63 +4756,6 @@
else else
olibs="$LIBS" olibs="$LIBS"
@ -64,7 +64,7 @@
LIBS="-lncursesw $olibs" LIBS="-lncursesw $olibs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libncursesw..." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking libncursesw..." >&5
$as_echo "$as_me: checking libncursesw..." >&6;} $as_echo "$as_me: checking libncursesw..." >&6;}
@@ -4999,15 +4942,6 @@ @@ -4897,15 +4840,6 @@
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
@ -79,8 +79,8 @@
- conftest$ac_exeext conftest.$ac_ext - conftest$ac_exeext conftest.$ac_ext
if test "$cross_compiling" = yes; then : if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 echo "- skipping check because we are cross compiling; assuming terminfo database is used" 1>&6
@@ -5020,7 +4954,8 @@ @@ -4917,7 +4851,8 @@
main() main()
{ {
@ -90,7 +90,7 @@
} }
_ACEOF _ACEOF
if ac_fn_c_try_run "$LINENO"; then : if ac_fn_c_try_run "$LINENO"; then :
@@ -5067,7 +5002,7 @@ @@ -4967,7 +4902,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys..." >&5
$as_echo "$as_me: checking for SVR4 ptys..." >&6;} $as_echo "$as_me: checking for SVR4 ptys..." >&6;}
sysvr4ptys= sysvr4ptys=
@ -99,7 +99,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@@ -5178,19 +5113,16 @@ @@ -5080,19 +5015,17 @@
fi fi
rm -f conftest* rm -f conftest*
@ -118,12 +118,12 @@
+#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" +#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv"
_ACEOF _ACEOF
fi
-fi -fi
-
# Check whether --with-pty-mode was given. # Check whether --with-pty-mode was given.
if test "${with_pty_mode+set}" = set; then : @@ -5318,6 +5251,8 @@
@@ -5417,6 +5349,8 @@
#if defined(SVR4) && !defined(DGUX) #if defined(SVR4) && !defined(DGUX)
#include <utmpx.h> #include <utmpx.h>
#define utmp utmpx #define utmp utmpx
@ -132,7 +132,7 @@
#else #else
#include <utmp.h> #include <utmp.h>
#endif #endif
@@ -5485,6 +5419,10 @@ @@ -5386,6 +5321,10 @@
#if defined(SVR4) && !defined(DGUX) #if defined(SVR4) && !defined(DGUX)
#include <utmpx.h> #include <utmpx.h>
#define utmp utmpx #define utmp utmpx

11
sysutils/screen/files/patch-os.h
View file

@ -1,8 +1,11 @@
--- os.h.orig 2016-06-19 12:41:03.000000000 -0700 --- os.h.orig 2019-10-01 15:08:00.000000000 -0700
+++ os.h 2016-06-21 04:13:47.509485000 -0700 +++ os.h 2019-10-08 04:49:54.436485000 -0700
@@ -252,7 +252,9 @@ @@ -250,9 +250,11 @@
#endif
#if defined(UTMPOK) || defined(BUGGYGETLOGIN) #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) -# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
+# if (defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)) || defined(__FreeBSD_version)
# include <utmpx.h> # include <utmpx.h>
-# define UTMPFILE UTMPX_FILE -# define UTMPFILE UTMPX_FILE
+# ifdef UTMPX_FILE /* GNU extension */ +# ifdef UTMPX_FILE /* GNU extension */

33
sysutils/screen/files/patch-utmp.c
View file

@ -1,5 +1,5 @@
--- utmp.c.orig 2017-01-17 11:28:29.397404660 -0800 --- utmp.c.orig 2019-10-01 15:08:00.000000000 -0700
+++ utmp.c 2017-02-10 16:48:34.902236000 -0800 +++ utmp.c 2019-10-08 12:08:46.535155000 -0700
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
**************************************************************** ****************************************************************
*/ */
@ -8,7 +8,26 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
@@ -409,12 +410,6 @@ @@ -88,6 +89,9 @@
static void makedead __P((struct utmp *));
static int pututslot __P((slot_t, struct utmp *, char *, struct win *));
static struct utmp *getutslot __P((slot_t));
+#ifdef __FreeBSD_version
+#define GETUTENT
+#endif
#ifndef GETUTENT
static struct utmp *getutent __P((void));
static void endutent __P((void));
@@ -102,7 +106,7 @@
static int utmpok;
static char UtmpName[] = UTMPFILE;
-#ifndef UTMP_HELPER
+#if !defined(UTMP_HELPER) || defined(__FreeBSD__)
static int utmpfd = -1;
#endif
@@ -409,12 +413,6 @@
register slot_t slot; register slot_t slot;
struct utmp u; struct utmp u;
int saved_ut; int saved_ut;
@ -21,7 +40,7 @@
wi->w_slot = (slot_t)0; wi->w_slot = (slot_t)0;
if (!utmpok || wi->w_type != W_TYPE_PTY) if (!utmpok || wi->w_type != W_TYPE_PTY)
@@ -435,51 +430,13 @@ @@ -435,51 +433,13 @@
makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid); makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid);
#ifdef UTHOST #ifdef UTHOST
@ -76,7 +95,7 @@
{ {
Msg(errno,"Could not write %s", UtmpName); Msg(errno,"Could not write %s", UtmpName);
UT_CLOSE; UT_CLOSE;
@@ -598,7 +555,7 @@ @@ -598,7 +558,7 @@
struct utmp *u; struct utmp *u;
{ {
u->ut_type = DEAD_PROCESS; u->ut_type = DEAD_PROCESS;
@ -85,7 +104,7 @@
u->ut_exit.e_termination = 0; u->ut_exit.e_termination = 0;
u->ut_exit.e_exit = 0; u->ut_exit.e_exit = 0;
#endif #endif
@@ -631,7 +588,11 @@ @@ -631,7 +591,11 @@
/* must use temp variable because of NetBSD/sparc64, where /* must use temp variable because of NetBSD/sparc64, where
* ut_xtime is long(64) but time_t is int(32) */ * ut_xtime is long(64) but time_t is int(32) */
(void)time(&now); (void)time(&now);
@ -98,7 +117,7 @@
} }
static slot_t static slot_t
@@ -743,7 +704,11 @@ @@ -743,7 +707,11 @@
strncpy(u->ut_line, line, sizeof(u->ut_line)); strncpy(u->ut_line, line, sizeof(u->ut_line));
strncpy(u->ut_name, user, sizeof(u->ut_name)); strncpy(u->ut_name, user, sizeof(u->ut_name));
(void)time(&now); (void)time(&now);