[Gsrc-commit] /srv/bzr/gsrc/trunk r1247: clean up time and fix install

[Brandon Invergo]

------------------------------------------------------------
revno: 1247
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-21 19:01:40 +0100
message:
  clean up time and fix install
added:
  gnu/time/config.mk
  gnu/time/files/
  gnu/time/files/time-1.7-fix-install.diff
  gnu/time/sha256sums
modified:
  gnu/time/Makefile

=== modified file 'gnu/time/Makefile'
--- a/gnu/time/Makefile 2010-06-15 12:45:59 +0000
+++ b/gnu/time/Makefile 2012-11-21 18:01:40 +0000
@@ -1,16 +1,20 @@
 GARNAME = time
 GARVERSION = 1.7
+HOME_URL = http://www.gnu.org/software/time
+DESCRIPTION = Display information about the resources a program uses
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = time/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
-# SIGFILES = 
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/time
-# DESCRIPTION = 
+SIGFILES = 
+PATCHFILES = $(DISTNAME)-fix-install.diff
+
+BUILDDEPS = 
+LIBDEPS = 
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk

=== added file 'gnu/time/config.mk'
--- a/gnu/time/config.mk        1970-01-01 00:00:00 +0000
+++ b/gnu/time/config.mk        2012-11-21 18:01:40 +0000
@@ -0,0 +1,4 @@
+## Configuration options for time ##
+
+CONFIGURE_OPTS ?= 
+BUILD_OPTS ?=

=== added directory 'gnu/time/files'
=== added file 'gnu/time/files/time-1.7-fix-install.diff'
--- a/gnu/time/files/time-1.7-fix-install.diff  1970-01-01 00:00:00 +0000
+++ b/gnu/time/files/time-1.7-fix-install.diff  2012-11-21 18:01:40 +0000
@@ -0,0 +1,56 @@
+diff -x config.log -x config.status -ru tmp/time-1.7/Makefile.in 
work/time-1.7/Makefile.in
+--- tmp/time-1.7/Makefile.in   1996-07-11 23:07:03.000000000 +0200
++++ work/time-1.7/Makefile.in  2012-11-21 19:00:38.184656880 +0100
+@@ -4,7 +4,7 @@
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ 
+-
++DESTDIR =
+ SHELL = /bin/sh
+ 
+ srcdir = @srcdir@
+@@ -51,7 +51,7 @@
+ 
+ CC = @CC@
+ LEX = @LEX@
+-YACC = @YACC@
++YACC = @address@hidden
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) 
+ CPPFLAGS = @CPPFLAGS@
+@@ -114,10 +114,10 @@
+ maintainer-clean-binPROGRAMS:
+ 
+ install-binPROGRAMS: $(bin_PROGRAMS)
+-      $(mkinstalldirs) $(bindir)
++      $(mkinstalldirs) $(DESTDIR)$(bindir)
+       list="$(bin_PROGRAMS)"; for p in $$list; do \
+         if test -f $$p; then \
+-          $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
++          $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 
'$(transform)'`; \
+         else :; fi; \
+       done
+ 
+@@ -176,10 +176,10 @@
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+ 
+ install-info: $(INFO_DEPS)
+-      $(mkinstalldirs) $(infodir)
++      $(mkinstalldirs) $(DESTDIR)$(infodir)
+       for file in $(INFO_DEPS); do            \
+         for ifile in `cd $(srcdir) && echo $$file*`; do \
+-          $(INSTALL_DATA) $(srcdir)/$$ifile $(infodir)/$$ifile; \
++          $(INSTALL_DATA) $(srcdir)/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
+         done;                                 \
+       done
+ 
+@@ -279,7 +279,7 @@
+ install-strip:
+       $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+ installdirs:
+-      $(mkinstalldirs)  $(bindir) $(infodir)
++      $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(infodir)
+ 
+ 
+ mostlyclean-generic:

=== added file 'gnu/time/sha256sums'
--- a/gnu/time/sha256sums       1970-01-01 00:00:00 +0000
+++ b/gnu/time/sha256sums       2012-11-21 18:01:40 +0000
@@ -0,0 +1,2 @@
+e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d  
download/time-1.7.tar.gz
+2c8dcb5b0036a14f2ea212ff73c69b6aa0adc61614149e0037ce9c520caae366  
download/time-1.7-fix-install.diff