CVS commit: pkgsrc/misc/screen

["Chris Pinnock" <cjep%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cjep
Date:           Fri Feb 12 22:28:03 UTC 2021

Modified Files:
        pkgsrc/misc/screen: Makefile distinfo
Added Files:
        pkgsrc/misc/screen/patches: patch-window.h

Log Message:
OpenBSD grumbles without the socket definitions. Fixes build.


To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 pkgsrc/misc/screen/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/misc/screen/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/screen/patches/patch-window.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/screen/Makefile
diff -u pkgsrc/misc/screen/Makefile:1.116 pkgsrc/misc/screen/Makefile:1.117
--- pkgsrc/misc/screen/Makefile:1.116   Sun Aug  2 10:59:13 2020
+++ pkgsrc/misc/screen/Makefile Fri Feb 12 22:28:03 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2020/08/02 10:59:13 kim Exp $
+# $NetBSD: Makefile,v 1.117 2021/02/12 22:28:03 cjep Exp $
 
 DISTNAME=      screen-4.8.0
 PKGREVISION=   3
@@ -45,6 +45,10 @@ PLIST_VARS+=         terminfo
 
 .include "../../mk/compiler.mk"
 
+.if ${OPSYS} == "OpenBSD"
+CFLAGS+=       -D_OpenBSD_
+.endif
+
 .if ${OPSYS} == "SunOS"
 .  if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*)
 CPPFLAGS+=     -D_XOPEN_SOURCE=600 -D__EXTENSIONS__

Index: pkgsrc/misc/screen/distinfo
diff -u pkgsrc/misc/screen/distinfo:1.55 pkgsrc/misc/screen/distinfo:1.56
--- pkgsrc/misc/screen/distinfo:1.55    Sun Aug  2 10:59:13 2020
+++ pkgsrc/misc/screen/distinfo Fri Feb 12 22:28:03 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2020/08/02 10:59:13 kim Exp $
+$NetBSD: distinfo,v 1.56 2021/02/12 22:28:03 cjep Exp $
 
 SHA1 (screen-4.8.0.tar.gz) = 2328927e10e68d357bdfec7bd740726011e834e9
 RMD160 (screen-4.8.0.tar.gz) = 43888fa00f708a8a9aa226e0df39abd7181b15ae
@@ -19,3 +19,4 @@ SHA1 (patch-display.h) = 922ebe152d8c09f
 SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8
 SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d
 SHA1 (patch-tty.sh) = 711e10879250de4b0e04bc2ec00472edeaf6aada
+SHA1 (patch-window.h) = 11a486e5d1d9c64d9baf56e868524264cc113047

Added files:

Index: pkgsrc/misc/screen/patches/patch-window.h
diff -u /dev/null pkgsrc/misc/screen/patches/patch-window.h:1.1
--- /dev/null   Fri Feb 12 22:28:03 2021
+++ pkgsrc/misc/screen/patches/patch-window.h   Fri Feb 12 22:28:03 2021
@@ -0,0 +1,17 @@
+# $NetBSD: patch-window.h,v 1.1 2021/02/12 22:28:03 cjep Exp $
+
+# OpenBSD grumbles without the socket definitions
+
+--- window.h.orig      Wed Feb  5 20:09:38 2020
++++ window.h   Thu Feb 11 21:01:43 2021
+@@ -33,6 +33,10 @@
+ #ifndef SCREEN_WINDOW_H
+ #define SCREEN_WINDOW_H
+ 
++#ifdef _OpenBSD_
++#include <sys/socket.h>
++#endif
++
+ /* keep this in sync with the initialisations in window.c */
+ struct NewWindow
+ {