Fri Feb 12 22:53:14 2021 UTC ()
better approach. thanks wiz@


(cjep)
diff -r1.117 -r1.118 pkgsrc/misc/screen/Makefile
diff -r1.57 -r1.58 pkgsrc/misc/screen/distinfo
diff -r1.2 -r1.3 pkgsrc/misc/screen/patches/patch-window.h
cvs diff -r1.117 -r1.118 pkgsrc/misc/screen/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/screen/Makefile 2021/02/12 22:28:03 1.117
+++ pkgsrc/misc/screen/Makefile 2021/02/12 22:53:14 1.118
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.117 2021/02/12 22:28:03 cjep Exp $ 1# $NetBSD: Makefile,v 1.118 2021/02/12 22:53:14 cjep Exp $
2 2
3DISTNAME= screen-4.8.0 3DISTNAME= screen-4.8.0
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= misc shells 5CATEGORIES= misc shells
6MASTER_SITES= ${MASTER_SITE_GNU:=screen/} 6MASTER_SITES= ${MASTER_SITE_GNU:=screen/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.gnu.org/software/screen/screen.html 9HOMEPAGE= https://www.gnu.org/software/screen/screen.html
10COMMENT= Multi-screen window manager 10COMMENT= Multi-screen window manager
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13EXTRACT_USING= bsdtar 13EXTRACT_USING= bsdtar
14 14
@@ -35,30 +35,26 @@ INFO_FILES= YES @@ -35,30 +35,26 @@ INFO_FILES= YES
35 35
36.include "../../mk/bsd.prefs.mk" 36.include "../../mk/bsd.prefs.mk"
37 37
38SUBST_CLASSES+= paths 38SUBST_CLASSES+= paths
39SUBST_FILES.paths= etc/etcscreenrc doc/screen.1 39SUBST_FILES.paths= etc/etcscreenrc doc/screen.1
40SUBST_VARS.paths= PKG_SYSCONFDIR 40SUBST_VARS.paths= PKG_SYSCONFDIR
41SUBST_SED.paths+= -e 's,@EXAMPLES@,${PREFIX}/share/examples/screen,g' 41SUBST_SED.paths+= -e 's,@EXAMPLES@,${PREFIX}/share/examples/screen,g'
42SUBST_STAGE.paths= pre-configure 42SUBST_STAGE.paths= pre-configure
43 43
44PLIST_VARS+= terminfo 44PLIST_VARS+= terminfo
45 45
46.include "../../mk/compiler.mk" 46.include "../../mk/compiler.mk"
47 47
48.if ${OPSYS} == "OpenBSD" 
49CFLAGS+= -D_OpenBSD_ 
50.endif 
51 
52.if ${OPSYS} == "SunOS" 48.if ${OPSYS} == "SunOS"
53. if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*) 49. if !empty(PKGSRC_COMPILER:Mclang) || !empty(CC_VERSION:Mgcc-[6-9]*)
54CPPFLAGS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ 50CPPFLAGS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
55. else 51. else
56CPPFLAGS+= -D_XOPEN_SOURCE=500 -D__EXTENSIONS__ 52CPPFLAGS+= -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
57. endif 53. endif
58. if ${CURSES_DEFAULT} == "curses" 54. if ${CURSES_DEFAULT} == "curses"
59INSTALLATION_DIRS+= share/lib/terminfo 55INSTALLATION_DIRS+= share/lib/terminfo
60PLIST.terminfo= yes 56PLIST.terminfo= yes
61post-install: screen-terminfo 57post-install: screen-terminfo
62. endif 58. endif
63.endif 59.endif
64 60
cvs diff -r1.57 -r1.58 pkgsrc/misc/screen/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/screen/distinfo 2021/02/12 22:29:36 1.57
+++ pkgsrc/misc/screen/distinfo 2021/02/12 22:53:14 1.58
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.57 2021/02/12 22:29:36 cjep Exp $ 1$NetBSD: distinfo,v 1.58 2021/02/12 22:53:14 cjep Exp $
2 2
3SHA1 (screen-4.8.0.tar.gz) = 2328927e10e68d357bdfec7bd740726011e834e9 3SHA1 (screen-4.8.0.tar.gz) = 2328927e10e68d357bdfec7bd740726011e834e9
4RMD160 (screen-4.8.0.tar.gz) = 43888fa00f708a8a9aa226e0df39abd7181b15ae 4RMD160 (screen-4.8.0.tar.gz) = 43888fa00f708a8a9aa226e0df39abd7181b15ae
5SHA512 (screen-4.8.0.tar.gz) = 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c 5SHA512 (screen-4.8.0.tar.gz) = 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
6Size (screen-4.8.0.tar.gz) = 854854 bytes 6Size (screen-4.8.0.tar.gz) = 854854 bytes
7SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc 7SHA1 (patch-aa) = 39c6fa5bda62b2891cecf4a5e9598b179ea8b4dc
8SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3 8SHA1 (patch-ab) = 40911979a540645db2a17861328292add22898d3
9SHA1 (patch-ae) = c952a7e52df0f33c2853c348e89650009c0d8696 9SHA1 (patch-ae) = c952a7e52df0f33c2853c348e89650009c0d8696
10SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190 10SHA1 (patch-ai) = edefc44e47066dc89bda22a94d417511f46f0190
11SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b 11SHA1 (patch-aj) = 446b07f7f418dd0c83fb5bc6246a01cc4417b03b
12SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba 12SHA1 (patch-ak) = 1aaf82f7fe666d86a9f4ab7d6f7222e895a17bba
13SHA1 (patch-al) = 74634eadfd53e217032e735adf09295868f11bd8 13SHA1 (patch-al) = 74634eadfd53e217032e735adf09295868f11bd8
14SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1 14SHA1 (patch-am) = a721e311e7dde7938de0e9546a7892bfd104ebd1
15SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552 15SHA1 (patch-an) = bda6c65148410a6c9a13afd8ad34f93e33731552
16SHA1 (patch-ao) = a45ae3186cd9bddeb915bad890f1be5abc315dd3 16SHA1 (patch-ao) = a45ae3186cd9bddeb915bad890f1be5abc315dd3
17SHA1 (patch-ap) = 4aab542045a0abe55e82d91851b94c3cb569139f 17SHA1 (patch-ap) = 4aab542045a0abe55e82d91851b94c3cb569139f
18SHA1 (patch-display.h) = 922ebe152d8c09fc016b983d8fe9c1c64ef74578 18SHA1 (patch-display.h) = 922ebe152d8c09fc016b983d8fe9c1c64ef74578
19SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8 19SHA1 (patch-screen.c) = de5d8468100ab88cbdb842e21b04b00221e798b8
20SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d 20SHA1 (patch-socket.c) = ef7d3cb14f0199383c0e750af48f19537eb0b36d
21SHA1 (patch-tty.sh) = 711e10879250de4b0e04bc2ec00472edeaf6aada 21SHA1 (patch-tty.sh) = 711e10879250de4b0e04bc2ec00472edeaf6aada
22SHA1 (patch-window.h) = c146857e76dbf6156ed93710bd4c5acc2469d0c5 22SHA1 (patch-window.h) = 84dc5a2c24ff77147b416c05f897536c0cfddf31
cvs diff -r1.2 -r1.3 pkgsrc/misc/screen/patches/patch-window.h (expand / switch to unified diff)

--- pkgsrc/misc/screen/patches/patch-window.h 2021/02/12 22:29:37 1.2
+++ pkgsrc/misc/screen/patches/patch-window.h 2021/02/12 22:53:14 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-window.h,v 1.2 2021/02/12 22:29:37 cjep Exp $ 1$NetBSD: patch-window.h,v 1.3 2021/02/12 22:53:14 cjep Exp $
2 2
3OpenBSD grumbles without the socket definitions 3OpenBSD grumbles without the socket definitions
4 4
5--- window.h.orig Wed Feb 5 20:09:38 2020 5--- window.h.orig Wed Feb 5 20:09:38 2020
6+++ window.h Thu Feb 11 21:01:43 2021 6+++ window.h Thu Feb 11 21:27:43 2021
7@@ -33,6 +33,10 @@ 7@@ -33,6 +33,10 @@
8 #ifndef SCREEN_WINDOW_H 8 #ifndef SCREEN_WINDOW_H
9 #define SCREEN_WINDOW_H 9 #define SCREEN_WINDOW_H
10  10
11+#ifdef _OpenBSD_ 11+#ifdef __OpenBSD__
12+#include <sys/socket.h> 12+#include <sys/socket.h>
13+#endif 13+#endif
14+ 14+
15 /* keep this in sync with the initialisations in window.c */ 15 /* keep this in sync with the initialisations in window.c */
16 struct NewWindow 16 struct NewWindow
17 { 17 {