* Converted some old Fix descriptors.

* A solution to the library abstraction problem (i.e., if 
  package X needs library Y, and library Y needs library Z, 
  then we do not (generally) want to declare Z as a input to X 
  since that would break abstraction).  This was not possible 
  under the old Nix.

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

pkgs/Xft/Xft-build.sh

@@ -0,0 +1,12 @@
+#! /bin/sh
+
+export PATH=/bin:/usr/bin
+envpkgs=$fontconfig
+. $setenv
+
+tar xvfz $src || exit 1
+cd fcpackage*/Xft || exit 1
+./configure --prefix=$out --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib || exit 1
+make || exit 1
+make install || exit 1
+echo $envpkgs > $out/envpkgs || exit 1

pkgs/Xft/Xft.fix

@@ -0,0 +1,14 @@
+Package(
+  [ ("name", "Xft-20021121")
+
+  , ("build", Relative("Xft/Xft-build.sh"))
+  , ("setenv", Relative("helpers/set-env.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz")
+      , ("md5", "2f2852c80924a9b5356c3037a471c1a1")
+      ]))
+
+  , ("fontconfig", IncludeFix("fontconfig/fontconfig.fix"))
+  ]
+)

pkgs/aterm/aterm.fix

@@ -3,7 +3,7 @@ Package(
   , ("build", Relative("aterm/aterm-build.sh"))
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz")
-      , ("hash", "653b1bb8140ee0206b00aab126ef412e")
+      , ("md5", "853474e4bcf4a85f7d38a0676b36bded")
       ]))
   ]
 )

pkgs/fontconfig/fontconfig-build.sh

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

pkgs/fontconfig/fontconfig.fix

@@ -0,0 +1,14 @@
+Package(
+  [ ("name", "fontconfig-20021121")
+
+  , ("build", Relative("fontconfig/fontconfig-build.sh"))
+  , ("setenv", Relative("helpers/set-env.sh"))
+
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://fontconfig.org/release/fcpackage.2_1.tar.gz")
+      , ("md5", "2f2852c80924a9b5356c3037a471c1a1")
+      ]))
+
+  , ("freetype", IncludeFix("freetype/freetype.fix"))
+  ]
+)

pkgs/freetype/freetype-build.sh

@@ -0,0 +1,9 @@
+#! /bin/sh
+
+export PATH=/bin:/usr/bin
+
+tar xvfj $src || exit 1
+cd freetype-* || exit 1
+./configure --prefix=$out || exit 1
+make || exit 1
+make install || exit 1

pkgs/freetype/freetype.fix

@@ -0,0 +1,9 @@
+Package(
+  [ ("name", "freetype-2.1.4")
+  , ("build", Relative("freetype/freetype-build.sh"))
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://easynews.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.bz2")
+      , ("md5", "1fc0b188f1fe1216776e5855d2da141f")
+      ]))
+  ]
+)

pkgs/helpers/set-env.sh

@@ -0,0 +1,30 @@
+addtoenv()
+{
+    envpkgs="$envpkgs $1"
+
+    if test -d $1/bin; then
+        export PATH=$1/bin:$PATH
+    fi
+
+    if test -d $1/lib; then
+        export LIBRARY_PATH=$1/lib:$LIBRARY_PATH
+        export LD_LIBRARY_PATH=$1/lib:$LD_LIBRARY_PATH
+    fi
+
+    if test -d $1/lib/pkgconfig; then
+        export PKG_CONFIG_PATH=$1/lib/pkgconfig:$PKG_CONFIG_PATH
+    fi
+
+    if test -f $1/envpkgs; then
+        for i in $(cat $1/envpkgs); do
+            addtoenv $i
+        done
+    fi
+}
+
+oldenvpkgs=$envpkgs
+envpkgs=
+
+for i in $oldenvpkgs; do
+    addtoenv $i
+done

pkgs/openssl/openssl-build.sh

@@ -0,0 +1,10 @@
+#! /bin/sh
+
+export PATH=/bin:/usr/bin
+
+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

pkgs/openssl/openssl.fix

@@ -0,0 +1,9 @@
+Package(
+  [ ("name", "openssl-0.9.7b")
+  , ("build", Relative("openssl/openssl-build.sh"))
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://www.openssl.org/source/openssl-0.9.7b.tar.gz")
+      , ("md5", "fae4bec090fa78e20f09d76d55b6ccff")
+      ]))
+  ]
+)

pkgs/pkgconfig/pkgconfig.fix

@@ -3,7 +3,7 @@ Package(
   , ("build", Relative("pkgconfig/pkgconfig-build.sh"))
   , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
       [ ("url", "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz")
-      , ("hash", "c62371dd07ef85043e91f298176c771f")
+      , ("md5", "c62371dd07ef85043e91f298176c771f")
       ]))
   ]
 )

pkgs/subversion/subversion-build.sh

@@ -0,0 +1,36 @@
+#! /bin/sh
+
+export PATH=$libxml/bin:/bin:/usr/bin:/usr/local/bin
+export LD_LIBRARY_PATH=$ssl/lib:
+
+export LDFLAGS=-s
+
+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"
+    extramakeflags="APACHE_LIBEXECDIR=$out/modules $extramakeflags"
+fi
+
+if test $pythonBindings; then
+    extraflags="--with-swig=$swig $extraflags"
+fi
+
+echo "extra flags: $extraflags"
+
+tar xvfz $src || exit 1
+cd subversion-* || exit 1
+./configure --prefix=$out $extraflags || 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

pkgs/subversion/subversion.fix

@@ -0,0 +1,11 @@
+Package(
+  [ ("name", "subversion-0.25.0")
+  , ("build", Relative("subversion/subversion-build.sh"))
+  , ("src", App(IncludeFix("fetchurl/fetchurl.fix"),
+      [ ("url", "http://subversion.tigris.org/files/documents/15/5110/subversion-0.25.tar.gz")
+      , ("md5", "a018220d5c790161bc712ccb7d0f1b38")
+      ]))
+  , ("httpsClient", "1")
+  , ("ssl", IncludeFix("openssl/openssl.fix"))
+  ]
+)

pkgs/system/populate-linkdirs.pl

@@ -30,7 +30,7 @@ sub createLinks {
             my $target = readlink($dstfile);
             die "collission between $srcfile and $target";
         } else {
-            print "linking $dstfile to $srcfile\n";
+#            print "linking $dstfile to $srcfile\n";
             symlink($srcfile, $dstfile) ||
                 die "error creating link $dstfile";
         }

pkgs/system/system.fix

@@ -4,5 +4,8 @@ Package(
 
   , ("actATerm", IncludeFix("aterm/aterm.fix"))
   , ("actPkgConfig", IncludeFix("pkgconfig/pkgconfig.fix"))
+  , ("actOpenSSL", IncludeFix("openssl/openssl.fix"))
+  , ("actSubversion", IncludeFix("subversion/subversion.fix"))
+  , ("actXft", IncludeFix("Xft/Xft.fix"))
   ]
 )