* Create the union of all directories, not just ["bin", "lib", ...].

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

build/Xft-build.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+export PATH=$freetype/bin:$fontconfig/bin:/bin:/usr/bin
+
+top=`pwd`
+tar xvfz $src || exit 1
+cd fcpackage*/Xft || exit 1
+./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
+make || exit 1
+make install || exit 1
+cd $top || exit 1
+rm -rf fcpackage* || exit 1

build/db4-build.sh

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

build/fontconfig-build.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+export PATH=$freetype/bin:/bin:/usr/bin
+
+top=`pwd`
+tar xvfz $src || exit 1
+cd fcpackage*/fontconfig || exit 1
+./configure --prefix=$top --with-confdir=$top/etc/fonts --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
+make || exit 1
+make install || exit 1
+cd $top || exit 1
+rm -rf fcpackage* || exit 1

build/freetype-build.sh

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

build/gtk+-build.sh

@@ -1,13 +1,13 @@
 #! /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
+export PATH=$pkgconfig/bin:$freetype/bin:/bin:/usr/bin
+export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$fontconfig/lib/pkgconfig:$Xft/lib/pkgconfig
+export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$fontconfig/lib:$Xft/lib
 
 top=`pwd`
 tar xvfj $src || exit 1
 cd gtk+-* || exit 1
-./configure --prefix=$top || exit 1
+./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
 make || exit 1
 make install || exit 1
 cd $top || exit 1

build/gtkspell-build.sh

@@ -2,7 +2,7 @@
 
 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 LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$pspell/lib:$fontconfig/lib:$Xft/lib:$freetype/lib:
 export C_INCLUDE_PATH=$pspell/include
 
 top=`pwd`

build/httpd-build.sh

@@ -1,11 +1,12 @@
 #! /bin/sh
 
 export PATH=/bin:/usr/bin
+export LD_LIBRARY_PATH=$ssl/lib:
 
 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
+./configure --prefix=$top --enable-ssl --with-ssl=$ssl --with-berkeley-db=$db4 --enable-mods-shared=all || exit 1
 make || exit 1
 make install || exit 1
 cd $top || exit 1

build/libxml2-build.sh

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

build/openssl-build.sh

@@ -5,7 +5,7 @@ export PATH=/bin:/usr/bin
 top=`pwd`
 tar xvfz $src || exit 1
 cd openssl-* || exit 1
-./config --prefix=$top || exit 1
+./config --prefix=$top shared || exit 1
 make || exit 1
 make install || exit 1
 cd $top || exit 1

build/pan-build-2.sh

@@ -1,8 +1,8 @@
 #! /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
+export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$atk/lib/pkgconfig:$pango/lib/pkgconfig:$gtk/lib/pkgconfig:$gtkspell/lib/pkgconfig:$libxml/lib/pkgconfig
+export LD_LIBRARY_PATH=$glib/lib:$atk/lib:$pango/lib:$gtk/lib:$gnet/lib:$pspell/lib:$gtkspell/lib:$fontconfig/lib:$Xft/lib:$freetype/lib
 
 # A bug in gtkspell: the pspell library path is not exported
 # through pkgconfig.

build/pango-build.sh

@@ -1,13 +1,13 @@
 #! /bin/sh
 
-export PATH=$pkgconfig/bin:/bin:/usr/bin
-export PKG_CONFIG_PATH=$glib/lib/pkgconfig
-export LD_LIBRARY_PATH=$glib/lib
+export PATH=$pkgconfig/bin:$freetype/bin:/bin:/usr/bin
+export PKG_CONFIG_PATH=$glib/lib/pkgconfig:$fontconfig/lib/pkgconfig:$Xft/lib/pkgconfig
+export LD_LIBRARY_PATH=$glib/lib:$fontconfig/lib:$Xft/lib
 
 top=`pwd` || exit 1
 tar xvfj $src || exit 1
 cd pango-* || exit 1
-./configure --prefix=$top || exit 1
+./configure --prefix=$top --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
 make || exit 1
 make install || exit 1
 cd $top || exit 1

build/populate-linkdirs.pl

@@ -0,0 +1,48 @@
+#! /usr/bin/perl -w
+
+use strict;
+use Cwd;
+
+my $selfdir = cwd;
+
+# For each activated package, create symlinks.
+
+sub createLinks {
+    my $srcdir = shift;
+    my $dstdir = shift;
+
+    my @srcfiles = glob("$srcdir/*");
+
+    foreach my $srcfile (@srcfiles) {
+        my $basename = $srcfile;
+        $basename =~ s/^.*\///g; # strip directory
+        my $dstfile = "$dstdir/$basename";
+        if (-d $srcfile) {
+            # !!! hack for resolving name clashes
+            if (!-e $dstfile) {
+                mkdir $dstfile, 0755 or 
+                    die "error creating directory $dstfile";
+            }
+            -d $dstfile or die "$dstfile is not a directory";
+            createLinks($srcfile, $dstfile);
+        } elsif (-l $dstfile) {
+            my $target = readlink($dstfile);
+            die "collission between $srcfile and $target";
+        } else {
+            print "linking $dstfile to $srcfile\n";
+            symlink($srcfile, $dstfile) or
+                die "error creating link $dstfile";
+        }
+    }
+}
+
+foreach my $name (keys %ENV) {
+
+    next unless ($name =~ /^act.*$/);
+
+    my $pkgdir = $ENV{$name};
+
+    print "merging $pkgdir\n";
+
+    createLinks("$pkgdir", "$selfdir");
+}

build/subversion-build.sh

@@ -1,18 +1,27 @@
 #! /bin/sh
 
-export PATH=/bin:/usr/bin
+export PATH=$libxml/bin:/bin:/usr/bin:/usr/local/bin
+export LD_LIBRARY_PATH=$ssl/lib:
 
 export LDFLAGS=-s
 
 top=`pwd`
 
+if test $localServer; then
+    extraflags="--with-berkeley-db=$db4 $extraflags"
+fi
+
 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"
+    extramakeflags="APACHE_LIBEXECDIR=$top/modules $extramakeflags"
+fi
+
+if test $pythonBindings; then
+    extraflags="--with-swig=$swig $extraflags"
 fi
 
 echo "extra flags: $extraflags"
@@ -20,7 +29,13 @@ 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
+make $extramakeflags || exit 1
+make install $extramakeflags || exit 1
+
+if test $pythonBindings; then
+    make swig-py || exit 1
+    make install-swig-py || exit 1
+fi
+
 cd $top || exit 1
 rm -rf subversion-* || exit 1

build/swig-build.sh

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

descriptors/Xft-20021121.fix

@@ -0,0 +1,11 @@
+Descr(
+  [ Bind("pkgId", "Xft-20021121")
+  , Bind("releaseId", "1")
+
+  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
+  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
+
+  , Bind("src", Url("2f2852c80924a9b5356c3037a471c1a1", "http://fontconfig.org/release/fcpackage.2_1.tar.gz"))
+  , Bind("build", Local("../build/Xft-build.sh"))
+  ]
+)

descriptors/db-4.0.14.fix

@@ -0,0 +1,8 @@
+Descr(
+  [ Bind("pkgId", "db-4.0.14")
+  , Bind("releaseId", "1")
+
+  , Bind("src", Url("12262c64fcd64b772e7cffad8e4d0ebc", "http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz"))
+  , Bind("build", Local("../build/db4-build.sh"))
+  ]
+)

descriptors/fontconfig-20021121.fix

@@ -0,0 +1,10 @@
+Descr(
+  [ Bind("pkgId", "fontconfig-20021121")
+  , Bind("releaseId", "1")
+
+  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
+
+  , Bind("src", Url("2f2852c80924a9b5356c3037a471c1a1", "http://fontconfig.org/release/fcpackage.2_1.tar.gz"))
+  , Bind("build", Local("../build/fontconfig-build.sh"))
+  ]
+)

descriptors/freetype-2.1.4.fix

@@ -0,0 +1,8 @@
+Descr(
+  [ Bind("pkgId", "freetype-2.1.4")
+  , Bind("releaseId", "1")
+
+  , Bind("src", Url("1fc0b188f1fe1216776e5855d2da141f", "http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.bz2"))
+  , Bind("build", Local("../build/freetype-build.sh"))
+  ]
+)

descriptors/gtk+-2.2.1.fix

@@ -1,10 +1,13 @@
 Descr(
   [ Bind("pkgId", "gtk+-2.2.1")
-  , Bind("releaseId", "1")
+  , Bind("releaseId", "2")
 
   , 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("freetype", Fix("./freetype-2.1.4.fix"))
+  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
+  , Bind("Xft", Fix("./Xft-20021121.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"))

descriptors/gtkspell-2.0.2.fix

@@ -5,6 +5,9 @@ Descr(
   , 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("freetype", Fix("./freetype-2.1.4.fix"))
+  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
+  , Bind("Xft", Fix("./Xft-20021121.fix"))
   , Bind("pango", Fix("./pango-1.2.1.fix"))
   , Bind("gtk", Fix("./gtk+-2.2.1.fix"))
   , Bind("pspell", Fix("./pspell-.12.2.fix"))

descriptors/httpd-2.0.46.fix

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

descriptors/libxml2-2.5.7.fix

@@ -0,0 +1,8 @@
+Descr(
+  [ Bind("pkgId", "libxml2-2.5.7")
+  , Bind("releaseId", "1")
+
+  , Bind("src", Url("f7ed96959fbddf366af64652804d1b57", "ftp://fr.rpmfind.net/pub/libxml/libxml2-2.5.7.tar.gz"))
+  , Bind("build", Local("../build/libxml2-build.sh"))
+  ]
+)

descriptors/pan-0.14.0.fix

@@ -3,8 +3,12 @@ Descr(
   , Bind("releaseId", "1")
 
   , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
+  , Bind("libxml", Fix("./libxml2-2.5.7.fix"))
   , Bind("glib", Fix("./glib-2.2.1.fix"))
   , Bind("atk", Fix("./atk-1.2.0.fix"))
+  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
+  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
+  , Bind("Xft", Fix("./Xft-20021121.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"))

descriptors/pango-1.2.1.fix

@@ -1,9 +1,12 @@
 Descr(
   [ Bind("pkgId", "pango-1.2.1")
-  , Bind("releaseId", "1")
+  , Bind("releaseId", "2")
 
   , Bind("pkgconfig", Fix("./pkgconfig-0.15.0.fix"))
   , Bind("glib", Fix("./glib-2.2.1.fix"))
+  , Bind("freetype", Fix("./freetype-2.1.4.fix"))
+  , Bind("fontconfig", Fix("./fontconfig-20021121.fix"))
+  , Bind("Xft", Fix("./Xft-20021121.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"))

descriptors/subversion-0.23.0.fix

@@ -0,0 +1,24 @@
+Descr(
+  [ Bind("pkgId", "subversion-0.23.0")
+  , Bind("releaseId", "3")
+
+  , Bind("localServer", Bool(True))
+  , Bind("httpsClient", Bool(True))
+  , Bind("httpServer", Bool(True))
+  , Bind("httpsServer", Bool(True))
+  , Bind("pythonBindings", Bool(True))
+
+  , Bind("libxml", Fix("./libxml2-2.5.7.fix"))
+
+  , Bind("db4", If(Var("localServer"), Fix("./db-4.0.14.fix"), ""))
+
+  , Bind("ssl", If(Var("httpsClient"), Fix("./openssl-0.9.7b.fix"), ""))
+
+  , Bind("httpd", If(Var("httpServer"), Fix("./httpd-2.0.46.fix"), ""))
+
+  , Bind("swig", If(Var("pythonBindings"), Fix("./swig-1.3.19.fix"), ""))
+
+  , Bind("src", Url("59661f2145976437b371a0ab3a555dbd", "http://subversion.tigris.org/files/documents/15/4218/subversion-0.23.0.tar.gz"))
+  , Bind("build", Local("../build/subversion-build.sh"))
+  ]
+)

descriptors/swig-1.3.19.fix

@@ -0,0 +1,8 @@
+Descr(
+  [ Bind("pkgId", "swig-1.3.19")
+  , Bind("releaseId", "1")
+
+  , Bind("src", Url("a733455544426b31868dd87fc162e750", "http://heanet.dl.sourceforge.net/sourceforge/swig/swig-1.3.19.tar.gz"))
+  , Bind("build", Local("../build/swig-build.sh"))
+  ]
+)

descriptors/system.fix

@@ -1,19 +1,26 @@
 Descr(
   [ Bind("pkgId", Str("system"))
-  , Bind("releaseId", Str("3"))
+  , Bind("releaseId", Str("5"))
 
   , Bind("actATerm", Fix("./aterm-2.0.fix"))
   , Bind("actPkgConfig", Fix("./pkgconfig-0.15.0.fix"))
+  , Bind("actLibxml", Fix("./libxml2-2.5.7.fix"))
   , Bind("actGlib", Fix("./glib-2.2.1.fix"))
   , Bind("actAtk", Fix("./atk-1.2.0.fix"))
+  , Bind("actFreetype", Fix("./freetype-2.1.4.fix"))
+  , Bind("actFontconfig", Fix("./fontconfig-20021121.fix"))
+  , Bind("actXft", Fix("./Xft-20021121.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("actSubversion", Fix("./subversion-0.23.0.fix"))
+  , Bind("actDb4", Fix("./db-4.0.14.fix"))
+  , Bind("actHttpd", Fix("./httpd-2.0.46.fix"))
+  , Bind("actSsl", Fix("./openssl-0.9.7b.fix"))
 
-  , Bind("build", Local("../../scripts/nix-populate"))
+  , Bind("build", Local("../build/populate-linkdirs.pl"))
   ]
 )

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/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"))
-  ]
-)