[arch-commits] Commit in dvtm/trunk (2 files)

[Lukas Fleischer]

    Date: Tuesday, June 4, 2013 @ 21:05:19
  Author: lfleischer
Revision: 92415

upgpkg: dvtm 0.9-2

Add terminfo (fixes FS#34921).

Added:
  dvtm/trunk/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
Modified:
  dvtm/trunk/PKGBUILD

-------------------------------------------------------+
 0001-Makefile-respect-DESTDIR-in-tic-invocation.patch |   25 ++++++++++++++++
 PKGBUILD                                              |   16 +++++++---
 2 files changed, 37 insertions(+), 4 deletions(-)

Added: 0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
===================================================================
--- 0001-Makefile-respect-DESTDIR-in-tic-invocation.patch	                        (rev 0)
+++ 0001-Makefile-respect-DESTDIR-in-tic-invocation.patch	2013-06-04 19:05:19 UTC (rev 92415)
@@ -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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-04 18:32:04 UTC (rev 92414)
+++ PKGBUILD	2013-06-04 19:05:19 UTC (rev 92415)
@@ -5,23 +5,31 @@
 
 pkgname=dvtm
 pkgver=0.9
-pkgrel=1
+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')
+        'config.h'
+        '0001-Makefile-respect-DESTDIR-in-tic-invocation.patch')
 md5sums=('7de1103abb0ca410f7250cf89f019a38'
-         '41107e5e84a8572f70d6cb111b4e07f8')
+         '41107e5e84a8572f70d6cb111b4e07f8'
+         'c85d8265ced45d014a7d3f05134bf6a1')
 
-build() {
+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
 }