* Renamed pkgs-ng to pkgs.

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

pkgs/servers/http/apache-httpd/builder.sh

@@ -0,0 +1,23 @@
+#! /bin/sh
+
+buildinputs="$openssl $db4 $expat $perl"
+. $stdenv/setup || exit 1
+
+if test $db4Support; then
+    extraflags="--with-berkeley-db=$db4 $extraflags"
+fi
+
+if test $sslSupport; then
+    extraflags="--enable-ssl --with-ssl=$openssl $extraflags"
+fi
+
+tar xvfz $src || exit 1
+cd httpd-* || exit 1
+./configure --prefix=$out \
+ --with-expat=$expat --enable-mods-shared=all --without-gdbm \
+ --enable-threads --with-devrandom=/dev/urandom \
+ $extraflags || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+rm -rf $out/manual || exit 1

pkgs/servers/http/apache-httpd/default.fix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, openssl, db4, expat, perl
+, sslSupport, db4Support
+}:
+derivation {
+  name = "apache-httpd-2.0.48";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.cs.uu.nl/mirror/apache.org/dist/httpd/httpd-2.0.48.tar.gz;
+    md5 = "466c63bb71b710d20a5c353df8c1a19c";
+  };
+
+  stdenv = stdenv;
+  perl = perl;
+  openssl = if sslSupport then openssl else "";
+  db4 = if db4Support then db4 else "";
+  expat = expat;
+}