Date: Tue, 8 Oct 2019 19:13:02 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r514098 - in head/sysutils/screen: . files Message-ID: <201910081913.x98JD23J003427@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Oct 8 19:13:02 2019 New Revision: 514098 URL: https://svnweb.freebsd.org/changeset/ports/514098 Log: Update 4.6.2 --> 4.7.0 Modified: head/sysutils/screen/Makefile head/sysutils/screen/distinfo head/sysutils/screen/files/patch-configure head/sysutils/screen/files/patch-os.h head/sysutils/screen/files/patch-utmp.c Modified: head/sysutils/screen/Makefile ============================================================================== --- head/sysutils/screen/Makefile Tue Oct 8 18:31:23 2019 (r514097) +++ head/sysutils/screen/Makefile Tue Oct 8 19:13:02 2019 (r514098) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= screen -PORTVERSION= 4.6.2 -PORTREVISION= 3 +PORTVERSION= 4.7.0 CATEGORIES= sysutils MASTER_SITES= GNU \ ftp://ftp.gnu.org/gnu/screen/ \ Modified: head/sysutils/screen/distinfo ============================================================================== --- head/sysutils/screen/distinfo Tue Oct 8 18:31:23 2019 (r514097) +++ head/sysutils/screen/distinfo Tue Oct 8 19:13:02 2019 (r514098) @@ -1,3 +1,3 @@ -TIMESTAMP = 1508858980 -SHA256 (screen-4.6.2.tar.gz) = 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a -SIZE (screen-4.6.2.tar.gz) = 845210 +TIMESTAMP = 1570534280 +SHA256 (screen-4.7.0.tar.gz) = da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1 +SIZE (screen-4.7.0.tar.gz) = 854192 Modified: head/sysutils/screen/files/patch-configure ============================================================================== --- head/sysutils/screen/files/patch-configure Tue Oct 8 18:31:23 2019 (r514097) +++ head/sysutils/screen/files/patch-configure Tue Oct 8 19:13:02 2019 (r514098) @@ -1,6 +1,6 @@ ---- configure.orig 2014-04-26 03:58:46.000000000 -0700 -+++ configure 2017-05-13 09:29:58.991277000 -0700 -@@ -4858,63 +4858,6 @@ +--- configure.orig 2019-10-01 15:27:14.000000000 -0700 ++++ configure 2019-10-08 04:39:00.284009000 -0700 +@@ -4756,63 +4756,6 @@ else olibs="$LIBS" @@ -64,7 +64,7 @@ LIBS="-lncursesw $olibs" { $as_echo "$as_me:${as_lineno-$LINENO}: checking libncursesw..." >&5 $as_echo "$as_me: checking libncursesw..." >&6;} -@@ -4999,15 +4942,6 @@ +@@ -4897,15 +4840,6 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -79,8 +79,8 @@ - conftest$ac_exeext conftest.$ac_ext if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -@@ -5020,7 +4954,8 @@ + echo "- skipping check because we are cross compiling; assuming terminfo database is used" 1>&6 +@@ -4917,7 +4851,8 @@ main() { @@ -90,7 +90,7 @@ } _ACEOF 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: checking for SVR4 ptys..." >&6;} sysvr4ptys= @@ -99,7 +99,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -5178,19 +5113,16 @@ +@@ -5080,19 +5015,17 @@ fi rm -f conftest* @@ -118,12 +118,12 @@ +#define PTYRANGE1 "0123456789abcdefghijklmnopqrstuv" _ACEOF + fi -fi -- + # Check whether --with-pty-mode was given. - if test "${with_pty_mode+set}" = set; then : -@@ -5417,6 +5349,8 @@ +@@ -5318,6 +5251,8 @@ #if defined(SVR4) && !defined(DGUX) #include <utmpx.h> #define utmp utmpx @@ -132,7 +132,7 @@ #else #include <utmp.h> #endif -@@ -5485,6 +5419,10 @@ +@@ -5386,6 +5321,10 @@ #if defined(SVR4) && !defined(DGUX) #include <utmpx.h> #define utmp utmpx Modified: head/sysutils/screen/files/patch-os.h ============================================================================== --- head/sysutils/screen/files/patch-os.h Tue Oct 8 18:31:23 2019 (r514097) +++ head/sysutils/screen/files/patch-os.h Tue Oct 8 19:13:02 2019 (r514098) @@ -1,8 +1,11 @@ ---- os.h.orig 2016-06-19 12:41:03.000000000 -0700 -+++ os.h 2016-06-21 04:13:47.509485000 -0700 -@@ -252,7 +252,9 @@ +--- os.h.orig 2019-10-01 15:08:00.000000000 -0700 ++++ os.h 2019-10-08 04:49:54.436485000 -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) ++# if (defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)) || defined(__FreeBSD_version) # include <utmpx.h> -# define UTMPFILE UTMPX_FILE +# ifdef UTMPX_FILE /* GNU extension */ Modified: head/sysutils/screen/files/patch-utmp.c ============================================================================== --- head/sysutils/screen/files/patch-utmp.c Tue Oct 8 18:31:23 2019 (r514097) +++ head/sysutils/screen/files/patch-utmp.c Tue Oct 8 19:13:02 2019 (r514098) @@ -1,5 +1,5 @@ ---- utmp.c.orig 2017-01-17 11:28:29.397404660 -0800 -+++ utmp.c 2017-02-10 16:48:34.902236000 -0800 +--- utmp.c.orig 2019-10-01 15:08:00.000000000 -0700 ++++ utmp.c 2019-10-08 12:08:46.535155000 -0700 @@ -26,6 +26,7 @@ **************************************************************** */ @@ -8,7 +8,26 @@ #include <sys/types.h> #include <sys/stat.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; struct utmp u; int saved_ut; @@ -21,7 +40,7 @@ wi->w_slot = (slot_t)0; 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); #ifdef UTHOST @@ -76,7 +95,7 @@ { Msg(errno,"Could not write %s", UtmpName); UT_CLOSE; -@@ -598,7 +555,7 @@ +@@ -598,7 +558,7 @@ struct utmp *u; { u->ut_type = DEAD_PROCESS; @@ -85,7 +104,7 @@ u->ut_exit.e_termination = 0; u->ut_exit.e_exit = 0; #endif -@@ -631,7 +588,11 @@ +@@ -631,7 +591,11 @@ /* must use temp variable because of NetBSD/sparc64, where * ut_xtime is long(64) but time_t is int(32) */ (void)time(&now); @@ -98,7 +117,7 @@ } static slot_t -@@ -743,7 +704,11 @@ +@@ -743,7 +707,11 @@ strncpy(u->ut_line, line, sizeof(u->ut_line)); strncpy(u->ut_name, user, sizeof(u->ut_name)); (void)time(&now);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910081913.x98JD23J003427>