diff options
author | tnn <tnn@pkgsrc.org> | 2008-05-25 11:46:33 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2008-05-25 11:46:33 +0000 |
commit | aedab9a91240343e003b6f7fc43ca87fec680aa6 (patch) | |
tree | f6d7f2a851197265b876ae09046cc4a6addf16e4 | |
parent | 2778c83e8bee350426b5a44fae397f444a32b9fa (diff) | |
download | pkgsrc-aedab9a91240343e003b6f7fc43ca87fec680aa6.tar.gz |
Update to dvtm-0.4.1. Contributed by Leonardo Taccari.
* Cursor key mode switching (this fixes arrow keys in vim)
* Characters following an escape are passed to the underlying
application, this fixes ALT+<n> key combination as used by
irssi
* A hack to make the keypad sort of work with putty
* Mouse support is now compile time selectable
* Destroy clients when an IO-error occurs
* Correct signal handling (save and restore errno)
* Destroy clients cleanly, prevent zombies
* Added a note about copy & paste to the manual page (use
SHIFT while selecting or pasting text)
* Some source code formatting fixes
-rw-r--r-- | misc/dvtm/Makefile | 18 | ||||
-rw-r--r-- | misc/dvtm/PLIST | 3 | ||||
-rw-r--r-- | misc/dvtm/distinfo | 10 | ||||
-rw-r--r-- | misc/dvtm/patches/patch-aa | 53 |
4 files changed, 49 insertions, 35 deletions
diff --git a/misc/dvtm/Makefile b/misc/dvtm/Makefile index d8d2ac99210..bed01263ff0 100644 --- a/misc/dvtm/Makefile +++ b/misc/dvtm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/03/09 17:20:47 tnn Exp $ +# $NetBSD: Makefile,v 1.2 2008/05/25 11:46:33 tnn Exp $ # -DISTNAME= dvtm-0.4 +DISTNAME= dvtm-0.4.1 CATEGORIES= misc MASTER_SITES= http://www.brain-dump.org/projects/dvtm/ @@ -14,11 +14,17 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_LANGUAGES= c99 NO_CONFIGURE= yes -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +SUBST_CLASSES+= makefile +SUBST_STAGE.makefile= pre-build +SUBST_MESSAGE.makefile= Fixing config.mk... +SUBST_FILES.makefile= config.mk +SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g' +SUBST_SED.makefile+= -e 's,share/man,${PKGMANDIR},g' +SUBST_SED.makefile+= -e 's,^CFLAGS =,CFLAGS +=,' +SUBST_SED.makefile+= -e 's,^LDFLAGS =,LDFLAGS +=,' +SUBST_SED.makefile+= -e 's/cc/${CC:Q}/' -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dvtm ${DESTDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/dvtm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 .include "options.mk" diff --git a/misc/dvtm/PLIST b/misc/dvtm/PLIST index d7030aca586..ef358345437 100644 --- a/misc/dvtm/PLIST +++ b/misc/dvtm/PLIST @@ -1,3 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/09 17:20:47 tnn Exp $ +@comment $NetBSD: PLIST,v 1.2 2008/05/25 11:46:33 tnn Exp $ bin/dvtm +bin/dvtm-status man/man1/dvtm.1 diff --git a/misc/dvtm/distinfo b/misc/dvtm/distinfo index 6ea1d994402..db3536fd811 100644 --- a/misc/dvtm/distinfo +++ b/misc/dvtm/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/03/09 17:20:47 tnn Exp $ +$NetBSD: distinfo,v 1.2 2008/05/25 11:46:33 tnn Exp $ -SHA1 (dvtm-0.4.tar.gz) = bcb12317fb2cd02e6b492560d945d672fcc8e856 -RMD160 (dvtm-0.4.tar.gz) = 80f86da540aff047c2ee8cc01cc73c8fb2a1c0b1 -Size (dvtm-0.4.tar.gz) = 20761 bytes -SHA1 (patch-aa) = 9a0563e52dd957a35c26087fa1b4cc6750772b1b +SHA1 (dvtm-0.4.1.tar.gz) = 44e032d6f4334ce0dfe92cc0121c6cb46d2d95bb +RMD160 (dvtm-0.4.1.tar.gz) = bfaf0869c74bf180da1e13ba35a87c68844799a5 +Size (dvtm-0.4.1.tar.gz) = 21729 bytes +SHA1 (patch-aa) = 5cf00f7d62eb2f4cf46798c1518dd54c477b8d83 diff --git a/misc/dvtm/patches/patch-aa b/misc/dvtm/patches/patch-aa index 215ee6fcc57..7abb33a1caf 100644 --- a/misc/dvtm/patches/patch-aa +++ b/misc/dvtm/patches/patch-aa @@ -1,26 +1,33 @@ -$NetBSD: patch-aa,v 1.1.1.1 2008/03/09 17:20:47 tnn Exp $ +$NetBSD: patch-aa,v 1.2 2008/05/25 11:46:33 tnn Exp $ ---- config.mk.orig 2008-02-06 17:30:25.000000000 +0100 -+++ config.mk -@@ -3,16 +3,13 @@ VERSION = 0.4 +--- Makefile.orig 2008-05-10 18:39:01.000000000 +0200 ++++ Makefile +@@ -20,6 +20,7 @@ ${OBJ}: config.h config.mk + dvtm: ${OBJ} + @echo CC -o $@ + @${CC} -o $@ ${OBJ} ${LDFLAGS} ++ @sed "s/VERSION/${VERSION}/g" < dvtm.1 > dvtm.1.out - # Customize below to fit your system + unicode: clean + @make LIBS='${LIBS_UTF8}' CFLAGS='${CFLAGS} -DUSE_UTF8' +@@ -45,15 +46,12 @@ 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 +- @chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm +- @cp -f dvtm-status ${DESTDIR}${PREFIX}/bin +- @chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm-status ++ @install -m 755 -d ${DESTDIR}${PREFIX}/bin ++ @install -m 755 -c dvtm ${DESTDIR}${PREFIX}/bin ++ @install -m 755 -c dvtm-status ${DESTDIR}${PREFIX}/bin + @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 ++ @install -m 755 -d ${DESTDIR}${MANPREFIX}/man1 ++ @install -m 644 -c dvtm.1.out ${DESTDIR}${MANPREFIX}/man1/dvtm.1 --PREFIX = /usr/local --MANPREFIX = ${PREFIX}/share/man -+MANPREFIX = ${DESTDIR}${PREFIX}/${PKGMANDIR} - - INCS = -I. -I/usr/include -I/usr/local/include --LIBS = -lc -lutil -lncurses --LIBS_UTF8 = -lc -lutil -lncursesw -+LIBS = -lc -lutil -lncurses -L/usr/lib -L${DESTDIR}${PREFIX}/lib -+LIBS_UTF8 = -lc -lutil -lncursesw -L/usr/lib -L${DESTDIR}${PREFIX}/lib - --CFLAGS = -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG --LDFLAGS = -L/usr/lib -L/usr/local/lib ${LIBS} -+CFLAGS += ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG -+LDFLAGS += ${LIBS} - - DEBUG_CFLAGS = -std=c99 -O0 -g -ggdb ${INCS} -Wall -DVERSION=\"${VERSION}\" -- --CC = cc + uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin |