[Gsrc-commit] /srv/bzr/gsrc/trunk r1974: fix termutils build and install

[Brandon Invergo]

------------------------------------------------------------
revno: 1974
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2013-03-18 00:13:07 +0100
message:
  fix termutils build and install
added:
  gnu/termutils/files/
  gnu/termutils/files/termutils-2.0-fix-build.diff
  gnu/termutils/files/termutils-2.0-fix-install.diff
modified:
  TODO
  gnu/termutils/Makefile
  gnu/termutils/sha256sums

=== modified file 'TODO'
--- a/TODO      2013-02-03 22:42:14 +0000
+++ b/TODO      2013-03-17 23:13:07 +0000
@@ -78,7 +78,7 @@
 aris
 c-graph
 remotecontrol
-* GNU packages [385/453] [84%]
+* GNU packages [386/454] [85%]
 ** IGNORE 3dkit
 *** decommissioned
 ** DONE 3dldf
@@ -866,6 +866,8 @@
 ** IGNORE pyconfigure
    CLOSED: [2012-12-16 Sun 20:16]
 *** dev only (no install); low priority
+** DEFERRED pythonwebkit
+*** no release available
 ** IGNORE qexo
    CLOSED: [2013-01-12 Sat 11:24]
 *** included in kawa
@@ -971,8 +973,8 @@
    CLOSED: [2012-12-16 Sun 20:12]
 ** DONE termcap
    CLOSED: [2012-12-16 Sun 20:12]
-** BROKEN termutils
-*** weird string.h build error
+** DONE termutils
+   CLOSED: [2013-03-18 Mon 00:12]
 ** DONE teseq
    CLOSED: [2012-12-16 Sun 20:12]
 ** IGNORE teximpatient

=== modified file 'gnu/termutils/Makefile'
--- a/gnu/termutils/Makefile    2013-01-20 15:57:22 +0000
+++ b/gnu/termutils/Makefile    2013-03-17 23:13:07 +0000
@@ -10,15 +10,12 @@
 MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = 
+PATCHFILES = $(DISTNAME)-fix-build.diff $(DISTNAME)-fix-install.diff
 
 BUILDDEPS = 
 LIBDEPS = 
 
 ######################################################################
 
-ifeq ($(FORCE_BUILD),y)
-       include ../../gar.lib/auto.mk
-else
-       include ../../gar.lib/broken.mk
-endif
+include ../../gar.lib/auto.mk
 include config.mk

=== added directory 'gnu/termutils/files'
=== added file 'gnu/termutils/files/termutils-2.0-fix-build.diff'
--- a/gnu/termutils/files/termutils-2.0-fix-build.diff  1970-01-01 00:00:00 
+0000
+++ b/gnu/termutils/files/termutils-2.0-fix-build.diff  2013-03-17 23:13:07 
+0000
@@ -0,0 +1,15 @@
+This patch fixes a conflict between the bcopy macro defined via 
+preprocessor directives and the one contained in string.h.
+
+diff -x config.log -x config.status -ru work/termutils-2.0/tparam.c 
work/termutils-2.0/tparam.c
+--- work/termutils-2.0/tparam.c        1995-09-03 01:53:43.000000000 +0200
++++ work/termutils-2.0/tparam.c        2013-03-18 00:06:38.159273382 +0100
+@@ -21,7 +21,7 @@
+ #endif
+ 
+ #ifndef emacs
+-#if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
++#if !defined(HAVE_STRING_H) || !defined(STDC_HEADERS)
+ #define bcopy(s, d, n) memcpy ((d), (s), (n))
+ #endif
+ 

=== added file 'gnu/termutils/files/termutils-2.0-fix-install.diff'
--- a/gnu/termutils/files/termutils-2.0-fix-install.diff        1970-01-01 
00:00:00 +0000
+++ b/gnu/termutils/files/termutils-2.0-fix-install.diff        2013-03-17 
23:13:07 +0000
@@ -0,0 +1,30 @@
+This patch adds support for DESTDIR-based staged installation in the 
+Makefile.
+
+diff -x config.log -x config.status -ru work/termutils-2.0/Makefile.in 
work/termutils-2.0/Makefile.in
+--- work/termutils-2.0/Makefile.in     1995-12-01 16:39:01.000000000 +0100
++++ work/termutils-2.0/Makefile.in     2013-03-18 00:10:29.929286310 +0100
+@@ -103,9 +103,9 @@
+ install:: install-programs
+ 
+ install-programs: $(PROGRAMS) $(SCRIPTS)
+-      $(top_srcdir)/mkinstalldirs $(bindir)
++      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+       for p in $(PROGRAMS) $(SCRIPTS); do \
+-        $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++        $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 
'$(transform)'`; \
+       done
+ 
+ uninstall:: uninstall-programs
+@@ -149,9 +149,9 @@
+ install:: install-info
+ 
+ install-info: $(INFO_DEPS)
+-      $(top_srcdir)/mkinstalldirs $(infodir)
++      $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir)
+       cd $(srcdir); for file in *.info*; do \
+-        $(INSTALL_DATA) $$file $(infodir)/$$file; \
++        $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
+       done
+ 
+ uninstall:: uninstall-info

=== modified file 'gnu/termutils/sha256sums'
--- a/gnu/termutils/sha256sums  2012-11-21 17:45:39 +0000
+++ b/gnu/termutils/sha256sums  2013-03-17 23:13:07 +0000
@@ -1,1 +1,3 @@
 4c2b3721a88b58b8a3918bf57b043fbd446ba334a2153a88305c9bf66f31f403  
download/termutils-2.0.tar.gz
+b88bef678150d353c8b18919afffd6f16211e9cbbd3fe8fa389bad5e19485e12  
download/termutils-2.0-fix-build.diff
+43015f41d539d8cf334a037db4a94fb7c8950817e9bb2afd95124576dd703068  
download/termutils-2.0-fix-install.diff