UPDATE: misc/dvtm
No need to manually include , 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 - 1.2 +++ patches/patch-Makefile 5 Jun 2017 14:41:03 - @@ -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 - 1.8 +++ patches/patch-config_mk 5 Jun 2017 14:41:03 - @@ -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_c28 Dec 2015 16:18:53 - 1.3 +++ patches/patch-dvtm_c5 Jun 2017 14:41:03 - @@ -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.origMon Dec 28 16:40:33 2015 -+++ dvtm.c Mon Dec 28 16:57:53 2015 -@@ -36,6 +36,11 @@ - #endif - #include "vt.h" - -+/* Needed for SIGWINCH */ -+#ifdef __OpenBSD__ -+#include -+#endif -+ - #ifdef PDCURSES - int ESCDELAY; - #endif -@@ -164,8 +169,12 @@ typedef struct { +--- dvtm.c.origSun Jun 4 15:30:02 2017 dvtm.c Sun Jun 4 15:30:30 2017 +@@ -165,8 +165,12 @@ typedef struct { } Editor; #define LENGTH(arr) (sizeof(arr) / sizeof((arr)[0]))
[update] misc/dvtm
Update to version 0.15. Lightly tested on amd64. Regarding the patch removals: patch-config_mk: The PREFIX and MANPREFIX in here aren't used since installation is done via our own do-install target. patch-dvtm_c: The ifdef guards around MIN/MAX were unneeded on amd64, but I didn't test on other platforms. As for the 'sys/signal.h' include: we can get SIGWINCH by defining _BSD_SOURCE (see Makefile), so do that instead. patch-vt_c: alloca(3) hasn't been used since 1fbfb22c (Oct. 16, 2014), so this patch is no longer applicable. Index: Makefile === RCS file: /cvs/ports/misc/dvtm/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- Makefile28 Dec 2015 16:18:53 - 1.16 +++ Makefile28 Jan 2016 04:06:11 - @@ -2,7 +2,7 @@ COMMENT= tiling window management for the console -DISTNAME= dvtm-0.14 +DISTNAME= dvtm-0.15 CATEGORIES=misc HOMEPAGE= http://www.brain-dump.org/projects/dvtm/ @@ -15,6 +15,9 @@ WANTLIB= c ncursesw util MASTER_SITES= ${HOMEPAGE} NO_TEST= Yes + +# for SIGWINCH +MAKE_FLAGS=CPPFLAGS=-D_BSD_SOURCE do-install: ${INSTALL_PROGRAM} ${WRKSRC}/dvtm ${PREFIX}/bin Index: distinfo === RCS file: /cvs/ports/misc/dvtm/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- distinfo28 Dec 2015 16:18:53 - 1.7 +++ distinfo28 Jan 2016 04:06:11 - @@ -1,2 +1,2 @@ -SHA256 (dvtm-0.14.tar.gz) = ipuzQfikxXi4OeItmnB/BTonrm3xUVjhb0/ueH5DdHo= -SIZE (dvtm-0.14.tar.gz) = 35893 +SHA256 (dvtm-0.15.tar.gz) = jyAVwF4q2C8SrkzxKzY9NPUnpLvIw2lmfyOeRULh5RA= +SIZE (dvtm-0.15.tar.gz) = 40511 Index: patches/patch-config_mk === RCS file: patches/patch-config_mk diff -N patches/patch-config_mk --- patches/patch-config_mk 28 Dec 2015 16:18:53 - 1.8 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,21 +0,0 @@ -$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 - - # 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 - - INCS = -I. - LIBS = -lc -lutil -lncursesw --CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED - CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS} - LDFLAGS += ${LIBS} - Index: patches/patch-dvtm_c === RCS file: patches/patch-dvtm_c diff -N patches/patch-dvtm_c --- patches/patch-dvtm_c28 Dec 2015 16:18:53 - 1.3 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,31 +0,0 @@ -$OpenBSD: patch-dvtm_c,v 1.3 2015/12/28 16:18:53 jasper Exp $ - -Add sys/signal.h for SIGWINCH - dvtm.c.origMon Dec 28 16:40:33 2015 -+++ dvtm.c Mon Dec 28 16:57:53 2015 -@@ -36,6 +36,11 @@ - #endif - #include "vt.h" - -+/* Needed for SIGWINCH */ -+#ifdef __OpenBSD__ -+#include -+#endif -+ - #ifdef PDCURSES - int ESCDELAY; - #endif -@@ -164,8 +169,12 @@ typedef struct { - } Editor; - - #define LENGTH(arr) (sizeof(arr) / sizeof((arr)[0])) -+#ifndef MAX - #define MAX(x, y) ((x) > (y) ? (x) : (y)) -+#endif -+#ifndef MIN - #define MIN(x, y) ((x) < (y) ? (x) : (y)) -+#endif - #define TAGMASK ((1 << LENGTH(tags)) - 1) - - #ifdef NDEBUG Index: patches/patch-vt_c === RCS file: patches/patch-vt_c diff -N patches/patch-vt_c --- patches/patch-vt_c 28 Dec 2015 16:18:53 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-vt_c,v 1.1 2015/12/28 16:18:53 jasper Exp $ vt.c.orig Thu Feb 19 17:51:23 2015 -+++ vt.c Mon Dec 28 16:38:05 2015 -@@ -48,6 +48,10 @@ - # include "forkpty-sunos.c" - #endif - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - #ifndef NCURSES_ATTR_SHIFT - # define NCURSES_ATTR_SHIFT 8 - #endif
UPDATE: misc/dvtm -> 0.14
Hi ports@, See title. The madtty.c patch + reference to it in the Makefile were dropped because madtty.c don't seem to be anywhere in dvtm's source, i.e., `grep -i mad' returns nothing and there's no mention of it in the LICENSE. Regards, Michael Index: Makefile === RCS file: /cvs/ports/misc/dvtm/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- Makefile11 Mar 2013 11:23:57 - 1.15 +++ Makefile26 Aug 2015 20:32:23 - @@ -2,15 +2,13 @@ COMMENT= tiling window management for the console -DISTNAME= dvtm-0.6 -REVISION= 1 +DISTNAME= dvtm-0.14 CATEGORIES=misc HOMEPAGE= http://www.brain-dump.org/projects/dvtm/ MAINTAINER=Emilien Gaspar # MIT/X -# LGPL: madtty.c PERMIT_PACKAGE_CDROM= Yes WANTLIB= c ncurses util Index: distinfo === RCS file: /cvs/ports/misc/dvtm/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo18 Jan 2015 03:14:31 - 1.6 +++ distinfo26 Aug 2015 20:32:23 - @@ -1,2 +1,2 @@ -SHA256 (dvtm-0.6.tar.gz) = lhCSLCBnjKls0tm/3o+Xu8KnvV5TbVAVxW34EkaKBIE= -SIZE (dvtm-0.6.tar.gz) = 26542 +SHA256 (dvtm-0.14.tar.gz) = ipuzQfikxXi4OeItmnB/BTonrm3xUVjhb0/ueH5DdHo= +SIZE (dvtm-0.14.tar.gz) = 35893 Index: patches/patch-Makefile === RCS file: /cvs/ports/misc/dvtm/patches/patch-Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-Makefile --- patches/patch-Makefile 24 Nov 2010 13:09:11 - 1.1 +++ patches/patch-Makefile 26 Aug 2015 20:32:23 - @@ -1,32 +1,53 @@ $OpenBSD: patch-Makefile,v 1.1 2010/11/24 13:09:11 jasper Exp $ - Don't hide the compile commands. +- Use ${BSD_INSTALL_*} instead of mkdir, cp, and chmod. - Don't unconditionally strip the binary. Makefile.orig Wed Nov 24 09:29:08 2010 -+++ Makefile Wed Nov 24 09:29:35 2010 -@@ -13,13 +13,13 @@ options: +--- Makefile.orig Wed Aug 26 16:11:27 2015 Makefile Wed Aug 26 16:11:53 2015 +@@ -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} debug: clean @make CFLAGS='${DEBUG_CFLAGS}' -@@ -40,8 +40,6 @@ dist: clean +@@ -43,20 +41,13 @@ dist: clean @rm -rf dvtm-${VERSION} install: dvtm - @echo stripping executable -- @strip -s dvtm - @echo installing executable file to ${DESTDIR}${PREFIX}/bin - @mkdir -p ${DESTDIR}${PREFIX}/bin - @cp -f dvtm ${DESTDIR}${PREFIX}/bin +- @${STRIP} dvtm +- @echo installing executable file to ${DESTDIR}${PREFIX}/bin +- @mkdir -p ${DESTDIR}${PREFIX}/bin +- @cp -f dvtm ${DESTDIR}${PREFIX}/bin +- @chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm +- @cp -f dvtm-status ${DESTDIR}${PREFIX}/bin +- @chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm-status +- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 +- @mkdir -p ${DESTDIR}${MANPREFIX}/man1 +- @sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1 +- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1 +- @echo installing terminfo description +- @TERMINFO=${TERMINFO} tic -s dvtm.info ++ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} dvtm ${DESTDIR}${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} dvtm-status ${DESTDIR}${PREFIX}/bin ++ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1 ++ sed -i "s/VERSION/${VERSION}/g" dvtm.1 ++ ${BSD_INSTALL_MAN} dvtm.1 ${DESTDIR}${MANPREFIX}/man1 ++ tic -s -o ${DESTDIR}${PREFIX}/share/terminfo dvtm.info + + uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin Index: patches/patch-config_mk === RCS file: /cvs/ports/misc/dvtm/patches/patch-config_mk,v retrieving revision 1.7 diff -u -p -r1.7 patch-config_mk --- patches/patch-config_mk 24 Nov 2010 13:09:11 - 1.7 +++ patches/patch-config_mk 26 Aug 2015 20:32:23 - @@ -1,32 +1,20 @@ $OpenBSD: patch-config_mk,v 1.7 2010/11/24 13:09:11 jasper Exp $ config.mk.orig Fri Oct 8 18:06:05 2010 -+++ config.mk Wed Nov 24 09:28:42 2010 -@@ -3,15 +3,15 @@ VERSION = 0.6 - +--- config.mk.orig Thu Feb 19 11:51:23 2015 config.mk Wed Aug 26 16:02:52 2015 +@@ -4,14 +4,14 @@ VERSION = 0.14 # Customize below to fit your system --PREFIX = /usr/local + PREFIX ?= /usr/local -MANPREFIX = ${PREFIX}/share/man -+#PREFIX = /usr/local +MANPREFIX = ${PREFIX}/man + # specify your systems terminf
Re: UPDATE: misc/dvtm
On 2013/08/28 11:33, Dennis Herrmann wrote: > Ahoi, > > For a long time i send a update for misc/dvtm. This is a new patch[1] > without ugly > snprintf patches or etc. > > # $Id: UPDATE,v 1.3 2013/08/28 11:10:04 dhn Exp $ > > 2013-08-28 Dennis Herrmann > > * Update to 0.9 > * Update/Remove some patches >- Update: patches/patch-vt_c >- Remove: patches/patch-dvtm_c I also had to remove patch-madtty_c, but I hit this: vt.c: In function 'vt_draw': vt.c:1528: warning: implicit declaration of function 'waddnwstr' this looks like it might be a problem for LP64 arch as a couple of the parameters are pointers, but the header appears to be correctly included, so I'm not quite sure what's going on there..
Re: UPDATE: misc/dvtm
Ahoi, For a long time i send a update for misc/dvtm. This is a new patch[1] without ugly snprintf patches or etc. # $Id: UPDATE,v 1.3 2013/08/28 11:10:04 dhn Exp $ 2013-08-28 Dennis Herrmann * Update to 0.9 * Update/Remove some patches - Update: patches/patch-vt_c - Remove: patches/patch-dvtm_c [1] https://github.com/jasperla/openbsd-wip/tree/master/misc/dvtm 2012/12/12 Dennis Herrmann > Stuart Henderson writes: > > On 2012/12/04 22:38, Dennis Herrmann wrote: > > > [03] "warning: sprintf() is often misused, please use snprintf()" > > > > We're not patching these in ports unless there's a serious > > bug - feeding this type of fix upstream is usually the best course > > of actionhowever > > > > > + static void send_curs(Vt *t) > > > + { > > > + char keyseq[16]; > > > +- sprintf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), > t->curs_col); > > > ++ printf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), > t->curs_col); > > > + vt_write(t, keyseq, strlen(keyseq)); > > > + } > > > + > > > > in this case the patch is bogus, the intent is to print to a string, > > it should either be changed to snprintf with a size limit, (and check > > the return code to avoid possibly not terminating the escape sequence > > properly if the string does get truncated), or (as there is a finite > > maximum length the %d can expand to) use a buffer large enough to > > hold the longest possible output of the sprintf. > > > > I change the patch a little bit, I hope it looks better? > > + static void send_curs(Vt *t) > + { > + char keyseq[16]; > +- sprintf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), > t->curs_col); > ++ snprintf(keyseq, sizeof(keyseq), "\e[%d;%dR", (int)(t->curs_row - > t->lines), t->curs_col); > + vt_write(t, keyseq, strlen(keyseq)); > + } > > /dhn > dvtm_update-0.9.diff Description: Binary data
Re: UPDATE: misc/dvtm
Stuart Henderson writes: > On 2012/12/04 22:38, Dennis Herrmann wrote: > > [03] "warning: sprintf() is often misused, please use snprintf()" > > We're not patching these in ports unless there's a serious > bug - feeding this type of fix upstream is usually the best course > of actionhowever > > > + static void send_curs(Vt *t) > > + { > > + char keyseq[16]; > > +- sprintf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), > > t->curs_col); > > ++ printf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), t->curs_col); > > + vt_write(t, keyseq, strlen(keyseq)); > > + } > > + > > in this case the patch is bogus, the intent is to print to a string, > it should either be changed to snprintf with a size limit, (and check > the return code to avoid possibly not terminating the escape sequence > properly if the string does get truncated), or (as there is a finite > maximum length the %d can expand to) use a buffer large enough to > hold the longest possible output of the sprintf. > I change the patch a little bit, I hope it looks better? + static void send_curs(Vt *t) + { + char keyseq[16]; +- sprintf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), t->curs_col); ++ snprintf(keyseq, sizeof(keyseq), "\e[%d;%dR", (int)(t->curs_row - t->lines), t->curs_col); + vt_write(t, keyseq, strlen(keyseq)); + } /dhn diff --git a/misc/dvtm/patches/patch-vt_c b/misc/dvtm/patches/patch-vt_c index 0fbc97d..a44aac7 100644 --- a/misc/dvtm/patches/patch-vt_c +++ b/misc/dvtm/patches/patch-vt_c @@ -16,7 +16,7 @@ { char keyseq[16]; - sprintf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), t->curs_col); -+ printf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), t->curs_col); ++ snprintf(keyseq, sizeof(keyseq), "\e[%d;%dR", (int)(t->curs_row - t->lines), t->curs_col); vt_write(t, keyseq, strlen(keyseq)); } pgpn4O3wZaLPP.pgp Description: PGP signature
Re: UPDATE: misc/dvtm
On 2012/12/04 22:38, Dennis Herrmann wrote: > [03] "warning: sprintf() is often misused, please use snprintf()" We're not patching these in ports unless there's a serious bug - feeding this type of fix upstream is usually the best course of actionhowever > + static void send_curs(Vt *t) > + { > + char keyseq[16]; > +-sprintf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), > t->curs_col); > ++printf(keyseq, "\e[%d;%dR", (int)(t->curs_row - t->lines), t->curs_col); > + vt_write(t, keyseq, strlen(keyseq)); > + } > + in this case the patch is bogus, the intent is to print to a string, it should either be changed to snprintf with a size limit, (and check the return code to avoid possibly not terminating the escape sequence properly if the string does get truncated), or (as there is a finite maximum length the %d can expand to) use a buffer large enough to hold the longest possible output of the sprintf.
UPDATE: misc/dvtm
# $Id: UPDATE,v 1.2 2012/11/11 10:29:47 dhn Exp $ 2012-11-11 Dennis Herrmann * The Maintainer has no more time to work at this port. So I take the maintainership now. [04] * Remove: "# LGPL: madtty.c" in the Makefile, because madtty.c is no longer a part of the package. 2012-11-10 Dennis Herrmann * Update to 0.8 * Update/Fix some patches - Updated: patches/patch-config_mk: [01] - Fix: patches/patch-dvtm_c: [02] - Fix: patches/patch-vt_c: [03] [01] Update for the new release [02] "warning: comparison is always false due to limited range of data type" [03] "warning: sprintf() is often misused, please use snprintf()" [04] Approved by: Emilien Gaspar (old maintainer), (via mail) EOF Index: Makefile === RCS file: /cvs/ports/misc/dvtm/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile24 Apr 2012 19:28:31 - 1.14 +++ Makefile4 Dec 2012 21:34:28 - @@ -2,15 +2,13 @@ COMMENT= tiling window management for the console -DISTNAME= dvtm-0.6 -REVISION= 1 +DISTNAME= dvtm-0.8 CATEGORIES=misc HOMEPAGE= http://www.brain-dump.org/projects/dvtm/ -MAINTAINER=Emilien Gaspar +MAINTAINER=Dennis Herrmann # MIT/X -# LGPL: madtty.c PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP=Yes PERMIT_DISTFILES_CDROM= Yes Index: distinfo === RCS file: /cvs/ports/misc/dvtm/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo24 Nov 2010 08:19:24 - 1.5 +++ distinfo4 Dec 2012 21:34:28 - @@ -1,5 +1,2 @@ -MD5 (dvtm-0.6.tar.gz) = 23ejdEho3ZGlrlrZi333CQ== -RMD160 (dvtm-0.6.tar.gz) = GSAcgt8YpMzPRSKKoFZSnJ9KFsM= -SHA1 (dvtm-0.6.tar.gz) = XVtcdRjq2fCLrijAgb8qu7RHKTM= -SHA256 (dvtm-0.6.tar.gz) = lhCSLCBnjKls0tm/3o+Xu8KnvV5TbVAVxW34EkaKBIE= -SIZE (dvtm-0.6.tar.gz) = 26542 +SHA256 (dvtm-0.8.tar.gz) = TIS3wy9s1HbvkhUMTByiEYNu0A8WyovdQImTORKzmng= +SIZE (dvtm-0.8.tar.gz) = 27543 Index: patches/patch-config_mk === RCS file: /cvs/ports/misc/dvtm/patches/patch-config_mk,v retrieving revision 1.7 diff -u -r1.7 patch-config_mk --- patches/patch-config_mk 24 Nov 2010 13:09:11 - 1.7 +++ patches/patch-config_mk 4 Dec 2012 21:34:28 - @@ -1,7 +1,6 @@ -$OpenBSD: patch-config_mk,v 1.7 2010/11/24 13:09:11 jasper Exp $ config.mk.orig Fri Oct 8 18:06:05 2010 -+++ config.mk Wed Nov 24 09:28:42 2010 -@@ -3,15 +3,15 @@ VERSION = 0.6 +--- config.mk.orig Sat Nov 10 21:51:59 2012 config.mk Sat Nov 10 21:53:26 2012 +@@ -3,11 +3,12 @@ # Customize below to fit your system @@ -10,21 +9,22 @@ +#PREFIX = /usr/local +MANPREFIX = ${PREFIX}/man --INCS = -I. -I/usr/include -I/usr/local/include +-INCS = -I. -I/usr/include -I/usr/local/include -LIBS = -lc -lutil -lncursesw --#LIBS = -lc -lutil -lncurses +INCS = -I. -I/usr/include +#LIBS = -lc -lutil -lncursesw +LIBS = -lc -lutil -lncurses + # NetBSD + #LIBS = -lc -lutil -lcurses + # AIX +@@ -15,9 +16,9 @@ + # Cygwin + #INCS += -I/usr/include/ncurses -CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG -LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS} +CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG +LDFLAGS += -L/usr/lib ${LIBS} - - # Mouse handling - CFLAGS += -DCONFIG_MOUSE -@@ -20,4 +20,4 @@ CFLAGS += -DCONFIG_STATUSBAR DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall Index: patches/patch-dvtm_c === RCS file: patches/patch-dvtm_c diff -N patches/patch-dvtm_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-dvtm_c4 Dec 2012 21:34:28 - @@ -0,0 +1,11 @@ +--- dvtm.c.origSat Nov 10 21:55:39 2012 dvtm.c Sat Nov 10 21:55:52 2012 +@@ -408,7 +408,7 @@ + short fg = -1, bg = -1; + const ColorRule *r; + +- for (i = 0; i < countof(colorrules); i++) { ++ for (int i = 0; i < countof(colorrules); i++) { + r = &colorrules[i]; + if (strstr(c->title, r->title)) { + attrs = r->attrs; Index: patches/patch-madtty_c === RCS file: patches/patch-madtty_c diff -N patches/patch-madtty_c --- patches/patch-madtty_c 24 Apr 2012 19:28:31 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-madtty_c,v 1.1 2012/04/24 19:28:31 naddy Exp $ madtty.c.orig Tue Apr 24 21:20:01 2012 -+++ madtty.c Tue Apr 24 21:22:45 2012 -@@ -47,6 +47,10 @@ - - #include "madtty.h" - -+#if defined(__GNUC__) && defined(__STRICT_ANSI__) -+#define alloca(size) __builtin_alloca(size) -+#endif -+ - #ifndef NCURSES_ATTR_SHIFT - # define NCURSES_ATTR_SHIFT 8 - #endif Index: patches/patch-vt_c =
UPDATE: misc/dvtm -> 0.6
Here is a trivial update for misc/dvtm. Tested on sparc64. Index: Makefile === RCS file: /cvs/ports/misc/dvtm/Makefile,v retrieving revision 1.10 diff -u -r1.10 Makefile --- Makefile19 Nov 2010 07:23:11 - 1.10 +++ Makefile22 Nov 2010 14:37:47 - @@ -2,7 +2,7 @@ COMMENT= tiling window management for the console -DISTNAME= dvtm-0.5.2 +DISTNAME= dvtm-0.6 CATEGORIES=misc HOMEPAGE= http://www.brain-dump.org/projects/dvtm/ Index: distinfo === RCS file: /cvs/ports/misc/dvtm/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo11 Oct 2009 21:59:02 - 1.4 +++ distinfo22 Nov 2010 14:37:47 - @@ -1,5 +1,5 @@ -MD5 (dvtm-0.5.2.tar.gz) = eHK55hcFpOmVJlWzuI5K3Q== -RMD160 (dvtm-0.5.2.tar.gz) = 4jOV3JZxNkDt5KtIRhaMPpBE3UA= -SHA1 (dvtm-0.5.2.tar.gz) = togEj8k6KHIvHtULZNJ1+9rlzUM= -SHA256 (dvtm-0.5.2.tar.gz) = hNxvkI5H5iLCmIhMDQRj6Ur8SZKPbmJ2vp0Yj+mvnX0= -SIZE (dvtm-0.5.2.tar.gz) = 26340 +MD5 (dvtm-0.6.tar.gz) = 23ejdEho3ZGlrlrZi333CQ== +RMD160 (dvtm-0.6.tar.gz) = GSAcgt8YpMzPRSKKoFZSnJ9KFsM= +SHA1 (dvtm-0.6.tar.gz) = XVtcdRjq2fCLrijAgb8qu7RHKTM= +SHA256 (dvtm-0.6.tar.gz) = lhCSLCBnjKls0tm/3o+Xu8KnvV5TbVAVxW34EkaKBIE= +SIZE (dvtm-0.6.tar.gz) = 26542