[arch-commits] Commit in dvtm/repos (10 files)

Lukas Fleischer lfleischer at nymeria.archlinux.org
Tue Jun 4 19:05:35 UTC 2013


    Date: Tuesday, June 4, 2013 @ 21:05:34
  Author: lfleischer
Revision: 92416

archrelease: copy trunk to community-i686, community-x86_64

Added:
  dvtm/repos/community-i686/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
    (from rev 92415, dvtm/trunk/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch)
  dvtm/repos/community-i686/PKGBUILD
    (from rev 92415, dvtm/trunk/PKGBUILD)
  dvtm/repos/community-i686/config.h
    (from rev 92415, dvtm/trunk/config.h)
  dvtm/repos/community-x86_64/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
    (from rev 92415, dvtm/trunk/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch)
  dvtm/repos/community-x86_64/PKGBUILD
    (from rev 92415, dvtm/trunk/PKGBUILD)
  dvtm/repos/community-x86_64/config.h
    (from rev 92415, dvtm/trunk/config.h)
Deleted:
  dvtm/repos/community-i686/PKGBUILD
  dvtm/repos/community-i686/config.h
  dvtm/repos/community-x86_64/PKGBUILD
  dvtm/repos/community-x86_64/config.h

------------------------------------------------------------------------+
 /PKGBUILD                                                              |   84 ++
 /config.h                                                              |  314 ++++++++++
 community-i686/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch   |   25 
 community-i686/PKGBUILD                                                |   34 -
 community-i686/config.h                                                |  157 -----
 community-x86_64/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch |   25 
 community-x86_64/PKGBUILD                                              |   34 -
 community-x86_64/config.h                                              |  157 -----
 8 files changed, 448 insertions(+), 382 deletions(-)

Copied: dvtm/repos/community-i686/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch (from rev 92415, dvtm/trunk/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch)
===================================================================
--- community-i686/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch	                        (rev 0)
+++ community-i686/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch	2013-06-04 19:05:34 UTC (rev 92416)
@@ -0,0 +1,25 @@
+From 4ab5ed57a3b53e0271cf50f256cd7904c50cac55 Mon Sep 17 00:00:00 2001
+From: Douglas Jerome <douglas at ttylinux.org>
+Date: Wed, 15 May 2013 14:33:31 +0200
+Subject: [PATCH] Makefile: respect ${DESTDIR} in tic invocation
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index ff85deb..eb849f4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ install: dvtm
+ 	@sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+ 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+ 	@echo installing terminfo description
+-	@tic -s dvtm.info
++	@tic -o ${DESTDIR}/usr/share/terminfo -s dvtm.info
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+-- 
+1.8.3.450.gf3f2a46
+

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-06-04 19:05:19 UTC (rev 92415)
+++ community-i686/PKGBUILD	2013-06-04 19:05:34 UTC (rev 92416)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Giorgio Lando <patroclo7 at gmail.com>
-# Contributor: bender02 at gmx dot com
-
-pkgname=dvtm
-pkgver=0.9
-pkgrel=1
-pkgdesc='Dynamic virtual terminal manager.'
-arch=('i686' 'x86_64')
-url='http://www.brain-dump.org/projects/dvtm/'
-license=('MIT')
-depends=('ncurses')
-source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'config.h')
-md5sums=('7de1103abb0ca410f7250cf89f019a38'
-         '41107e5e84a8572f70d6cb111b4e07f8')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	cp "${srcdir}/config.h" .
-	sed -i 's/CFLAGS =/CFLAGS +=/' config.mk
-
-	make clean
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
-	install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: dvtm/repos/community-i686/PKGBUILD (from rev 92415, dvtm/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-06-04 19:05:34 UTC (rev 92416)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Giorgio Lando <patroclo7 at gmail.com>
+# Contributor: bender02 at gmx dot com
+
+pkgname=dvtm
+pkgver=0.9
+pkgrel=2
+pkgdesc='Dynamic virtual terminal manager.'
+arch=('i686' 'x86_64')
+url='http://www.brain-dump.org/projects/dvtm/'
+license=('MIT')
+depends=('ncurses')
+source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'config.h'
+        '0001-Makefile-respect-DESTDIR-in-tic-invocation.patch')
+md5sums=('7de1103abb0ca410f7250cf89f019a38'
+         '41107e5e84a8572f70d6cb111b4e07f8'
+         'c85d8265ced45d014a7d3f05134bf6a1')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
+
+	cp "${srcdir}/config.h" .
+	sed -i 's/CFLAGS =/CFLAGS +=/' config.mk
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make clean
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make PREFIX=/usr DESTDIR="${pkgdir}" install
+	install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: community-i686/config.h
===================================================================
--- community-i686/config.h	2013-06-04 19:05:19 UTC (rev 92415)
+++ community-i686/config.h	2013-06-04 19:05:34 UTC (rev 92416)
@@ -1,157 +0,0 @@
-/* valid curses attributes are listed below they can be ORed
- *
- * A_NORMAL        Normal display (no highlight)
- * A_STANDOUT      Best highlighting mode of the terminal.
- * A_UNDERLINE     Underlining
- * A_REVERSE       Reverse video
- * A_BLINK         Blinking
- * A_DIM           Half bright
- * A_BOLD          Extra bright or bold
- * A_PROTECT       Protected mode
- * A_INVIS         Invisible or blank mode
- */
-#define BLUE            (COLORS==256 ? 68 : COLOR_BLUE)
-/* curses attributes for the currently focused window */
-#define SELECTED_ATTR   COLOR(BLUE, -1) | A_NORMAL
-/* curses attributes for normal (not selected) windows */
-#define NORMAL_ATTR     COLOR(-1, -1) | A_NORMAL
-/* curses attributes for the status bar */
-#define BAR_ATTR        COLOR(BLUE, -1) | A_NORMAL
-/* status bar (command line option -s) position */
-#define BAR_POS		BAR_TOP /* BAR_BOTTOM, BAR_OFF */
-/* determines whether the statusbar text should be right or left aligned */
-#define BAR_ALIGN       ALIGN_RIGHT
-/* separator between window title and window number */
-#define SEPARATOR " | "
-/* printf format string for the window title, first %s
- * is replaced by the title, second %s is replaced by
- * the SEPARATOR, %d stands for the window number */
-#define TITLE "[%s%s#%d]"
-/* master width factor [0.1 .. 0.9] */
-#define MFACT 0.5
-/* scroll back buffer size in lines */
-#define SCROLL_HISTORY 500
-
-#include "tile.c"
-#include "grid.c"
-#include "bstack.c"
-#include "fullscreen.c"
-
-/* by default the first layout entry is used */
-static Layout layouts[] = {
-	{ "[]=", tile },
-	{ "+++", grid },
-	{ "TTT", bstack },
-	{ "[ ]", fullscreen },
-};
-
-#define MOD CTRL('g')
-
-/* you can at most specifiy MAX_ARGS (3) number of arguments */
-static Key keys[] = {
-	{ MOD, 'c',       { create,         { NULL }                    } },
-	{ MOD, 'C',       { create,         { NULL, NULL, "$CWD" }      } },
-	{ MOD, 'x',       { killclient,     { NULL }                    } },
-	{ MOD, 'j',       { focusnext,      { NULL }                    } },
-	{ MOD, 'u',       { focusnextnm,    { NULL }                    } },
-	{ MOD, 'i',       { focusprevnm,    { NULL }                    } },
-	{ MOD, 'k',       { focusprev,      { NULL }                    } },
-	{ MOD, 't',       { setlayout,      { "[]=" }                   } },
-	{ MOD, 'g',       { setlayout,      { "+++" }                   } },
-	{ MOD, 'b',       { setlayout,      { "TTT" }                   } },
-	{ MOD, 'm',       { setlayout,      { "[ ]" }                   } },
-	{ MOD, ' ',       { setlayout,      { NULL }                    } },
-	{ MOD, 'h',       { setmfact,       { "-0.05" }                 } },
-	{ MOD, 'l',       { setmfact,       { "+0.05" }                 } },
-	{ MOD, '.',       { toggleminimize, { NULL }                    } },
-	{ MOD, 's',       { togglebar,      { NULL }                    } },
-	{ MOD, 'M',       { togglemouse,    { NULL }                    } },
-	{ MOD, '\n',      { zoom ,          { NULL }                    } },
-	{ MOD, '1',       { focusn,         { "1" }                     } },
-	{ MOD, '2',       { focusn,         { "2" }                     } },
-	{ MOD, '3',       { focusn,         { "3" }                     } },
-	{ MOD, '4',       { focusn,         { "4" }                     } },
-	{ MOD, '5',       { focusn,         { "5" }                     } },
-	{ MOD, '6',       { focusn,         { "6" }                     } },
-	{ MOD, '7',       { focusn,         { "7" }                     } },
-	{ MOD, '8',       { focusn,         { "8" }                     } },
-	{ MOD, '9',       { focusn,         { "9" }                     } },
-	{ MOD, 'q',       { quit,           { NULL }                    } },
-	{ MOD, 'G',       { escapekey,      { NULL }                    } },
-	{ MOD, 'a',       { togglerunall,   { NULL }                    } },
-	{ MOD, 'r',       { redraw,         { NULL }                    } },
-	{ MOD, 'X',       { lock,           { NULL }                    } },
-	{ MOD, 'B',       { togglebell,     { NULL }                    } },
-	{ MOD, 'v',       { copymode,       { NULL }                    } },
-	{ MOD, '/',       { copymode,       { "/" }                     } },
-	{ MOD, '?',       { copymode,       { "?" }                     } },
-	{ MOD, 'p',       { paste,          { NULL }                    } },
-	{ MOD, KEY_PPAGE, { scrollback,     { "-1" }                    } },
-	{ MOD, KEY_NPAGE, { scrollback,     { "1"  }                    } },
-	{ MOD, KEY_F(1),  { create,         { "man dvtm", "dvtm help" } } },
-};
-
-static const ColorRule colorrules[] = {
-	{ "", A_NORMAL, -1, -1 }, /* default */
-#if 0
-	/* title attrs     fgcolor      bgcolor */
-	{ "ssh", A_NORMAL, COLOR_BLACK, 224      },
-#endif
-};
-
-/* possible values for the mouse buttons are listed below:
- *
- * BUTTON1_PRESSED          mouse button 1 down
- * BUTTON1_RELEASED         mouse button 1 up
- * BUTTON1_CLICKED          mouse button 1 clicked
- * BUTTON1_DOUBLE_CLICKED   mouse button 1 double clicked
- * BUTTON1_TRIPLE_CLICKED   mouse button 1 triple clicked
- * BUTTON2_PRESSED          mouse button 2 down
- * BUTTON2_RELEASED         mouse button 2 up
- * BUTTON2_CLICKED          mouse button 2 clicked
- * BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
- * BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
- * BUTTON3_PRESSED          mouse button 3 down
- * BUTTON3_RELEASED         mouse button 3 up
- * BUTTON3_CLICKED          mouse button 3 clicked
- * BUTTON3_DOUBLE_CLICKED   mouse button 3 double clicked
- * BUTTON3_TRIPLE_CLICKED   mouse button 3 triple clicked
- * BUTTON4_PRESSED          mouse button 4 down
- * BUTTON4_RELEASED         mouse button 4 up
- * BUTTON4_CLICKED          mouse button 4 clicked
- * BUTTON4_DOUBLE_CLICKED   mouse button 4 double clicked
- * BUTTON4_TRIPLE_CLICKED   mouse button 4 triple clicked
- * BUTTON_SHIFT             shift was down during button state change
- * BUTTON_CTRL              control was down during button state change
- * BUTTON_ALT               alt was down during button state change
- * ALL_MOUSE_EVENTS         report all button state changes
- * REPORT_MOUSE_POSITION    report mouse movement
- */
-
-#ifdef NCURSES_MOUSE_VERSION
-# define CONFIG_MOUSE /* compile in mouse support if we build against ncurses */
-#endif
-
-#define ENABLE_MOUSE true /* whether to enable mouse events by default */
-
-#ifdef CONFIG_MOUSE
-static Button buttons[] = {
-	{ BUTTON1_CLICKED,        { mouse_focus,      { NULL  } } },
-	{ BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { "[ ]" } } },
-	{ BUTTON2_CLICKED,        { mouse_zoom,       { NULL  } } },
-	{ BUTTON3_CLICKED,        { mouse_minimize,   { NULL  } } },
-};
-#endif /* CONFIG_MOUSE */
-
-static Cmd commands[] = {
-	{ "create", { create,	{ NULL } } },
-};
-
-/* gets executed when dvtm is started */
-static Action actions[] = {
-	{ create, { NULL } },
-};
-
-static char const * const keytable[] = {
-	/* add your custom key escape sequences */
-};

Copied: dvtm/repos/community-i686/config.h (from rev 92415, dvtm/trunk/config.h)
===================================================================
--- community-i686/config.h	                        (rev 0)
+++ community-i686/config.h	2013-06-04 19:05:34 UTC (rev 92416)
@@ -0,0 +1,157 @@
+/* valid curses attributes are listed below they can be ORed
+ *
+ * A_NORMAL        Normal display (no highlight)
+ * A_STANDOUT      Best highlighting mode of the terminal.
+ * A_UNDERLINE     Underlining
+ * A_REVERSE       Reverse video
+ * A_BLINK         Blinking
+ * A_DIM           Half bright
+ * A_BOLD          Extra bright or bold
+ * A_PROTECT       Protected mode
+ * A_INVIS         Invisible or blank mode
+ */
+#define BLUE            (COLORS==256 ? 68 : COLOR_BLUE)
+/* curses attributes for the currently focused window */
+#define SELECTED_ATTR   COLOR(BLUE, -1) | A_NORMAL
+/* curses attributes for normal (not selected) windows */
+#define NORMAL_ATTR     COLOR(-1, -1) | A_NORMAL
+/* curses attributes for the status bar */
+#define BAR_ATTR        COLOR(BLUE, -1) | A_NORMAL
+/* status bar (command line option -s) position */
+#define BAR_POS		BAR_TOP /* BAR_BOTTOM, BAR_OFF */
+/* determines whether the statusbar text should be right or left aligned */
+#define BAR_ALIGN       ALIGN_RIGHT
+/* separator between window title and window number */
+#define SEPARATOR " | "
+/* printf format string for the window title, first %s
+ * is replaced by the title, second %s is replaced by
+ * the SEPARATOR, %d stands for the window number */
+#define TITLE "[%s%s#%d]"
+/* master width factor [0.1 .. 0.9] */
+#define MFACT 0.5
+/* scroll back buffer size in lines */
+#define SCROLL_HISTORY 500
+
+#include "tile.c"
+#include "grid.c"
+#include "bstack.c"
+#include "fullscreen.c"
+
+/* by default the first layout entry is used */
+static Layout layouts[] = {
+	{ "[]=", tile },
+	{ "+++", grid },
+	{ "TTT", bstack },
+	{ "[ ]", fullscreen },
+};
+
+#define MOD CTRL('g')
+
+/* you can at most specifiy MAX_ARGS (3) number of arguments */
+static Key keys[] = {
+	{ MOD, 'c',       { create,         { NULL }                    } },
+	{ MOD, 'C',       { create,         { NULL, NULL, "$CWD" }      } },
+	{ MOD, 'x',       { killclient,     { NULL }                    } },
+	{ MOD, 'j',       { focusnext,      { NULL }                    } },
+	{ MOD, 'u',       { focusnextnm,    { NULL }                    } },
+	{ MOD, 'i',       { focusprevnm,    { NULL }                    } },
+	{ MOD, 'k',       { focusprev,      { NULL }                    } },
+	{ MOD, 't',       { setlayout,      { "[]=" }                   } },
+	{ MOD, 'g',       { setlayout,      { "+++" }                   } },
+	{ MOD, 'b',       { setlayout,      { "TTT" }                   } },
+	{ MOD, 'm',       { setlayout,      { "[ ]" }                   } },
+	{ MOD, ' ',       { setlayout,      { NULL }                    } },
+	{ MOD, 'h',       { setmfact,       { "-0.05" }                 } },
+	{ MOD, 'l',       { setmfact,       { "+0.05" }                 } },
+	{ MOD, '.',       { toggleminimize, { NULL }                    } },
+	{ MOD, 's',       { togglebar,      { NULL }                    } },
+	{ MOD, 'M',       { togglemouse,    { NULL }                    } },
+	{ MOD, '\n',      { zoom ,          { NULL }                    } },
+	{ MOD, '1',       { focusn,         { "1" }                     } },
+	{ MOD, '2',       { focusn,         { "2" }                     } },
+	{ MOD, '3',       { focusn,         { "3" }                     } },
+	{ MOD, '4',       { focusn,         { "4" }                     } },
+	{ MOD, '5',       { focusn,         { "5" }                     } },
+	{ MOD, '6',       { focusn,         { "6" }                     } },
+	{ MOD, '7',       { focusn,         { "7" }                     } },
+	{ MOD, '8',       { focusn,         { "8" }                     } },
+	{ MOD, '9',       { focusn,         { "9" }                     } },
+	{ MOD, 'q',       { quit,           { NULL }                    } },
+	{ MOD, 'G',       { escapekey,      { NULL }                    } },
+	{ MOD, 'a',       { togglerunall,   { NULL }                    } },
+	{ MOD, 'r',       { redraw,         { NULL }                    } },
+	{ MOD, 'X',       { lock,           { NULL }                    } },
+	{ MOD, 'B',       { togglebell,     { NULL }                    } },
+	{ MOD, 'v',       { copymode,       { NULL }                    } },
+	{ MOD, '/',       { copymode,       { "/" }                     } },
+	{ MOD, '?',       { copymode,       { "?" }                     } },
+	{ MOD, 'p',       { paste,          { NULL }                    } },
+	{ MOD, KEY_PPAGE, { scrollback,     { "-1" }                    } },
+	{ MOD, KEY_NPAGE, { scrollback,     { "1"  }                    } },
+	{ MOD, KEY_F(1),  { create,         { "man dvtm", "dvtm help" } } },
+};
+
+static const ColorRule colorrules[] = {
+	{ "", A_NORMAL, -1, -1 }, /* default */
+#if 0
+	/* title attrs     fgcolor      bgcolor */
+	{ "ssh", A_NORMAL, COLOR_BLACK, 224      },
+#endif
+};
+
+/* possible values for the mouse buttons are listed below:
+ *
+ * BUTTON1_PRESSED          mouse button 1 down
+ * BUTTON1_RELEASED         mouse button 1 up
+ * BUTTON1_CLICKED          mouse button 1 clicked
+ * BUTTON1_DOUBLE_CLICKED   mouse button 1 double clicked
+ * BUTTON1_TRIPLE_CLICKED   mouse button 1 triple clicked
+ * BUTTON2_PRESSED          mouse button 2 down
+ * BUTTON2_RELEASED         mouse button 2 up
+ * BUTTON2_CLICKED          mouse button 2 clicked
+ * BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
+ * BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
+ * BUTTON3_PRESSED          mouse button 3 down
+ * BUTTON3_RELEASED         mouse button 3 up
+ * BUTTON3_CLICKED          mouse button 3 clicked
+ * BUTTON3_DOUBLE_CLICKED   mouse button 3 double clicked
+ * BUTTON3_TRIPLE_CLICKED   mouse button 3 triple clicked
+ * BUTTON4_PRESSED          mouse button 4 down
+ * BUTTON4_RELEASED         mouse button 4 up
+ * BUTTON4_CLICKED          mouse button 4 clicked
+ * BUTTON4_DOUBLE_CLICKED   mouse button 4 double clicked
+ * BUTTON4_TRIPLE_CLICKED   mouse button 4 triple clicked
+ * BUTTON_SHIFT             shift was down during button state change
+ * BUTTON_CTRL              control was down during button state change
+ * BUTTON_ALT               alt was down during button state change
+ * ALL_MOUSE_EVENTS         report all button state changes
+ * REPORT_MOUSE_POSITION    report mouse movement
+ */
+
+#ifdef NCURSES_MOUSE_VERSION
+# define CONFIG_MOUSE /* compile in mouse support if we build against ncurses */
+#endif
+
+#define ENABLE_MOUSE true /* whether to enable mouse events by default */
+
+#ifdef CONFIG_MOUSE
+static Button buttons[] = {
+	{ BUTTON1_CLICKED,        { mouse_focus,      { NULL  } } },
+	{ BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { "[ ]" } } },
+	{ BUTTON2_CLICKED,        { mouse_zoom,       { NULL  } } },
+	{ BUTTON3_CLICKED,        { mouse_minimize,   { NULL  } } },
+};
+#endif /* CONFIG_MOUSE */
+
+static Cmd commands[] = {
+	{ "create", { create,	{ NULL } } },
+};
+
+/* gets executed when dvtm is started */
+static Action actions[] = {
+	{ create, { NULL } },
+};
+
+static char const * const keytable[] = {
+	/* add your custom key escape sequences */
+};

Copied: dvtm/repos/community-x86_64/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch (from rev 92415, dvtm/trunk/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch)
===================================================================
--- community-x86_64/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch	                        (rev 0)
+++ community-x86_64/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch	2013-06-04 19:05:34 UTC (rev 92416)
@@ -0,0 +1,25 @@
+From 4ab5ed57a3b53e0271cf50f256cd7904c50cac55 Mon Sep 17 00:00:00 2001
+From: Douglas Jerome <douglas at ttylinux.org>
+Date: Wed, 15 May 2013 14:33:31 +0200
+Subject: [PATCH] Makefile: respect ${DESTDIR} in tic invocation
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index ff85deb..eb849f4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ install: dvtm
+ 	@sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+ 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1
+ 	@echo installing terminfo description
+-	@tic -s dvtm.info
++	@tic -o ${DESTDIR}/usr/share/terminfo -s dvtm.info
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+-- 
+1.8.3.450.gf3f2a46
+

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-06-04 19:05:19 UTC (rev 92415)
+++ community-x86_64/PKGBUILD	2013-06-04 19:05:34 UTC (rev 92416)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Giorgio Lando <patroclo7 at gmail.com>
-# Contributor: bender02 at gmx dot com
-
-pkgname=dvtm
-pkgver=0.9
-pkgrel=1
-pkgdesc='Dynamic virtual terminal manager.'
-arch=('i686' 'x86_64')
-url='http://www.brain-dump.org/projects/dvtm/'
-license=('MIT')
-depends=('ncurses')
-source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'config.h')
-md5sums=('7de1103abb0ca410f7250cf89f019a38'
-         '41107e5e84a8572f70d6cb111b4e07f8')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	cp "${srcdir}/config.h" .
-	sed -i 's/CFLAGS =/CFLAGS +=/' config.mk
-
-	make clean
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make PREFIX=/usr DESTDIR="${pkgdir}" install
-	install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: dvtm/repos/community-x86_64/PKGBUILD (from rev 92415, dvtm/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-06-04 19:05:34 UTC (rev 92416)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Giorgio Lando <patroclo7 at gmail.com>
+# Contributor: bender02 at gmx dot com
+
+pkgname=dvtm
+pkgver=0.9
+pkgrel=2
+pkgdesc='Dynamic virtual terminal manager.'
+arch=('i686' 'x86_64')
+url='http://www.brain-dump.org/projects/dvtm/'
+license=('MIT')
+depends=('ncurses')
+source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'config.h'
+        '0001-Makefile-respect-DESTDIR-in-tic-invocation.patch')
+md5sums=('7de1103abb0ca410f7250cf89f019a38'
+         '41107e5e84a8572f70d6cb111b4e07f8'
+         'c85d8265ced45d014a7d3f05134bf6a1')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
+
+	cp "${srcdir}/config.h" .
+	sed -i 's/CFLAGS =/CFLAGS +=/' config.mk
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make clean
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	make PREFIX=/usr DESTDIR="${pkgdir}" install
+	install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: community-x86_64/config.h
===================================================================
--- community-x86_64/config.h	2013-06-04 19:05:19 UTC (rev 92415)
+++ community-x86_64/config.h	2013-06-04 19:05:34 UTC (rev 92416)
@@ -1,157 +0,0 @@
-/* valid curses attributes are listed below they can be ORed
- *
- * A_NORMAL        Normal display (no highlight)
- * A_STANDOUT      Best highlighting mode of the terminal.
- * A_UNDERLINE     Underlining
- * A_REVERSE       Reverse video
- * A_BLINK         Blinking
- * A_DIM           Half bright
- * A_BOLD          Extra bright or bold
- * A_PROTECT       Protected mode
- * A_INVIS         Invisible or blank mode
- */
-#define BLUE            (COLORS==256 ? 68 : COLOR_BLUE)
-/* curses attributes for the currently focused window */
-#define SELECTED_ATTR   COLOR(BLUE, -1) | A_NORMAL
-/* curses attributes for normal (not selected) windows */
-#define NORMAL_ATTR     COLOR(-1, -1) | A_NORMAL
-/* curses attributes for the status bar */
-#define BAR_ATTR        COLOR(BLUE, -1) | A_NORMAL
-/* status bar (command line option -s) position */
-#define BAR_POS		BAR_TOP /* BAR_BOTTOM, BAR_OFF */
-/* determines whether the statusbar text should be right or left aligned */
-#define BAR_ALIGN       ALIGN_RIGHT
-/* separator between window title and window number */
-#define SEPARATOR " | "
-/* printf format string for the window title, first %s
- * is replaced by the title, second %s is replaced by
- * the SEPARATOR, %d stands for the window number */
-#define TITLE "[%s%s#%d]"
-/* master width factor [0.1 .. 0.9] */
-#define MFACT 0.5
-/* scroll back buffer size in lines */
-#define SCROLL_HISTORY 500
-
-#include "tile.c"
-#include "grid.c"
-#include "bstack.c"
-#include "fullscreen.c"
-
-/* by default the first layout entry is used */
-static Layout layouts[] = {
-	{ "[]=", tile },
-	{ "+++", grid },
-	{ "TTT", bstack },
-	{ "[ ]", fullscreen },
-};
-
-#define MOD CTRL('g')
-
-/* you can at most specifiy MAX_ARGS (3) number of arguments */
-static Key keys[] = {
-	{ MOD, 'c',       { create,         { NULL }                    } },
-	{ MOD, 'C',       { create,         { NULL, NULL, "$CWD" }      } },
-	{ MOD, 'x',       { killclient,     { NULL }                    } },
-	{ MOD, 'j',       { focusnext,      { NULL }                    } },
-	{ MOD, 'u',       { focusnextnm,    { NULL }                    } },
-	{ MOD, 'i',       { focusprevnm,    { NULL }                    } },
-	{ MOD, 'k',       { focusprev,      { NULL }                    } },
-	{ MOD, 't',       { setlayout,      { "[]=" }                   } },
-	{ MOD, 'g',       { setlayout,      { "+++" }                   } },
-	{ MOD, 'b',       { setlayout,      { "TTT" }                   } },
-	{ MOD, 'm',       { setlayout,      { "[ ]" }                   } },
-	{ MOD, ' ',       { setlayout,      { NULL }                    } },
-	{ MOD, 'h',       { setmfact,       { "-0.05" }                 } },
-	{ MOD, 'l',       { setmfact,       { "+0.05" }                 } },
-	{ MOD, '.',       { toggleminimize, { NULL }                    } },
-	{ MOD, 's',       { togglebar,      { NULL }                    } },
-	{ MOD, 'M',       { togglemouse,    { NULL }                    } },
-	{ MOD, '\n',      { zoom ,          { NULL }                    } },
-	{ MOD, '1',       { focusn,         { "1" }                     } },
-	{ MOD, '2',       { focusn,         { "2" }                     } },
-	{ MOD, '3',       { focusn,         { "3" }                     } },
-	{ MOD, '4',       { focusn,         { "4" }                     } },
-	{ MOD, '5',       { focusn,         { "5" }                     } },
-	{ MOD, '6',       { focusn,         { "6" }                     } },
-	{ MOD, '7',       { focusn,         { "7" }                     } },
-	{ MOD, '8',       { focusn,         { "8" }                     } },
-	{ MOD, '9',       { focusn,         { "9" }                     } },
-	{ MOD, 'q',       { quit,           { NULL }                    } },
-	{ MOD, 'G',       { escapekey,      { NULL }                    } },
-	{ MOD, 'a',       { togglerunall,   { NULL }                    } },
-	{ MOD, 'r',       { redraw,         { NULL }                    } },
-	{ MOD, 'X',       { lock,           { NULL }                    } },
-	{ MOD, 'B',       { togglebell,     { NULL }                    } },
-	{ MOD, 'v',       { copymode,       { NULL }                    } },
-	{ MOD, '/',       { copymode,       { "/" }                     } },
-	{ MOD, '?',       { copymode,       { "?" }                     } },
-	{ MOD, 'p',       { paste,          { NULL }                    } },
-	{ MOD, KEY_PPAGE, { scrollback,     { "-1" }                    } },
-	{ MOD, KEY_NPAGE, { scrollback,     { "1"  }                    } },
-	{ MOD, KEY_F(1),  { create,         { "man dvtm", "dvtm help" } } },
-};
-
-static const ColorRule colorrules[] = {
-	{ "", A_NORMAL, -1, -1 }, /* default */
-#if 0
-	/* title attrs     fgcolor      bgcolor */
-	{ "ssh", A_NORMAL, COLOR_BLACK, 224      },
-#endif
-};
-
-/* possible values for the mouse buttons are listed below:
- *
- * BUTTON1_PRESSED          mouse button 1 down
- * BUTTON1_RELEASED         mouse button 1 up
- * BUTTON1_CLICKED          mouse button 1 clicked
- * BUTTON1_DOUBLE_CLICKED   mouse button 1 double clicked
- * BUTTON1_TRIPLE_CLICKED   mouse button 1 triple clicked
- * BUTTON2_PRESSED          mouse button 2 down
- * BUTTON2_RELEASED         mouse button 2 up
- * BUTTON2_CLICKED          mouse button 2 clicked
- * BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
- * BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
- * BUTTON3_PRESSED          mouse button 3 down
- * BUTTON3_RELEASED         mouse button 3 up
- * BUTTON3_CLICKED          mouse button 3 clicked
- * BUTTON3_DOUBLE_CLICKED   mouse button 3 double clicked
- * BUTTON3_TRIPLE_CLICKED   mouse button 3 triple clicked
- * BUTTON4_PRESSED          mouse button 4 down
- * BUTTON4_RELEASED         mouse button 4 up
- * BUTTON4_CLICKED          mouse button 4 clicked
- * BUTTON4_DOUBLE_CLICKED   mouse button 4 double clicked
- * BUTTON4_TRIPLE_CLICKED   mouse button 4 triple clicked
- * BUTTON_SHIFT             shift was down during button state change
- * BUTTON_CTRL              control was down during button state change
- * BUTTON_ALT               alt was down during button state change
- * ALL_MOUSE_EVENTS         report all button state changes
- * REPORT_MOUSE_POSITION    report mouse movement
- */
-
-#ifdef NCURSES_MOUSE_VERSION
-# define CONFIG_MOUSE /* compile in mouse support if we build against ncurses */
-#endif
-
-#define ENABLE_MOUSE true /* whether to enable mouse events by default */
-
-#ifdef CONFIG_MOUSE
-static Button buttons[] = {
-	{ BUTTON1_CLICKED,        { mouse_focus,      { NULL  } } },
-	{ BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { "[ ]" } } },
-	{ BUTTON2_CLICKED,        { mouse_zoom,       { NULL  } } },
-	{ BUTTON3_CLICKED,        { mouse_minimize,   { NULL  } } },
-};
-#endif /* CONFIG_MOUSE */
-
-static Cmd commands[] = {
-	{ "create", { create,	{ NULL } } },
-};
-
-/* gets executed when dvtm is started */
-static Action actions[] = {
-	{ create, { NULL } },
-};
-
-static char const * const keytable[] = {
-	/* add your custom key escape sequences */
-};

Copied: dvtm/repos/community-x86_64/config.h (from rev 92415, dvtm/trunk/config.h)
===================================================================
--- community-x86_64/config.h	                        (rev 0)
+++ community-x86_64/config.h	2013-06-04 19:05:34 UTC (rev 92416)
@@ -0,0 +1,157 @@
+/* valid curses attributes are listed below they can be ORed
+ *
+ * A_NORMAL        Normal display (no highlight)
+ * A_STANDOUT      Best highlighting mode of the terminal.
+ * A_UNDERLINE     Underlining
+ * A_REVERSE       Reverse video
+ * A_BLINK         Blinking
+ * A_DIM           Half bright
+ * A_BOLD          Extra bright or bold
+ * A_PROTECT       Protected mode
+ * A_INVIS         Invisible or blank mode
+ */
+#define BLUE            (COLORS==256 ? 68 : COLOR_BLUE)
+/* curses attributes for the currently focused window */
+#define SELECTED_ATTR   COLOR(BLUE, -1) | A_NORMAL
+/* curses attributes for normal (not selected) windows */
+#define NORMAL_ATTR     COLOR(-1, -1) | A_NORMAL
+/* curses attributes for the status bar */
+#define BAR_ATTR        COLOR(BLUE, -1) | A_NORMAL
+/* status bar (command line option -s) position */
+#define BAR_POS		BAR_TOP /* BAR_BOTTOM, BAR_OFF */
+/* determines whether the statusbar text should be right or left aligned */
+#define BAR_ALIGN       ALIGN_RIGHT
+/* separator between window title and window number */
+#define SEPARATOR " | "
+/* printf format string for the window title, first %s
+ * is replaced by the title, second %s is replaced by
+ * the SEPARATOR, %d stands for the window number */
+#define TITLE "[%s%s#%d]"
+/* master width factor [0.1 .. 0.9] */
+#define MFACT 0.5
+/* scroll back buffer size in lines */
+#define SCROLL_HISTORY 500
+
+#include "tile.c"
+#include "grid.c"
+#include "bstack.c"
+#include "fullscreen.c"
+
+/* by default the first layout entry is used */
+static Layout layouts[] = {
+	{ "[]=", tile },
+	{ "+++", grid },
+	{ "TTT", bstack },
+	{ "[ ]", fullscreen },
+};
+
+#define MOD CTRL('g')
+
+/* you can at most specifiy MAX_ARGS (3) number of arguments */
+static Key keys[] = {
+	{ MOD, 'c',       { create,         { NULL }                    } },
+	{ MOD, 'C',       { create,         { NULL, NULL, "$CWD" }      } },
+	{ MOD, 'x',       { killclient,     { NULL }                    } },
+	{ MOD, 'j',       { focusnext,      { NULL }                    } },
+	{ MOD, 'u',       { focusnextnm,    { NULL }                    } },
+	{ MOD, 'i',       { focusprevnm,    { NULL }                    } },
+	{ MOD, 'k',       { focusprev,      { NULL }                    } },
+	{ MOD, 't',       { setlayout,      { "[]=" }                   } },
+	{ MOD, 'g',       { setlayout,      { "+++" }                   } },
+	{ MOD, 'b',       { setlayout,      { "TTT" }                   } },
+	{ MOD, 'm',       { setlayout,      { "[ ]" }                   } },
+	{ MOD, ' ',       { setlayout,      { NULL }                    } },
+	{ MOD, 'h',       { setmfact,       { "-0.05" }                 } },
+	{ MOD, 'l',       { setmfact,       { "+0.05" }                 } },
+	{ MOD, '.',       { toggleminimize, { NULL }                    } },
+	{ MOD, 's',       { togglebar,      { NULL }                    } },
+	{ MOD, 'M',       { togglemouse,    { NULL }                    } },
+	{ MOD, '\n',      { zoom ,          { NULL }                    } },
+	{ MOD, '1',       { focusn,         { "1" }                     } },
+	{ MOD, '2',       { focusn,         { "2" }                     } },
+	{ MOD, '3',       { focusn,         { "3" }                     } },
+	{ MOD, '4',       { focusn,         { "4" }                     } },
+	{ MOD, '5',       { focusn,         { "5" }                     } },
+	{ MOD, '6',       { focusn,         { "6" }                     } },
+	{ MOD, '7',       { focusn,         { "7" }                     } },
+	{ MOD, '8',       { focusn,         { "8" }                     } },
+	{ MOD, '9',       { focusn,         { "9" }                     } },
+	{ MOD, 'q',       { quit,           { NULL }                    } },
+	{ MOD, 'G',       { escapekey,      { NULL }                    } },
+	{ MOD, 'a',       { togglerunall,   { NULL }                    } },
+	{ MOD, 'r',       { redraw,         { NULL }                    } },
+	{ MOD, 'X',       { lock,           { NULL }                    } },
+	{ MOD, 'B',       { togglebell,     { NULL }                    } },
+	{ MOD, 'v',       { copymode,       { NULL }                    } },
+	{ MOD, '/',       { copymode,       { "/" }                     } },
+	{ MOD, '?',       { copymode,       { "?" }                     } },
+	{ MOD, 'p',       { paste,          { NULL }                    } },
+	{ MOD, KEY_PPAGE, { scrollback,     { "-1" }                    } },
+	{ MOD, KEY_NPAGE, { scrollback,     { "1"  }                    } },
+	{ MOD, KEY_F(1),  { create,         { "man dvtm", "dvtm help" } } },
+};
+
+static const ColorRule colorrules[] = {
+	{ "", A_NORMAL, -1, -1 }, /* default */
+#if 0
+	/* title attrs     fgcolor      bgcolor */
+	{ "ssh", A_NORMAL, COLOR_BLACK, 224      },
+#endif
+};
+
+/* possible values for the mouse buttons are listed below:
+ *
+ * BUTTON1_PRESSED          mouse button 1 down
+ * BUTTON1_RELEASED         mouse button 1 up
+ * BUTTON1_CLICKED          mouse button 1 clicked
+ * BUTTON1_DOUBLE_CLICKED   mouse button 1 double clicked
+ * BUTTON1_TRIPLE_CLICKED   mouse button 1 triple clicked
+ * BUTTON2_PRESSED          mouse button 2 down
+ * BUTTON2_RELEASED         mouse button 2 up
+ * BUTTON2_CLICKED          mouse button 2 clicked
+ * BUTTON2_DOUBLE_CLICKED   mouse button 2 double clicked
+ * BUTTON2_TRIPLE_CLICKED   mouse button 2 triple clicked
+ * BUTTON3_PRESSED          mouse button 3 down
+ * BUTTON3_RELEASED         mouse button 3 up
+ * BUTTON3_CLICKED          mouse button 3 clicked
+ * BUTTON3_DOUBLE_CLICKED   mouse button 3 double clicked
+ * BUTTON3_TRIPLE_CLICKED   mouse button 3 triple clicked
+ * BUTTON4_PRESSED          mouse button 4 down
+ * BUTTON4_RELEASED         mouse button 4 up
+ * BUTTON4_CLICKED          mouse button 4 clicked
+ * BUTTON4_DOUBLE_CLICKED   mouse button 4 double clicked
+ * BUTTON4_TRIPLE_CLICKED   mouse button 4 triple clicked
+ * BUTTON_SHIFT             shift was down during button state change
+ * BUTTON_CTRL              control was down during button state change
+ * BUTTON_ALT               alt was down during button state change
+ * ALL_MOUSE_EVENTS         report all button state changes
+ * REPORT_MOUSE_POSITION    report mouse movement
+ */
+
+#ifdef NCURSES_MOUSE_VERSION
+# define CONFIG_MOUSE /* compile in mouse support if we build against ncurses */
+#endif
+
+#define ENABLE_MOUSE true /* whether to enable mouse events by default */
+
+#ifdef CONFIG_MOUSE
+static Button buttons[] = {
+	{ BUTTON1_CLICKED,        { mouse_focus,      { NULL  } } },
+	{ BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { "[ ]" } } },
+	{ BUTTON2_CLICKED,        { mouse_zoom,       { NULL  } } },
+	{ BUTTON3_CLICKED,        { mouse_minimize,   { NULL  } } },
+};
+#endif /* CONFIG_MOUSE */
+
+static Cmd commands[] = {
+	{ "create", { create,	{ NULL } } },
+};
+
+/* gets executed when dvtm is started */
+static Action actions[] = {
+	{ create, { NULL } },
+};
+
+static char const * const keytable[] = {
+	/* add your custom key escape sequences */
+};




More information about the arch-commits mailing list