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 --- Makefile 11 Mar 2013 11:23:57 -0000 1.15 +++ Makefile 26 Aug 2015 20:32:23 -0000 @@ -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 <g...@dud-t.org> # 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 --- distinfo 18 Jan 2015 03:14:31 -0000 1.6 +++ distinfo 26 Aug 2015 20:32:23 -0000 @@ -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 -0000 1.1 +++ patches/patch-Makefile 26 Aug 2015 20:32:23 -0000 @@ -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 -0000 1.7 +++ patches/patch-config_mk 26 Aug 2015 20:32:23 -0000 @@ -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 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 ++CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE + CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS} + LDFLAGS += ${LIBS} --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 - --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 - --CC = cc -+CC ?= cc 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 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -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: pkg/PLIST =================================================================== RCS file: /cvs/ports/misc/dvtm/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 9 Jul 2008 11:20:43 -0000 1.1.1.1 +++ pkg/PLIST 26 Aug 2015 20:32:23 -0000 @@ -2,3 +2,7 @@ @bin bin/dvtm bin/dvtm-status @man man/man1/dvtm.1 +share/terminfo/ +share/terminfo/d/ +share/terminfo/d/dvtm +share/terminfo/d/dvtm-256color
