[Gsrc-commit] /srv/bzr/gsrc/trunk r1214: clean up rottlog but build behaves badly

[Brandon Invergo]

------------------------------------------------------------
revno: 1214
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-11-20 16:39:20 +0100
message:
  clean up rottlog but build behaves badly
added:
  gnu/rottlog/config.mk
  gnu/rottlog/files/
  gnu/rottlog/files/rottlog-0.72.2-fix-install.diff
modified:
  TODO
  gnu/rottlog/Makefile
  gnu/rottlog/sha256sums

=== modified file 'TODO'
--- a/TODO      2012-11-18 13:38:24 +0000
+++ b/TODO      2012-11-20 15:39:20 +0000
@@ -135,4 +135,6 @@
 ** metahtml: build mysteriously fails
 ** gnash: dependency hell (gstreamer)
 ** oleo: hangs during configure
+** orgadoc: Eiffel hell
+** rottlog: permissions hell
 

=== modified file 'gnu/rottlog/Makefile'
--- a/gnu/rottlog/Makefile      2012-08-30 22:16:19 +0000
+++ b/gnu/rottlog/Makefile      2012-11-20 15:39:20 +0000
@@ -1,16 +1,30 @@
 GARNAME = rottlog
 GARVERSION = 0.72.2
+HOME_URL = http://www.gnu.org/software/rottlog
+DESCRIPTION = The GNU log management program
+
+######################################################################
 
 MASTER_SITES = $(MASTER_GNU)
-MASTER_SUBDIR = rottlog/
-
+MASTER_SUBDIR = $(GARNAME)/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-
-# BUILDDEPS = 
-# LIBDEPS = 
-
-HOME_URL = http://www.gnu.org/software/rottlog
-DESCRIPTION = The GNU log management program
+PATCHFILES = $(DISTNAME)-fix-install.diff
+
+BUILDDEPS = automake
+LIBDEPS = 
+
+######################################################################
 
 include ../../gar.lib/auto.mk
+include config.mk
+
+pre-build:
+       sed -i -e 's/0300/0644/g' $(WORKSRC)/Makefile
+       sed -i -e 's/0500/0644/g' $(WORKSRC)/Makefile
+       sed -i -e 's/0700/0755/g' $(WORKSRC)/Makefile
+       sed -i -e 's/0444/0644/g' $(WORKSRC)/Makefile
+       sed -i -e 's/install_sh_DATA/INSTALL_DATA/g' $(WORKSRC)/Makefile
+       chmod 644 $(WORKSRC)/rc/rc
+       chmod 644 $(WORKSRC)/rc/weekly
+       $(MAKECOOKIE)

=== added file 'gnu/rottlog/config.mk'
--- a/gnu/rottlog/config.mk     1970-01-01 00:00:00 +0000
+++ b/gnu/rottlog/config.mk     2012-11-20 15:39:20 +0000
@@ -0,0 +1,6 @@
+## Configuration options for rottlog ##
+
+CONFIGURE_OPTS ?= LOG_OWN=$(shell whoami) LOG_GROUP=$(shell whoami) \
+                 ROTT_ETCDIR=$(prefix)/etc/rottlog \
+                 LOCKFILE=$(prefix)/var/lock/LOCK.rottlog
+BUILD_OPTS ?=

=== added directory 'gnu/rottlog/files'
=== added file 'gnu/rottlog/files/rottlog-0.72.2-fix-install.diff'
--- a/gnu/rottlog/files/rottlog-0.72.2-fix-install.diff 1970-01-01 00:00:00 
+0000
+++ b/gnu/rottlog/files/rottlog-0.72.2-fix-install.diff 2012-11-20 15:39:20 
+0000
@@ -0,0 +1,22 @@
+diff -x config.log -x config.status -ru work/rottlog-0.72.2/Makefile.in 
work/rottlog-0.72.2/Makefile.in
+--- work/rottlog-0.72.2/Makefile.in    2010-03-30 07:06:27.000000000 +0200
++++ work/rottlog-0.72.2/Makefile.in    2012-11-20 00:19:36.444090259 +0100
+@@ -1066,13 +1066,13 @@
+       echo "OK"
+ 
+ install-data-local:
+-      mkdir -m $(ETC_MODE) -p $(ROTT_ETCDIR)
+-      mkdir -p $(ROTT_STATDIR)
+-      $(install_sh_DATA) $(srcdir)/rc/rc $(ROTT_ETCDIR)
+-      $(install_sh_DATA) $(srcdir)/rc/weekly $(ROTT_ETCDIR)
++      mkdir -m $(ETC_MODE) -p $(DESTDIR)$(ROTT_ETCDIR)
++      mkdir -p $(DESTDIR)$(ROTT_STATDIR)
++      $(install_sh_DATA) $(srcdir)/rc/rc $(DESTDIR)$(ROTT_ETCDIR)
++      $(install_sh_DATA) $(srcdir)/rc/weekly $(DESTDIR)$(ROTT_ETCDIR)
+ 
+ install-exec-hook:
+-      $(INSTALL_SCRIPT) $(srcdir)/src/rottlog $(bindir)/rottlog
++      $(INSTALL_SCRIPT) $(srcdir)/src/rottlog $(DESTDIR)$(bindir)/rottlog
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.

=== modified file 'gnu/rottlog/sha256sums'
--- a/gnu/rottlog/sha256sums    2012-08-30 22:16:19 +0000
+++ b/gnu/rottlog/sha256sums    2012-11-20 15:39:20 +0000
@@ -1,2 +1,3 @@
 a7cdb1f5a70d4cf4c86060f2485b10a1b968158d081bb9c7cc123841d3aaa11c  
download/rottlog-0.72.2.tar.gz
+7bd61d601ea990d6f264d061d22883903d40effd05933b41b6077af7015713ce  
download/rottlog-0.72.2-fix-install.diff
 a156561283fd4325eddaba8f04f7959bc4dda4201109bb1ce06207aedbe75942  
download/rottlog-0.72.2.tar.gz.sig