Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24674

pkgs/tools/misc/fileschanged/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, fam }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "fileschanged-0.6.9";
 
   src = fetchurl {
-    url = "http://nongnu.askapache.com/fileschanged/fileschanged-0.6.9.tar.gz";
+    url = "mirror://savannah/fileschanged/${name}.tar.gz";
     sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc";
   };
 
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.nongnu.org/fileschanged/";
-    description = "A command-line utility that reports when files have been altered.";
-    license = "GPL";
+    description = "A command-line utility that reports when files have been altered";
+    license = "GPLv3+";
 
     longDescription = ''
       This utility is a client to FAM (File Alteration Monitor) servers

pkgs/tools/misc/screen/default.nix

@@ -8,7 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0xvckv1ia5pjxk7fs4za6gz2njwmfd54sc464n8ab13096qxbw3q";
   };
 
-  configureFlags = [ "--enable-telnet" ];
+  preConfigure = ''
+    configureFlags="--enable-telnet --infodir=$out/share/info --mandir=$out/share/man"
+    sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in
+  '';
+
   buildInputs = [ ncurses ];
 
   doCheck = true;
@@ -42,6 +46,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ];
   };
 }