From 05dd21d4fb5980e4ececcd5e6e09b730ce07cc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 4 Jul 2010 21:11:08 +0000
Subject: [PATCH] GNU mcron 1.0.6.

svn path=/nixpkgs/trunk/; revision=22464
---
 pkgs/tools/system/mcron/default.nix           |  6 ++--
 .../system/mcron/install-vixie-programs.patch | 33 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix
index 3c14d207a56..2b4f28fa868 100644
--- a/pkgs/tools/system/mcron/default.nix
+++ b/pkgs/tools/system/mcron/default.nix
@@ -1,17 +1,19 @@
 { fetchurl, stdenv, guile, which, ed }:
 
 stdenv.mkDerivation rec {
-  name = "mcron-1.0.4";
+  name = "mcron-1.0.6";
 
   src = fetchurl {
     url = "mirror://gnu/mcron/${name}.tar.gz";
-    sha256 = "0wrpi9qj50a8wfslapnkmsr6d3qx40hfw57a022m1z1syiljq4xl";
+    sha256 = "0yvrfzzdy2m7fbqkr61fw01wd9r2jpnbyabxhcsfivgxywknl0fy";
   };
 
   patches = [ ./install-vixie-programs.patch ];
 
   buildInputs = [ guile which ed ];
 
+  doCheck = true;
+
   meta = {
     description = "GNU mcron, a flexible implementation of `cron' in Guile";
 
diff --git a/pkgs/tools/system/mcron/install-vixie-programs.patch b/pkgs/tools/system/mcron/install-vixie-programs.patch
index 98cdb6d142c..d268ecb4a0a 100644
--- a/pkgs/tools/system/mcron/install-vixie-programs.patch
+++ b/pkgs/tools/system/mcron/install-vixie-programs.patch
@@ -1,22 +1,23 @@
 This patch allows us to install the Vixie-compatible binaries as
-non-root.
+non-root without creating /var/run, etc.
 
---- mcron-1.0.4/makefile.in	2008-02-21 20:55:24.000000000 +0100
-+++ mcron-1.0.4/makefile.in	2009-04-03 20:18:44.000000000 +0200
-@@ -872,15 +872,11 @@ mcron.c : main.scm crontab.scm makefile.
+--- mcron-1.0.6/makefile.in	2010-06-19 20:44:17.000000000 +0200
++++ mcron-1.0.6/makefile.in	2010-07-04 16:16:25.000000000 +0200
+@@ -1004,15 +1004,11 @@ mcron.c : main.scm crontab.scm makefile.
  	@rm -f mcron.escaped.scm > /dev/null 2>&1
  
  install-exec-hook:
--	@if [ "`id -u`" -eq "0" ]; then \
-+	@if true; then \
- 	   rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
- 	   $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
- 	   rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
- 	   $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
--	   ./mkinstalldirs -m 'u=rwx' /var/cron; \
--	   ./mkinstalldirs -m 'u=rwx,og=rx' /var/run; \
--	   ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@; \
--	   ./mkinstalldirs -m 'u=rwx,og=rx' @GUILE_SITE@/mcron; \
+-	@if [ "x@NO_VIXIE_CLOBBER@" != "xyes"   -a   "`id -u`" -eq "0" ]; then \
++	@if [ "x@NO_VIXIE_CLOBBER@" != "xyes" ]; then \
+        rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
+        $(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
+        rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
+        $(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
+-       $(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \
+-       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \
+-       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \
+-       $(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \
+     elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \
+        echo "Not installing Vixie-style programs"; \
      else \
-        echo "+++ WARNING: NON-ROOT INSTALL: ONLY mcron WILL BE INSTALLED, NOT ANY OF THE VIXIE REPLACEMENT PROGRAMS"; \
- 	fi
+