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

[Brandon Invergo]

------------------------------------------------------------
revno: 1235
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-11-21 12:58:33 +0100
message:
  clean up spell and fix install
added:
  gnu/spell/config.mk
  gnu/spell/files/
  gnu/spell/files/spell-1.1-fix-install.diff
modified:
  gnu/spell/Makefile
  gnu/spell/sha256sums

=== modified file 'gnu/spell/Makefile'
--- a/gnu/spell/Makefile        2012-08-20 21:53:04 +0000
+++ b/gnu/spell/Makefile        2012-11-21 11:58:33 +0000
@@ -1,16 +1,20 @@
 GARNAME = spell
 GARVERSION = 1.1
+HOME_URL = http://www.gnu.org/software/spell/
+DESCRIPTION = A clone of the Unix spell command
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = spell/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
-# SIGFILES = 
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/spell/
-DESCRIPTION = GNU spell
+SIGFILES = 
+PATCHFILES = $(DISTNAME)-fix-install.diff
+
+BUILDDEPS = 
+LIBDEPS = aspell
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk

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

=== added directory 'gnu/spell/files'
=== added file 'gnu/spell/files/spell-1.1-fix-install.diff'
--- a/gnu/spell/files/spell-1.1-fix-install.diff        1970-01-01 00:00:00 
+0000
+++ b/gnu/spell/files/spell-1.1-fix-install.diff        2012-11-21 11:58:33 
+0000
@@ -0,0 +1,34 @@
+diff -x config.log -x config.status -ru work/spell-1.1/Makefile.in 
work/spell-1.1/Makefile.in
+--- work/spell-1.1/Makefile.in 2010-05-04 21:04:35.000000000 +0200
++++ work/spell-1.1/Makefile.in 2012-11-21 12:57:38.982069647 +0100
+@@ -18,7 +18,7 @@
+ 
+ 
+ # Start of system configuration section.
+-
++DESTDIR =
+ SHELL = /bin/sh
+ VPATH = @srcdir@
+ srcdir = @srcdir@
+@@ -66,10 +66,10 @@
+       $(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
+ 
+ install: installdirs install-info
+-      $(INSTALL_PROGRAM) spell $(bindir)/spell
++      $(INSTALL_PROGRAM) spell $(DESTDIR)$(bindir)/spell
+ 
+ install-info:
+-      $(INSTALL_DATA) $(srcdir)/spell.info $(infodir)/spell.info
++      $(INSTALL_DATA) $(srcdir)/spell.info $(DESTDIR)$(infodir)/spell.info
+ 
+ uninstall:
+       rm -f $(bindir)/spell $(infodir)/spell.info
+@@ -137,7 +137,7 @@
+ installcheck:
+ 
+ installdirs: mkinstalldirs
+-      $(srcdir)/mkinstalldirs $(bindir) $(infodir)
++      $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(infodir)
+ 
+ Makefile: Makefile.in config.status
+       CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status

=== modified file 'gnu/spell/sha256sums'
--- a/gnu/spell/sha256sums      2012-08-20 21:53:04 +0000
+++ b/gnu/spell/sha256sums      2012-11-21 11:58:33 +0000
@@ -1,1 +1,2 @@
 7cc243547eb31360ff769835dc88b5ba4f2f47385daa230523beecf9e1c29744  
download/spell-1.1.tar.gz
+e4d2cb2bfa77c28c4761864d38bbe9c8eef0a21de45be2ca66035a7ab78ac24f  
download/spell-1.1-fix-install.diff