* Set PERL5LIB automatically in the Perl setup hook.

* Remove explicit setting of PERL5LIB.
* Use the generic Perl builder for the BerkeleyDB and XML::Parser
  modules.
* Prefix all names of Perl modules with `perl-' (in the generic Perl
  builder).

svn path=/nixpkgs/trunk/; revision=2365

pkgs/development/interpreters/perl/builder.sh

@@ -9,4 +9,10 @@ configureScript=./Configure
 configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags"
 dontAddPrefix=1
 
+postInstall() {
+    ensureDir "$out/nix-support"
+    cp $setupHook $out/nix-support/setup-hook
+}
+postInstall=postInstall
+
 genericBuild

pkgs/development/interpreters/perl/default.nix

@@ -1,12 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "perl-5.8.5";
+  name = "perl-5.8.6";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.cs.uu.nl/mirror/CPAN/src/5.0/perl-5.8.5.tar.gz;
-    md5 = "49baa8d7d29b4a9713c06edeb81e6b1b";
+    url = ftp://ftp.cpan.org/pub/CPAN/src/5.0/perl-5.8.6.tar.bz2;
+    md5 = "3d030b6ff2a433840edb1a407d18dc0a";
   };
 
   # This patch does the following:
@@ -16,4 +16,6 @@ stdenv.mkDerivation {
   # 2) Force the use of <errno.h>, not /usr/include/errno.h, on Linux
   #    systems.  (This actually appears to be due to a bug in Perl.)
   patches = [./no-sys-dirs.patch];
+
+  setupHook = ./setup-hook.sh;
 }

pkgs/development/interpreters/perl/no-sys-dirs.patch

@@ -1,6 +1,6 @@
-diff -rc perl-orig/Configure perl-5.8.5/Configure
-*** perl-orig/Configure	2004-05-12 13:00:41.000000000 +0200
---- perl-5.8.5/Configure	2004-10-04 12:38:29.000000000 +0200
+diff -rc perl-orig/Configure perl-5.8.6/Configure
+*** perl-orig/Configure	2004-09-10 08:25:52.000000000 +0200
+--- perl-5.8.6/Configure	2005-03-10 12:53:28.000000000 +0100
 ***************
 *** 86,100 ****
   fi
@@ -11,7 +11,7 @@ diff -rc perl-orig/Configure perl-5.8.5/Configure
 ! paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
 ! paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
 ! paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
-! paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /usr/ccs/bin"
+! paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
 ! paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
 ! paths="$paths /sbin /usr/sbin /usr/libexec"
 ! paths="$paths /system/gnu_library/bin"
@@ -97,7 +97,7 @@ diff -rc perl-orig/Configure perl-5.8.5/Configure
   	case "$xxx" in
 --- 2252,2257 ----
 ***************
-*** 7908,7920 ****
+*** 7910,7922 ****
   echo " "
   case "$sysman" in
   '') 
@@ -111,7 +111,7 @@ diff -rc perl-orig/Configure perl-5.8.5/Configure
   	;;
   esac
   if $test -d "$sysman"; then
---- 7892,7899 ----
+--- 7894,7901 ----
   echo " "
   case "$sysman" in
   '') 
@@ -121,7 +121,7 @@ diff -rc perl-orig/Configure perl-5.8.5/Configure
   esac
   if $test -d "$sysman"; then
 ***************
-*** 17947,17955 ****
+*** 17949,17957 ****
   case "$full_ar" in
   '') full_ar=$ar ;;
   esac
@@ -131,7 +131,7 @@ diff -rc perl-orig/Configure perl-5.8.5/Configure
   
   : see what type gids are declared as in the kernel
   echo " "
---- 17926,17935 ----
+--- 17928,17937 ----
   case "$full_ar" in
   '') full_ar=$ar ;;
   esac
@@ -142,9 +142,9 @@ diff -rc perl-orig/Configure perl-5.8.5/Configure
   
   : see what type gids are declared as in the kernel
   echo " "
-diff -rc perl-orig/ext/Errno/Errno_pm.PL perl-5.8.5/ext/Errno/Errno_pm.PL
-*** perl-orig/ext/Errno/Errno_pm.PL	2004-03-31 00:01:25.000000000 +0200
---- perl-5.8.5/ext/Errno/Errno_pm.PL	2004-10-04 10:53:59.000000000 +0200
+diff -rc perl-orig/ext/Errno/Errno_pm.PL perl-5.8.6/ext/Errno/Errno_pm.PL
+*** perl-orig/ext/Errno/Errno_pm.PL	2004-11-01 15:31:59.000000000 +0100
+--- perl-5.8.6/ext/Errno/Errno_pm.PL	2005-03-10 12:52:31.000000000 +0100
 ***************
 *** 105,111 ****
   	# Watch out for cross compiling for EPOC (usually done on linux)
@@ -162,9 +162,9 @@ diff -rc perl-orig/ext/Errno/Errno_pm.PL perl-5.8.5/ext/Errno/Errno_pm.PL
   	     ) {
   	# Some Linuxes have weird errno.hs which generate
   	# no #file or #line directives
-diff -rc perl-orig/lib/Cwd.pm perl-5.8.5/lib/Cwd.pm
-*** perl-orig/lib/Cwd.pm	2004-07-15 18:49:22.000000000 +0200
---- perl-5.8.5/lib/Cwd.pm	2004-10-04 10:53:59.000000000 +0200
+diff -rc perl-orig/lib/Cwd.pm perl-5.8.6/lib/Cwd.pm
+*** perl-orig/lib/Cwd.pm	2004-11-01 16:42:41.000000000 +0100
+--- perl-5.8.6/lib/Cwd.pm	2005-03-10 12:52:31.000000000 +0100
 ***************
 *** 292,298 ****
   

pkgs/development/interpreters/perl/setup-hook.sh

@@ -0,0 +1,7 @@
+addPerlLibPath () {
+    if test -d $1/lib/site_perl; then
+        export PERL5LIB="${PERL5LIB}${PERL5LIB:+:}$1/lib/site_perl"
+    fi
+}
+
+envHooks=(${envHooks[@]} addPerlLibPath)