misc/screen adjustments

We're quite behind on updates for misc/screen, largely because there's
a "screen,shm" FLAVOR including a patch set that is used with misc/brltty
which can't easily be updated.

I'd like to split the patched version into a separate port so that the main
screen port can be updated independently. tgz for the screen-shm port is
attached, and there's a diff inline to remove/adjust the other parts.
(I'll also rm patches/shmpatch-*, but that's uninteresting noise so I've
left it out of the diff).

Any comments/OKs?


Index: misc/Makefile
===================================================================
RCS file: /cvs/ports/misc/Makefile,v
retrieving revision 1.190
diff -u -p -r1.190 Makefile
--- misc/Makefile 14 Aug 2019 18:43:48 -0000 1.190
+++ misc/Makefile 31 Aug 2019 16:38:19 -0000
@@ -94,7 +94,7 @@
SUBDIR += rocrail
SUBDIR += rpm
SUBDIR += screen
- SUBDIR += screen,shm
+ SUBDIR += screen-shm,shm
SUBDIR += sent
SUBDIR += shared-desktop-ontologies
SUBDIR += shared-mime-info
Index: misc/brltty/Makefile
===================================================================
RCS file: /cvs/ports/misc/brltty/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- misc/brltty/Makefile 17 Jul 2019 14:46:33 -0000 1.18
+++ misc/brltty/Makefile 31 Aug 2019 16:38:19 -0000
@@ -3,16 +3,17 @@
COMMENT= access software for a blind person using a braille terminal

DISTNAME= brltty-3.6
-REVISION= 3
+REVISION= 4
CATEGORIES= misc
HOMEPAGE= http://mielke.cc/brltty
MASTER_SITES= ${HOMEPAGE}/releases/
+
# GPL
PERMIT_PACKAGE= Yes

WANTLIB= c curses pthread sndio

-RUN_DEPENDS= screen-*-shm:misc/screen,shm
+RUN_DEPENDS= screen-*-shm:misc/screen-shm
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --with-install-root=${WRKINST} \
Index: misc/screen/Makefile
===================================================================
RCS file: /cvs/ports/misc/screen/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- misc/screen/Makefile 15 Aug 2019 21:01:49 -0000 1.70
+++ misc/screen/Makefile 31 Aug 2019 16:38:19 -0000
@@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.70 2019/08/15 21:01:49 naddy Exp $
-# Please adjust www/faq/faq15.html if updating.

COMMENT= multi-screen window manager

VERSION= 4.0.3
DISTNAME= screen-${VERSION}
-REVISION= 7
+REVISION= 8
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU:=screen/}

@@ -21,16 +20,13 @@ CONFIGURE_STYLE= autoconf no-autoheader
CONFIGURE_ARGS= --with-sys-screenrc="${SYSCONFDIR}/screenrc"
USE_GROFF = Yes

-FLAVORS= static shm
+FLAVORS= static
FLAVOR?=

.if ${FLAVOR} == "static"
CONFIGURE_ENV= LDFLAGS="${STATIC}"
.else
WANTLIB= c curses util
-.endif
-.if ${FLAVOR} == "shm"
-PATCH_LIST= patch-* shmpatch-*
.endif

ALL_TARGET= screen screen.info
Index: misc/screen/pkg/DESCR
===================================================================
RCS file: /cvs/ports/misc/screen/pkg/DESCR,v
retrieving revision 1.5
diff -u -p -r1.5 DESCR
--- misc/screen/pkg/DESCR 22 Nov 2003 00:56:58 -0000 1.5
+++ misc/screen/pkg/DESCR 31 Aug 2019 16:38:20 -0000
@@ -9,4 +9,3 @@ regions between windows.

Flavors:
static - Build with statically linked binaries.
- shm - export screen as shared memory, useful for brltty.