* 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;
+}

pkgs/servers/x11/xfree86/builder.sh

@@ -0,0 +1,15 @@
+#! /bin/sh
+
+export buildinputs="$bison $flex"
+. $stdenv/setup || exit 1
+
+tar xvfz $src1 || exit 1
+tar xvfz $src2 || exit 1
+tar xvfz $src3 || exit 1
+cd xc || exit 1
+sed "s^@OUT@^$out^" < $hostdef > config/cf/host.def
+make World || exit 1
+make install || exit 1
+
+# !!! Hack to get fontconfig to work.
+ln -s /usr/X11R6/lib/X11/fonts $out/lib/X11/fonts

pkgs/servers/x11/xfree86/default.fix

@@ -0,0 +1,34 @@
+{ buildServer ? true
+, buildClientLibs ? true
+, stdenv, fetchurl, bison, flex}:
+
+assert !buildServer; # we don't support this currently
+assert buildClientLibs; # we don't support *not* doing this currently
+assert !isNull bison && !isNull flex;
+
+derivation {
+  name = "xfree86-4.3";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  hostdef = ./host.def;
+  src1 = fetchurl {
+    url = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-1.tgz;
+    md5 = "4f241a4f867363f40efa2b00dca292af";
+  };
+  src2 = fetchurl {
+    url = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-2.tgz;
+    md5 = "844c2ee908d21dbf8911fd13115bf8b4";
+  };
+  src3 = fetchurl {
+    url = ftp://gnu.kookel.org/pub/XFree86/4.3.0/source/X430src-3.tgz;
+    md5 = "b82a0443e1b7bf860e4343e6b6766cb6";
+  };
+
+  buildServer = buildServer;
+  buildClientLibs = buildClientLibs;
+
+  stdenv = stdenv;
+  bison = bison;
+  flex = flex;
+}

pkgs/servers/x11/xfree86/host.def

@@ -0,0 +1,30 @@
+#define BuildServer		NO
+#define BuildFontServer         NO
+#define BuildSpeedo             NO
+#define BuildType1              NO
+#define BuildCID                NO
+#define BuildFreeType           NO
+#define BuildXTrueType          NO
+#define BuildFonts              NO
+#define BuildXftLibrary		NO
+#define BuildXft1Library	NO
+#define BuildClients		NO
+#define BuildDocs		NO
+#define BuildLibraries		YES
+#define BuildGLXLibrary		NO
+#define BuildOSMesaLib		NO
+#define BuildOSMesaLib		NO
+#define BuildXvMCExt		NO
+#define BuildXvMCLibrary	NO
+
+#define XF86Server              NO
+#define XnestServer             NO
+#define XVirtualFramebufferServer	NO
+#define XprtServer		NO
+#define XF86CardDrivers
+#define XInputDrivers
+
+#define ProjectRoot @OUT@
+#define NothingOutsideProjectRoot YES
+#define EtcX11Directory ProjectRoot/etc
+#define UseSeparateConfDir	NO