* Browser plugin for MPlayer.

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

ChangeLog

@@ -0,0 +1,12 @@
+2003-08-18  Eelco Visser  <visser@cs.uu.nl>
+
+	* pkgs/strategoxt/pkg-build.sh: generic build script for packages
+	with the standard untar; bootstrap; configure; make; make install
+	interface.  The script is parameterized with arguments for
+	configure. That is, all arguments are passed verbatim to
+	configure.
+
+	* asfix-tools, gpp, sc, srts, stratego-front, xtc: Fix expressions
+	and (trivial) build script for basic strategoxt packages. All
+	packages are abstracted on subversion revision.
+

build/aterm-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src
-cd aterm-*
-./configure --prefix=$top
-make
-make install
-cd ..
-rm -rf aterm-*

build/atk-build.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd` || exit 1
-tar xvfj $src || exit 1
-cd atk-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf atk-* || exit 1

build/glib-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-
-top=`pwd`
-tar xvfj $src
-cd glib-*
-./configure --prefix=$top
-make
-make install
-cd ..
-rm -rf glib-*

build/gnet-build.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd gnet-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gnet-* || exit 1

build/gtk+-build.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd gtk+-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gtk+-* || exit 1

build/gtkspell-build.sh

@@ -1,15 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib
-export C_INCLUDE_PATH=$pspell/include
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd gtkspell-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf gtkspell-* || exit 1

build/httpd-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd httpd-* || exit 1
-./configure --prefix=$top --enable-ssl --with-ssl=$ssl --enable-mods-shared=all || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf httpd-* || exit 1

build/openssl-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd openssl-* || exit 1
-./config --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf openssl-* || exit 1

build/pan-build-2.sh

@@ -1,20 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig:$gtkspell/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
-
-# A bug in gtkspell: the pspell library path is not exported
-# through pkgconfig.
-export LIBRARY_PATH=$pspell/lib
-
-export LDFLAGS=-s
-
-top=`pwd`
-tar xvfj $src || exit 1
-cd pan-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pan-* || exit 1

build/pan-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:$gnet/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib
-
-top=`pwd`
-tar xvfj $src
-cd pan-*
-./configure --prefix=$top
-make
-make install

build/pan-run.sh

@@ -1,10 +0,0 @@
-#! /bin/sh
-
-export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib
-
-ldd $pan/bin/pan
-
-prog=$1
-shift
-
-$pan/bin/$prog $*

build/pango-build.sh

@@ -1,14 +0,0 @@
-#! /bin/sh
-
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
-
-top=`pwd` || exit 1
-tar xvfj $src || exit 1
-cd pango-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pango-* || exit 1

build/pkgconfig-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd pkgconfig-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd .. || exit 1
-rm -rf pkgconfig-* || exit 1

build/pspell-build.sh

@@ -1,12 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-top=`pwd`
-tar xvfz $src || exit 1
-cd pspell-* || exit 1
-./configure --prefix=$top || exit 1
-make || exit 1
-make install || exit 1
-cd $top || exit 1
-rm -rf pspell-* || exit 1

build/subversion-build.sh

@@ -1,26 +0,0 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
-
-export LDFLAGS=-s
-
-top=`pwd`
-
-if test $httpsClient; then
-    extraflags="--with-ssl --with-libs=$ssl $extraflags"
-fi
-
-if test $httpServer; then
-    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
-    extrainst="APACHE_LIBEXECDIR=$top/modules $extrainst"
-fi
-
-echo "extra flags: $extraflags"
-
-tar xvfz $src || exit 1
-cd subversion-* || exit 1
-./configure --prefix=$top $extraflags || exit 1
-make || exit 1
-make install $extrainst || exit 1
-cd $top || exit 1
-rm -rf subversion-* || exit 1

fixdescriptors/aterm-2.0.fix

@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "aterm-2.0")
-  , Bind("releaseId", "1")
-
-  , Bind("createGCC", True)
-
-  , Bind("src", Url("853474e4bcf4a85f7d38a0676b36bded", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz"))
-  , Bind("build", Local("../build/aterm-build.sh"))
-  ]
-)

fixdescriptors/atk-1.2.0.fix

@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "atk-1.2.0")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("06a84758129554ae044af8865ecb6f1c", "ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.0.tar.bz2"))
-  , Bind("build", Local("../build/atk-build.sh"))
-  ]
-)

fixdescriptors/glib-2.2.1.fix

@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "glib-2.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-
-  , Bind("src", Url("42406a17819080326e105f8333963b97", "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.1.tar.bz2"))
-  , Bind("build", Local("../build/glib-build.sh"))
-  ]
-)

fixdescriptors/gnet-1.1.8.fix

@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gnet-1.1.8")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("da2b5de278e96a5b907c2e2304bf6542", "http://www.gnetlibrary.org/src/gnet-1.1.8.tar.gz"))
-  , Bind("build", Local("../build/gnet-build.sh"))
-  ]
-)

fixdescriptors/gtk+-2.2.1.fix

@@ -1,13 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gtk+-2.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-
-  , Bind("src", Url("dfd5755fddb26a46c96bfaa813280ac4", "ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.1.tar.bz2"))
-  , Bind("build", Local("../build/gtk+-build.sh"))
-  ]
-)

fixdescriptors/gtkspell-2.0.2.fix

@@ -1,15 +0,0 @@
-Descr(
-  [ Bind("pkgId", "gtkspell-2.0.2")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("pspell", Fix("./pspell-.12.2.fix"))
-
-  , Bind("src", Url("385daba9bebfdc7fdbdf524e07deb920", "http://pan.rebelbase.com/download/extras/gtkspell/SOURCES/gtkspell-2.0.2.tar.gz"))
-  , Bind("build", Local("../build/gtkspell-build.sh"))
-  ]
-)

fixdescriptors/httpd-2.0.45.fix

@@ -1,10 +0,0 @@
-Descr(
-  [ Bind("pkgId", "httpd-2.0.45")
-  , Bind("releaseId", "1")
-
-  , Bind("ssl", Fix("./openssl-0.9.7b.fix"))
-
-  , Bind("src", Url("1f33e9a2e2de06da190230fa72738d75", "http://apache.cs.uu.nl/dist/httpd/httpd-2.0.45.tar.gz"))
-  , Bind("build", Local("../build/httpd-build.sh"))
-  ]
-)

fixdescriptors/openssl-0.9.7b.fix

@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "openssl-0.9.7b")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("fae4bec090fa78e20f09d76d55b6ccff", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz"))
-  , Bind("build", Local("../build/openssl-build.sh"))
-  ]
-)

fixdescriptors/pan-0.14.0.fix

@@ -1,17 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pan-0.14.0")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-  , Bind("atk", Fix("./atk-1.2.0.fix"))
-  , Bind("pango", Fix("./pango-1.2.1.fix"))
-  , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("gnet", Fix("./gnet-1.1.8.fix"))
-  , Bind("pspell", Fix("./pspell-.12.2.fix"))
-  , Bind("gtkspell", Fix("./gtkspell-2.0.2.fix"))
-
-  , Bind("src", Url("b2702adadb84c2e0d52d2bb029c05206", "http://pan.rebelbase.com/download/releases/0.14.0/SOURCE/pan-0.14.0.tar.bz2"))
-  , Bind("build", Local("../build/pan-build-2.sh"))
-  ]
-)

fixdescriptors/pango-1.2.1.fix

@@ -1,11 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pango-1.2.1")
-  , Bind("releaseId", "1")
-
-  , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("glib", Fix("./glib-2.2.1.fix"))
-
-  , Bind("src", Url("6b354ef14e75739a92b5b78f4ca3165a", "ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.1.tar.bz2"))
-  , Bind("build", Local("../build/pango-build.sh"))
-  ]
-)

fixdescriptors/pkgconfig-0.15.0.fix

@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pkgconfig-0.15.0")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("a7e4f60a6657dbc434334deb594cc242", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz"))
-  , Bind("build", Local("../build/pkgconfig-build.sh"))
-  ]
-)

fixdescriptors/pspell-.12.2.fix

@@ -1,8 +0,0 @@
-Descr(
-  [ Bind("pkgId", "pspell-.12.2")
-  , Bind("releaseId", "1")
-
-  , Bind("src", Url("cfd3816b2372932a1b71c0ce4e9f881e", "http://unc.dl.sourceforge.net/sourceforge/pspell/pspell-.12.2.tar.gz"))
-  , Bind("build", Local("../build/pspell-build.sh"))
-  ]
-)

fixdescriptors/subversion-0.21.0.fix

@@ -1,16 +0,0 @@
-Descr(
-  [ Bind("pkgId", "subversion-0.21.0")
-  , Bind("releaseId", "1")
-
-  , Bind("httpsClient", Bool(True))
-  , Bind("httpServer", Bool(True))
-  , Bind("httpsServer", Bool(True))
-
-  , Bind("ssl", If(Var("httpsClient"), Fix("./openssl-0.9.7b.fix"), ""))
-
-  , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.45.fix"), ""))
-
-  , Bind("src", Url("b2ad91127fb652e764b750f4c0002528", "http://subversion.tigris.org/files/documents/15/3712/subversion-0.21.0.tar.gz"))
-  , Bind("build", Local("../build/subversion-build.sh"))
-  ]
-)

fixdescriptors/system.fix

@@ -1,19 +0,0 @@
-Descr(
-  [ Bind("pkgId", Str("system"))
-  , Bind("releaseId", Str("3"))
-
-  , Bind("actATerm", Fix("./aterm-2.0.fix"))
-  , Bind("actPkgConfig", Fix("./pkgconfig-0.15.0.fix"))
-  , Bind("actGlib", Fix("./glib-2.2.1.fix"))
-  , Bind("actAtk", Fix("./atk-1.2.0.fix"))
-  , Bind("actPango", Fix("./pango-1.2.1.fix"))
-  , Bind("actGtk", Fix("./gtk+-2.2.1.fix"))
-  , Bind("actGnet", Fix("./gnet-1.1.8.fix"))
-  , Bind("actPspell", Fix("./pspell-.12.2.fix"))
-  , Bind("actGtkspell", Fix("./gtkspell-2.0.2.fix"))
-  , Bind("actPan", Fix("./pan-0.14.0.fix"))
-  , Bind("actSubversion", Fix("./subversion-0.21.0.fix"))
-
-  , Bind("build", Local("../../scripts/nix-populate"))
-  ]
-)

pkgs-ng/README

@@ -0,0 +1,97 @@
+* Classification scheme for packages
+
+- many packages fall under several categories; what matters is the
+  *primary* purpose of a package.  For example, the libxml2 package
+  builds both a library and some tools; but it's a library foremost,
+  so it goes under ./development/libraries. 
+
+- when in doubt, refactor.
+
+IF it's used to support SOFTWARE DEVELOPMENT:
+
+  IF it's a LIBRARY used by other packages:
+    IF it's directly related to GTK:
+      ./development/libraries/gtk+
+    ELSE
+      ./development/libraries
+      (e.g., libxml2)
+  ELSE IF it's a COMPILER:
+    ./development/compilers
+    (e.g., gcc)
+  ELSE IF it's an INTERPRETER:
+    ./development/interpreters
+  ELSE IF it's a development TOOL (or set of):
+    IF it's a PARSER GENERATOR (incl. lexers):
+      ./development/tools/parsing
+      (e.g., bison, flex)
+    ELSE IF it's a BUILD MANAGER:
+      ./development/tools/build-managers
+      (e.g., gnumake
+    ELSE
+      ./development/tools/misc
+      (e.g., binutils)
+  ELSE
+    ./development/misc
+
+ELSE IF it's a TOOL (or set of):
+  # a tool is a relatively *small* program, esp. one intented to be
+  # used non-interactively
+
+  IF it's for NETWORKING:
+    ./tools/networking
+    (e.g., wget)
+  ELSE IF it's for TEXT PROCESSING:
+    ./tools/text
+    (e.g., diffutils)
+  ELSE IF it's a SYSTEM utility, i.e., something related or essential
+    to the operation of a system:
+    ./tools/system
+    (e.g., init)
+  ELSE IF it's an ARCHIVER (which may include a compression function):
+    ./tools/archivers
+    (e.g., zip, tar)
+  ELSE IF it's a COMPRESSION program:
+    ./tools/compression
+    (e.g., gzip, bzip2)
+  ELSE
+    ./tools/misc
+
+ELSE IF it's a SHELL:
+
+  ./shells
+
+ELSE IF it's a SERVER:
+
+  IF it's a HTTP server:
+    ./servers/http
+    (e.g., apache)
+  IF it's a X11 server:
+    ./servers/x11
+    (e.g., xfree86)
+  ELSE
+    ./servers/misc
+
+ELSE IF it's a DESKTOP ENVIRONMENT (incl. WINDOW MANAGERS):
+
+  ./desktops
+  (e.g., kde, gnome, fvwm)
+
+ELSE IF it's an APPLICATION:
+  # a (typically large) program with a distinct user interface,
+  # primarily used interactively
+
+  IF it's a VERSION MANAGEMENT system:
+    ./applications/version-management
+  ELSE IF it's for VIDEO playback/etc:
+    ./applications/video
+  ELSE IF it's for GRAPHICS viewing/editing/etc:
+    ./applications/graphics
+  ELSE IF it's for NETWORKING:
+    IF it's a MAILREADER:
+      ./applications/networking/mailreaders
+    IF it's a NEWSREADER:
+      ./applications/networking/newsreaders
+    ELSE
+      ./applications/networking/misc
+  ELSE
+    ./applications/misc

pkgs-ng/applications/graphics/gqview/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $libpng"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd gqview-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/applications/graphics/gqview/default.fix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, gtk, libpng}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull png;
+# Note that we cannot just copy gtk's png attribute, since gtk might
+# not be linked against png.
+assert libpng == gtk.libpng;
+
+derivation {
+  name = "gqview-1.3.5";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-1.3.5.tar.gz;
+    md5 = "c44687bdd636ea6e5133fb936abf880a";
+  };
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  libpng = libpng;
+}

pkgs-ng/applications/networking/browsers/firebird/builder.sh

@@ -0,0 +1,30 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $perl $zip $libIDL"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd mozilla || exit 1
+
+cat > .mozconfig <<EOF
+export MOZ_PHOENIX=1
+mk_add_options MOZ_PHOENIX=1
+ac_add_options --enable-crypto
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-mailnews
+ac_add_options --disable-composer
+ac_add_options --enable-optimize=-O2
+ac_add_options --disable-ldap
+ac_add_options --disable-mailnews
+ac_add_options --enable-extensions=default,-inspector,-irc,-venkman,-content-packs,-help
+ac_add_options --enable-xft
+ac_add_options --enable-swg
+ac_add_options --enable-strip
+ac_add_options --enable-default-toolkit=gtk2
+EOF
+echo "ac_add_options --prefix=$out" >> .mozconfig
+
+./configure || exit 1
+make -f client.mk build || exit 1
+make install || exit 1

pkgs-ng/applications/networking/browsers/firebird/default.fix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, gtk, perl, zip, libIDL
+}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull perl
+  && !isNull zip && !isNull libIDL;
+
+assert libIDL.glib == gtk.glib;
+
+derivation {
+  name = "MozillaFirebird-0.7";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/firebird/releases/0.7/MozillaFirebird-source-0.7.tar.gz;
+    md5 = "35112566a3dca5bdf363972056afc462";
+  };
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  perl = perl;
+  zip = zip;
+  libIDL = libIDL;
+}

pkgs-ng/applications/networking/mailreaders/sylpheed/builder.sh

@@ -0,0 +1,20 @@
+#! /bin/sh
+
+buildinputs="$gtk $gdkpixbuf $openssl"
+. $stdenv/setup || exit 1
+
+if test $sslSupport; then
+    extraflags="--enable-ssl $extraflags"
+fi
+
+if test $imageSupport; then
+    extraflags="--enable-gdk-pixbuf $extraflags"
+else
+    extraflags="--disable-gdk-pixbuf --disable-imlibtest $extraflags"
+fi    
+
+tar xvfj $src || exit 1
+cd sylpheed-* || exit 1
+./configure --prefix=$out $extraflags || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/applications/networking/mailreaders/sylpheed/default.fix

@@ -0,0 +1,27 @@
+{ sslSupport ? true
+, imageSupport ? true
+, stdenv, fetchurl, gtk, openssl ? null, gdkpixbuf ? null
+}:
+
+assert !isNull gtk;
+assert sslSupport -> !isNull openssl;
+assert imageSupport -> !isNull gdkpixbuf;
+
+derivation {
+  name = "sylpheed-0.9.7";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://sylpheed.good-day.net/sylpheed/sylpheed-0.9.7.tar.bz2;
+    md5 = "399deb5abd52396d26d6475689a5ec3f";
+  };
+
+  sslSupport = sslSupport;
+  imageSupport = imageSupport;
+
+  stdenv = stdenv;
+  gtk = gtk;
+  openssl = if sslSupport then openssl else null;
+  gdkpixbuf = if imageSupport then gdkpixbuf else null;
+}

pkgs-ng/applications/networking/newsreaders/pan/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd pan-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/applications/networking/newsreaders/pan/default.fix

@@ -0,0 +1,29 @@
+{ spellChecking ? true
+, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet, libxml2, perl
+}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull gnet
+  && !isNull libxml2 && !isNull perl;
+assert spellChecking -> !isNull gtkspell && gtk == gtkspell.gtk;
+assert gtk.glib == gnet.glib;
+
+derivation {
+  name = "pan-0.14.2";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://pan.rebelbase.com/download/releases/0.14.2/SOURCE/pan-0.14.2.tar.bz2;
+    md5 = "ed3188e7059bb6d6c209ee5d46ac1852";
+  };
+
+  spellChecking = spellChecking;
+
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gtk = gtk;
+  gtkspell = if spellChecking then gtkspell else null;
+  gnet = gnet;
+  libxml2 = libxml2;
+  perl = perl;
+}

pkgs-ng/applications/version-management/subversion/builder.sh

@@ -0,0 +1,35 @@
+#! /bin/sh
+
+buildinputs="$openssl $db4 $httpd $swig $expat"
+. $stdenv/setup || exit 1
+
+if test $localServer; then
+    extraflags="--with-berkeley-db=$db4 $extraflags"
+fi
+
+if test $sslSupport; then
+    extraflags="--with-ssl --with-libs=$openssl $extraflags"
+fi
+
+if test $httpServer; then
+    extraflags="--with-apxs=$httpd/bin/apxs --with-apr=$httpd --with-apr-util=$httpd $extraflags"
+    extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
+fi
+
+if test $swigBindings; then
+    extraflags="--with-swig=$swig $extraflags"
+fi
+
+echo "extra flags: $extraflags"
+
+tar xvfz $src || exit 1
+cd subversion-* || exit 1
+./configure --prefix=$out $extraflags \
+ --without-gdbm --disable-static || exit 1
+make $extramakeflags || exit 1
+make install $extramakeflags || exit 1
+
+if test $swigBindings; then
+    make swig-py || exit 1
+    make install-swig-py || exit 1
+fi

pkgs-ng/applications/version-management/subversion/default.fix

@@ -0,0 +1,36 @@
+{ localServer ? false
+, httpServer ? false
+, sslSupport ? false
+, swigBindings ? false
+, stdenv, fetchurl
+, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null
+}:
+
+assert !isNull expat;
+assert localServer -> !isNull db4;
+assert httpServer -> !isNull httpd && httpd.expat == expat;
+assert sslSupport -> !isNull openssl && (httpServer -> httpd.openssl == openssl);
+assert swigBindings -> !isNull swig;
+
+derivation {
+  name = "subversion-0.32.1";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://svn.collab.net/tarballs/subversion-0.32.1.tar.gz;
+    md5 = "b06717a8ef50db4b5c4d380af00bd901";
+  };
+
+  localServer = localServer;
+  httpServer = httpServer;
+  sslSupport = sslSupport;
+  swigBindings = swigBindings;
+
+  stdenv = stdenv;
+  openssl = if sslSupport then openssl else null;
+  httpd = if httpServer then httpd else null;
+  expat = expat;
+  db4 = if localServer then db4 else null;
+  swig = if swigBindings then swig else null;
+}

pkgs-ng/applications/video/MPlayer/builder.sh

@@ -0,0 +1,19 @@
+#! /bin/sh
+
+buildinputs="$freetype $x11 $alsa"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+tar xvfj $fonts || exit 1
+cd MPlayer-* || exit 1
+./configure --prefix=$out --with-win32libdir=$win32codecs \
+ --with-x11incdir=$x11/include --with-x11libdir=$x11/lib \
+ --with-reallibdir=$win32codecs \
+ --disable-sdl --disable-esd --disable-xanim --disable-cdparanoia --disable-directfb \
+ --disable-lirc --disable-svga --disable-libdv \
+ --disable-vorbis --disable-png --disable-jpeg --disable-gif \
+ --enable-runtime-cpudetection \
+ || exit 1
+make || exit 1
+make install || exit 1
+cp -p ../font-arial-iso-8859-1/font-arial-18-iso-8859-1/* $out/share/mplayer/font || exit 1

pkgs-ng/applications/video/MPlayer/default.fix

@@ -0,0 +1,31 @@
+{ alsaSupport ? false
+, stdenv, fetchurl, x11, freetype, alsa ? null}:
+
+assert !isNull x11 && !isNull freetype;
+assert alsaSupport -> !isNull alsa;
+
+derivation {
+  name = "MPlayer-1.0pre2";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www2.mplayerhq.hu/MPlayer/releases/MPlayer-1.0pre2.tar.bz2;
+    md5 = "a60c179468f85e83e3f9e1922e81ad64";
+  };
+  fonts = fetchurl {
+    url = http://www2.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2;
+    md5 = "1ecd31d17b51f16332b1fcc7da36b312";
+  };
+
+  alsaSupport = alsaSupport;
+
+  stdenv = stdenv;
+  x11 = x11;
+  freetype = freetype;
+  alsa = if alsaSupport then alsa else null;
+  win32codecs = (import ./win32codecs) {
+    stdenv = stdenv;
+    fetchurl = fetchurl;
+  };
+}

pkgs-ng/applications/video/MPlayer/win32codecs/builder.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+mkdir $out || exit 1
+cd $out || exit 1
+tar xvfj $src || exit 1
+mv extralite/* . || exit 1
+rmdir extralite || exit 1

pkgs-ng/applications/video/MPlayer/win32codecs/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "win32codecs-1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/extralite.tar.bz2;
+    md5 = "4748ecae87f71e8bda9cb2e2a9bd30b4";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/applications/video/mplayerplug-in/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$x11"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd mplayer* || exit 1
+./configure || exit 1
+make || exit 1
+mkdir -p $out/lib/mozilla/plugins || exit 1
+cp mplayerplug-in.so $out/lib/mozilla/plugins || exit 1

pkgs-ng/applications/video/mplayerplug-in/default.fix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, x11}:
+
+assert !isNull x11;
+
+derivation {
+  name = "mplayerplug-in-1.0pre2";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-1.0pre2.tar.gz;
+    md5 = "1a6eb243989c143984bb1aac63b5282e";
+  };
+
+  stdenv = stdenv;
+  x11 = x11;
+}

pkgs-ng/build-support/fetchurl/builder.sh

@@ -0,0 +1,21 @@
+#! /bin/sh
+
+. $stdenv/setup
+
+echo "downloading $url into $out..."
+
+#prefetch=@prefix@/store/nix-prefetch-url-$md5
+prefetch=/nix/store/nix-prefetch-url-$md5
+if test -f "$prefetch"; then
+    echo "using prefetched $prefetch";
+    mv $prefetch $out || exit 1
+else
+    wget --passive-ftp "$url" -O "$out" || exit 1
+fi
+
+#actual=$(@bindir@/nix-hash --flat $out)
+actual=$(/nix/bin/nix-hash --flat $out)
+if test "$actual" != "$md5"; then
+    echo "hash is $actual, expected $md5"
+    exit 1
+fi

pkgs-ng/build-support/fetchurl/default.fix

@@ -0,0 +1,9 @@
+{stdenv}: {url, md5}: derivation {
+  name = baseNameOf (toString url);
+  system = stdenv.system;
+  builder = ./builder.sh;
+  stdenv = stdenv;
+  url = url;
+  md5 = md5;
+  id = md5;
+}

pkgs-ng/development/compilers/gcc/builder.sh

@@ -0,0 +1,56 @@
+#! /bin/sh
+
+buildinputs="$binutils"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+
+if test "$noSysDirs" == "1"; then
+    # Disable the standard include directories.
+    cd gcc-* || exit 1
+    cat >> ./gcc/cppdefault.h <<EOF
+#undef LOCAL_INCLUDE_DIR
+#undef SYSTEM_INCLUDE_DIR
+#undef STANDARD_INCLUDE_DIR
+EOF
+    cd .. || exit 1
+fi
+
+# Configure.
+mkdir build || exit 1
+cd build || exit 1
+../gcc-*/configure --prefix=$out --enable-languages=c,c++ || exit 1
+
+if test "$noSysDirs" == "1"; then
+    # Patch some of the makefiles to force linking against our own glibc.
+    extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
+    for i in $NIX_LDFLAGS; do
+        extraflags="$extraflags -Wl,$i"
+    done
+
+    mf=Makefile
+    sed \
+        -e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraflags^" \
+        < $mf > $mf.tmp || exit 1
+    mv $mf.tmp $mf
+
+    mf=gcc/Makefile
+    sed \
+        -e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraflags^" \
+        < $mf > $mf.tmp || exit 1
+    mv $mf.tmp $mf
+
+    # Patch gcc/Makefile to prevent fixinc.sh from "fixing" system header files
+    # from /usr/include.
+    mf=gcc/Makefile
+    sed \
+        -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
+        < $mf > $mf.tmp || exit 1
+    mv $mf.tmp $mf
+fi
+
+# Build and install.
+make bootstrap || exit 1
+make install || exit 1
+
+find $out -name "*.a" -exec strip -S {} \; || exit 1

pkgs-ng/development/compilers/gcc/default.fix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, binutils}: derivation {
+  name = "gcc-3.3.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.3.2/gcc-3.3.2.tar.bz2;
+    md5 = "65999f654102f5438ac8562d13a6eced";
+  };
+  stdenv = stdenv;
+  binutils = binutils;
+  noSysDirs = stdenv.noSysDirs;
+}

pkgs-ng/development/interpreters/perl/builder.sh

@@ -0,0 +1,26 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd perl-* || exit 1
+
+# Perl's Configure messes with PATH.  We can't have that, so we patch it.
+# Yeah, this is an ugly hack.
+cat Configure | \
+ grep -v '^paths=' | \
+ grep -v '^locincpth=' | \
+ grep -v '^xlibpth=' | \
+ grep -v '^glibpth=' | \
+ grep -v '^loclibpth=' | \
+ grep -v '^locincpth=' | \
+ cat > Configure.tmp || exit 1
+mv Configure.tmp Configure || exit 1
+chmod +x Configure || exit 1
+
+./Configure -de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl \
+ -Dlocincpth="$NIX_LIBC_INCLUDES" \
+ -Dloclibpth="$NIX_LIBC_LIBS" \
+ || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/development/interpreters/perl/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "perl-5.8.0";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+      url = ftp://ftp.cs.uu.nl/mirror/CPAN/src/5.0/perl-5.8.1.tar.gz;
+      md5 = "87cf132f1fbf23e780f0b218046438a6";
+    };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/aterm/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd aterm-* || exit 1
+./configure --prefix=$out --with-gcc || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs-ng/development/libraries/aterm/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "aterm-2.0";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz;
+    md5 = "853474e4bcf4a85f7d38a0676b36bded";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/db4/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd db-*/build_unix || exit 1
+../dist/configure --prefix=$out --enable-cxx --enable-compat185 || exit 1
+make || exit 1
+make install || exit 1
+rm -rf $out/doc || exit 1

pkgs-ng/development/libraries/db4/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "db4-4.0.14";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz;
+    md5 = "12262c64fcd64b772e7cffad8e4d0ebc";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/expat/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd expat-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs-ng/development/libraries/expat/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "expat-1.95.7";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/expat/expat-1.95.7.tar.gz;
+    md5 = "2ff59c2a5cbdd21a285c5f343e214fa9";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/fontconfig/builder.sh

@@ -0,0 +1,18 @@
+#! /bin/sh
+
+buildinputs="$freetype $expat $x11 $ed"
+. $stdenv/setup || exit 1
+
+# Fontconfig generates a bad `fonts.conf' file is the timezone is not known
+# (because it calls `date').
+export TZ=UTC
+
+tar xvfz $src || exit 1
+cd fontconfig-* || exit 1
+./configure --prefix=$out --with-confdir=$out/etc/fonts \
+ --x-includes=$x11/include --x-libraries=$x11/lib \
+ --with-expat-includes=$expat/include --with-expat-lib=$expat/lib || exit 1
+make || exit 1
+make install || exit 1
+
+echo "$freetype" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/fontconfig/default.fix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, x11, freetype, expat, ed}:
+
+assert !isNull x11 && x11.buildClientLibs;
+assert !isNull freetype;
+assert !isNull expat;
+assert !isNull ed;
+
+derivation {
+  name = "fontconfig-2.2.90";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://pdx.freedesktop.org/software/fontconfig/releases/fontconfig-2.2.90.tar.gz;
+    md5 = "5cb87476743be1bbf1674ed72a76ae6a";
+  };
+  stdenv = stdenv;
+  x11 = x11;
+  freetype = freetype;
+  expat = expat;
+  ed = ed;
+}

pkgs-ng/development/libraries/freetype/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd freetype-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs-ng/development/libraries/freetype/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "freetype-2.1.5";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.5.tar.bz2;
+    md5 = "54537b518b84d04190a1eccd393a29df";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/gettext/builder.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd gettext-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/development/libraries/gettext/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "gettext-0.12.1";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.nluug.nl/pub/gnu/gettext/gettext-0.12.1.tar.gz;
+    md5 = "5d4bddd300072315e668247e5b7d5bdb";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/glibc/builder.sh

@@ -0,0 +1,26 @@
+#! /bin/sh
+
+# glibc cannot have itself in its rpath.
+export NIX_NO_SELF_RPATH=1
+. $stdenv/setup || exit 1
+
+tar xvfj $glibcSrc || exit 1
+(cd glibc-* && tar xvfj $linuxthreadsSrc) || exit 1
+
+(cd glibc-* && patch -p1 < $vaargsPatch) || exit 1
+
+mkdir build || exit 1
+cd build || exit 1
+LDFLAGS=-Wl,-S ../glibc-*/configure --prefix=$out --enable-add-ons --disable-profile || exit 1
+
+make || exit 1
+make install || exit 1
+make localedata/install-locales || exit 1
+strip -S $out/lib/*.a $out/lib/*.so $out/lib/gconv/*.so
+strip -s $out/bin/* $out/sbin/* $out/libexec/*
+
+ln -sf /etc/ld.so.cache $out/etc/ld.so.cache || exit 1
+
+(cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1
+
+exit 0

pkgs-ng/development/libraries/glibc/default.fix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, kernelHeaders}: derivation {
+  name = "glibc-2.3.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+
+  glibcSrc = fetchurl {
+    url = ftp://ftp.nl.net/pub/gnu/glibc/glibc-2.3.2.tar.bz2;
+    md5 = "ede969aad568f48083e413384f20753c";
+  };
+  linuxthreadsSrc = fetchurl {
+    url = ftp://ftp.nl.net/pub/gnu/glibc/glibc-linuxthreads-2.3.2.tar.bz2;
+    md5 = "894b8969cfbdf787c73e139782167607";
+  };
+
+  # This is a patch to make glibc compile under GCC 3.3.  Presumably
+  # later releases of glibc won't need this.
+  vaargsPatch = ./glibc-2.3.2-sscanf-1.patch;
+
+  stdenv = stdenv;
+  kernelHeaders = kernelHeaders;
+}

pkgs-ng/development/libraries/glibc/glibc-2.3.2-sscanf-1.patch

@@ -0,0 +1,68 @@
+Submitted By: David Shust (www.shustring.com)
+Date: 2003-08-15
+Initial Package Version: 2.3.2
+Origin: glibc CVS changes performed by Roland McGrath
+Description: patches stdio-common/sscanf.c, libio/{swprintf.c, swscanf.c}
+
+diff -Naur glibc-2.3.2/libio/swprintf.c glibc-2.3.2-new/libio/swprintf.c
+--- glibc-2.3.2/libio/swprintf.c	2001-07-07 19:21:03.000000000 +0000
++++ glibc-2.3.2-new/libio/swprintf.c	2003-08-15 19:36:42.000000000 +0000
+@@ -1,4 +1,5 @@
+-/* Copyright (C) 1991,1995,1997,1998,1999,2000 Free Software Foundation, Inc.
++/* Copyright (C) 1991,1995,1997,1998,1999,2000,2003
++	Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -22,10 +23,7 @@
+ /* Write formatted output into S, according to the format string FORMAT.  */
+ /* VARARGS3 */
+ int
+-swprintf (s, n, format)
+-     wchar_t *s;
+-     size_t n;
+-     const wchar_t *format;
++swprintf (wchar_t *s, size_t n, const wchar_t *format, ...)
+ {
+   va_list arg;
+   int done;
+diff -Naur glibc-2.3.2/libio/swscanf.c glibc-2.3.2-new/libio/swscanf.c
+--- glibc-2.3.2/libio/swscanf.c	2001-07-07 19:21:03.000000000 +0000
++++ glibc-2.3.2-new/libio/swscanf.c	2003-08-15 19:36:42.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1991, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
++/* Copyright (C) 1991,1995,1996,1998,1999,2003 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -22,9 +22,7 @@
+ /* Read formatted input from S, according to the format string FORMAT.  */
+ /* VARARGS2 */
+ int
+-swscanf (s, format)
+-     const wchar_t *s;
+-     const wchar_t *format;
++swscanf (const wchar_t *s, const wchar_t *format, ...)
+ {
+   va_list arg;
+   int done;
+diff -Naur glibc-2.3.2/stdio-common/sscanf.c glibc-2.3.2-new/stdio-common/sscanf.c
+--- glibc-2.3.2/stdio-common/sscanf.c	2002-08-10 18:09:08.000000000 +0000
++++ glibc-2.3.2-new/stdio-common/sscanf.c	2003-08-15 19:36:24.000000000 +0000
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 1991,95,96,98,2002 Free Software Foundation, Inc.
++/* Copyright (C) 1991,1995,1996,1998,2002,2003 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -27,9 +27,7 @@
+ /* Read formatted input from S, according to the format string FORMAT.  */
+ /* VARARGS2 */
+ int
+-sscanf (s, format)
+-     const char *s;
+-     const char *format;
++sscanf (const char *s, const char *format, ...)
+ {
+   va_list arg;
+   int done;

pkgs-ng/development/libraries/gnet/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $glib"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd gnet-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/development/libraries/gnet/default.fix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, pkgconfig, glib}:
+
+assert !isNull pkgconfig && !isNull glib;
+
+derivation {
+  name = "gnet-2.0.4";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.gnetlibrary.org/src/gnet-2.0.4.tar.gz;
+    md5 = "b43e728391143214e2cfd0b835b6fd2a";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  glib = glib;
+}

pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$gtk $libtiff $libjpeg $libpng"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd gdk-pixbuf-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/development/libraries/gtk+-1/gdk-pixbuf/default.fix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, gtk, libtiff, libjpeg, libpng}:
+
+assert !isNull gtk && !isNull libtiff
+  && !isNull libjpeg && !isNull libpng;
+
+derivation {
+  name = "gdk-pixbuf-0.22.0";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/0.22/gdk-pixbuf-0.22.0.tar.bz2;
+    md5 = "05fcb68ceaa338614ab650c775efc2f2";
+  };
+
+  stdenv = stdenv;
+  gtk = gtk;
+  libtiff = libtiff;
+  libjpeg = libjpeg;
+  libpng = libpng;
+}

pkgs-ng/development/libraries/gtk+-1/glib/builder.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd glib-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/development/libraries/gtk+-1/glib/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "glib-1.2.10";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
+    md5 = "6fe30dad87c77b91b632def29dd69ef9";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/gtk+-1/gtk+/builder.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+buildinputs="$x11 $glib"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd gtk+-* || exit 1
+./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
+make || exit 1
+make install || exit 1
+
+echo "$x11 $glib" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/gtk+-1/gtk+/default.fix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl, x11, glib}:
+
+assert !isNull x11 && !isNull glib;
+assert x11.buildClientLibs;
+
+derivation {
+  name = "gtk+-1.2.10";
+  system = stdenv.system;
+
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz;
+    md5 = "4d5cb2fc7fb7830e4af9747a36bfce20";
+  };
+
+  stdenv = stdenv;
+  x11 = x11;
+  glib = glib;
+}

pkgs-ng/development/libraries/gtk+/atk/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $perl $glib"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd atk-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/development/libraries/gtk+/atk/default.fix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, glib, perl}:
+
+assert !isNull pkgconfig && !isNull glib && !isNull perl;
+
+derivation {
+  name = "atk-1.2.4";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/atk-1.2.4.tar.bz2;
+    md5 = "2d6d50df31abe0e8892b5d3e7676a02d";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  glib = glib;
+  perl = perl;
+}

pkgs-ng/development/libraries/gtk+/glib/builder.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $gettext $perl"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd glib-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/development/libraries/gtk+/glib/default.fix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, pkgconfig, gettext, perl}:
+
+assert !isNull pkgconfig && !isNull gettext && !isNull perl;
+
+derivation {
+  name = "glib-2.2.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/glib-2.2.3.tar.bz2;
+    md5 = "aa214a10d873b68ddd67cd9de2ccae55";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  gettext = gettext;
+  perl = perl;
+}

pkgs-ng/development/libraries/gtk+/gtk+/builder.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $x11 $glib $atk $pango $perl $libtiff $libjpeg $libpng"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd gtk+-* || exit 1
+./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
+make || exit 1
+make install || exit 1
+
+echo "$x11 $glib $atk $pango" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/gtk+/gtk+/default.fix

@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, x11, glib, atk
+, pango, perl, libtiff, libjpeg, libpng}:
+
+assert !isNull pkgconfig && !isNull x11 && !isNull glib && !isNull atk
+  && !isNull pango && !isNull perl && !isNull perl && !isNull libtiff
+  && !isNull libjpeg && !isNull libpng;
+assert x11.buildClientLibs;
+assert glib == atk.glib;
+assert glib == pango.glib;
+assert x11 == pango.x11;
+
+derivation {
+  name = "gtk+-2.2.4";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/gtk+-2.2.4.tar.bz2;
+    md5 = "605332199533e73bc6eec481fb4f1671";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  x11 = x11;
+  glib = glib;
+  atk = atk;
+  pango = pango;
+  perl = perl;
+  libtiff = libtiff;
+  libjpeg = libjpeg;
+  libpng = libpng;
+}

pkgs-ng/development/libraries/gtk+/pango/builder.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $x11 $glib $xft"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd pango-* || exit 1
+./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
+make || exit 1
+make install || exit 1
+
+echo "$xft" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/gtk+/pango/default.fix

@@ -0,0 +1,20 @@
+{stdenv, fetchurl, pkgconfig, x11, glib, xft}:
+
+assert !isNull pkgconfig && !isNull x11 && !isNull glib && !isNull xft;
+assert x11.buildClientLibs;
+assert xft.x11 == x11;
+
+derivation {
+  name = "pango-1.2.5";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gtk.org/pub/gtk/v2.2/pango-1.2.5.tar.bz2;
+    md5 = "df00fe3e71cd297010f24f439b6c8ee6";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  x11 = x11;
+  glib = glib;
+  xft = xft;
+}

pkgs-ng/development/libraries/libIDL/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $glib $lex $yacc"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libIDL-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs-ng/development/libraries/libIDL/default.fix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, glib, lex, yacc}:
+
+assert !isNull pkgconfig && !isNull gtk && !isNull lex && !isNull yacc;
+
+derivation {
+  name = "libIDL-0.8.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2;
+    md5 = "a75d2dbf3a3c66b567047c94245f8b82";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  glib = glib;
+  lex = lex;
+  yacc = yacc;
+}

pkgs-ng/development/libraries/libjpeg/builder.sh

@@ -0,0 +1,15 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd jpeg-* || exit 1
+./configure --prefix=$out --enable-shared || exit 1
+make || exit 1
+mkdir $out || exit 1
+mkdir $out/bin || exit 1
+mkdir $out/lib || exit 1
+mkdir $out/include || exit 1
+mkdir $out/man || exit 1
+mkdir $out/man/man1 || exit 1
+make install || exit 1

pkgs-ng/development/libraries/libjpeg/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "libjpeg-6b";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.ijg.org/files/jpegsrc.v6b.tar.gz;
+    md5 = "dbd5f3b47ed13132f04c685d608a7547";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/libpng/builder.sh

@@ -0,0 +1,16 @@
+#! /bin/sh
+
+buildinputs="$zlib"
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd libpng-* || exit 1
+make -f scripts/makefile.linux || exit 1
+mkdir $out || exit 1
+mkdir $out/bin || exit 1
+mkdir $out/lib || exit 1
+mkdir $out/include || exit 1
+make -f scripts/makefile.linux install prefix=$out || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$zlib" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/libpng/default.fix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, zlib}:
+
+assert !isNull zlib;
+
+derivation {
+  name = "libpng-1.2.5";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/png-mng/libpng-1.2.5.tar.bz2;
+    md5 = "3fc28af730f12ace49b14568de4ad934";
+  };
+  stdenv = stdenv;
+  zlib = zlib;
+}

pkgs-ng/development/libraries/libtiff/builder.sh

@@ -0,0 +1,16 @@
+#! /bin/sh
+
+buildinputs="$zlib $libjpeg"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd tiff-* || exit 1
+./configure --prefix=$out --with-DIR_MAN=$out/man \
+ --with-ZIP --with-JPEG \
+ --with-DIRS_LIBINC="$zlib/include $libjpeg/include" || exit 1
+make || exit 1
+mkdir $out || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1
+
+echo "$zlib $libjpeg" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/libtiff/default.fix

@@ -0,0 +1,16 @@
+{stdenv, fetchurl, zlib, libjpeg}:
+
+assert !isNull zlib && !isNull libjpeg;
+
+derivation {
+  name = "libtiff-3.5.7";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-v3.5.7.tar.gz;
+    md5 = "82243b5ae9b7c9e492aeebc501680990";
+  };
+  stdenv = stdenv;
+  zlib = zlib;
+  libjpeg = libjpeg;
+}

pkgs-ng/development/libraries/libxml2/builder.sh

@@ -0,0 +1,11 @@
+#! /bin/sh
+
+buildinputs="$zlib"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd libxml2-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1
+strip -S $out/lib/*.a || exit 1

pkgs-ng/development/libraries/libxml2/default.fix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl, zlib}:
+
+assert !isNull zlib;
+
+derivation {
+  name = "libxml2-2.6.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://rpmfind.net/pub/libxml/libxml2-2.6.2.tar.gz;
+    md5 = "56e7f74d3d44cc16790ad08624faef64";
+  };
+  stdenv = stdenv;
+  zlib = zlib;
+}

pkgs-ng/development/libraries/openssl/builder.sh

@@ -0,0 +1,16 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+export PATH=$perl/bin:$PATH
+
+tar xvfz $src || exit 1
+cd openssl-* || exit 1
+./config --prefix=$out shared || exit 1
+make || exit 1
+mkdir $out || exit 1
+make install || exit 1
+
+# Bug fix: openssl does a `chmod 644' on the pkgconfig directory.
+chmod 755 $out/lib/pkgconfig || exit 1
+
+echo $envpkgs > $out/envpkgs || exit 1

pkgs-ng/development/libraries/openssl/default.fix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, perl}: derivation {
+  name = "openssl-0.9.7c";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+      url = http://www.openssl.org/source/openssl-0.9.7c.tar.gz;
+      md5 = "c54fb36218adaaaba01ef733cd88c8ec";
+    };
+  stdenv = stdenv;
+  perl = perl;
+}

pkgs-ng/development/libraries/pcre/builder.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+. $stdenv/setup || exit 1
+
+tar xvfj $src || exit 1
+cd pcre-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs-ng/development/libraries/pcre/default.fix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: derivation {
+  name = "pcre-4.3";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-4.3.tar.bz2;
+    md5 = "7bc7d5b590a41e6f9ede30f272002a02";
+  };
+  stdenv = stdenv;
+}

pkgs-ng/development/libraries/xft/builder.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+buildinputs="$pkgconfig $fontconfig $x11"
+. $stdenv/setup || exit 1
+
+tar xvfz $src || exit 1
+cd xft-* || exit 1
+./configure --prefix=$out --x-includes=$x11/include --x-libraries=$x11/lib || exit 1
+make || exit 1
+make install || exit 1
+
+echo "$fontconfig" > $out/propagated-build-inputs || exit 1

pkgs-ng/development/libraries/xft/default.fix

@@ -0,0 +1,18 @@
+{stdenv, fetchurl, pkgconfig, x11, fontconfig}:
+
+assert !isNull pkgconfig && !isNull x11 && !isNull fontconfig;
+assert fontconfig.x11 == x11;
+
+derivation {
+  name = "xft-2.1.2";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://pdx.freedesktop.org/software/fontconfig/releases/xft-2.1.2.tar.gz;
+    md5 = "defb7e801d4938b8b15a426ae57e2f3f";
+  };
+  stdenv = stdenv;
+  pkgconfig = pkgconfig;
+  x11 = x11;
+  fontconfig = fontconfig;
+}