[Midnightbsd-cvs] mports [19607] trunk/sysutils/screen: screen 4.3.1

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Jul 17 10:09:40 EDT 2015 

Revision: 19607
          http://svnweb.midnightbsd.org/mports/?rev=19607
Author:   laffer1
Date:     2015-07-17 10:09:39 -0400 (Fri, 17 Jul 2015)
Log Message:
-----------
screen 4.3.1

Modified Paths:
--------------
    trunk/sysutils/screen/Makefile
    trunk/sysutils/screen/distinfo
    trunk/sysutils/screen/files/patch-os.h
    trunk/sysutils/screen/files/patch-screen.c
    trunk/sysutils/screen/files/patch-utmp.c
    trunk/sysutils/screen/pkg-plist

Removed Paths:
-------------
    trunk/sysutils/screen/files/patch-ansi.c

Modified: trunk/sysutils/screen/Makefile
===================================================================
--- trunk/sysutils/screen/Makefile	2015-07-16 03:02:03 UTC (rev 19606)
+++ trunk/sysutils/screen/Makefile	2015-07-17 14:09:39 UTC (rev 19607)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	screen
-PORTVERSION=	4.2.1
+PORTVERSION=	4.3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://ftp.gnu.org/gnu/screen/ \
 		ftp://ftp.gnu.org/gnu/screen/ \
@@ -13,13 +13,13 @@
 		http://people.freebsd.org/~cy/distfiles/ \
 		GNU
 
-MAINTAINER=	cy at FreeBSD.org
+MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Multi-screen window manager
 
 LICENSE=	gpl3
 
-OPTIONS_DEFINE=		INFO MAN NETHACK XTERM_256 SHOWENC
-OPTIONS_DEFAULT=	INFO MAN NETHACK XTERM_256 SOCKETS
+OPTIONS_DEFINE=		INFO MAN NETHACK XTERM_256 SHOWENC SYSTEM_SCREENRC
+OPTIONS_DEFAULT=	INFO MAN NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC
 OPTIONS_SINGLE=		IPC
 OPTIONS_SINGLE_IPC=	SOCKETS NAMED_PIPES
 INFO_DESC=		Build and install info documentation
@@ -29,11 +29,14 @@
 SHOWENC_DESC=		Show encoding on the status line
 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
 
 OPTIONS_SUB=
 
-USES=		gmake
+USES=		gmake cpe
 
+CPE_VENDOR=	gnu
+
 .include <bsd.mport.options.mk>
 
 GNU_CONFIGURE=	yes
@@ -69,7 +72,7 @@
 .endif
 
 post-patch:
-	@${RM} ${WRKSRC}/doc/screen.info*
+	-@${RM} ${WRKSRC}/doc/screen.info*
 	@${REINPLACE_CMD} -e 's|/dev/ptmx|/nonexistent|' ${WRKSRC}/configure
 
 # Bug 191029:	Users can choose whether to use sockets or named pipes.
@@ -83,9 +86,21 @@
 	@${ECHO_CMD} User selected named pipes override set.
 .endif
 
+ETCDIR?=	${PREFIX}/etc
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
-		${STAGEDIR}${EXAMPLESDIR}/screenrc
+		${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1
+	${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
+		${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2
+	@${MKDIR} ${ETCDIR}
+.if ${PORT_OPTIONS:MSYSTEM_SCREENRC}
+	${INSTALL_DATA} ${FILESDIR}/screenrc.sample \
+		${ETCDIR}/screenrc.sample
+.else
+	${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \
+		${ETCDIR}/screenrc.sample
+.endif
 
 .include <bsd.port.mk>

Modified: trunk/sysutils/screen/distinfo
===================================================================
--- trunk/sysutils/screen/distinfo	2015-07-16 03:02:03 UTC (rev 19606)
+++ trunk/sysutils/screen/distinfo	2015-07-17 14:09:39 UTC (rev 19607)
@@ -1,2 +1,2 @@
-SHA256 (screen-4.2.1.tar.gz) = 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080
-SIZE (screen-4.2.1.tar.gz) = 1062485
+SHA256 (screen-4.3.1.tar.gz) = fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63
+SIZE (screen-4.3.1.tar.gz) = 845958

Deleted: trunk/sysutils/screen/files/patch-ansi.c
===================================================================
--- trunk/sysutils/screen/files/patch-ansi.c	2015-07-16 03:02:03 UTC (rev 19606)
+++ trunk/sysutils/screen/files/patch-ansi.c	2015-07-17 14:09:39 UTC (rev 19607)
@@ -1,10 +0,0 @@
---- ansi.c.orig	2014-04-26 04:32:54.000000000 -0700
-+++ ansi.c	2014-04-29 19:08:26.631287189 -0700
-@@ -569,6 +569,7 @@
- 		case '0': case '1': case '2': case '3': case '4':
- 		case '5': case '6': case '7': case '8': case '9':
- 		  if (curr->w_NumArgs < MAXARGS)
-+		  if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
- 		    {
- 		      if (curr->w_args[curr->w_NumArgs] < 100000000)
- 			curr->w_args[curr->w_NumArgs] =

Modified: trunk/sysutils/screen/files/patch-os.h
===================================================================
--- trunk/sysutils/screen/files/patch-os.h	2015-07-16 03:02:03 UTC (rev 19606)
+++ trunk/sysutils/screen/files/patch-os.h	2015-07-17 14:09:39 UTC (rev 19607)
@@ -1,27 +1,5 @@
 --- os.h.orig	2014-04-26 03:58:35.000000000 -0700
 +++ os.h	2014-04-29 19:16:31.730773575 -0700
-@@ -252,7 +252,11 @@
- #if defined(UTMPOK) || defined(BUGGYGETLOGIN)
- # if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)
- #  include <utmpx.h>
--#  define UTMPFILE	UTMPX_FILE
-+#  ifdef UTMPX_FILE
-+#   define UTMPFILE	UTMPX_FILE
-+#  else
-+#   define UTMPFILE	"/nonexistent"
-+#  endif
- #  define utmp		utmpx
- #  define getutent	getutxent
- #  define getutid	getutxid
-@@ -260,7 +264,7 @@
- #  define pututline	pututxline
- #  define setutent	setutxent
- #  define endutent	endutxent
--#  define ut_time	ut_xtime
-+#  define ut_time	ut_tv.tv_sec
- # else /* SVR4 */
- #  include <utmp.h>
- # endif /* SVR4 */
 @@ -524,6 +528,6 @@
  /* Changing those you won't be able to attach to your old sessions
   * when changing those values in official tree don't forget to bump

Modified: trunk/sysutils/screen/files/patch-screen.c
===================================================================
--- trunk/sysutils/screen/files/patch-screen.c	2015-07-16 03:02:03 UTC (rev 19606)
+++ trunk/sysutils/screen/files/patch-screen.c	2015-07-17 14:09:39 UTC (rev 19607)
@@ -9,12 +9,3 @@
  	{
  	  winmsg_rendpos[--r] = pn - buf;
  	  continue;
-@@ -2271,8 +2271,6 @@
- 	  while (i-- > 0)
- 	    *pn-- = ' ';
- 	  numpad--;
--	  if (r && p - buf == winmsg_rendpos[r - 1])
--	    winmsg_rendpos[--r] = pn - buf;
- 	}
-     }
-   return pn2;

Modified: trunk/sysutils/screen/files/patch-utmp.c
===================================================================
--- trunk/sysutils/screen/files/patch-utmp.c	2015-07-16 03:02:03 UTC (rev 19606)
+++ trunk/sysutils/screen/files/patch-utmp.c	2015-07-17 14:09:39 UTC (rev 19607)
@@ -1,6 +1,14 @@
---- utmp.c.orig	2014-04-26 09:22:09.000000000 -0700
-+++ utmp.c	2014-04-29 19:42:22.660642853 -0700
-@@ -409,12 +409,6 @@
+--- utmp.c.orig	2015-06-28 14:37:40.000000000 -0700
++++ utmp.c	2015-07-02 13:22:34.463948044 -0700
+@@ -26,6 +26,7 @@
+  ****************************************************************
+  */
+ 
++#include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -409,12 +410,6 @@
    register slot_t slot;
    struct utmp u;
    int saved_ut;
@@ -13,7 +21,7 @@
  
    wi->w_slot = (slot_t)0;
    if (!utmpok || wi->w_type != W_TYPE_PTY)
-@@ -435,51 +429,12 @@
+@@ -435,51 +430,12 @@
      makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid);
  
  #ifdef UTHOST
@@ -67,7 +75,7 @@
      {
        Msg(errno,"Could not write %s", UtmpName);
        UT_CLOSE;
-@@ -598,7 +553,7 @@
+@@ -598,7 +554,7 @@
  struct utmp *u;
  {
    u->ut_type = DEAD_PROCESS;
@@ -76,3 +84,27 @@
    u->ut_exit.e_termination = 0;
    u->ut_exit.e_exit = 0;
  #endif
+@@ -631,7 +587,11 @@
+   /* must use temp variable because of NetBSD/sparc64, where
+    * ut_xtime is long(64) but time_t is int(32) */
+   (void)time(&now);
++#if defined(__FreeBSD_version) && __FreeBSD_version < 900000
++  u->ut_time =  now;
++#else
+   u->ut_tv.tv_sec = now;
++#endif
+ }
+ 
+ static slot_t
+@@ -743,7 +703,11 @@
+   strncpy(u->ut_line, line, sizeof(u->ut_line));
+   strncpy(u->ut_name, user, sizeof(u->ut_name));
+   (void)time(&now);
++#if defined(__FreeBSD_version) && __FreeBSD_version < 900000
++  u->ut_time =  now;
++#else
+   u->ut_tv.tv_sec = now;
++#endif
+ }
+ 
+ static slot_t

Modified: trunk/sysutils/screen/pkg-plist
===================================================================
--- trunk/sysutils/screen/pkg-plist	2015-07-16 03:02:03 UTC (rev 19606)
+++ trunk/sysutils/screen/pkg-plist	2015-07-17 14:09:39 UTC (rev 19607)
@@ -1,8 +1,5 @@
 bin/screen
 %%MAN%%man/man1/screen.1.gz
- at unexec if cmp -s %D/etc/screenrc %D/%%EXAMPLESDIR%%/screenrc; then rm -f %D/etc/screenrc; else echo If permanently deleting this package, %%PREFIX%%/etc/screenrc must be removed manually; fi
-%%EXAMPLESDIR%%/screenrc
- at exec [ -f %D/etc/screenrc ] || cp %B/%f %D/etc/screenrc
 %%DATADIR%%/utf8encodings/01
 %%DATADIR%%/utf8encodings/02
 %%DATADIR%%/utf8encodings/03
@@ -20,6 +17,9 @@
 %%DATADIR%%/utf8encodings/cc
 %%DATADIR%%/utf8encodings/cd
 %%DATADIR%%/utf8encodings/d6
- at dirrm %%DATADIR%%/utf8encodings
- at dirrm %%DATADIR%%
- at dirrm %%EXAMPLESDIR%%
+ at comment We always install the same screenrc it just depends on if we
+ at comment are installing the the one bundled with source, or the one from
+ at comment FILESDIR/screenrc.sample
+ at sample %%ETCDIR%%/screenrc.sample
+%%EXAMPLESDIR%%/screenrc.sample-1
+%%EXAMPLESDIR%%/screenrc.sample-2

More information about the Midnightbsd-cvs mailing list