Monday, June 05, 2017

UPDATE: misc/dvtm

No need to manually include <sys/signal.h>, <signal.h> does that. This
was probably done because -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700
would cause __BSD_VISIBLE to be undefined which in turn would prevent
SIGWINCH from being defined.

-D_XOPEN_SOURCE_EXTENDED is needed, otherwise the compiler will warn
about implicitly defined addnwstr(3).

When unhiding ${CC} in Makefile, remove the corresponding @echo line
to avoid duplicate output such as

CC dvtm.c
cc -c -O2 -pipe ... dvtm.c

Feedback/OK?

Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/misc/dvtm/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 28 Dec 2015 16:18:53 -0000 1.2
+++ patches/patch-Makefile 5 Jun 2017 14:41:03 -0000
@@ -1,20 +1,17 @@
-$OpenBSD: patch-Makefile,v 1.2 2015/12/28 16:18:53 jasper Exp $
-
-- Don't hide the compile commands.
-
---- Makefile.orig Thu Feb 19 17:51:23 2015
-+++ Makefile Mon Dec 28 17:10:19 2015
-@@ -16,13 +16,13 @@ config.h:
+--- Makefile.orig Sun Jun 4 15:30:02 2017
++++ Makefile Sun Jun 4 15:30:30 2017
+@@ -15,14 +15,12 @@ config.h:
+ cp config.def.h config.h

.c.o:
- @echo CC $<
+- @echo CC $<
- @${CC} -c ${CFLAGS} $<
+ ${CC} -c ${CFLAGS} $<

${OBJ}: config.h config.mk

dvtm: ${OBJ}
- @echo CC -o $@
+- @echo CC -o $@
- @${CC} -o $@ ${OBJ} ${LDFLAGS}
+ ${CC} -o $@ ${OBJ} ${LDFLAGS}

Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/misc/dvtm/patches/patch-config_mk,v
retrieving revision 1.8
diff -u -p -r1.8 patch-config_mk
--- patches/patch-config_mk 28 Dec 2015 16:18:53 -0000 1.8
+++ patches/patch-config_mk 5 Jun 2017 14:41:03 -0000
@@ -1,14 +1,11 @@
-$OpenBSD: patch-config_mk,v 1.8 2015/12/28 16:18:53 jasper Exp $
---- config.mk.orig Thu Feb 19 17:51:23 2015
-+++ config.mk Mon Dec 28 16:58:31 2015
-@@ -3,15 +3,14 @@ VERSION = 0.14
+--- config.mk.orig Mon Jun 5 02:23:44 2017
++++ config.mk Mon Jun 5 02:24:41 2017
+@@ -3,15 +3,13 @@ VERSION = 0.15

# Customize below to fit your system

-PREFIX ?= /usr/local
-MANPREFIX = ${PREFIX}/share/man
-+#PREFIX ?= /usr/local
-+#MANPREFIX = ${PREFIX}/share/man
# specify your systems terminfo directory
# leave empty to install into your home folder
TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo
@@ -16,6 +13,7 @@ $OpenBSD: patch-config_mk,v 1.8 2015/12/
INCS = -I.
LIBS = -lc -lutil -lncursesw
-CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED
++CPPFLAGS = -D_XOPEN_SOURCE_EXTENDED
CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS}
LDFLAGS += ${LIBS}

Index: patches/patch-dvtm_c
===================================================================
RCS file: /cvs/ports/misc/dvtm/patches/patch-dvtm_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-dvtm_c
--- patches/patch-dvtm_c 28 Dec 2015 16:18:53 -0000 1.3
+++ patches/patch-dvtm_c 5 Jun 2017 14:41:03 -0000
@@ -1,22 +1,6 @@
-$OpenBSD: patch-dvtm_c,v 1.3 2015/12/28 16:18:53 jasper Exp $
-
-Add sys/signal.h for SIGWINCH
-
---- dvtm.c.orig Mon Dec 28 16:40:33 2015
-+++ dvtm.c Mon Dec 28 16:57:53 2015
-@@ -36,6 +36,11 @@
-

No comments:

Post a Comment