Drastic, sweeping modifications to support iPhone 1.2.0/2.0.

git-svn-id: http://svn.telesphoreo.org/trunk@199 514c082c-b64e-11dc-b46d-3d985efe055d
author: Jay Freeman <saurik@saurik.com> 2008-04-06 10:28:29 +0000
committer: Jay Freeman <saurik@saurik.com> 2008-04-06 10:28:29 +0000
commit: d699a01fabaa04a1aad60f6ca5777f82ee24839a (patch)
tree: 1eb62bad23b14a0877c5b9171f2a5f9358c8d592
parent: 8a49e427447f40fdd43fc4b5f513b166dd639e2a (diff)
207 files changed, 1463 insertions, 1019 deletions
diff --git a/bootstrap.sh b/bootstrap.sh
index a1fa41e14..17c6d597a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,6 +4,7 @@ shopt -s extglob nullglob
 
 export PKG_BASE=$(realpath "$(dirname "$0")")
 export PKG_BOOT=${PKG_BASE}/Packager
+export PKG_TARG=arm-apple-darwin
 
 rm -rf "${PKG_BOOT}"
 svn export "${PKG_BASE}/over" "${PKG_BOOT}"
@@ -14,24 +15,26 @@ chmod +s "${PKG_BOOT}/usr/libexec/cydia_"/{godmode,symlink}
 
 mkdir -p "${PKG_BOOT}/var/lib/dpkg/info"
 
-PKG_REQS=(adv-cmds base bash coreutils cydia gawk grep inetutils less libarmfp modmyifone nano network-cmds saurik sed shell-cmds system-cmds unzip zip)
+PKG_REQS=(adv-cmds base bash coreutils cydia gawk grep inetutils iphonesurge less libarmfp modmyifone nano network-cmds rsync saurik sed shell-cmds system-cmds unzip zip)
 
 cd "${PKG_BASE}/data"
-PKG_REQS=($(find -L "${PKG_REQS[@]}" | while read -r line; do realpath "${line}"; done | grep "/home/saurik/telesphoreo/data/[^/]*$" | sed -e 's/.*\///' | sort -u))
+PKG_REQS=($(find -L "${PKG_REQS[@]}" | while read -r line; do realpath "${line}"; done | grep "/apl/tel/data/[^/]*$" | sed -e 's/.*\///' | sort -u))
 
 for PKG_NAME in "${PKG_REQS[@]}"; do
     PKG_NAME=${PKG_NAME%/_metadata/priority}
     PKG_NAME=${PKG_NAME##*/}
+    source "${PKG_BASE}/helper.sh"
 
-    export PKG_DEST=${PKG_BASE}/dest/${PKG_NAME}
+    rm -rf "${PKG_BASE}/temp"
+    dpkg -x "${PKG_BASE}/debs/${PKG_NAME}_${PKG_VRSN}-${PKG_RVSN}_darwin-arm.deb" "${PKG_BASE}/temp"
 
     echo "merging ${PKG_NAME}..."
-    cp -a "${PKG_DEST}"/* "${PKG_BOOT}"
+    cp -a "${PKG_BASE}/temp"/* "${PKG_BOOT}"
 
     "${PKG_BASE}/control.sh" "${PKG_NAME}" available >>"${PKG_BOOT}/var/lib/dpkg/available"
     "${PKG_BASE}/control.sh" "${PKG_NAME}" status >>"${PKG_BOOT}/var/lib/dpkg/status"
 
-    (cd "${PKG_DEST}"; find | sed -e '
+    (cd "${PKG_BASE}/temp"; find | sed -e '
         s/^\.\///
         s/^/\//
     ') >"${PKG_BOOT}/var/lib/dpkg/info/${PKG_NAME}.list"
@@ -39,11 +42,8 @@ done
 
 cd "${PKG_BOOT}"
 
-rm -f ../Packager.xml
-find * -type l -print -o -name "terminfo" -prune | while read -r link; do
-    echo "<array><string>Exec</string><string>/usr/libexec/cydia_/symlink $(readlink "${link}") /${link}</string></array>"
-    rm -f "${link}"
-done >>../Packager.xml
+rm -f ../Packager.tgz
+tar -zcvf ../Packager.tgz *
 
 cp -a bin/bash usr/libexec/cydia_
 cp -a bin/chmod usr/libexec/cydia_
@@ -64,6 +64,12 @@ cp -a usr/lib/libintl.8.0.2.dylib usr/libexec/cydia_
 cp -a usr/lib/libncurses.5.dylib usr/libexec/cydia_
 cp -a usr/lib/libreadline.5.2.dylib usr/libexec/cydia_
 
+rm -f ../Packager.xml
+find * -type l -print -o -name "terminfo" -prune | while read -r link; do
+    echo "<array><string>Exec</string><string>/usr/libexec/cydia_/symlink $(readlink "${link}") /${link}</string></array>"
+    rm -f "${link}"
+done >>../Packager.xml
+
 rm -f ../Packager.zip
 zip -qry ../Packager.zip *
 rm -rf "${PKG_BOOT}"
diff --git a/build.sh b/build.sh
index b7892c0ab..2aa4e3bd7 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 shopt -s extglob
-for package in data/!(*_); do
+for package in data/!(*_|cydia|ui*|iphone-python|llvm-gcc|mobileterminal|nethack); do
     PKG_NAME=$(basename "${package}")
-    ./package.sh "${PKG_NAME}"
+    echo "========== ${PKG_NAME} =========="
+    ./make.sh "${PKG_NAME}"
 done
-./construct.sh
diff --git a/construct.sh b/construct.sh
index 5732acd1a..c2d2618ee 100755
--- a/construct.sh
+++ b/construct.sh
@@ -5,13 +5,14 @@ PKG_BASE=$(pwd)
 PKG_REPO=/dat/web/apt.saurik.com
 PKG_OVER=${PKG_REPO}/indices/override.tangelo.main.gz
 PKG_PKGS=${PKG_REPO}/dists/tangelo/main/binary-darwin-arm/Packages
+tag=arm-apple-darwin
 rm -rf link
 mkdir link
 for package in data/!(*_); do
     PKG_NAME=$(basename "${package}")
     PKG_DATA="${PKG_BASE}/data/${PKG_NAME}"
     echo "${PKG_NAME}" "$(cat "${PKG_DATA}/_metadata/priority")" "$(cat "${PKG_DATA}/_metadata/section")"
-    ln -s "../debs/${PKG_NAME}_$(cat "${PKG_DATA}/_metadata/version")-$(cat "${PKG_BASE}/stat/${PKG_NAME}/dest-ver")_darwin-arm.deb" link
+    ln -s "../debs/${PKG_NAME}_$(cat "${PKG_DATA}/_metadata/version")-$(cat "${PKG_BASE}/stat/${tag}/${PKG_NAME}/dest-ver")_darwin-arm.deb" link
 done | gzip -9c >"${PKG_OVER}"
 dpkg-scanpackages link <(zcat "${PKG_OVER}") | sed -e 's/: link\//: debs\//' >"${PKG_PKGS}"
 gzip -c "${PKG_PKGS}" >"${PKG_PKGS}.gz"
diff --git a/control.sh b/control.sh
index f7d28c42a..e111fbbcc 100755
--- a/control.sh
+++ b/control.sh
@@ -73,6 +73,17 @@ for dep in "${PKG_DEPS[@]}"; do
     echo -n " $(basename "${dep}" .dep)"
 done
 
+if [[ -e ${PKG_DATA}/_metadata/depends ]]; then
+    if [[ ${comma+@} == @ ]]; then
+        echo -n ","
+    else
+        echo -n "Depends:"
+        comma=
+    fi
+
+    echo -n " $(cat "${PKG_DATA}/_metadata/depends")"
+fi
+
 if [[ ${comma+@} == @ ]]; then
     echo
 fi
diff --git a/data/adv-cmds/make.sh b/data/adv-cmds/make.sh
index ae4cb5506..5d0039951 100644
--- a/data/adv-cmds/make.sh
+++ b/data/adv-cmds/make.sh
@@ -1,8 +1,7 @@
 pkg:extract
 cd *
 for tproj in finger fingerd last lsvfs md ps; do
-    arm-apple-darwin-gcc -o "${tproj}" "${tproj}.tproj"/*.c -D'__FBSDID(x)='
-    arm-apple-darwin-strip "${tproj}"
+    "${PKG_TARG}-gcc" -o "${tproj}" "${tproj}.tproj"/*.c -D'__FBSDID(x)='
 done
 pkg: mkdir -p /bin /usr/bin /usr/libexec
 pkg: cp -a ps /bin
diff --git a/data/apr-util/_metadata/apr.dep b/data/apr-util/_metadata/apr.dep
new file mode 120000
index 000000000..a2d8d092f
--- /dev/null
+++ b/data/apr-util/_metadata/apr.dep
@@ -0,0 +1 @@
+../../apr
+\ No newline at end of file
diff --git a/data/apr-util/make.sh b/data/apr-util/make.sh
index 8aaa84de9..d39e41ed6 100644
--- a/data/apr-util/make.sh
+++ b/data/apr-util/make.sh
@@ -1,5 +1,5 @@
-tar -zxvf "${PKG_DATA}/apr-util-1.2.12.tar.gz"
-cd apr-util-1.2.12
+pkg:extract
+cd *
 pkg:configure --disable-static --with-apr="$(PKG_WORK_ apr)/apr-1.2.12" --with-berkeley-db="${PKG_ROOT}"
 make
 pkg:install
diff --git a/data/apr/make.sh b/data/apr/make.sh
index a472e891d..70eecb6ba 100644
--- a/data/apr/make.sh
+++ b/data/apr/make.sh
@@ -1,5 +1,6 @@
-tar -zxvf "${PKG_DATA}/apr-1.2.12.tar.gz"
-cd apr-1.2.12
+pkg:extract
+cd *
+pkg:patch
 pkg:configure --disable-static ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes apr_cv_process_shared_works=yes apr_cv_mutex_robust_shared=no apr_cv_tcp_nodelay_with_cork=no
 make
 pkg:install
diff --git a/data/apr/offsetof.diff b/data/apr/offsetof.diff
new file mode 100644
index 000000000..bbb6889bc
--- /dev/null
+++ b/data/apr/offsetof.diff
@@ -0,0 +1,12 @@
+diff -r -u apr-1.2.12/include/apr_general.h apr-1.2.12+iPhone/include/apr_general.h
+--- apr-1.2.12/include/apr_general.h	2006-08-03 11:05:27.000000000 +0000
++++ apr-1.2.12+iPhone/include/apr_general.h	2008-03-24 02:43:17.000000000 +0000
+@@ -76,7 +76,7 @@
+  * @return offset
+  */
+ 
+-#if defined(CRAY) || (defined(__arm) && !defined(LINUX))
++#if defined(CRAY) || (defined(__arm) && !defined(LINUX) && !defined(__APPLE__))
+ #ifdef __STDC__
+ #define APR_OFFSET(p_type,field) _Offsetof(p_type,field)
+ #else
diff --git a/data/apt/cfnetwork.diff b/data/apt/cfnetwork.diff
index 726abe52b..6cdd2fc3b 100644
--- a/data/apt/cfnetwork.diff
+++ b/data/apt/cfnetwork.diff
@@ -1,6 +1,6 @@
 diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 --- apt-0.6.46.4.1/methods/http.cc	2006-12-04 14:37:36.000000000 +0000
-+++ apt-0.6.46.4.1+iPhone/methods/http.cc	2008-02-27 01:21:07.000000000 +0000
++++ apt-0.6.46.4.1+iPhone/methods/http.cc	2008-04-06 10:00:37.000000000 +0000
 @@ -44,6 +48,10 @@
  // Internet stuff
  #include <netdb.h>
@@ -53,14 +53,14 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 +    } else if (se.domain == kCFStreamErrorDomainSSL) {
 +        _error->Error("SSL: %ld", se.error);
 +    } else {
-+        _error->Error("Domain #%d: %ld", se.domain, se.error);
++        _error->Error("Domain #%ld: %ld", se.domain, se.error);
 +    }
 +}
 +
  string HttpMethod::FailFile;
  int HttpMethod::FailFd = -1;
  time_t HttpMethod::FailTime = 0;
-@@ -1062,159 +1111,209 @@
+@@ -1062,159 +1111,234 @@
  
        if (Queue == 0)
  	 continue;
@@ -132,7 +132,9 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 -      };
 +      CFStringEncoding se = kCFStringEncodingUTF8;
 +
-+      CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, Queue->Uri.c_str(), se);
++      char *url = strdup(Queue->Uri.c_str());
++    url:
++      CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, url, se);
 +      CFURLRef ur = CFURLCreateWithString(kCFAllocatorDefault, sr, NULL);
 +      CFRelease(sr);
 +      CFHTTPMessageRef hm = CFHTTPMessageCreateRequest(kCFAllocatorDefault, CFSTR("GET"), ur, kCFHTTPVersion1_1);
@@ -161,13 +163,15 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 +      CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPProxy, dr);
 +      CFRelease(dr);
 +
-+      CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPShouldAutoredirect, kCFBooleanTrue);
++      //CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPShouldAutoredirect, kCFBooleanTrue);
 +      CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPAttemptPersistentConnection, kCFBooleanTrue);
 +
 +      URI uri = Queue->Uri;
  
 -      // Decide what to do.
        FetchResult Res;
++      CFIndex rd;
++      UInt32 sc;
 +
 +      uint8_t data[10240];
 +      size_t offset = 0;
@@ -180,7 +184,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 +         goto done;
 +      }
 +
-+      CFIndex rd = CFReadStreamRead(rs, data, sizeof(data));
++      rd = CFReadStreamRead(rs, data, sizeof(data));
 +
 +      if (rd == -1) {
 +         CfrsError(rs);
@@ -199,10 +203,30 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 -	    // Run the data
 -	    bool Result =  Server->RunData();
 +      hm = (CFHTTPMessageRef) CFReadStreamCopyProperty(rs, kCFStreamPropertyHTTPResponseHeader);
-+      UInt32 sc = CFHTTPMessageGetResponseStatusCode(hm);
++      sc = CFHTTPMessageGetResponseStatusCode(hm);
  
 -	    /* If the server is sending back sizeless responses then fill in
 -	       the size now */
++      if (sc == 302) {
++         sr = CFHTTPMessageCopyHeaderFieldValue(hm, CFSTR("Location"));
++         if (sr == NULL) {
++            Fail();
++            goto done_;
++         } else {
++            size_t ln = CFStringGetLength(sr) + 1;
++            free(url);
++            url = static_cast<char *>(malloc(ln));
++
++            if (!CFStringGetCString(sr, url, ln, se)) {
++               Fail();
++               goto done_;
++            }
++
++            CFRelease(sr);
++            goto url;
++         }
++      }
++
 +      sr = CFHTTPMessageCopyHeaderFieldValue(hm, CFSTR("Content-Range"));
 +      if (sr != NULL) {
 +         size_t ln = CFStringGetLength(sr) + 1;
@@ -387,6 +411,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 +    done:
 +      CFReadStreamClose(rs);
 +      CFRelease(rs);
++      free(url);
  
 -	 // We need to flush the data, the header is like a 404 w/ error text
 -	 case 4:
@@ -411,7 +436,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
     
 diff -ru apt-0.6.46.4.1/methods/makefile apt-0.6.46.4.1+iPhone/methods/makefile
 --- apt-0.6.46.4.1/methods/makefile	2006-12-04 14:37:36.000000000 +0000
-+++ apt-0.6.46.4.1+iPhone/methods/makefile	2008-02-26 23:54:07.000000000 +0000
++++ apt-0.6.46.4.1+iPhone/methods/makefile	2008-04-06 09:55:04.000000000 +0000
 @@ -47,7 +47,7 @@
  
  # The http method
diff --git a/data/apt/make.sh b/data/apt/make.sh
index 8e391d6d6..7c3f4d757 100644
--- a/data/apt/make.sh
+++ b/data/apt/make.sh
@@ -1,16 +1,22 @@
-tar -zxvf "${PKG_DATA}/apt_0.6.46.4-0.1.tar.gz"
-cd apt-0.6.46.4.1
+pkg:extract
+cd *
 pkg:patch
 autoconf
 pkg:configure --disable-nls
 make
-pkg:mkdir /etc/apt/sources.list.d
-pkg:mkdir /var/cache/apt/archives/partial
-pkg:mkdir /var/lib/apt/lists/partial
-pkg:mkdir /var/lib/apt/periodic
+
+pkg: mkdir -p /etc/apt/sources.list.d
+pkg: mkdir -p /var/cache/apt/archives/partial
+pkg: mkdir -p /var/lib/apt/lists/partial
+pkg: mkdir -p /var/lib/apt/periodic
+
 pkg: mkdir -p /usr/bin /usr/lib/apt
 pkg: cp -a bin/apt-* /usr/bin
 pkg: cp -a bin/libapt-* /usr/lib
 pkg: cp -a bin/methods /usr/lib/apt
-pkg:mkdir /usr/lib/dpkg/methods
-cp -a scripts/dselect "${PKG_DEST}/usr/lib/dpkg/methods/apt"
+
+pkg: mkdir -p /usr/lib/dpkg/methods
+pkg: cp -a scripts/dselect /usr/lib/dpkg/methods/apt
+
+pkg: mkdir -p /usr/include
+pkg: cp -a include/apt-pkg /usr/include
diff --git a/data/autossh/_metadata/section b/data/autossh/_metadata/section
index 8708e4b54..f3d9861c1 100644
--- a/data/autossh/_metadata/section
+++ b/data/autossh/_metadata/section
@@ -1 +1 @@
-Networking
+Network
diff --git a/data/basic-cmds/make.sh b/data/basic-cmds/make.sh
index 5c580e3f2..eceb9f5cb 100644
--- a/data/basic-cmds/make.sh
+++ b/data/basic-cmds/make.sh
@@ -1,6 +1,6 @@
-tar -zxvf "${PKG_DATA}/basic_cmds-48.tar.gz"
-cd basic_cmds-48
+pkg:extract
+cd *
 for bin in mesg write uudecode uuencode; do
-    arm-apple-darwin-gcc -o "${bin}/${bin}" "${bin}"/*.c
+    "${PKG_TARG}-gcc" -o "${bin}/${bin}" "${bin}"/*.c
     pkg:usrbin "${bin}/${bin}"
 done
diff --git a/data/bigboss/bigboss.list b/data/bigboss/bigboss.list
index 07c78c064..fbf7ba2bc 100644
--- a/data/bigboss/bigboss.list
+++ b/data/bigboss/bigboss.list
@@ -3,4 +3,4 @@
 # either add your own .list file to /etc/apt/sources.list.d
 # or add your entry to the global /etc/apt/sources.list file
 
-deb http://iphone.sleepers.net/repofiles/cydia/ stable main
+deb http://thebigboss.org/repofiles/cydia/ stable main
diff --git a/data/bind/_metadata/section b/data/bind/_metadata/section
index 8708e4b54..f3d9861c1 100644
--- a/data/bind/_metadata/section
+++ b/data/bind/_metadata/section
@@ -1 +1 @@
-Networking
+Network
diff --git a/data/bind/make.sh b/data/bind/make.sh
index 1e90e5aac..d697a3f20 100644
--- a/data/bind/make.sh
+++ b/data/bind/make.sh
@@ -1,5 +1,5 @@
-tar -zxvf "${PKG_DATA}/bind-9.4.2.tar.gz"
-cd bind-9.4.2
+pkg:extract
+cd *
 pkg:configure --with-randomdev=/dev/random BUILD_CC=gcc
 make
 pkg:install
diff --git a/data/bitchx/_metadata/ncurses.dep b/data/bitchx/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/bitchx/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/bitchx/_metadata/section b/data/bitchx/_metadata/section
index 8708e4b54..f3d9861c1 100644
--- a/data/bitchx/_metadata/section
+++ b/data/bitchx/_metadata/section
@@ -1 +1 @@
-Networking
+Network
diff --git a/data/bootstrap-cmds/make.sh b/data/bootstrap-cmds/make.sh
index bc6273cd3..af6db12d1 100644
--- a/data/bootstrap-cmds/make.sh
+++ b/data/bootstrap-cmds/make.sh
@@ -9,7 +9,7 @@ EOF
 cp -a i386 arm
 yacc -d parser.y -o parser.c
 lex lexxer.l
-arm-apple-darwin-gcc -o migcom *.c
+${PKG_TARG}-gcc -o migcom *.c
 pkg: mkdir -p /usr/bin /usr/libexec
 pkg: cp -a migcom /usr/libexec
 pkg: cp -a mig.sh /usr/bin/mig
diff --git a/data/bzip2/make.sh b/data/bzip2/make.sh
index 3a1bb44fd..560f35a04 100644
--- a/data/bzip2/make.sh
+++ b/data/bzip2/make.sh
@@ -1,5 +1,5 @@
-tar -zxvf "${PKG_DATA}/bzip2-1.0.4.tar.gz"
-cd bzip2-1.0.4
-make bzip2 bzip2recover CC=arm-apple-darwin-gcc
+pkg:extract
+cd *
+make bzip2 bzip2recover CC=${PKG_TARG}-gcc
 pkg: mkdir -p /bin
 pkg: cp -a bzip2 bzip2recover /bin
diff --git a/data/connect.c/_metadata/section b/data/connect.c/_metadata/section
index 8708e4b54..f3d9861c1 100644
--- a/data/connect.c/_metadata/section
+++ b/data/connect.c/_metadata/section
@@ -1 +1 @@
-Networking
+Network
diff --git a/data/connect.c/make.sh b/data/connect.c/make.sh
index 30f48d53f..8e46cf906 100644
--- a/data/connect.c/make.sh
+++ b/data/connect.c/make.sh
@@ -1,3 +1,3 @@
-pkg: arm-apple-darwin-gcc -o connect %/connect.c -lresolv
+pkg: ${PKG_TARG}-gcc -o connect %/connect.c -lresolv
 pkg: mkdir -p /usr/bin
 pkg: cp -a connect /usr/bin
diff --git a/data/curl/_metadata/section b/data/curl/_metadata/section
index 8708e4b54..f3d9861c1 100644
--- a/data/curl/_metadata/section
+++ b/data/curl/_metadata/section
@@ -1 +1 @@
-Networking
+Network
diff --git a/data/cydia/_metadata/version b/data/cydia/_metadata/version
index 3df35775b..71de0b4d0 100644
--- a/data/cydia/_metadata/version
+++ b/data/cydia/_metadata/version
@@ -1 +1 @@
-1.0.2361
+1.0.2363
diff --git a/data/cydia/cydia-1.0.2361.tgz b/data/cydia/cydia-1.0.2361.tgz
deleted file mode 100644
index 038013806..000000000
--- a/data/cydia/cydia-1.0.2361.tgz
+++ /dev/null
diff --git a/data/cydia/cydia-1.0.2363.tgz b/data/cydia/cydia-1.0.2363.tgz
new file mode 100644
index 000000000..fcc6951e1
--- /dev/null
+++ b/data/cydia/cydia-1.0.2363.tgz
diff --git a/data/darwintools/make.sh b/data/darwintools/make.sh
index cf0191d94..297af9c33 100644
--- a/data/darwintools/make.sh
+++ b/data/darwintools/make.sh
@@ -3,6 +3,6 @@ cd *
 pkg: mkdir -p /usr/bin
 
 for tool in startupfiletool sw_vers; do
-    arm-apple-darwin-gcc -o "${tool}" "${tool}.c" -framework CoreFoundation
+    "${PKG_TARG}-gcc" -o "${tool}" "${tool}.c" -framework CoreFoundation
     pkg: cp -a "${tool}" /usr/bin
 done
diff --git a/data/developer-cmds/make.sh b/data/developer-cmds/make.sh
index e797a1702..227ee9159 100644
--- a/data/developer-cmds/make.sh
+++ b/data/developer-cmds/make.sh
@@ -2,10 +2,10 @@ pkg:extract
 cd *
 pkg: mkdir -p /usr/bin
 
-arm-apple-darwin-gcc -o hexdump/hexdump hexdump/{conv,display,hexdump,hexsyntax,odsyntax,parse}.c -D'__FBSDID(x)='
+${PKG_TARG}-gcc -o hexdump/hexdump hexdump/{conv,display,hexdump,hexsyntax,odsyntax,parse}.c -D'__FBSDID(x)='
 pkg: cp -a hexdump/hexdump /usr/bin
 
 for bin in ctags error rpcgen unifdef; do
-    arm-apple-darwin-gcc -o "${bin}/${bin}" "${bin}"/*.c
+    ${PKG_TARG}-gcc -o "${bin}/${bin}" "${bin}"/*.c
     pkg: cp -a "${bin}/${bin}" /usr/bin
 done
diff --git a/data/dict/make.sh b/data/dict/make.sh
index 84f49c26f..69cf25c8a 100644
--- a/data/dict/make.sh
+++ b/data/dict/make.sh
@@ -1,6 +1,6 @@
 pkg:extract
 cd *
 pkg:patch
-pkg:configure ac_cv_type_wint_t=yes ac_cv_prog_AR=$(which arm-apple-darwin-ar)
-make AR=arm-apple-darwin-ar
+pkg:configure ac_cv_type_wint_t=yes ac_cv_prog_AR=$(which ${PKG_TARG}-ar)
+make AR=${PKG_TARG}-ar
 pkg:install
diff --git a/data/dict/slfind.diff b/data/dict/slfind.diff
new file mode 100644
index 000000000..4dcd70a59
--- /dev/null
+++ b/data/dict/slfind.diff
@@ -0,0 +1,19 @@
+diff -r -u dictd-1.9.9/libmaa/sl.c dictd-1.9.9+iPhone/libmaa/sl.c
+--- dictd-1.9.9/libmaa/sl.c	2002-08-02 19:43:15.000000000 +0000
++++ dictd-1.9.9+iPhone/libmaa/sl.c	2008-04-05 17:27:43.000000000 +0000
+@@ -355,6 +355,7 @@
+    _sl_check( list );
+ }
+ 
++#if 0
+ /* \doc Find the datum in |list| that has an associated value of |key|.
+    Return that datum (a pointer), or "NULL" if the |key| is not found. */
+ 
+@@ -371,6 +372,7 @@
+    if (pt && !l->compare( l->key( pt->datum ), key )) return pt->datum;
+    return NULL;
+ }
++#endif
+ 
+ /* \doc Iterate |f| over every datum in |list|.  If |f| returns non-zero,
+    then abort the remainder of the iteration.  Iterations are designed to
diff --git a/data/diskdev-cmds/make.sh b/data/diskdev-cmds/make.sh
index 7f70ce9d9..735de086b 100644
--- a/data/diskdev-cmds/make.sh
+++ b/data/diskdev-cmds/make.sh
@@ -4,8 +4,8 @@ cd *
 
 cd disklib
 rm -f mntopts.h getmntopts.c
-arm-apple-darwin-gcc -c *.c
-arm-apple-darwin-ar -r libdisk.a *.o
+${PKG_TARG}-gcc -c *.c
+${PKG_TARG}-ar -r libdisk.a *.o
 cd ..
 
 for tproj in !(fstyp|dev_mkdb|dump|fsck_hfs|fuser|mount_hfs|restore|quotacheck|ufs).tproj; do
@@ -21,15 +21,13 @@ for tproj in !(fstyp|dev_mkdb|dump|fsck_hfs|fuser|mount_hfs|restore|quotacheck|u
         extra="${extra} -framework CoreFoundation"
     fi
 
-    arm-apple-darwin-gcc -Idisklib -o "${tproj}" $(find "${tproj}.tproj" -name '*.c') disklib/libdisk.a -lutil ${extra}
-    arm-apple-darwin-strip "${tproj}"
+    ${PKG_TARG}-gcc -Idisklib -o "${tproj}" $(find "${tproj}.tproj" -name '*.c') disklib/libdisk.a -lutil ${extra}
 done
 
 cd fstyp.tproj
 for c in *.c; do
     bin=../$(basename "${c}" .c)
-    arm-apple-darwin-gcc -o "${bin}" "${c}"
-    arm-apple-darwin-strip "${bin}"
+    ${PKG_TARG}-gcc -o "${bin}" "${c}"
 done
 cd ..
 
diff --git a/data/dmg2img/make.sh b/data/dmg2img/make.sh
index 430845bef..e4dd86221 100644
--- a/data/dmg2img/make.sh
+++ b/data/dmg2img/make.sh
@@ -1,6 +1,6 @@
 pkg:extract
 cd *
 pkg:patch
-make CC=arm-apple-darwin-gcc
+make CC=${PKG_TARG}-gcc
 pkg: mkdir -p /usr/bin
 pkg: mv dmg2img /usr/bin
diff --git a/data/dmg2img/optimizer.diff b/data/dmg2img/optimizer.diff
deleted file mode 100644
index e2e464236..000000000
--- a/data/dmg2img/optimizer.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru dmg2img/Makefile dmg2img+iPhone/Makefile
---- dmg2img/Makefile	2007-08-07 05:43:12.000000000 +0000
-+++ dmg2img+iPhone/Makefile	2008-01-30 18:53:21.000000000 +0000
-@@ -1,6 +1,6 @@
- BIN_DIR = /usr/bin
- CC = gcc
--CFLAGS = -O3
-+CFLAGS = -O0
- 
- all: clean dmg2img
- 
diff --git a/data/dpkg/_metadata/bzip2.dep b/data/dpkg/_metadata/bzip2.dep
new file mode 120000
index 000000000..15aa44a77
--- /dev/null
+++ b/data/dpkg/_metadata/bzip2.dep
@@ -0,0 +1 @@
+../../bzip2
+\ No newline at end of file
diff --git a/data/dpkg/make.sh b/data/dpkg/make.sh
index 45da861e8..9b4d86a95 100644
--- a/data/dpkg/make.sh
+++ b/data/dpkg/make.sh
@@ -1,8 +1,8 @@
-tar -zxvf "${PKG_DATA}/dpkg_1.13.25.tar.gz"
-cd dpkg-1.13.25
+pkg:extract
+cd *
 pkg:patch
 autoconf
-cp -a getopt/obstack.c lib
+cp -a getopt/obstack.[ch] lib
 pkg:configure --with-admindir=/var/lib/dpkg --without-start-stop-daemon --without-dselect --disable-nls --sysconfdir=/etc --disable-linker-optimisations
 make
 pkg:install
diff --git a/data/ed/make.sh b/data/ed/make.sh
index 3504cbff8..26d2ee621 100644
--- a/data/ed/make.sh
+++ b/data/ed/make.sh
@@ -1,5 +1,5 @@
 pkg:extract
 cd *
 ./configure --prefix=/usr
-make CC=arm-apple-darwin-gcc
+make CC="${PKG_TARG}-gcc"
 pkg:install
diff --git a/data/file-cmds/make.sh b/data/file-cmds/make.sh
index be6802a41..492dc9947 100644
--- a/data/file-cmds/make.sh
+++ b/data/file-cmds/make.sh
@@ -2,6 +2,6 @@ pkg:extract
 cd *
 pkg: mkdir -p /usr/bin
 for bin in chflags compress ipcrm ipcs pax; do
-    arm-apple-darwin-gcc -o "${bin}/${bin}" "${bin}"/*.c -D'__FBSDID(x)=' -D__POSIX_C_SOURCE
+    ${PKG_TARG}-gcc -o "${bin}/${bin}" "${bin}"/*.c -D'__FBSDID(x)=' -D__POSIX_C_SOURCE
     pkg: cp -a "${bin}/${bin}" /usr/bin
 done
diff --git a/data/gcrypt/_metadata/libgpg-error.dep b/data/gcrypt/_metadata/libgpg-error.dep
new file mode 120000
index 000000000..b2a102581
--- /dev/null
+++ b/data/gcrypt/_metadata/libgpg-error.dep
@@ -0,0 +1 @@
+../../libgpg-error
+\ No newline at end of file
diff --git a/data/gcrypt/make.sh b/data/gcrypt/make.sh
index 1b3c1b776..d2688436e 100644
--- a/data/gcrypt/make.sh
+++ b/data/gcrypt/make.sh
@@ -1,6 +1,7 @@
 pkg:extract
 cd *
 pkg:patch
-pkg:configure
+pkg:autoconf
+pkg:configure --with-gpg-error-prefix="$(PKG_DEST_ libgpg-error)/usr"
 make
 pkg:install
diff --git a/data/gettext/regex.diff b/data/gettext/regex.diff
new file mode 100644
index 000000000..247f12201
--- /dev/null
+++ b/data/gettext/regex.diff
@@ -0,0 +1,19 @@
+diff -ru gettext-0.17/gettext-tools/libgrep/regex.c gettext-0.17+iPhone/gettext-tools/libgrep/regex.c
+--- gettext-0.17/gettext-tools/libgrep/regex.c	2007-10-07 19:37:37.000000000 +0000
++++ gettext-0.17+iPhone/gettext-tools/libgrep/regex.c	2008-04-04 19:45:52.000000000 +0000
+@@ -45,13 +45,13 @@
+ #  include <wctype.h>
+ # endif
+ 
+-# ifdef _LIBC
+-/* We have to keep the namespace clean.  */
+ #  define regfree(preg) __regfree (preg)
+ #  define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
+ #  define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
+ #  define regerror(errcode, preg, errbuf, errbuf_size) \
+ 	__regerror(errcode, preg, errbuf, errbuf_size)
++# ifdef _LIBC
++/* We have to keep the namespace clean.  */
+ #  define re_set_registers(bu, re, nu, st, en) \
+ 	__re_set_registers (bu, re, nu, st, en)
+ #  define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
diff --git a/data/glib/nmedit.diff b/data/glib/nmedit.diff
index bfbacfe50..a6c9db9a4 100644
--- a/data/glib/nmedit.diff
+++ b/data/glib/nmedit.diff
@@ -6,13 +6,13 @@ diff -ru glib-2.12.13/aclocal.m4 glib-2.12.13+iPhone/aclocal.m4
          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
            if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            else
 -            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            fi
 -            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
        else
        case $cc_basename in
          xlc*)
@@ -22,8 +22,8 @@ diff -ru glib-2.12.13/aclocal.m4 glib-2.12.13+iPhone/aclocal.m4
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
           _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -33,8 +33,8 @@ diff -ru glib-2.12.13/aclocal.m4 glib-2.12.13+iPhone/aclocal.m4
        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
      else
        case $cc_basename in
          xlc*)
@@ -44,8 +44,8 @@ diff -ru glib-2.12.13/aclocal.m4 glib-2.12.13+iPhone/aclocal.m4
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
           _LT_AC_TAGVAR(ld_shlibs, $1)=no
diff --git a/data/gnupg2/make.sh b/data/gnupg2/make.sh
index 49a2b0759..124aa6f04 100644
--- a/data/gnupg2/make.sh
+++ b/data/gnupg2/make.sh
@@ -2,6 +2,6 @@ pkg:extract
 cd *
 pkg:patch
 autoconf
-pkg:configure --with-{ksba,libassuan,pth}-prefix="${PKG_ROOT}"/usr --sysconfdir=/etc
+pkg:configure --with-ksba-prefix="$(PKG_DEST_ libksba)/usr" --with-libassuan-prefix="$(PKG_DEST_ libassuan)/usr" --with-pth-prefix="$(PKG_DEST_ gnupth)/usr" --sysconfdir=/etc
 make
 pkg:install
diff --git a/data/grep/make.sh b/data/grep/make.sh
index 6053ef5d6..a035be7ae 100644
--- a/data/grep/make.sh
+++ b/data/grep/make.sh
@@ -1,7 +1,6 @@
-tar -zxvf "${PKG_DATA}/grep-2.5.tar.gz"
-cd grep-2.5
+pkg:extract
+cd *
 pkg:patch
-pkg:configure --disable-perl-regexp
+pkg:configure --disable-perl-regexp --bindir=/bin
 make
 pkg:install
-pkg:bin grep
diff --git a/data/grep/regcomp.diff b/data/grep/regcomp.diff
new file mode 100644
index 000000000..f4922f80d
--- /dev/null
+++ b/data/grep/regcomp.diff
@@ -0,0 +1,19 @@
+diff -ru grep-2.5/lib/regex.c grep-2.5+iPhone/lib/regex.c
+--- grep-2.5/lib/regex.c	2001-04-02 18:04:45.000000000 +0000
++++ grep-2.5+iPhone/lib/regex.c	2008-04-05 05:18:34.000000000 +0000
+@@ -80,13 +80,13 @@
+ # define PUT_CHAR(c) putchar (c)
+ #endif /* MBS_SUPPORT */
+ 
+-#ifdef _LIBC
+-/* We have to keep the namespace clean.  */
+ # define regfree(preg) __regfree (preg)
+ # define regexec(pr, st, nm, pm, ef) __regexec (pr, st, nm, pm, ef)
+ # define regcomp(preg, pattern, cflags) __regcomp (preg, pattern, cflags)
+ # define regerror(errcode, preg, errbuf, errbuf_size) \
+ 	__regerror(errcode, preg, errbuf, errbuf_size)
++#ifdef _LIBC
++/* We have to keep the namespace clean.  */
+ # define re_set_registers(bu, re, nu, st, en) \
+ 	__re_set_registers (bu, re, nu, st, en)
+ # define re_match_2(bufp, string1, size1, string2, size2, pos, regs, stop) \
diff --git a/data/ice/_metadata/section b/data/ice/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/ice/_metadata/section
+++ b/data/ice/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/ice/_metadata/xproto.dep b/data/ice/_metadata/xproto.dep
new file mode 120000
index 000000000..48f62c38c
--- /dev/null
+++ b/data/ice/_metadata/xproto.dep
@@ -0,0 +1 @@
+../../xproto
+\ No newline at end of file
diff --git a/data/ice/_metadata/xtrans.dep b/data/ice/_metadata/xtrans.dep
new file mode 120000
index 000000000..aa5f03d4b
--- /dev/null
+++ b/data/ice/_metadata/xtrans.dep
@@ -0,0 +1 @@
+../../xtrans
+\ No newline at end of file
diff --git a/data/inetutils/talkd.diff b/data/inetutils/talkd.diff
new file mode 100644
index 000000000..2a17a1ddc
--- /dev/null
+++ b/data/inetutils/talkd.diff
@@ -0,0 +1,13 @@
+diff -ru inetutils-1.5/configure.ac inetutils-1.5+iPhone/configure.ac
+--- inetutils-1.5/configure.ac	2007-06-28 22:58:23.000000000 +0000
++++ inetutils-1.5+iPhone/configure.ac	2008-03-24 13:47:26.000000000 +0000
+@@ -470,7 +470,8 @@
+               [AC_DEFINE(HAVE_OSOCKADDR_H, 1,
+                          [Define to one if you have <osockaddr.h>.])],
+ 	      [#include <sys/types.h>
+-               #include <sys/socket.h> ])
++               #include <sys/socket.h>
++               #include <protocols/talkd.h> ])
+ 
+ AC_CHECK_TYPES(struct if_nameindex, , ,
+   [#include <sys/types.h>
diff --git a/data/inputproto/_metadata/section b/data/inputproto/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/inputproto/_metadata/section
+++ b/data/inputproto/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/iokittools/_metadata/ncurses.dep b/data/iokittools/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/iokittools/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/iokittools/mactypes.diff b/data/iokittools/mactypes.diff
new file mode 100644
index 000000000..a2233cada
--- /dev/null
+++ b/data/iokittools/mactypes.diff
@@ -0,0 +1,33 @@
+diff -ru IOKitTools-76/ioalloccount.tproj/ioalloccount.c IOKitTools-76+iPhone/ioalloccount.tproj/ioalloccount.c
+--- IOKitTools-76/ioalloccount.tproj/ioalloccount.c	2003-11-18 19:23:01.000000000 +0000
++++ IOKitTools-76+iPhone/ioalloccount.tproj/ioalloccount.c	2008-03-24 11:14:24.000000000 +0000
+@@ -6,6 +6,7 @@
+ #include <CoreFoundation/CoreFoundation.h>
+ #include <IOKit/IOKitLib.h>
+ #include <IOKit/IOKitKeys.h>
++#include <MacTypes.h>
+ 
+ static void printNumber( CFDictionaryRef dict, CFStringRef name )
+ {
+diff -ru IOKitTools-76/ioclasscount.tproj/ioclasscount.c IOKitTools-76+iPhone/ioclasscount.tproj/ioclasscount.c
+--- IOKitTools-76/ioclasscount.tproj/ioclasscount.c	2003-11-06 19:16:54.000000000 +0000
++++ IOKitTools-76+iPhone/ioclasscount.tproj/ioclasscount.c	2008-03-24 11:14:24.000000000 +0000
+@@ -8,6 +8,7 @@
+ 
+ #include <IOKit/IOKitLib.h>
+ #include <IOKit/IOKitKeys.h>
++#include <MacTypes.h>
+ 
+ static int CompareKey(const void * left, const void * right)
+ {
+diff -ru IOKitTools-76/ioreg.tproj/ioreg.c IOKitTools-76+iPhone/ioreg.tproj/ioreg.c
+--- IOKitTools-76/ioreg.tproj/ioreg.c	2007-01-23 21:29:08.000000000 +0000
++++ IOKitTools-76+iPhone/ioreg.tproj/ioreg.c	2008-03-24 11:14:47.000000000 +0000
+@@ -28,6 +28,7 @@
+ #include <sys/ioctl.h>                                // (TIOCGWINSZ, ...)
+ #include <term.h>                                     // (tputs, ...)
+ #include <unistd.h>                                   // (getopt, ...)
++#include <MacTypes.h>
+ 
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ 
diff --git a/data/iokittools/make.sh b/data/iokittools/make.sh
index 566b36f34..a846152d7 100644
--- a/data/iokittools/make.sh
+++ b/data/iokittools/make.sh
@@ -1,8 +1,9 @@
 shopt -s extglob
-tar -zxvf "${PKG_DATA}/IOKitTools-76.tar.gz"
-cd IOKitTools-76
+pkg:extract
+cd *
+pkg:patch
 for tproj in *.tproj; do
     tproj=$(basename "${tproj}" .tproj)
-    arm-apple-darwin-gcc -lcurses -o "${tproj}" "${tproj}.tproj"/*.c -framework CoreFoundation -framework IOKit
+    ${PKG_TARG}-gcc -lcurses -o "${tproj}" "${tproj}.tproj"/*.c -framework CoreFoundation -framework IOKit
     pkg:usrbin "${tproj}"
 done
diff --git a/data/iphonesurge/_metadata/priority b/data/iphonesurge/_metadata/priority
index 134d9bc32..66c8c3616 100644
--- a/data/iphonesurge/_metadata/priority
+++ b/data/iphonesurge/_metadata/priority
@@ -1 +1 @@
-optional
++optional
diff --git a/data/irssi/_metadata/gettext.dep b/data/irssi/_metadata/gettext.dep
new file mode 120000
index 000000000..e8dbd8996
--- /dev/null
+++ b/data/irssi/_metadata/gettext.dep
@@ -0,0 +1 @@
+../../gettext
+\ No newline at end of file
diff --git a/data/irssi/make.sh b/data/irssi/make.sh
index 8d75cb48d..5b2761c57 100644
--- a/data/irssi/make.sh
+++ b/data/irssi/make.sh
@@ -1,6 +1,7 @@
 pkg:extract
 cd *
 pkg:patch
-CFLAGS=-O0 pkg:configure --enable-static
+pkg:autoconf
+pkg:configure --enable-static
 make
 pkg:install
diff --git a/data/jamvm/classpath.diff b/data/jamvm/classpath.diff
deleted file mode 100644
index dbab6f716..000000000
--- a/data/jamvm/classpath.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru jamvm-20080302/lib/Makefile.am jamvm-20080302+iPhone/lib/Makefile.am
---- jamvm-20080302/lib/Makefile.am	2008-02-22 02:06:05.000000000 +0000
-+++ jamvm-20080302+iPhone/lib/Makefile.am	2008-03-02 08:07:56.000000000 +0000
-@@ -48,7 +48,7 @@
- 
- classes.zip: $(JAVA_FILES)
- 	-mkdir classes
--	$(JAVAC) -bootclasspath ${GLIBJ_ZIP} -d classes $(JAVA_FILES)
-+	$(JAVAC) -bootclasspath ${PKG_ROOT}${GLIBJ_ZIP} -d classes $(JAVA_FILES)
- 	cd classes && zip -r ../classes.zip .
- 	rm -rf classes
- 
diff --git a/data/jamvm/jamvm-1.5.1.tar.gz b/data/jamvm/jamvm-1.5.1.tar.gz
new file mode 100644
index 000000000..771efb6ce
--- /dev/null
+++ b/data/jamvm/jamvm-1.5.1.tar.gz
diff --git a/data/jamvm/jamvm-20080302.tgz b/data/jamvm/jamvm-20080302.tgz
deleted file mode 100644
index 999695609..000000000
--- a/data/jamvm/jamvm-20080302.tgz
+++ /dev/null
diff --git a/data/jamvm/make.sh b/data/jamvm/make.sh
index b76cfc3d9..07e7447eb 100644
--- a/data/jamvm/make.sh
+++ b/data/jamvm/make.sh
@@ -1,9 +1,9 @@
 pkg:extract
 cd *
 pkg:patch
-PKG_CONF=./autogen.sh
-CFLAGS=-O0 pkg:configure --with-classpath-install-dir=/usr --enable-ffi=no
-make
+#PKG_CONF=./autogen.sh
+pkg:configure --with-classpath-install-dir=/usr --enable-ffi=no
+make with_classpath_install_dir="$(PKG_DEST_ classpath)/usr"
 pkg:install
 pkg: rm -rf /usr/include
 pkg: ln -s jamvm /usr/bin/java
diff --git a/data/jocstrap/_metadata/version b/data/jocstrap/_metadata/version
index 3a8c7189a..1553d35df 100644
--- a/data/jocstrap/_metadata/version
+++ b/data/jocstrap/_metadata/version
@@ -1 +1 @@
-1.0.2358
+1.0.2365
diff --git a/data/jocstrap/libjocstrap.jnilib b/data/jocstrap/libjocstrap.jnilib
index 7b063c2da..9621f72d1 100755
--- a/data/jocstrap/libjocstrap.jnilib
+++ b/data/jocstrap/libjocstrap.jnilib
diff --git a/data/kbproto/_metadata/section b/data/kbproto/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/kbproto/_metadata/section
+++ b/data/kbproto/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/kext-tools/make.sh b/data/kext-tools/make.sh
index 5d02653d6..292ea7463 100755
--- a/data/kext-tools/make.sh
+++ b/data/kext-tools/make.sh
@@ -1,15 +1,15 @@
 tar -zxvf "${PKG_DATA}/kext_tools-117.tar.gz"
 cd kext_tools-117
 cp -a "${PKG_DATA}/getiopolicy_np.c" .
-#arm-apple-darwin-gcc -o kextload kextload_main.c  -framework CoreFoundation utility.c -framework IOKit getiopolicy_np.c -DPRIVATE
-arm-apple-darwin-gcc -o kextstat kextstat_main.c
-arm-apple-darwin-gcc -o kextfind kextfind_*.c  -framework IOKit -framework CoreFoundation QEQuery.c utility.c getiopolicy_np.c -DPRIVATE
-arm-apple-darwin-gcc -I. -o kextunload kextunload_main.c  -framework CoreFoundation  -framework IOKit utility.c getiopolicy_np.c  -DPRIVATE
-arm-apple-darwin-gcc -o kextlibs kextlibs_main.c -framework IOKit -framework CoreFoundation utility.c getiopolicy_np.c -DPRIVATE
-arm-apple-darwin-gcc -o kextsymboltool kextsymboltool.c
-arm-apple-darwin-gcc -o mkextunpack mkextunpack_main.c -framework CoreFoundation compression.c
-#arm-apple-darwin-gcc -o kextd kextd_main.c -framework CoreFoundation -framework IOKit getiopolicy_np.c -DPRIVATE logging.c request.c PTLock.c watchvol.c bootcaches.c utility.c safecalls.c
-#arm-apple-darwin-gcc -o kextcache kextcache_main.c -framework CoreFoundation -framework IOKit utility.c prelink.c mkext_file.c logging.c arch.c bootcaches.c compression.c safecalls.c update_boot.c getiopolicy_np.c -DPRIVATE
+#${PKG_TARG}-gcc -o kextload kextload_main.c  -framework CoreFoundation utility.c -framework IOKit getiopolicy_np.c -DPRIVATE
+${PKG_TARG}-gcc -o kextstat kextstat_main.c
+${PKG_TARG}-gcc -o kextfind kextfind_*.c  -framework IOKit -framework CoreFoundation QEQuery.c utility.c getiopolicy_np.c -DPRIVATE
+${PKG_TARG}-gcc -I. -o kextunload kextunload_main.c  -framework CoreFoundation  -framework IOKit utility.c getiopolicy_np.c  -DPRIVATE
+${PKG_TARG}-gcc -o kextlibs kextlibs_main.c -framework IOKit -framework CoreFoundation utility.c getiopolicy_np.c -DPRIVATE
+${PKG_TARG}-gcc -o kextsymboltool kextsymboltool.c
+${PKG_TARG}-gcc -o mkextunpack mkextunpack_main.c -framework CoreFoundation compression.c
+#${PKG_TARG}-gcc -o kextd kextd_main.c -framework CoreFoundation -framework IOKit getiopolicy_np.c -DPRIVATE logging.c request.c PTLock.c watchvol.c bootcaches.c utility.c safecalls.c
+#${PKG_TARG}-gcc -o kextcache kextcache_main.c -framework CoreFoundation -framework IOKit utility.c prelink.c mkext_file.c logging.c arch.c bootcaches.c compression.c safecalls.c update_boot.c getiopolicy_np.c -DPRIVATE
 # XXX: these files shouldn't go in /usr/bin
 pkg: mkdir -p /sbin /usr/bin /usr/sbin
 pkg: cp -a kextfind kextlibs kextsymboltool /usr/bin
diff --git a/data/krb5/_metadata/ncurses.dep b/data/krb5/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/krb5/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/krb5/cin.diff b/data/krb5/cin.diff
new file mode 100644
index 000000000..a6466330a
--- /dev/null
+++ b/data/krb5/cin.diff
@@ -0,0 +1,13 @@
+diff -ru krb5-1.6.3/src/lib/krb5/os/dnsglue.h krb5-1.6.3+iPhone/src/lib/krb5/os/dnsglue.h
+--- krb5-1.6.3/src/lib/krb5/os/dnsglue.h	2006-04-01 03:08:17.000000000 +0000
++++ krb5-1.6.3+iPhone/src/lib/krb5/os/dnsglue.h	2008-03-24 13:05:14.000000000 +0000
+@@ -109,6 +109,9 @@
+ /*
+  * Some BIND implementations might be old enough to lack these.
+  */
++#ifndef C_IN
++#define C_IN 1
++#endif
+ #ifndef T_TXT
+ #define T_TXT 15
+ #endif
diff --git a/data/krb5/make.sh b/data/krb5/make.sh
index 74b159213..6d21ae0ee 100644
--- a/data/krb5/make.sh
+++ b/data/krb5/make.sh
@@ -2,6 +2,6 @@ pkg:extract
 cd *
 pkg:patch
 cd src
-pkg:configure ac_cv_func_regcomp=yes ac_cv_printf_positional=yes ac_cv_file__etc_environment=no ac_cv_file__etc_TIMEZONE=no ac_cv_prog_AR="$(which arm-apple-darwin-ar)" krb5_cv_attr_constructor_destructor=yes,yes
-make LIBRESOLV='-dylib_file /usr/lib/libresolv.dylib:${PKG_ROOT}/usr/lib/libresolv.dylib'
+pkg:configure ac_cv_func_regcomp=yes ac_cv_printf_positional=yes ac_cv_file__etc_environment=no ac_cv_file__etc_TIMEZONE=no ac_cv_prog_AR="$(which ${PKG_TARG}-ar)" krb5_cv_attr_constructor_destructor=yes,yes
+make
 pkg:install
diff --git a/data/less/_metadata/ncurses.dep b/data/less/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/less/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/libassuan/make.sh b/data/libassuan/make.sh
index 5c9a7d870..a68682133 100644
--- a/data/libassuan/make.sh
+++ b/data/libassuan/make.sh
@@ -2,6 +2,6 @@ pkg:extract
 cd *
 pkg:patch
 autoconf
-pkg:configure --with-pth-prefix="${PKG_ROOT}/usr"
+pkg:configure --with-pth-prefix="$(PKG_DEST_ gnupth)/usr"
 make
 pkg:install
diff --git a/data/libdict/make.sh b/data/libdict/make.sh
index f6eda4ab7..b93b9a065 100644
--- a/data/libdict/make.sh
+++ b/data/libdict/make.sh
@@ -2,7 +2,7 @@ pkg:extract
 cd *
 pkg:patch
 cd src
-make CC=arm-apple-darwin-gcc CXX=arm-apple-darwin-g++
+make CC=${PKG_TARG}-gcc CXX=${PKG_TARG}-g++
 pkg: mkdir -p /usr/lib /usr/include
 pkg: cp -a libdict.a /usr/lib
 pkg: cp -a include/*.{h,hpp} /usr/include
diff --git a/data/libdict/tools.diff b/data/libdict/tools.diff
index 16f469f20..bb35451cb 100644
--- a/data/libdict/tools.diff
+++ b/data/libdict/tools.diff
@@ -21,8 +21,8 @@ diff -ru libdict-0.9/src/Makefile libdict-0.9+iPhone/src/Makefile
  	rm -f libdict.a
 -	ar rc libdict.a *.o
 -	ranlib libdict.a
-+	arm-apple-darwin-ar rc libdict.a *.o
-+	arm-apple-darwin-ranlib libdict.a
++	$${PKG_TARG}-ar rc libdict.a *.o
++	$${PKG_TARG}-ranlib libdict.a
  clean: clean-example
  	rm -f *.o *.core core 
  superclean: clean
diff --git a/data/libffi/make.sh b/data/libffi/make.sh
index 04d7f7dc2..cf3f0feca 100644
--- a/data/libffi/make.sh
+++ b/data/libffi/make.sh
@@ -4,9 +4,8 @@ pkg:patch
 cd ../..
 mkdir build
 cd build
-PKG_CONF=../gcc/libffi/configure
-pkg:configure --with-sysroot="${PKG_ROOT}"
+PKG_CONF=../gcc/libffi/configure pkg:configure --with-sysroot="${PKG_ROOT}"
 make
 pkg:install
-pkg: mv /usr/lib/gcc/arm-apple-darwin/include /usr/
+mv "${PKG_DEST}"/usr/lib/gcc/*/include "${PKG_DEST}"/usr
 pkg: rm -rfv /usr/lib/gcc
diff --git a/data/libksba/make.sh b/data/libksba/make.sh
index 35a54076e..30062eb73 100644
--- a/data/libksba/make.sh
+++ b/data/libksba/make.sh
@@ -1,5 +1,6 @@
 pkg:extract
 cd *
+pkg:autoconf
 pkg:configure
 make
 pkg:install
diff --git a/data/libresolv/make.sh b/data/libresolv/make.sh
index 96cb9c2eb..874174bc2 100644
--- a/data/libresolv/make.sh
+++ b/data/libresolv/make.sh
@@ -1,6 +1,10 @@
 pkg:extract
 cd *
+pkg:patch
 cp -a "${PKG_DATA}"/*.[ch] .
-arm-apple-darwin-gcc -fno-common !(dns_async).c -o libresolv.dylib -dynamiclib -I. -DkDNSServiceFlagsReturnIntermediates=0x1000 -linfo -install_name /usr/lib/libresolv.dylib
+declare -a flags
+# XXX: don't use this on darwin8
+flags[${#flags[@]}]=-DNEED_PSELECT
+"${PKG_TARG}-gcc" -fno-common !(dns_async).c -o libresolv.dylib -dynamiclib -I. -linfo -install_name /usr/lib/libresolv.dylib "${flags[@]}"
 pkg: mkdir -p /usr/lib
 pkg: cp -a libresolv.dylib /usr/lib
diff --git a/data/libresolv/pselect.diff b/data/libresolv/pselect.diff
new file mode 100644
index 000000000..192eee992
--- /dev/null
+++ b/data/libresolv/pselect.diff
@@ -0,0 +1,22 @@
+diff -ru libresolv-19/res_send.c libresolv-19+iPhone/res_send.c
+--- libresolv-19/res_send.c	2007-10-05 00:02:17.000000000 +0000
++++ libresolv-19+iPhone/res_send.c	2008-04-04 20:18:45.000000000 +0000
+@@ -141,7 +141,8 @@
+ static void		Perror(const res_state, FILE *, const char *, int);
+ static int		sock_eq(struct sockaddr *, struct sockaddr *);
+ #ifdef NEED_PSELECT
+-static int		pselect(int, void *, void *, void *, struct timespec *, const sigset_t *);
++static int		pselect_(int, void *, void *, void *, struct timespec *, const sigset_t *);
++#define pselect pselect_
+ #endif
+ 
+ static const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
+@@ -1414,7 +1415,7 @@
+ #ifdef NEED_PSELECT
+ /* XXX needs to move to the porting library. */
+ static int
+-pselect(int nfds, void *rfds, void *wfds, void *efds, struct timespec *tsp, const sigset_t *sigmask)
++pselect_(int nfds, void *rfds, void *wfds, void *efds, struct timespec *tsp, const sigset_t *sigmask)
+ {
+ 	struct timeval tv, *tvp = NULL;
+ 	sigset_t sigs;
diff --git a/data/libutil/local.diff b/data/libutil/local.diff
new file mode 100644
index 000000000..d669d961a
--- /dev/null
+++ b/data/libutil/local.diff
@@ -0,0 +1,39 @@
+diff -ru libutil-11/Makefile libutil-11+iPhone/Makefile
+--- libutil-11/Makefile	2007-02-28 03:34:30.000000000 +0000
++++ libutil-11+iPhone/Makefile	2008-03-24 10:13:50.000000000 +0000
+@@ -50,8 +50,8 @@
+ 	done
+ 
+ installhdrs :
+-	$(INSTALL) -d $(DSTROOT)/usr/local/include
+-	$(INSTALL) -m 0644 $(HDRS) $(DSTROOT)/usr/local/include
++	$(INSTALL) -d $(DSTROOT)/usr/include
++	$(INSTALL) -m 0644 $(HDRS) $(DSTROOT)/usr/include
+ 
+ 
+ install : installhdrs installlib strip installman install-plist
+@@ -74,10 +74,10 @@
+ 	$(LN) -fs libutil1.0.dylib $(DSTROOT)/usr/lib/libutil.dylib
+ 
+ installman :
+-	$(INSTALL) -d $(DSTROOT)/usr/local/share/man/man3
++	$(INSTALL) -d $(DSTROOT)/usr/share/man/man3
+ 	@for i in $(MAN3); do\
+-		echo "$(INSTALL) -m 0444 $(SRCROOT)/$$i $(DSTROOT)/usr/local/share/man/man3/"; \
+-		$(INSTALL) -m 0444 $(SRCROOT)/$$i $(DSTROOT)/usr/local/share/man/man3; \
++		echo "$(INSTALL) -m 0444 $(SRCROOT)/$$i $(DSTROOT)/usr/share/man/man3/"; \
++		$(INSTALL) -m 0444 $(SRCROOT)/$$i $(DSTROOT)/usr/share/man/man3; \
+ 	done
+ 
+ $(OBJROOT)/%.o : $(SRCROOT)/%.c \
+@@ -87,8 +87,8 @@
+ $(SYMROOT)/$(LIB) : $(patsubst %.c,$(OBJROOT)/%.o,$(SRCS))
+ 	$(CC) -dynamiclib $(LDFLAGS) -o $@ $?
+ 
+-OSV	= $(DSTROOT)/usr/local/OpenSourceVersions
+-OSL	= $(DSTROOT)/usr/local/OpenSourceLicenses
++OSV	= $(DSTROOT)/usr/OpenSourceVersions
++OSL	= $(DSTROOT)/usr/OpenSourceLicenses
+ 
+ install-plist:
+ 	$(MKDIR) $(OSV)
diff --git a/data/libutil/make.sh b/data/libutil/make.sh
index db247280f..3e867c082 100644
--- a/data/libutil/make.sh
+++ b/data/libutil/make.sh
@@ -1,4 +1,5 @@
-tar -zxvf "${PKG_DATA}/libutil-11.tar.gz"
-cd libutil-11
-make CC=arm-apple-darwin-gcc
-make install STRIP=arm-apple-darwin-strip DSTROOT="${PKG_DEST}"
+pkg:extract
+cd *
+pkg:patch
+make CC="${PKG_TARG}-gcc"
+make install STRIP="${PKG_TARG}-strip" DSTROOT="${PKG_DEST}"
diff --git a/data/lighttpd/_metadata/openssl.dep b/data/lighttpd/_metadata/openssl.dep
new file mode 120000
index 000000000..9b58fd56b
--- /dev/null
+++ b/data/lighttpd/_metadata/openssl.dep
@@ -0,0 +1 @@
+../../openssl
+\ No newline at end of file
diff --git a/data/minicom/_metadata/ncurses.dep b/data/minicom/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/minicom/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/mobileterminal/make.sh b/data/mobileterminal/make.sh
index b368ace2d..28259fe4a 100644
--- a/data/mobileterminal/make.sh
+++ b/data/mobileterminal/make.sh
@@ -1,6 +1,6 @@
 pkg:extract
 cd *
 pkg:patch
-make package
+make CC="${PKG_TARG}-gcc" package
 pkg: mkdir -p /Applications
 pkg: cp -a Terminal.app /Applications
diff --git a/data/nail/make.sh b/data/nail/make.sh
index 99b10fe47..0e3f56bee 100644
--- a/data/nail/make.sh
+++ b/data/nail/make.sh
@@ -1,4 +1,5 @@
 pkg:extract
 cd *
-make all install PREFIX=/usr SYSCONFDIR=/etc DESTDIR=/home/saurik/telesphoreo/dest/nail UCBINSTALL=/usr/bin/install STRIP=arm-apple-darwin-strip CC=arm-apple-darwin-gcc
+pkg:patch
+make all install PREFIX=/usr SYSCONFDIR=/etc DESTDIR="${PKG_DEST}" UCBINSTALL=/usr/bin/install CC="${PKG_TARG}-gcc"
 pkg: ln -s mailx /usr/bin/mail
diff --git a/data/nail/strip.diff b/data/nail/strip.diff
new file mode 100644
index 000000000..374d46565
--- /dev/null
+++ b/data/nail/strip.diff
@@ -0,0 +1,11 @@
+diff -r -u mailx-12.3/Makefile mailx-12.3+iPhone/Makefile
+--- mailx-12.3/Makefile	2007-07-15 11:39:54.000000000 +0000
++++ mailx-12.3+iPhone/Makefile	2008-04-04 20:47:33.000000000 +0000
+@@ -102,7 +102,6 @@
+ install: all
+ 	test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR)
+ 	$(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx
+-	$(STRIP) $(DESTDIR)$(BINDIR)/mailx
+ 	test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1
+ 	$(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1
+ 	test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR)
diff --git a/data/nano/_metadata/ncurses.dep b/data/nano/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/nano/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/ncftp/make.sh b/data/ncftp/make.sh
index 148b0a736..7da69beab 100644
--- a/data/ncftp/make.sh
+++ b/data/ncftp/make.sh
@@ -1,7 +1,7 @@
 pkg:extract
 cd *
 pkg:patch
-CC=$(which arm-apple-darwin-gcc) ./configure --prefix=/usr
+RANLIB=$(which "${PKG_TARG}-ranlib") CC=$(which "${PKG_TARG}-gcc") pkg:configure
 make
 mkdir -p "${PKG_DEST}/usr/share"
 pkg:install
diff --git a/data/ncftp/tools.diff b/data/ncftp/tools.diff
new file mode 100644
index 000000000..b34de4787
--- /dev/null
+++ b/data/ncftp/tools.diff
@@ -0,0 +1,17 @@
+diff -ru ncftp-3.2.1/configure ncftp-3.2.1+iPhone/configure
+--- ncftp-3.2.1/configure	2007-08-01 05:39:16.000000000 +0000
++++ ncftp-3.2.1+iPhone/configure	2008-03-24 09:22:22.000000000 +0000
+@@ -8387,10 +8387,13 @@
+ 	case "$CC" in
+ 		*${machine}*)
+ 			f=`echo "$CC" | sed 's|/[^/]*$||'`
++			AR=$(which "${machine}-ar") ||
+ 			if [ -x "$f/${machine}-ar" ] ; then
+ 				AR="$f/${machine}-ar"
+ 			elif [ -x "$f/ar" ] ; then
+ 				AR="$f/ar"
++			else
++				AR="ar"
+ 			fi
+ 			;;
+ 	esac
diff --git a/data/neon/nmedit.diff b/data/neon/nmedit.diff
index 2b2797a7e..599393ba5 100644
--- a/data/neon/nmedit.diff
+++ b/data/neon/nmedit.diff
@@ -6,13 +6,13 @@ diff -ru neon-0.26.4/aclocal.m4 neon-0.26.4+iPhone/aclocal.m4
          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
            if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            else
 -            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            fi
 -            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
        else
        case $cc_basename in
          xlc*)
@@ -22,8 +22,8 @@ diff -ru neon-0.26.4/aclocal.m4 neon-0.26.4+iPhone/aclocal.m4
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
           _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -33,8 +33,8 @@ diff -ru neon-0.26.4/aclocal.m4 neon-0.26.4+iPhone/aclocal.m4
        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
      else
        case $cc_basename in
          xlc*)
@@ -44,8 +44,8 @@ diff -ru neon-0.26.4/aclocal.m4 neon-0.26.4+iPhone/aclocal.m4
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
           _LT_AC_TAGVAR(ld_shlibs, $1)=no
diff --git a/data/network-cmds/make.sh b/data/network-cmds/make.sh
index 90dd13938..7545bf0eb 100644
--- a/data/network-cmds/make.sh
+++ b/data/network-cmds/make.sh
@@ -3,8 +3,8 @@ tar -zxvf "${PKG_DATA}/network_cmds-306.tar.gz"
 cd network_cmds-306
 for tproj in !(natd|ping|spray).tproj; do
     tproj=$(basename "${tproj}" .tproj)
-    arm-apple-darwin-gcc -o "${tproj}" "${tproj}.tproj"/*.c -DPRIVATE -Dether_ntohost=_old_ether_ntohost
+    "${PKG_TARG}-gcc" -o "${tproj}" "${tproj}.tproj"/*.c -DPRIVATE -Dether_ntohost=_old_ether_ntohost
     pkg:usrbin "${tproj}"
 done
-arm-apple-darwin-gcc -Ialias -o natd natd.tproj/*.c alias/*.c -DPRIVATE
+"${PKG_TARG}-gcc" -Ialias -o natd natd.tproj/*.c alias/*.c -DPRIVATE
 pkg:usrbin natd
diff --git a/data/ngrep/_metadata/libpcap.dep b/data/ngrep/_metadata/libpcap.dep
new file mode 120000
index 000000000..6c356a9b8
--- /dev/null
+++ b/data/ngrep/_metadata/libpcap.dep
@@ -0,0 +1 @@
+../../libpcap
+\ No newline at end of file
diff --git a/data/ngrep/_metadata/section b/data/ngrep/_metadata/section
index 872c3bcfe..f3d9861c1 100644
--- a/data/ngrep/_metadata/section
+++ b/data/ngrep/_metadata/section
@@ -1 +1 @@
-Network_Analysis
+Network
diff --git a/data/nmap/_metadata/section b/data/nmap/_metadata/section
index 872c3bcfe..f3d9861c1 100644
--- a/data/nmap/_metadata/section
+++ b/data/nmap/_metadata/section
@@ -1 +1 @@
-Network_Analysis
+Network
diff --git a/data/nvi/_metadata/ncurses.dep b/data/nvi/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/nvi/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/nvi/make.sh b/data/nvi/make.sh
index 237d6f052..caf751cad 100644
--- a/data/nvi/make.sh
+++ b/data/nvi/make.sh
@@ -1,6 +1,6 @@
 pkg:extract
 cd */build.unix
-PKG_CONF=../dist/configure pkg:configure vi_cv_sprintf_count=yes vi_cv_sys5_pty=no
+PKG_CONF=../dist/configure pkg:configure vi_cv_sprintf_count=yes vi_cv_sys5_pty=no "--with-db-prefix=$(PKG_DEST_ berkeleydb)/usr"
 make
 pkg:install
 pkg: mkdir -p /etc/profile.d
diff --git a/data/odcctools/_metadata/version b/data/odcctools/_metadata/version
index 7fba2b437..1cf253f92 100644
--- a/data/odcctools/_metadata/version
+++ b/data/odcctools/_metadata/version
@@ -1 +1 @@
-209
+238
diff --git a/data/odcctools/adrbxj.diff b/data/odcctools/adrbxj.diff
deleted file mode 100644
index 7840a1fe7..000000000
--- a/data/odcctools/adrbxj.diff
+++ /dev/null
@@ -1,176 +0,0 @@
-diff -ru odcctools/as/arm.c odcctools+iPhone/as/arm.c
---- odcctools/as/arm.c	2007-09-13 02:31:45.000000000 +0000
-+++ odcctools+iPhone/as/arm.c	2007-12-29 08:49:20.000000000 +0000
-@@ -655,6 +666,18 @@
-             fill_reloc_value(buf, n << 7, 31 << 7);
-             break;
- 
-+        case ARM_RELOC_ADR:
-+            val -= 4;
-+            if (val >= 0)
-+                n = 1 << 23;
-+            else {
-+                n = 1 << 22;
-+                val = -val;
-+            }
-+            n |= generate_shifted_immediate(val, NULL);
-+            fill_reloc_value(buf, (unsigned int)n, 0x00c00fff); 
-+            break;
-+
-         default:
-             fprintf(stderr, "reloc type %d\n", fixP->fx_r_type);
-             as_fatal("md_number_to_imm: reloc unimplemented");
-diff -ru odcctools/as/armop.c odcctools+iPhone/as/armop.c
---- odcctools/as/armop.c	2007-10-16 20:20:35.000000000 +0000
-+++ odcctools+iPhone/as/armop.c	2007-12-29 08:49:59.000000000 +0000
-@@ -5,7 +5,7 @@
- 
- #include "army.h"
- 
--int arm_op_count = 5823;
-+int arm_op_count = 5863;
- struct arm_op_info arm_op_info[] = {
-     { "adc", OP_DATA_PROC_3, 0xe0a00000 },
-     { "adcal", OP_DATA_PROC_3, 0xe0a00000 },
-@@ -87,6 +87,46 @@
-     { "addvcs", OP_DATA_PROC_3, 0x70900000 },
-     { "addvs", OP_DATA_PROC_3, 0x60800000 },
-     { "addvss", OP_DATA_PROC_3, 0x60900000 },
-+    { "adr", OP_ADR, 0xe0000000 },
-+    { "adral", OP_ADR, 0xe0000000 },
-+    { "adrals", OP_ADR, 0xe0100000 },
-+    { "adrcc", OP_ADR, 0x30000000 },
-+    { "adrccs", OP_ADR, 0x30100000 },
-+    { "adrcs", OP_ADR, 0x20000000 },
-+    { "adrcss", OP_ADR, 0x20100000 },
-+    { "adreq", OP_ADR, 0x00000000 },
-+    { "adreqs", OP_ADR, 0x00100000 },
-+    { "adrge", OP_ADR, 0xa0000000 },
-+    { "adrges", OP_ADR, 0xa0100000 },
-+    { "adrgt", OP_ADR, 0xc0000000 },
-+    { "adrgts", OP_ADR, 0xc0100000 },
-+    { "adrhi", OP_ADR, 0x80000000 },
-+    { "adrhis", OP_ADR, 0x80100000 },
-+    { "adrhs", OP_ADR, 0x20000000 },
-+    { "adrhss", OP_ADR, 0x20100000 },
-+    { "adrle", OP_ADR, 0xd0000000 },
-+    { "adrles", OP_ADR, 0xd0100000 },
-+    { "adrlo", OP_ADR, 0x30000000 },
-+    { "adrlos", OP_ADR, 0x30100000 },
-+    { "adrls", OP_ADR, 0x90000000 },
-+    { "adrlss", OP_ADR, 0x90100000 },
-+    { "adrlt", OP_ADR, 0xb0000000 },
-+    { "adrlts", OP_ADR, 0xb0100000 },
-+    { "adrmi", OP_ADR, 0x40000000 },
-+    { "adrmis", OP_ADR, 0x40100000 },
-+    { "adrne", OP_ADR, 0x10000000 },
-+    { "adrnes", OP_ADR, 0x10100000 },
-+    { "adrnv", OP_ADR, 0xf0000000 },
-+    { "adrnvs", OP_ADR, 0xf0100000 },
-+    { "adrpl", OP_ADR, 0x50000000 },
-+    { "adrpls", OP_ADR, 0x50100000 },
-+    { "adrs", OP_ADR, 0xe0100000 },
-+    { "adrul", OP_ADR, 0x30000000 },
-+    { "adruls", OP_ADR, 0x30100000 },
-+    { "adrvc", OP_ADR, 0x70000000 },
-+    { "adrvcs", OP_ADR, 0x70100000 },
-+    { "adrvs", OP_ADR, 0x60000000 },
-+    { "adrvss", OP_ADR, 0x60100000 },
-     { "and", OP_DATA_PROC_3, 0xe0000000 },
-     { "andal", OP_DATA_PROC_3, 0xe0000000 },
-     { "andals", OP_DATA_PROC_3, 0xe0100000 },
-Only in odcctools+iPhone/as: armop.c.orig
-Only in odcctools+iPhone/as: armop.c.rej
-diff -ru odcctools/as/armop.in odcctools+iPhone/as/armop.in
---- odcctools/as/armop.in	2007-10-16 20:20:35.000000000 +0000
-+++ odcctools+iPhone/as/armop.in	2007-12-29 08:49:20.000000000 +0000
-@@ -27,6 +27,7 @@
- mov{<cond>}{s}      t: OP_DATA_PROC_1   e: 1101     (21)
- bic{<cond>}{s}      t: OP_DATA_PROC_3   e: 1110     (21)
- mvn{<cond>}{s}      t: OP_DATA_PROC_1   e: 1111     (21)
-+adr{<cond>}{s}      t: OP_ADR           e: 0000     (21)
- 
- # Multiply instructions
- mul{<cond>}{s}      t: OP_MUL           e: 0000000 (21), 1001 (4)
-@@ -164,6 +165,7 @@
- # -----------------------------------------------------------------------------
- 
- blx{<cond>}             t: OP_BLX       e: 0 (0)
-+bxj{<cond>}             t: OP_BXJ       e: 0 (0)
- 
- smla{<x>}{<y>}{<cond>}  t: OP_SMLA_XY   e: 00010000 (20), 1 (7), 0 (4)
- smlaw{<y>}{<cond>}      t: OP_SMLA_XY   e: 00010010 (20), 1 (7), 0 (5), 0 (4)
-diff -ru odcctools/as/army.y odcctools+iPhone/as/army.y
---- odcctools/as/army.y	2007-10-16 23:11:52.000000000 +0000
-+++ odcctools+iPhone/as/army.y	2007-12-29 08:49:20.000000000 +0000
-@@ -31,7 +31,7 @@
- %token <nval> OPRD_REG
- %token <ival> OPRD_IMM
- %token <nval> OP_BRANCH OP_DATA_PROC_1 OP_DATA_PROC_2 OP_DATA_PROC_3 OP_MUL
--%token <nval> OP_MLA OP_SMLAL OP_CLZ OP_LDR OP_LDRH OP_LDM OP_SWI OP_BKPT
-+%token <nval> OP_MLA OP_SMLAL OP_CLZ OP_LDR OP_LDRH OP_LDM OP_SWI OP_BKPT OP_BXJ
- %token <nval> OP_CPS_EFFECT OP_CPS OP_LDREX OP_MCRR2 OP_PKHBT OP_QADD16 OP_REV
- %token <nval> OP_RFE OP_SXTAH OP_SEL OP_SETEND OP_SMLAD OP_SMLALD OP_SMMUL
- %token <nval> OP_SRS OP_SSAT OP_SSAT16 OP_STREX OP_SXTH OP_SWP OP_USAD8 OP_USADA8
-@@ -41,7 +41,7 @@
- %token <nval> OP_VFP_ST_D OP_VFP_MSR OP_VFP_MRS OP_VFP_MDXR OP_VFP_MRDX
- %token <nval> OP_VFP_MXR OP_VFP_MRX OP_VFP_FMSTAT OP_VFP_DPX1_S OP_VFP_DPX1_D
- %token <nval> OP_VFP_FMDRR OP_VFP_FMRRD OP_VFP_FMSRR OP_VFP_FMRRS OP_VFP_DPX_SD
--%token <nval> OP_VFP_DPX_DS OP_MSR OP_MRS OP_LDC OP_MCR
-+%token <nval> OP_VFP_DPX_DS OP_MSR OP_MRS OP_LDC OP_MCR OP_ADR
- %token <nval> OPRD_LSL_LIKE OPRD_RRX OPRD_IFLAGS OPRD_COPROC OPRD_CR OPRD_REG_S
- %token <nval> OPRD_REG_D OPRD_REG_VFP_SYS OPRD_ENDIANNESS OPRD_PSR
- %token <nval> OPRD_COPRO_REG
-@@ -66,6 +66,7 @@
- %type  <nval> vfp_maybe_imm_offset generic_reg vfp_data_proc_inst
- %type  <nval> vfp_store_inst vfp_misc_inst vfp2_inst vfp_imm_offset_with_u_bit
- %type  <nval> vfp_store_am armv3_inst clz_class_inst armv2_inst
-+%type  <nval> bxj_class_inst
- %type  <nval> load_store_copro_am imm_div_4_with_u_bit mcr_opcode_2
- 
- %%
-@@ -101,6 +102,11 @@
-         { $$ = ($1 | $2 | $4 | (1 << 20)); }
-     | OP_DATA_PROC_3 dest_reg ',' src_reg ',' shifter_operand
-         { $$ = ($1 | $2 | $4 | $6); }
-+    | OP_ADR dest_reg ',' expr
-+        {
-+            register_reloc_type(ARM_RELOC_ADR, 4, 1);
-+            $$ = ($1 | $2 | (15 << 16) | (1 << 25));
-+        }
-     ;
- 
- load_inst:
-@@ -378,6 +384,7 @@
- 
- armv5_inst:
-       blx_class_inst        { $$ = $1; }
-+    | bxj_class_inst        { $$ = $1; }
-     | smla_xy_class_inst    { $$ = $1; }
-     | smlal_xy_class_inst   { $$ = $1; }
-     | smul_xy_class_inst    { $$ = $1; }
-@@ -389,6 +396,10 @@
-       OP_CLZ OPRD_REG ',' OPRD_REG  { $$ = ($1 | ($2 << 12) | $4); }
-     ;
- 
-+bxj_class_inst:
-+      OP_BXJ OPRD_REG   { $$ = ($1 | (0x12 << 20) | (0xfff2 << 4) | $2); }
-+    ;
-+
- blx_class_inst:
-       OP_BLX branch_am  { $$ = ((0x7d << 25) | $2); }
-     | OP_BLX OPRD_REG   { $$ = ($1 | (0x12 << 20) | (0xfff3 << 4) | $2); }
-Only in odcctools+iPhone/as: army.y.orig
-diff -ru odcctools/include/mach-o/arm/reloc.h odcctools+iPhone/include/mach-o/arm/reloc.h
---- odcctools/include/mach-o/arm/reloc.h	2007-09-08 01:05:35.000000000 +0000
-+++ odcctools+iPhone/include/mach-o/arm/reloc.h	2007-12-29 08:49:16.000000000 +0000
-@@ -21,7 +21,8 @@
-     ARM_RELOC_PCREL_DATA_IMM12, /* Load and Store Word/Immediate Offset, r15 */
-     ARM_RELOC_SHIFT_IMM12,      /* Data-processing operands - Immediate */
-     ARM_RELOC_PCREL_VFP_IMM8_TIMES_4,   /* VFP Load and Store Word, r15 */
--    ARM_RELOC_SHIFT_IMM         /* immediate shifter operand */
-+    ARM_RELOC_SHIFT_IMM,         /* immediate shifter operand */
-+    ARM_RELOC_ADR               /* immediate shifter operand with add/sub */
- };
- 
- /* Determines whether a reloc can be exported to object files (1) or whether
diff --git a/data/odcctools/archive64.diff b/data/odcctools/archive64.diff
deleted file mode 100644
index 48ecb5e1a..000000000
--- a/data/odcctools/archive64.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -r -u odcctools/libstuff/ofile.c odcctools+iPhone/libstuff/ofile.c
---- odcctools/libstuff/ofile.c	2007-09-08 01:05:35.000000000 +0000
-+++ odcctools+iPhone/libstuff/ofile.c	2007-12-29 09:01:22.000000000 +0000
-@@ -105,7 +105,7 @@
-     unsigned long module_index);
- 
- #ifndef OTOOL
--#ifdef ALIGNMENT_CHECKS
-+#ifdef ALIGNMENT_CHECKS_ARCHIVE_64_BIT
- static
- void
- temporary_archive_member_warning(
-@@ -128,7 +128,7 @@
-         print("\n");
- 	va_end(ap);
- }
--#endif /* defined(ALIGNMENT_CHECKS) */
-+#endif /* defined(ALIGNMENT_CHECKS_ARCHIVE_64_BIT) */
- #endif /* !defined(OTOOL) */
- 
- #ifndef OFI
diff --git a/data/odcctools/armv6.diff b/data/odcctools/armv6.diff
deleted file mode 100644
index ab0ed8a4f..000000000
--- a/data/odcctools/armv6.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ru odcctools/include/mach/machine.h odcctools+iPhone/include/mach/machine.h
---- odcctools/include/mach/machine.h	2007-09-08 01:05:35.000000000 +0000
-+++ odcctools+iPhone/include/mach/machine.h	2008-03-06 11:16:03.000000000 +0000
-@@ -330,4 +330,7 @@
- #define CPU_SUBTYPE_VEO_2	((cpu_subtype_t) 2)
- #define CPU_SUBTYPE_VEO_ALL	CPU_SUBTYPE_VEO_2
- 
-+#define CPU_SUBTYPE_ARM_ALL     ((cpu_subtype_t) 0)
-+#define CPU_SUBTYPE_ARM_V6      ((cpu_subtype_t) 6)
-+
- #endif	/* _MACH_MACHINE_H_ */
-diff -ru odcctools/libstuff/arch.c odcctools+iPhone/libstuff/arch.c
---- odcctools/libstuff/arch.c	2007-09-08 01:05:35.000000000 +0000
-+++ odcctools+iPhone/libstuff/arch.c	2008-03-06 11:18:04.000000000 +0000
-@@ -62,7 +62,7 @@
-     { "m88k",   CPU_TYPE_MC88000, CPU_SUBTYPE_MC88000_ALL },
-     { "i860",   CPU_TYPE_I860,    CPU_SUBTYPE_I860_ALL },
-     { "veo",    CPU_TYPE_VEO,     CPU_SUBTYPE_VEO_ALL },
--    { "arm",    CPU_TYPE_ARM,     6 },
-+    { "arm",    CPU_TYPE_ARM,     CPU_SUBTYPE_ARM_ALL },
-     /* specific architecture implementations */
-     { "ppc601", CPU_TYPE_POWERPC, CPU_SUBTYPE_POWERPC_601 },
-     { "ppc603", CPU_TYPE_POWERPC, CPU_SUBTYPE_POWERPC_603 },
-@@ -88,7 +88,7 @@
-     { "hppa7100LC", CPU_TYPE_HPPA,  CPU_SUBTYPE_HPPA_7100LC },
-     { "veo1",   CPU_TYPE_VEO,     CPU_SUBTYPE_VEO_1 },
-     { "veo2",   CPU_TYPE_VEO,     CPU_SUBTYPE_VEO_2 },
--    { "arm",    CPU_TYPE_ARM,     6 },
-+    { "armv6",    CPU_TYPE_ARM,     CPU_SUBTYPE_ARM_V6 },
-     { NULL,	0,		  0 }
- };
- 
diff --git a/data/odcctools/comm.diff b/data/odcctools/comm.diff
deleted file mode 100644
index 93b5d0a54..000000000
--- a/data/odcctools/comm.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: as/read.c
-===================================================================
---- odcctools/as/read.c	(revision 206)
-+++ odcctools+iPhone/as/read.c	(working copy)
-@@ -1698,7 +1700,7 @@
- 
- /*
-  * s_comm() implements the pseudo op:
-- *	.comm name , expression
-+ *	.comm name , expression [ , align_expression ]
-  */
- static
- void
-@@ -1710,6 +1712,7 @@
-     char *p;
-     signed_target_addr_t temp;
-     symbolS *symbolP;
-+    int align;
- 
- 	if(*input_line_pointer == '"')
- 	    name = input_line_pointer + 1;
-@@ -1731,6 +1734,13 @@
- 	    ignore_rest_of_line();
- 	    return;
- 	}
-+        align = 0;
-+        if(*input_line_pointer == ','){
-+            input_line_pointer++;
-+            align = get_absolute_expression();
-+            as_warn("Alignment of %u specified on .comm, and we didn't care.", align);
-+        }
-+
- 	*p = 0;
- 	symbolP = symbol_find_or_make(name);
- 	*p = c;
diff --git a/data/odcctools/ifnc.diff b/data/odcctools/ifnc.diff
deleted file mode 100644
index 5d77c5981..000000000
--- a/data/odcctools/ifnc.diff
+++ /dev/null
@@ -1,225 +0,0 @@
-Index: as/read.c
-===================================================================
---- odcctools/as/read.c	(revision 206)
-+++ odcctools+iPhone/as/read.c	(working copy)
-@@ -524,6 +525,7 @@
-   { "rept", s_rept, 0       },
-   { "endr", s_endr, 0       },
-   { "ifc", s_ifc,   0       },
-+  { "ifnc", s_ifnc,   0       },
-   { NULL }	/* end sentinel */
- };
- 
-@@ -3826,6 +3836,15 @@
- 	return(s);
- }
- 
-+static int is_identifier_char(char c) {
-+    return
-+	(c >= 'a' && c <= 'z') ||
-+	(c >= 'A' && c <= 'Z') ||
-+	(c >= '0' && c <= '9') ||
-+	(c == '_' || c == '.') ||
-+        (c == '=' || c == '$');
-+}
-+
- /*
-  *			demand_copy_string()
-  *
-@@ -3855,19 +3874,20 @@
- 		obstack_1grow(&notes, c);
- 		len++;
- 	    }
--	    /*
--	     * This next line is so demand_copy_C_string will return a null
--	     * termanated string.
--	     */
--	    obstack_1grow(&notes, '\0');
--	    retval = obstack_finish(&notes);
- 	}
- 	else{
--	    as_bad("Missing string");
--	    retval = NULL;
--	    ignore_rest_of_line();
-+	    while (is_identifier_char(*input_line_pointer)) {
-+		obstack_1grow(&notes, *input_line_pointer++);
-+		len++;
-+	    }
- 	}
-+	/*
-+	 * This next line is so demand_copy_C_string will return a null
-+	 * termanated string.
-+	 */
-+	obstack_1grow(&notes, '\0');
- 	*lenP = len;
-+	retval = obstack_finish(&notes);
- 	return(retval);
- }
- 
-@@ -3964,6 +3984,36 @@
- }
- 
- /* iPhone binutils extension: .ifc assembles if the two strings are the same */
-+void s_ifnc(int value)
-+{
-+    char *ptr1, *ptr2;
-+    int len1, len2;
-+
-+    if (if_depth >= MAX_IF_DEPTH)
-+        as_fatal("Maximum if nesting level reached");
-+    last_states[if_depth++] = the_cond_state;
-+    the_cond_state.the_cond = if_cond;
-+
-+    if (the_cond_state.ignore)
-+        totally_ignore_line();
-+    else {
-+        ptr1 = demand_copy_string(&len1);
-+        
-+        SKIP_WHITESPACE();
-+        if (*input_line_pointer != ',')
-+            as_bad(".ifnc needs two strings separated by a comma (',')");
-+        else
-+            input_line_pointer++;
-+        
-+        ptr2 = demand_copy_string(&len2);
-+
-+        the_cond_state.cond_met = (len1 != len2 || strncmp(ptr1, ptr2, len1));
-+        the_cond_state.ignore = !the_cond_state.cond_met;
-+        demand_empty_rest_of_line();
-+    }
-+}
-+
-+/* iPhone binutils extension: .ifc assembles if the two strings are the same */
- void s_ifc(int value)
- {
-     char *ptr1, *ptr2;
-@@ -4381,7 +4431,7 @@
-          * determine which it is. */
-         named_invocation = 0;
-         ptr = input_line_pointer;
--        while (!is_end_of_line(*ptr)) {
-+        while (is_identifier_char(*ptr)) {
-             if (*ptr == '=') {
-                 named_invocation = 1;
-                 break;
-@@ -4391,66 +4441,58 @@
- 
-         index = 0;
- 
--        while (is_ignorable_ws(*input_line_pointer))
--            input_line_pointer++; 
--        ptr = input_line_pointer;
-+	SKIP_WHITESPACE();
- 
-         /* Ok, now parse each argument. */
-         while (1) {
--            if (is_end_of_line(*input_line_pointer) || *input_line_pointer ==
--                ',' || is_ignorable_ws(*input_line_pointer)) {
--                len = input_line_pointer - ptr;
--                arg_buf = malloc(len + 1);
--                if (len)
--                    strncpy(arg_buf, ptr, len);
--                arg_buf[len] = '\0';
-+            int length;
-+            char *value = demand_copy_string(&length);
- 
--#if 0
--                printf("arg is '%s'\n", arg_buf);
--#endif
-+            if (named_invocation) {
-+                if (*input_line_pointer++ != '=') {
-+                    as_bad("In a named-argument-style macro invocation, "
-+                        "all of the arguments must be specified in the "
-+                        "named-argument style, but one or more weren't");
-+                    break;
-+                }
- 
--                if (named_invocation) {
--                    arg_val_ptr = arg_buf;
--                    strsep(&arg_val_ptr, "=");
--                    if (arg_val_ptr == NULL) {
--                        as_bad("In a named-argument-style macro invocation, "
--                            "all of the arguments must be specified in the "
--                            "named-argument style, but one or more weren't");
-+                /* We've parsed it fine, now just find which argument the
-+                 * user meant. */
-+                which_arg = -1;
-+                for (i = 0; i < info->arg_count; i++) {
-+                    if (!strcmp(value, info->args[i]->name)) {
-+                        which_arg = i;
-                         break;
-                     }
-+                }
- 
--                    /* We've parsed it fine, now just find which argument the
--                     * user meant. */
--                    which_arg = -1;
--                    for (i = 0; i < info->arg_count; i++) {
--                        if (!strcmp(arg_buf, info->args[i]->name)) {
--                            which_arg = i;
--                            break;
--                        }
--                    }
-+                if (which_arg == -1) {
-+                    as_bad("'%s' doesn't name an argument of the macro "
-+                        "'%s'", arg_buf, info->name);
-+                    break;
-+                }
- 
--                    if (which_arg == -1) {
--                        as_bad("'%s' doesn't name an argument of the macro "
--                            "'%s'", arg_buf, info->name);
--                        break;
--                    }
-+                arguments[which_arg] = demand_copy_string(&length); 
-+            } else {
-+                /* If not a named invocation, it's simple. */
-+                arguments[index++] = value; 
-+            }
- 
--                    arguments[which_arg] = arg_val_ptr; 
--                } else {
--                    /* If not a named invocation, it's simple. */
--                    arguments[index++] = arg_buf; 
--                }
-+            if (*input_line_pointer == ',') {
-+                ++input_line_pointer;
-+                SKIP_WHITESPACE();
-+                continue;
-+            } else if (
-+                !is_end_of_line(*input_line_pointer) &&
-+                !is_ignorable_ws(*input_line_pointer)
-+            ) {
-+                as_bad("invalid macro expansion argument character (%c)", *input_line_pointer);
-+            }
- 
--                if (*input_line_pointer == ',' || is_ignorable_ws(
--                    *input_line_pointer)) {
--                    input_line_pointer++;
--                    while (is_ignorable_ws(*input_line_pointer))
--                        input_line_pointer++; 
--                    ptr = input_line_pointer;
--                } else  /* must be end of line */
--                    break;
--            } else
--                input_line_pointer++;
-+            SKIP_WHITESPACE();
-+
-+            if (is_end_of_line(*input_line_pointer))
-+                break;
-         }
- 
-         nargs = info->arg_count;
-Index: as/read.h
-===================================================================
---- odcctools/as/read.h	(revision 206)
-+++ odcctools+iPhone/as/read.h	(working copy)
-@@ -110,6 +110,8 @@
-     int value);
- extern void s_endr(
-     int value);
-+extern void s_ifnc(
-+    int value);
- extern void s_ifc(
-     int value);
- extern void big_cons(
diff --git a/data/odcctools/imm12.diff b/data/odcctools/imm12.diff
deleted file mode 100644
index 3c7df13f0..000000000
--- a/data/odcctools/imm12.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ru odcctools/as/arm.c odcctools+iPhone/as/arm.c
---- odcctools/as/arm.c	2007-09-13 02:31:45.000000000 +0000
-+++ odcctools+iPhone/as/arm.c	2008-03-06 10:46:58.000000000 +0000
-@@ -592,7 +592,7 @@
- void md_number_to_imm(unsigned char *buf, signed_expr_t val, int size, fixS *
-     fixP, int nsect)
- {
--    unsigned int n = 0;
-+    unsigned int n = 0, err;
- 
-     switch (fixP->fx_r_type) {
-         case ARM_RELOC_VANILLA:
-@@ -644,8 +644,19 @@
-             break;
- 
-         case ARM_RELOC_SHIFT_IMM12:
--            n = generate_shifted_immediate(val, NULL);
--            fill_reloc_value(buf, (unsigned int)n, 0x00000fff); 
-+            n = generate_shifted_immediate(val, &err);
-+            if (err) {
-+                n = (0x3 << 21) | generate_shifted_immediate(~val, &err);
-+                    if (!err)
-+                        as_warn("Immediate value is out of range: converting "
-+                            "automatically to a MVN instruction, but if this "
-+                            "was not a MOV instruction then this is unsafe!");
-+                    else
-+                        as_bad("Immediate value out of range");
-+                    printf("%x\n", n);
-+                fill_reloc_value(buf, (unsigned int)n, (0x3 << 21) | 0x00000fff);
-+            } else
-+                fill_reloc_value(buf, (unsigned int)n, 0x00000fff);
-             break;
- 
-         case ARM_RELOC_SHIFT_IMM:
-diff -ru odcctools/as/army.y odcctools+iPhone/as/army.y
---- odcctools/as/army.y	2007-10-16 23:11:52.000000000 +0000
-+++ odcctools+iPhone/as/army.y	2008-03-06 10:47:08.000000000 +0000
-@@ -249,7 +249,7 @@
-     | expr
-         {
-             register_reloc_type(ARM_RELOC_SHIFT_IMM12, 4, 0);
--            $$ = ((0x1 << 25) | $1);
-+            $$ = ((0x1 << 25) | $1 & 0xfff);
-         }
-     ;
- 
diff --git a/data/odcctools/make.sh b/data/odcctools/make.sh
index ab01d270f..d7405717e 100644
--- a/data/odcctools/make.sh
+++ b/data/odcctools/make.sh
@@ -1,8 +1,9 @@
-tar -zxvf "${PKG_DATA}/odcctools-209.tgz"
-cd odcctools
-rm -f include/mach/machine/{boolean,exception,kern_return,processor_info,thread_state,thread_status,vm_param,vm_types}.h
-rm -f include/mach/{task,thread_act,thread_status}.h include/mach/machine/rpc.h
+pkg:extract
+cd *
 pkg:patch
-pkg:configure
+rm -f include/libkern/OSByteOrder.h
+rm -f include/mach/{task,thread_act,thread_status}.h
+rm -f include/mach/machine/{boolean,exception,kern_return,processor_info,rpc,thread_state,thread_status,vm_param,vm_types}.h
+pkg:configure --disable-ld64 ac_cv_header_objc_objc_runtime_h=no
 make
 pkg:install
diff --git a/data/odcctools/odcctools-209.tgz b/data/odcctools/odcctools-209.tgz
deleted file mode 100644
index 05de50e94..000000000
--- a/data/odcctools/odcctools-209.tgz
+++ /dev/null
diff --git a/data/odcctools/odcctools-238.tgz b/data/odcctools/odcctools-238.tgz
new file mode 100644
index 000000000..316c21c40
--- /dev/null
+++ b/data/odcctools/odcctools-238.tgz
diff --git a/data/odcctools/word.diff b/data/odcctools/word.diff
deleted file mode 100644
index 9b588b21e..000000000
--- a/data/odcctools/word.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: as/read.c
-===================================================================
---- odcctools/as/read.c	(revision 206)
-+++ odcctools+iPhone/as/read.c	(working copy)
-@@ -488,6 +488,7 @@
-   { "lcomm",	s_lcomm,	0	},
-   { "line",	s_line,		0	},
-   { "long",	cons,		4	},
-+  { "word",	cons,		4	},
-   { "quad",	cons,		8	},
-   { "lsym",	s_lsym,		0	},
-   { "section",	s_section,	0	},
diff --git a/data/odcctools/x86.diff b/data/odcctools/x86.diff
new file mode 100644
index 000000000..14d4e2695
--- /dev/null
+++ b/data/odcctools/x86.diff
@@ -0,0 +1,53 @@
+diff -ru odcctools-236/libstuff/swap_headers.c odcctools-236+iPhone/libstuff/swap_headers.c
+--- odcctools-236/libstuff/swap_headers.c	2008-03-20 16:32:08.000000000 +0000
++++ odcctools-236+iPhone/libstuff/swap_headers.c	2008-03-30 20:18:22.000000000 +0000
+@@ -634,13 +634,13 @@
+ 		   || cputype == CPU_TYPE_X86_64
+ #endif /* x86_THREAD_STATE64 */
+ 		   ){
+-		    i386_thread_state_t *cpu;
++		    x86_thread_state_t *cpu;
+ #ifdef x86_THREAD_STATE64
+ 		    x86_thread_state64_t *cpu64;
+ #endif /* x86_THREAD_STATE64 */
+ /* current i386 thread states */
+ #if i386_THREAD_STATE == 1
+-		    struct i386_float_state *fpu;
++		    struct x86_float_state *fpu;
+ 		    i386_exception_state_t *exc;
+ #endif /* i386_THREAD_STATE == 1 */
+ 
+@@ -678,8 +678,8 @@
+ 				    "LC_THREAD", i);
+ 				return(FALSE);
+ 			    }
+-			    cpu = (i386_thread_state_t *)state;
+-			    state += sizeof(i386_thread_state_t);
++			    cpu = (x86_thread_state_t *)state;
++			    state += sizeof(x86_thread_state_t);
+ 			    break;
+ /* current i386 thread states */
+ #if i386_THREAD_STATE == 1
+@@ -694,8 +694,8 @@
+ 				    "LC_THREAD", i);
+ 				return(FALSE);
+ 			    }
+-			    fpu = (struct i386_float_state *)state;
+-			    state += sizeof(struct i386_float_state);
++			    fpu = (struct x86_float_state *)state;
++			    state += sizeof(struct x86_float_state);
+ 			    break;
+ 			case i386_EXCEPTION_STATE:
+ 			    if(count != I386_EXCEPTION_STATE_COUNT){
+@@ -1313,9 +1313,9 @@
+ /* current i386 thread states */
+ #if i386_THREAD_STATE == 1
+ 			case i386_FLOAT_STATE:
+-			    fpu = (struct i386_float_state *)state;
++			    fpu = (struct x86_float_state *)state;
+ 			    swap_i386_float_state(fpu, target_byte_sex);
+-			    state += sizeof(struct i386_float_state);
++			    state += sizeof(struct x86_float_state);
+ 			    break;
+ 			case i386_EXCEPTION_STATE:
+ 			    exc = (i386_exception_state_t *)state;
diff --git a/data/openssl/armnm.diff b/data/openssl/armnm.diff
index d6fed48e6..2969a5c00 100644
--- a/data/openssl/armnm.diff
+++ b/data/openssl/armnm.diff
@@ -6,7 +6,7 @@ diff -ru openssl-0.9.8g/Makefile.shared openssl-0.9.8g+iPhone/Makefile.shared
      SHAREDCMD="$${SHAREDCMD:-$(CC)}"; \
      SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
 -    nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \
-+    arm-apple-darwin-nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \
++    $${PKG_TARG}-nm -Pg $$SHOBJECTS | grep ' [BDT] ' | cut -f1 -d' ' > lib$(LIBNAME).exp; \
      LIBPATH=`for x in $$LIBDEPS; do if echo $$x | grep '^ *-L' > /dev/null 2>&1; then echo $$x | sed -e 's/^ *-L//'; fi; done | uniq`; \
      LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
      LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
diff --git a/data/openssl/darwin.diff b/data/openssl/darwin.diff
index fc65cf9e7..b80aceee4 100644
--- a/data/openssl/darwin.diff
+++ b/data/openssl/darwin.diff
@@ -1,11 +1,13 @@
 diff -ru openssl-0.9.8g/Configure openssl-0.9.8g+iPhone/Configure
 --- openssl-0.9.8g/Configure	2007-09-16 12:24:17.000000000 +0000
 +++ openssl-0.9.8g+iPhone/Configure	2007-12-30 04:04:20.000000000 +0000
-@@ -501,6 +501,7 @@
+@@ -501,6 +501,9 @@
  "rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
  "darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
  "darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:ppccpuid_osx64.o:osx_ppc64.o osx_ppc64-mont.o:::::sha1-ppc_osx64.o sha256-ppc_osx64.o sha512-ppc_osx64.o:::::::dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
 +"darwin-arm-gcc","arm-apple-darwin-gcc:-arch arm -O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin-ranlib",
++"darwin8-arm-gcc","arm-apple-darwin8-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin8-ranlib",
++"darwin9-arm-gcc","arm-apple-darwin9-gcc:-O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib:arm-apple-darwin9-ranlib",
  "darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -fno-common::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
  "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -fomit-frame-pointer -DL_ENDIAN -DMD32_REG_T=int -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
  "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::osx_ppc32.o::::::::::dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
diff --git a/data/openssl/make.sh b/data/openssl/make.sh
index 482912fcb..48016981d 100644
--- a/data/openssl/make.sh
+++ b/data/openssl/make.sh
@@ -1,8 +1,8 @@
 pkg:extract
 cd *
 pkg:patch
-./Configure -D__DARWIN_UNIX03 darwin-arm-gcc --prefix=/usr --openssldir=/usr/lib/ssl shared
-make AR='arm-apple-darwin-ar -r'
+./Configure -D__DARWIN_UNIX03 "$(echo "${PKG_TARG}" | sed -e 's/\(.*\)-\(.*\)-\(.*\)/\3-\1/')-gcc" --prefix=/usr --openssldir=/usr/lib/ssl shared
+make AR="${PKG_TARG}-ar -r"
 make install INSTALL_PREFIX="${PKG_DEST}"
 pkg: rm -rf /usr/lib/man /usr/lib/ssl/man
 pkg: mkdir -p /etc/ssl
diff --git a/data/p7zip/tools.diff b/data/p7zip/tools.diff
index 9194d9f02..eb1655b39 100644
--- a/data/p7zip/tools.diff
+++ b/data/p7zip/tools.diff
@@ -7,8 +7,8 @@ diff -ru p7zip_4.57/makefile.macosx p7zip_4.57+iPhone/makefile.macosx
  
 -CXX=c++ $(ALLFLAGS)
 -CC=cc $(ALLFLAGS)
-+CXX=arm-apple-darwin-c++ $(ALLFLAGS)
-+CC=arm-apple-darwin-gcc $(ALLFLAGS)
++CXX=$${PKG_TARG}-g++ $(ALLFLAGS)
++CC=$${PKG_TARG}-gcc $(ALLFLAGS)
  LINK_SHARED=-bundle
  
  LOCAL_LIBS=
diff --git a/data/png/nmedit.diff b/data/png/nmedit.diff
index 2b4e8fb36..319bbcf93 100644
--- a/data/png/nmedit.diff
+++ b/data/png/nmedit.diff
@@ -6,13 +6,13 @@ diff -r -u libpng-1.2.24/aclocal.m4 libpng-1.2.24+iPhone/aclocal.m4
          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
            if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 -            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            else
 -            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            fi
 -            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
        else
        case $cc_basename in
          xlc*)
@@ -22,8 +22,8 @@ diff -r -u libpng-1.2.24/aclocal.m4 libpng-1.2.24+iPhone/aclocal.m4
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
           _LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -33,8 +33,8 @@ diff -r -u libpng-1.2.24/aclocal.m4 libpng-1.2.24+iPhone/aclocal.m4
        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
      else
        case $cc_basename in
          xlc*)
@@ -44,8 +44,8 @@ diff -r -u libpng-1.2.24/aclocal.m4 libpng-1.2.24+iPhone/aclocal.m4
            # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 -         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 -          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~arm-apple-darwin-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~${PKG_TARG}-nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
           _LT_AC_TAGVAR(ld_shlibs, $1)=no
diff --git a/data/pthread-stubs/_metadata/section b/data/pthread-stubs/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/pthread-stubs/_metadata/section
+++ b/data/pthread-stubs/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/pyobjc/cfnetwork.diff b/data/pyobjc/cfnetwork.diff
new file mode 100644
index 000000000..03c1de914
--- /dev/null
+++ b/data/pyobjc/cfnetwork.diff
@@ -0,0 +1,11 @@
+diff -ru pyobjc-1946/pyobjc-core/Modules/objc/pointer-support.m pyobjc-1946+iPhone/pyobjc-core/Modules/objc/pointer-support.m
+--- pyobjc-1946/pyobjc-core/Modules/objc/pointer-support.m	2007-11-01 13:04:34.000000000 +0000
++++ pyobjc-1946+iPhone/pyobjc-core/Modules/objc/pointer-support.m	2008-03-27 10:59:08.000000000 +0000
+@@ -22,6 +22,7 @@
+ 
+ 
+ #import <CoreFoundation/CoreFoundation.h>
++#import <CFNetwork/CFNetwork.h>
+ 
+ struct wrapper {
+ 	const char* signature;
diff --git a/data/pyobjc/make.sh b/data/pyobjc/make.sh
index 8342d7232..587ee450e 100644
--- a/data/pyobjc/make.sh
+++ b/data/pyobjc/make.sh
@@ -1,17 +1,19 @@
+shopt -s extglob
+
 pkg:extract
 cd *
 pkg:patch
 cd pyobjc-core
 
-$(arm-apple-darwin-gcc -print-prog-name=cc1obj) -print-objc-runtime-info <(echo) >Modules/objc/objc-runtime-info.h
+$("${PKG_TARG}-gcc" -print-prog-name=cc1obj) -print-objc-runtime-info <(echo) >Modules/objc/objc-runtime-info.h
 
-find Modules/objc -name '*.m' -print0 | while read -d $'\0' -r m; do
+find Modules/objc/!(test) -name '*.m' -print0 | while read -d $'\0' -r m; do
     o=${m%.m}.o
     mi=${m%.m}.mi
-    arm-apple-darwin-gcc -O0 -g3 -I"${PKG_ROOT}"/usr/include/{libxml2,python2.5} -ObjC -c -o "$o" "$m" -DNO_OBJC2_RUNTIME -IModules/objc -fno-common
-done
+    ${PKG_TARG}-gcc -O2 -I"$(PKG_DEST_ libxml2)"/usr/include/libxml2 -I"$(PKG_DEST_ python)"/usr/include/python2.5 -ObjC -c -o "$o" "$m" -IModules/objc -fno-common || exit 1
+done || exit 1
 
-arm-apple-darwin-gcc -O0 -g3 -dynamiclib -lpython2.5 -o _objc.dylib Modules/objc/*.o -lobjc -lffi -lxml2 -framework CoreFoundation -framework Foundation
+${PKG_TARG}-gcc -O2 -dynamiclib -lpython2.5 -o _objc.dylib Modules/objc/*.o -lobjc -lffi -lxml2 -framework CoreFoundation -framework Foundation
 
 pkg: mkdir -p /usr/lib/python2.5/lib-dynload
 pkg: cp -a _objc.dylib /usr/lib/python2.5/lib-dynload
diff --git a/data/pyobjc/port.diff b/data/pyobjc/port.diff
index 53880d5fe..3403d22ab 100644
--- a/data/pyobjc/port.diff
+++ b/data/pyobjc/port.diff
@@ -118,7 +118,7 @@ Index: pyobjc/pyobjc-core/Modules/objc/objc-runtime-compat.h
  #define objc_superGetReceiver(super) ((super).receiver)
  
 -#ifdef __OBJC2__
-+#ifdef __cplusplus
++#if defined(__OBJC2__) || defined(__cplusplus)
  
  #define objc_superSetClass(super, cls) (super).super_class = (cls)
  #define objc_superGetClass(super) ((super).super_class)
diff --git a/data/python/common.diff b/data/python/common.diff
index fee4dd829..64f9eb4f2 100644
--- a/data/python/common.diff
+++ b/data/python/common.diff
@@ -6,7 +6,7 @@ diff -r -u Python-2.5.1/configure.in Python-2.5.1+iPhone/configure.in
  	# is there any other compiler on Darwin besides gcc?
  	Darwin*)
 -	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
-+	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
++	    BASECFLAGS="$BASECFLAGS -no-cpp-precomp -fno-common"
  	    if test "${enable_universalsdk}"; then
  		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
  	    fi
diff --git a/data/python/make.sh b/data/python/make.sh
index 2dc8c68c6..059937971 100644
--- a/data/python/make.sh
+++ b/data/python/make.sh
@@ -7,13 +7,13 @@ cp -a python{,_}
 sleep 10
 pkg:patch
 autoconf
-SO=.dylib CXX=arm-apple-darwin-g++ pkg:configure --enable-shared --with-system-ffi --with-signal-module --disable-toolbox-glue
+SO=.dylib CXX=${PKG_TARG}-g++ pkg:configure --enable-shared --with-system-ffi --with-signal-module --disable-toolbox-glue
 make clean
 rm libpython2.5.a
 #make Include/graminit.h Python/graminit.c CC=gcc BASECFLAGS=
 #cp -a Parser/pgen pgen-host
 #make clean
-make python AR=arm-apple-darwin-ar
+make python AR=${PKG_TARG}-ar
 sleep 2
 touch python_
 make BUILDPYTHON=python_
diff --git a/data/rdesktop/_metadata/openssl.dep b/data/rdesktop/_metadata/openssl.dep
new file mode 120000
index 000000000..9b58fd56b
--- /dev/null
+++ b/data/rdesktop/_metadata/openssl.dep
@@ -0,0 +1 @@
+../../openssl
+\ No newline at end of file
diff --git a/data/rdesktop/make.sh b/data/rdesktop/make.sh
index dea20ceb6..886cecb4e 100644
--- a/data/rdesktop/make.sh
+++ b/data/rdesktop/make.sh
@@ -1,5 +1,6 @@
 pkg:extract
 cd *
+pkg:patch
 pkg:configure --with-openssl="${PKG_ROOT}/usr"
 make
 pkg:install
diff --git a/data/rdesktop/strip.diff b/data/rdesktop/strip.diff
new file mode 100644
index 000000000..3facb9cbe
--- /dev/null
+++ b/data/rdesktop/strip.diff
@@ -0,0 +1,11 @@
+diff -ru rdesktop-1.5.0/Makefile.in rdesktop-1.5.0+iPhone/Makefile.in
+--- rdesktop-1.5.0/Makefile.in	2006-04-09 18:27:50.000000000 +0000
++++ rdesktop-1.5.0+iPhone/Makefile.in	2008-04-04 20:02:01.000000000 +0000
+@@ -57,7 +57,6 @@
+ installbin: rdesktop
+ 	mkdir -p $(DESTDIR)$(bindir)
+ 	$(INSTALL) rdesktop $(DESTDIR)$(bindir)
+-	$(STRIP) $(DESTDIR)$(bindir)/rdesktop
+ 	chmod 755 $(DESTDIR)$(bindir)/rdesktop
+ 
+ .PHONY: installman
diff --git a/data/readline/make.sh b/data/readline/make.sh
index 9e49126ad..a1b07204a 100644
--- a/data/readline/make.sh
+++ b/data/readline/make.sh
@@ -1,6 +1,6 @@
-tar -zxvf "${PKG_DATA}/readline-5.2.tar.gz"
-cd readline-5.2
+pkg:extract
+cd *
 pkg:patch
-pkg:configure
+pkg:configure ac_cv_func_strcoll_works=yes bash_cv_func_sigsetjmp=present bash_cv_func_ctype_nonascii=no bash_cv_must_reinstall_sighandlers=no bash_cv_func_strcoll_broken=yes
 make
 pkg:install
diff --git a/data/rubyobjc_/make.sh b/data/rubyobjc_/make.sh
index 20502ad1e..bddcec3f2 100644
--- a/data/rubyobjc_/make.sh
+++ b/data/rubyobjc_/make.sh
@@ -7,7 +7,7 @@ for bridge in foundation uikit; do
     ruby ../ruby/bridge.rb "${bridge}" >../ruby/"${bridge}".rb
 done
 erb fast_handlers.ri >fast_handlers.i
-arm-apple-darwin-gcc -o objc.bundle -bundle *.m -I"${PKG_ROOT}"/usr/lib/ruby/1.8/arm-darwin -lffi -lobjc -framework Foundation -framework CoreFoundation -lruby -framework UIKit
+${PKG_TARG}-gcc -o objc.bundle -bundle *.m -I"${PKG_ROOT}"/usr/lib/ruby/1.8/arm-darwin -lffi -lobjc -framework Foundation -framework CoreFoundation -lruby -framework UIKit
 pkg: mkdir -p /usr/lib/ruby/site_ruby/1.8/arm-darwin
 pkg: cp -a objc.bundle /usr/lib/ruby/site_ruby/1.8/arm-darwin
 cd ../ruby
diff --git a/data/sgrep/make.sh b/data/sgrep/make.sh
index 35a54076e..8e0b49bb3 100644
--- a/data/sgrep/make.sh
+++ b/data/sgrep/make.sh
@@ -1,5 +1,5 @@
 pkg:extract
 cd *
 pkg:configure
-make
+make CC="${PKG_TARG}"-gcc
 pkg:install
diff --git a/data/shell-cmds/make.sh b/data/shell-cmds/make.sh
index 912d9acd4..a22062488 100644
--- a/data/shell-cmds/make.sh
+++ b/data/shell-cmds/make.sh
@@ -2,7 +2,7 @@ tar -zxvf "${PKG_DATA}/shell_cmds-116.tar.gz"
 cd shell_cmds-116
 mkdir -p "${PKG_DEST}/usr/bin"
 for bin in killall mktemp renice script time which; do
-    arm-apple-darwin-gcc -o "${bin}/${bin}" "${bin}"/*.c -D'__FBSDID(x)='
+    ${PKG_TARG}-gcc -o "${bin}/${bin}" "${bin}"/*.c -D'__FBSDID(x)='
     cp -a "${bin}/${bin}" "${PKG_DEST}/usr/bin"
 done
 pkg:bin mktemp
diff --git a/data/sm/_metadata/section b/data/sm/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/sm/_metadata/section
+++ b/data/sm/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/spidermonkey/port.diff b/data/spidermonkey/port.diff
index 51dcfee37..29b00a974 100644
--- a/data/spidermonkey/port.diff
+++ b/data/spidermonkey/port.diff
@@ -1,22 +1,33 @@
 diff -ru js/src/config/Darwin.mk js+iPhone/src/config/Darwin.mk
 --- js/src/config/Darwin.mk	2007-02-05 16:24:49.000000000 +0000
-+++ js+iPhone/src/config/Darwin.mk	2007-12-31 21:06:50.000000000 +0000
-@@ -43,12 +43,12 @@
++++ js+iPhone/src/config/Darwin.mk	2008-04-05 05:47:23.000000000 +0000
+@@ -43,13 +43,13 @@
  # Just ripped from Linux config
  #
  
 -CC = cc
 -CCC = g++
-+CC = arm-apple-darwin-gcc
-+CCC = arm-apple-darwin-g++
++CC = $${PKG_TARG}-gcc
++CCC = $${PKG_TARG}-g++
  CFLAGS +=  -Wall -Wno-format
  OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -D_BSD_SOURCE -DPOSIX_SOURCE -DDARWIN
  
 -RANLIB = ranlib
-+RANLIB = arm-apple-darwin-ranlib
- MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System
+-MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS) -framework System
++RANLIB = $${PKG_TARG}-ranlib
++MKSHLIB = $(CC) -dynamiclib $(XMKSHLIBOPTS)
  
  SO_SUFFIX = dylib
+ 
+@@ -63,7 +63,7 @@
+ endif
+ GFX_ARCH = x
+ 
+-OS_LIBS = -lc -framework System
++OS_LIBS = -lc
+ 
+ ASFLAGS += -x assembler-with-cpp
+ 
 @@ -81,3 +81,4 @@
  # Don't allow Makefile.ref to use libmath
  NO_LIBM = 1
@@ -73,15 +84,6 @@ diff -ru js/src/jsnum.c js+iPhone/src/jsnum.c
 diff -ru js/src/Makefile.ref js+iPhone/src/Makefile.ref
 --- js/src/Makefile.ref	2006-07-26 19:16:47.000000000 +0000
 +++ js+iPhone/src/Makefile.ref	2007-12-31 21:07:20.000000000 +0000
-@@ -82,7 +82,7 @@
- #
- # XCFLAGS may be set in the environment or on the gmake command line
- #
--CFLAGS          += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-+CFLAGS          += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) $(XCFLAGS) -O0
- 
- LDFLAGS		= $(XLDFLAGS)
- 
 @@ -320,10 +320,10 @@
  
  $(OBJDIR)/jskwgen.o: jskwgen.c jskeyword.tbl
diff --git a/data/srelay/make.sh b/data/srelay/make.sh
index accfe0144..03a3e0119 100644
--- a/data/srelay/make.sh
+++ b/data/srelay/make.sh
@@ -1,7 +1,8 @@
-tar -zxvf "${PKG_DATA}/srelay-0.4.6.tar.gz"
-cd srelay-0.4.6
+pkg:extract
+cd *
 pkg:patch
 autoconf
 pkg:configure
 make
-pkg:usrbin srelay
+pkg: mkdir -p /usr/bin
+pkg: cp -a srelay /usr/bin
diff --git a/data/srelay/strip.diff b/data/srelay/strip.diff
new file mode 100644
index 000000000..93d118b8c
--- /dev/null
+++ b/data/srelay/strip.diff
@@ -0,0 +1,12 @@
+diff -ru srelay-0.4.6/configure.in srelay-0.4.6+iPhone/configure.in
+--- srelay-0.4.6/configure.in	2003-04-14 05:36:15.000000000 +0000
++++ srelay-0.4.6+iPhone/configure.in	2008-04-05 05:51:44.000000000 +0000
+@@ -24,7 +24,7 @@
+ esac
+ 
+ CFLAGS="$CFLAGS -O2 -Wall"
+-LDFLAGS="$LDFLAGS -s"
++LDFLAGS="$LDFLAGS"
+ 
+ dnl Local libralies.
+ if test -d /usr/local/lib; then
diff --git a/data/ste/_metadata/description b/data/ste/_metadata/description
new file mode 100644
index 000000000..4a137b0f1
--- /dev/null
+++ b/data/ste/_metadata/description
@@ -0,0 +1 @@
+Ste's APT repository
diff --git a/data/ste/_metadata/license b/data/ste/_metadata/license
new file mode 120000
index 000000000..b9c4e3684
--- /dev/null
+++ b/data/ste/_metadata/license
@@ -0,0 +1 @@
+../../../licenses/menes
+\ No newline at end of file
diff --git a/data/ste/_metadata/maintainer b/data/ste/_metadata/maintainer
new file mode 120000
index 000000000..d4e1d32ea
--- /dev/null
+++ b/data/ste/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/francis
+\ No newline at end of file
diff --git a/data/ste/_metadata/name b/data/ste/_metadata/name
new file mode 100644
index 000000000..c8e55c0d1
--- /dev/null
+++ b/data/ste/_metadata/name
@@ -0,0 +1 @@
+Ste's Source
diff --git a/data/ste/_metadata/postinst b/data/ste/_metadata/postinst
new file mode 100755
index 000000000..73c703b4f
--- /dev/null
+++ b/data/ste/_metadata/postinst
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/apt-key add /usr/share/keyrings/ste-keyring.gpg
diff --git a/data/ste/_metadata/prerm b/data/ste/_metadata/prerm
new file mode 100755
index 000000000..08594e9eb
--- /dev/null
+++ b/data/ste/_metadata/prerm
@@ -0,0 +1,6 @@
+#!/bin/sh
+case "$1" in
+    (remove|purge)
+        /usr/bin/apt-key del 16BA136C
+    ;;
+esac
diff --git a/data/ste/_metadata/priority b/data/ste/_metadata/priority
new file mode 100644
index 000000000..66c8c3616
--- /dev/null
+++ b/data/ste/_metadata/priority
@@ -0,0 +1 @@
++optional
diff --git a/data/ste/_metadata/section b/data/ste/_metadata/section
new file mode 100644
index 000000000..a1854b6a5
--- /dev/null
+++ b/data/ste/_metadata/section
@@ -0,0 +1 @@
+Repositories
diff --git a/data/ste/_metadata/version b/data/ste/_metadata/version
new file mode 100644
index 000000000..573541ac9
--- /dev/null
+++ b/data/ste/_metadata/version
@@ -0,0 +1 @@
+0
diff --git a/data/ste/make.sh b/data/ste/make.sh
new file mode 100644
index 000000000..0d58dedae
--- /dev/null
+++ b/data/ste/make.sh
@@ -0,0 +1,4 @@
+pkg: mkdir -p /etc/apt/sources.list.d
+pkg: cp -a %/ste.list /etc/apt/sources.list.d
+pkg: mkdir -p /usr/share/keyrings
+pkg: cp -a %/stepkg_key_2008.asc /usr/share/keyrings/ste-keyring.gpg
diff --git a/data/ste/ste.list b/data/ste/ste.list
new file mode 100644
index 000000000..1577a496f
--- /dev/null
+++ b/data/ste/ste.list
@@ -0,0 +1,6 @@
+# do not edit this file to add your own custom sources
+# this file is subject to be upgraded as part of a package
+# either add your own .list file to /etc/apt/sources.list.d
+# or add your entry to the global /etc/apt/sources.list file
+
+deb http://iphonesurge.com/cydia/ stable main
diff --git a/data/ste/stepkg_key_2008.asc b/data/ste/stepkg_key_2008.asc
new file mode 100644
index 000000000..e93c57afa
--- /dev/null
+++ b/data/ste/stepkg_key_2008.asc
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBEfdgLsRBADpMb9R9/L7Lt9jxAXLYpKIR83xG+Rbrfb/jqZCOKDomqY1/fGF
+Y5YcdhMknWXM++eVGY+hpLLq7pYQcaPbWAb/ssqcUYTXg0XsZXPxC7VYlewuUvx6
+nH1P1JSPeUFM8NMtWHADiSdO5TXdt6xtuC4hDlZIP2jU1XmwaowA9/UikwCgg5Y0
+iDmvvvJe4i9t9Xt7CF4TwT8D/3c7k+zdgEcdARuYMOKduZSCGN8F6+lSu+DTHNnQ
+nyE3/108ZIl2owi+yhzkouK8u3swYT9qvqkZzreYlmO8s28DFCgiNojxQKV20t1b
+ygyPGGopdGBDTNDs3Sss7MwS3dpuxAgvrM3YRu3dgIi6uIPEJh8X6mb+SUkENDVr
+vYdNBAC7ySl7V7WjRkQknZeTYKcugRQbrWi2TVWDiP3Dc67Vk40r+BWCV/SZAr2O
+I3pF9/jPzrwThcY5LSReNYvape40UGeGE4Wnlzj1Og6Fe5H23HFNI3Gpg2rrMiN/
+JvpWmRjZxym8ovVaHuYRsVVZDVomeXwlvYUFzaztNgUxfErS8rQwU2hhdW4gVC4g
+RXJpY2tzb24gKFN0ZSBQYWNrYWdpbmcpIDxzdGVAc214eS5vcmc+iGYEExECACYF
+AkfdgLsCGwMFCQHhM4AGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRD8ihW7eKbR
+UsyfAJ4qy/CQqcnYeVv3/YVmHfaCadZH8wCfZunaKH+8oAV3yXFk6MzJ/7Z1aje5
+Ag0ER92AyRAIAOEkuD9X3d2foKFWz8E0oPP3Lw+j0l0U5zS+GEv+jGdzrQutdXSa
+FrBI4BZQj+Z8QzyKoSfDYDLMDI4CDjuLrfy9g6mzJEb0AiUXSOWvaojoy1UgzHHw
+Qe5DJ1OVHSM5K0wdwxklpCvAWiT/AoU8l4vFL1cE71p4Kck8A5hbNUX30yApGydY
+qfXZtE+vr8bT+JstwU/IFm6/32GsP1d5v3orm2PlVoOYwOo0WbgBguKTkeJVc5pv
+5HU4KV+nhnlsuSL5k+1v6PngmdFadSOt3SMto0VVIX7YYfkAWMrFjQtjR7GwauO3
+2sRyiQHHxKwu/dLW46El4hDfM7K2M4DLi88AAwUH/ims23ThTygHKi1wi7RXtWOs
+WEEG9b8JP4wN+9OCHeOnxWVhu5nf4Dopzj1iussXJGoxhgqux7EfHLiqJR96CH6/
+AFUWsSB+WFR/0cuRdEVwNYf0MoXR+266oYz+eqCuQ6pxk8ez7YW/iqqxxIUxDzcF
+AH+TzbqxUWiwHNjUEZj0dJ4oVBY9iCdHqe3XDcNs/8aBTqmHw1XWGrezrZXA2uig
+vMZX+RBleGtDQR2G7lbgv5ktqardM8lnMfcaQL6y+YAyT9dM9ZBShu1plHqX7PN8
+Q9Itj8BpyhTpwmaHmAkf8R1SpWzkHJD9Lc0jDp1gFmJ8JdWR3YtIFW0i95VZsD6I
+TwQYEQIADwUCR92AyQIbDAUJAeEzgAAKCRD8ihW7eKbRUo/mAJoC+BI/SQSTjiUM
+rx0H39bmrnS+HwCfQYdWL5eyl9KjzxX4+ZEnTYKmBX0=
+=72L6
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/data/stunnel/_metadata/openssl.dep b/data/stunnel/_metadata/openssl.dep
new file mode 120000
index 000000000..9b58fd56b
--- /dev/null
+++ b/data/stunnel/_metadata/openssl.dep
@@ -0,0 +1 @@
+../../openssl
+\ No newline at end of file
diff --git a/data/stunnel/ipush.diff b/data/stunnel/ipush.diff
new file mode 100644
index 000000000..ee8758f0f
--- /dev/null
+++ b/data/stunnel/ipush.diff
@@ -0,0 +1,12 @@
+diff -ru stunnel-3.26/pty.c stunnel-3.26+iPhone/pty.c
+--- stunnel-3.26/pty.c	2003-08-01 23:43:03.000000000 +0000
++++ stunnel-3.26+iPhone/pty.c	2008-04-04 18:33:41.000000000 +0000
+@@ -54,6 +54,8 @@
+ #define O_NOCTTY 0
+ #endif /* O_NOCTTY */
+ 
++#include <OSServices/OpenTransportProtocol.h>
++
+ /*
+  * Allocates and opens a pty.  Returns -1 if no pty could be allocated, or
+  * zero if a pty was successfully allocated.  On success, open file
diff --git a/data/subversion/make.sh b/data/subversion/make.sh
index 8ac64fcd3..f28724ec4 100644
--- a/data/subversion/make.sh
+++ b/data/subversion/make.sh
@@ -2,6 +2,6 @@ pkg:extract
 cd *
 pkg:patch
 autoconf
-CFLAGS="-DSVN_NEON_0_25 -DSVN_NEON_0_26" pkg:configure --enable-maintainer-mode --disable-keychain --with-neon="${PKG_ROOT}/usr" --with-apr="$(PKG_WORK_ apr)/apr-1.2.12" --with-apr-util="$(PKG_WORK_ apr-util)/apr-util-1.2.12"
+CFLAGS="-DSVN_NEON_0_25 -DSVN_NEON_0_26" pkg:configure --enable-maintainer-mode --disable-keychain --with-neon="$(PKG_DEST_ neon)/usr" --with-apr="$(PKG_WORK_ apr)/apr-1.2.12" --with-apr-util="$(PKG_WORK_ apr-util)/apr-util-1.2.12"
 make
 pkg:install
diff --git a/data/sudo/strip.diff b/data/sudo/strip.diff
index f0d9215e4..c432d97fb 100644
--- a/data/sudo/strip.diff
+++ b/data/sudo/strip.diff
@@ -1,26 +1,17 @@
-diff -ru sudo-1.6.9p12/install-sh sudo-1.6.9p12+iPhone/install-sh
---- sudo-1.6.9p12/install-sh	2002-01-10 18:00:58.000000000 +0000
-+++ sudo-1.6.9p12+iPhone/install-sh	2008-02-13 20:44:20.000000000 +0000
-@@ -15,7 +15,7 @@
- MKDIR=mkdir
- MV=mv
- RM=rm
--STRIP=strip
-+STRIP=arm-apple-darwin-strip
- WHOAMI="echo root"
+diff -ru sudo-1.6.9p12/Makefile.in sudo-1.6.9p12+iPhone/Makefile.in
+--- sudo-1.6.9p12/Makefile.in	2008-01-14 12:22:57.000000000 +0000
++++ sudo-1.6.9p12+iPhone/Makefile.in	2008-04-05 05:54:13.000000000 +0000
+@@ -310,11 +310,11 @@
+ 	    $(DESTDIR)$(noexecdir)
  
- ##  Some systems don't support -x, so we have to use -f.
-@@ -35,13 +35,6 @@
-     fi
- done
+ install-binaries: $(PROGS)
+-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 -s sudo $(DESTDIR)$(sudodir)/sudo
++	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 4111 sudo $(DESTDIR)$(sudodir)/sudo
+ 	rm -f $(DESTDIR)$(sudodir)/sudoedit
+ 	ln $(DESTDIR)$(sudodir)/sudo $(DESTDIR)$(sudodir)/sudoedit
  
--for d in /usr/ccs/bin /usr/bin /bin; do
--    if [ -f $d/strip ]; then
--	STRIP=${d}/strip
--	break
--    fi
--done
--
- ##  Defaults.
- CHOWNIT=false
- CHGROUPIT=false
+-	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 -s visudo $(DESTDIR)$(visudodir)/visudo
++	$(INSTALL) -O $(install_uid) -G $(install_gid) -M 0111 visudo $(DESTDIR)$(visudodir)/visudo
+ 
+ install-noexec: sudo_noexec.la
+ 	$(LIBTOOL) --mode=install $(INSTALL) sudo_noexec.la $(DESTDIR)$(noexecdir)
diff --git a/data/system-cmds/_metadata/libutil.dep b/data/system-cmds/_metadata/libutil.dep
new file mode 120000
index 000000000..828c65dfc
--- /dev/null
+++ b/data/system-cmds/_metadata/libutil.dep
@@ -0,0 +1 @@
+../../libutil
+\ No newline at end of file
diff --git a/data/system-cmds/make.sh b/data/system-cmds/make.sh
index 8c7a28e90..4981007fa 100644
--- a/data/system-cmds/make.sh
+++ b/data/system-cmds/make.sh
@@ -9,11 +9,8 @@ for gperf in *.gperf; do
 done
 cd ..
 
-arm-apple-darwin-gcc -o passwd passwd.tproj/!(od_passwd).c -I. -DTARGET_OS_EMBEDDED
-arm-apple-darwin-strip passwd
-
-arm-apple-darwin-gcc -o dmesg dmesg.tproj/*.c -I.
-arm-apple-darwin-strip dmesg
+${PKG_TARG}-gcc -o passwd passwd.tproj/!(od_passwd).c -I. -DTARGET_OS_EMBEDDED
+${PKG_TARG}-gcc -o dmesg dmesg.tproj/*.c -I.
 
 cp -va "${PKG_DATA}"/kextmanager* .
 # XXX: shutdown
@@ -25,8 +22,7 @@ for tproj in getconf getty hostinfo iostat login nvram reboot sync sysctl vipw z
     ;; esac
 
     echo "${tproj}"
-    arm-apple-darwin-gcc -o "${tproj}" "${tproj}.tproj"/*.c -I. -D'__FBSDID(x)=' -DTARGET_OS_EMBEDDED -framework CoreFoundation -framework IOKit kextmanagerUser.c ${cflags}
-    arm-apple-darwin-strip "${tproj}"
+    ${PKG_TARG}-gcc -o "${tproj}" "${tproj}.tproj"/*.c -I. -D'__FBSDID(x)=' -DTARGET_OS_EMBEDDED -framework CoreFoundation -framework IOKit kextmanagerUser.c ${cflags}
 done
 
 chmod u+s passwd login
diff --git a/data/system-cmds/reboot.diff b/data/system-cmds/reboot.diff
index 21d11a3bd..4c9dc152d 100644
--- a/data/system-cmds/reboot.diff
+++ b/data/system-cmds/reboot.diff
@@ -1,7 +1,15 @@
-diff -r -u system_cmds-431/reboot.tproj/reboot.c system_cmds-431+iPhone/reboot.tproj/reboot.c
+diff -ru system_cmds-431/reboot.tproj/reboot.c system_cmds-431+iPhone/reboot.tproj/reboot.c
 --- system_cmds-431/reboot.tproj/reboot.c	2007-09-06 20:46:17.000000000 +0000
-+++ system_cmds-431+iPhone/reboot.tproj/reboot.c	2008-02-12 11:29:02.000000000 +0000
-@@ -81,11 +81,9 @@
++++ system_cmds-431+iPhone/reboot.tproj/reboot.c	2008-03-30 20:43:53.000000000 +0000
+@@ -63,7 +63,6 @@
+ #include <mach/mach_port.h>		// allocate
+ #include <mach/mach.h>			// task_self, etc
+ #include <servers/bootstrap.h>	// bootstrap
+-#include <reboot2.h>
+ #endif
+ 
+ void usage(void);
+@@ -81,11 +80,9 @@
  	int ch, howto, kflag, lflag, nflag, qflag, uflag;
  	char *p;
  	const char *user;
@@ -13,7 +21,7 @@ diff -r -u system_cmds-431/reboot.tproj/reboot.c system_cmds-431+iPhone/reboot.t
  
  	if (strstr((p = rindex(*argv, '/')) ? p + 1 : *argv, "halt")) {
  		dohalt = 1;
-@@ -240,19 +238,16 @@
+@@ -240,19 +237,16 @@
  	}
  #endif
  
diff --git a/data/system-cmds/shutdown.diff b/data/system-cmds/shutdown.diff
new file mode 100644
index 000000000..8526c7534
--- /dev/null
+++ b/data/system-cmds/shutdown.diff
@@ -0,0 +1,12 @@
+diff -r -u system_cmds-431/shutdown.tproj/shutdown.c system_cmds-431+iPhone/shutdown.tproj/shutdown.c
+--- system_cmds-431/shutdown.tproj/shutdown.c	2007-09-06 21:59:26.000000000 +0000
++++ system_cmds-431+iPhone/shutdown.tproj/shutdown.c	2008-02-25 22:30:51.000000000 +0000
+@@ -471,7 +471,7 @@
+ 		if (nosync) howto |= RB_NOSYNC;
+ 
+ 		// launchd(8) handles reboot.  This call returns NULL on success.
+-		exit(reboot2(howto) == NULL ? EXIT_SUCCESS : EXIT_FAILURE);
++                reboot(howto);
+ 	}
+ 	/* NOT-REACHED */
+ 
diff --git a/data/tcpdump/_metadata/section b/data/tcpdump/_metadata/section
index 872c3bcfe..f3d9861c1 100644
--- a/data/tcpdump/_metadata/section
+++ b/data/tcpdump/_metadata/section
@@ -1 +1 @@
-Network_Analysis
+Network
diff --git a/data/tcpdump/make.sh b/data/tcpdump/make.sh
index ff8919e32..470217b6c 100644
--- a/data/tcpdump/make.sh
+++ b/data/tcpdump/make.sh
@@ -1,5 +1,5 @@
-tar -zxvf "${PKG_DATA}/tcpdump-3.9.8.tar.gz"
-cd tcpdump-3.9.8
-Xprefix="${PKG_ROOT}/usr" pkg:configure
+pkg:extract
+cd *
+Xprefix="$(PKG_DEST_ openssl)/usr" pkg:configure
 make
 pkg:install
diff --git a/data/tcsh/_metadata/ncurses.dep b/data/tcsh/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/tcsh/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/top/mactypes.diff b/data/top/mactypes.diff
new file mode 100644
index 000000000..48d006c68
--- /dev/null
+++ b/data/top/mactypes.diff
@@ -0,0 +1,11 @@
+diff -ru top-37/libtop.c top-37+iPhone/libtop.c
+--- top-37/libtop.c	2007-06-29 23:50:49.000000000 +0000
++++ top-37+iPhone/libtop.c	2008-03-24 12:16:34.000000000 +0000
+@@ -47,6 +47,7 @@
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #include <pwd.h>
++#include <MacTypes.h>
+ 
+ #include <sys/resource.h>
+ 
diff --git a/data/top/make.sh b/data/top/make.sh
index a2a21d3ca..072bcdce9 100644
--- a/data/top/make.sh
+++ b/data/top/make.sh
@@ -1,5 +1,5 @@
-tar -zxvf "${PKG_DATA}/top-37.tar.gz"
-cd top-37
+pkg:extract
+cd *
 pkg:patch
-make CC=arm-apple-darwin-gcc AR=arm-apple-darwin-ar RANLIB=arm-apple-darwin-ranlib
-make install STRIP=arm-apple-darwin-strip DSTROOT="${PKG_DEST}"
+make CC="${PKG_TARG}-gcc" AR="${PKG_TARG}-ar" RANLIB="${PKG_TARG}-ranlib"
+make install STRIP="${PKG_TARG}-strip" DSTROOT="${PKG_DEST}"
diff --git a/data/top/strip.diff b/data/top/strip.diff
index 3303c3dd5..644196b0e 100644
--- a/data/top/strip.diff
+++ b/data/top/strip.diff
@@ -1,12 +1,11 @@
 diff -u top-37/Makefile top-37+iPhone/Makefile
 --- top-37/Makefile	2006-06-19 22:22:33.000000000 +0000
 +++ top-37+iPhone/Makefile	2007-12-27 12:03:07.000000000 +0000
-@@ -77,7 +77,8 @@
+@@ -77,7 +77,7 @@
  
  installbin : $(SYMROOT)/$(BIN)
  	$(INSTALL) -d $(DSTROOT)/usr/bin
 -	$(INSTALL) -s -m 4755 $< $(DSTROOT)/usr/bin
-+	$(STRIP) $<
 +	$(INSTALL) -m 4755 $< $(DSTROOT)/usr/bin
  
  installman :
diff --git a/data/uicaboodle.py/make.sh b/data/uicaboodle.py/make.sh
index 6fe3a7ede..0717ab445 100644
--- a/data/uicaboodle.py/make.sh
+++ b/data/uicaboodle.py/make.sh
@@ -1,3 +1,3 @@
-arm-apple-darwin-gcc -o _uicaboodle.dylib "${PKG_DATA}/uicaboodle.m" -I"${PKG_ROOT}"/usr/include/python2.5 -I "$(PKG_WORK_ pyobjc)"/*/pyobjc-core/Modules/objc -lpython2.5 -framework UIKit -dynamiclib -framework Foundation
+${PKG_TARG}-gcc -o _uicaboodle.dylib "${PKG_DATA}/uicaboodle.m" -I"${PKG_ROOT}"/usr/include/python2.5 -I "$(PKG_WORK_ pyobjc)"/*/pyobjc-core/Modules/objc -lpython2.5 -framework UIKit -dynamiclib -framework Foundation
 pkg: mkdir -p /usr/lib/python2.5/lib-dynload
 pkg: cp -a _uicaboodle.dylib /usr/lib/python2.5/lib-dynload
diff --git a/data/unrar/make.sh b/data/unrar/make.sh
index 916b2a9ae..ab228ce28 100644
--- a/data/unrar/make.sh
+++ b/data/unrar/make.sh
@@ -1,5 +1,6 @@
-tar -zxvf "${PKG_DATA}/unrarsrc-3.6.8.tar.gz"
-cd unrar
+pkg:extract
+cd *
 pkg:patch
-make -f makefile.unix CXX=arm-apple-darwin-g++ STRIP=arm-apple-darwin-strip all
-pkg:usrbin unrar
+make -f makefile.unix CXX="${PKG_TARG}-g++" all
+pkg: mkdir -p /usr/bin
+pkg: cp -a unrar /usr/bin
diff --git a/data/unrar/strip.diff b/data/unrar/strip.diff
new file mode 100644
index 000000000..7773b0374
--- /dev/null
+++ b/data/unrar/strip.diff
@@ -0,0 +1,17 @@
+diff -ru unrar/makefile.unix unrar+iPhone/makefile.unix
+--- unrar/makefile.unix	2005-04-30 07:00:12.000000000 +0000
++++ unrar+iPhone/makefile.unix	2008-04-04 20:59:42.000000000 +0000
+@@ -105,13 +105,11 @@
+ unrar:	$(OBJECTS) $(UNRAR_OBJ)
+ 	@rm -f unrar
+ 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
+-	$(STRIP) unrar
+ 
+ sfx:	WHAT=SFX_MODULE
+ sfx:	$(OBJECTS)
+ 	@rm -f default.sfx
+ 	$(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS)
+-	$(STRIP) default.sfx
+ 
+ lib:	WHAT=RARDLL
+ lib:	$(OBJECTS) $(LIB_OBJ)
diff --git a/data/unzip/make.sh b/data/unzip/make.sh
index 16d7c9a34..8a4b8a9b5 100644
--- a/data/unzip/make.sh
+++ b/data/unzip/make.sh
@@ -1,5 +1,5 @@
-tar -zxvf "${PKG_DATA}/unzip552.tar.gz"
-cd unzip-5.52
+pkg:extract
+cd  *
 cp unix/Makefile .
-make unzips CC=arm-apple-darwin-gcc CF='-O3 -Wall -I. -DBSD -DUNIX' LF2=
+make unzips CC=${PKG_TARG}-gcc CF='-O3 -Wall -I. -DBSD -DUNIX' LF2=
 pkg:usrbin unzip funzip unzipsfx
diff --git a/data/vfdecrypt/_metadata/openssl.dep b/data/vfdecrypt/_metadata/openssl.dep
new file mode 120000
index 000000000..9b58fd56b
--- /dev/null
+++ b/data/vfdecrypt/_metadata/openssl.dep
@@ -0,0 +1 @@
+../../openssl
+\ No newline at end of file
diff --git a/data/vfdecrypt/make.sh b/data/vfdecrypt/make.sh
index d03245f99..df7db7d63 100644
--- a/data/vfdecrypt/make.sh
+++ b/data/vfdecrypt/make.sh
@@ -1,5 +1,6 @@
 pkg:extract
 cd *
-make CC=arm-apple-darwin-gcc
+pkg:patch
+make CC=${PKG_TARG}-gcc
 pkg: mkdir -p /usr/bin
 pkg: mv vfdecrypt /usr/bin
diff --git a/data/vfdecrypt/osswap.diff b/data/vfdecrypt/osswap.diff
new file mode 100644
index 000000000..0dc4495ea
--- /dev/null
+++ b/data/vfdecrypt/osswap.diff
@@ -0,0 +1,11 @@
+diff -ru vfdecrypt-iphone/util.c vfdecrypt-iphone+iPhone/util.c
+--- vfdecrypt-iphone/util.c	2007-08-12 22:02:19.000000000 +0000
++++ vfdecrypt-iphone+iPhone/util.c	2008-03-24 13:12:13.000000000 +0000
+@@ -3,6 +3,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#include <libkern/OSByteOrder.h>
+ #include "util.h"
+ 
+ void print_hex(uint8_t *data, uint32_t len)
diff --git a/data/vim/_metadata/ncurses.dep b/data/vim/_metadata/ncurses.dep
new file mode 120000
index 000000000..a395fad08
--- /dev/null
+++ b/data/vim/_metadata/ncurses.dep
@@ -0,0 +1 @@
+../../ncurses
+\ No newline at end of file
diff --git a/data/vim/make.sh b/data/vim/make.sh
index 4e0b397c1..b8e239331 100644
--- a/data/vim/make.sh
+++ b/data/vim/make.sh
@@ -1,10 +1,10 @@
-tar -jxvf "${PKG_DATA}/vim-7.1.tar.bz2"
-cd vim71
+pkg:extract
+cd *
 pkg:patch
 cd src
 autoconf
 cd ..
-STRIP=$(which arm-apple-darwin-strip) CFLAGS='-O0' ./configure --prefix=/usr --host=arm-apple-darwin --enable-gui=no --without-x vim_cv_toupper_broken=no --with-tlib=ncurses vim_cv_terminfo=yes vim_cv_tty_group=4 vim_cv_tty_mode=0620 vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no ac_cv_sizeof_int=4 vim_cv_memmove_handles_overlap=yes
+pkg:configure --enable-gui=no --without-x vim_cv_toupper_broken=no --with-tlib=ncurses vim_cv_terminfo=yes vim_cv_tty_group=4 vim_cv_tty_mode=0620 vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no ac_cv_sizeof_int=4 vim_cv_memmove_handles_overlap=yes
 make
 pkg:install
 pkg: mkdir -p /etc/profile.d
diff --git a/data/vim/strip.diff b/data/vim/strip.diff
new file mode 100644
index 000000000..bbd88eed7
--- /dev/null
+++ b/data/vim/strip.diff
@@ -0,0 +1,19 @@
+diff -r -u vim71/src/Makefile vim71+iPhone/src/Makefile
+--- vim71/src/Makefile	2007-05-12 11:57:13.000000000 +0000
++++ vim71+iPhone/src/Makefile	2008-04-04 18:50:37.000000000 +0000
+@@ -1758,7 +1758,6 @@
+ 	  rm -f $(DEST_BIN)/$(VIMNAME).rm; \
+ 	fi
+ 	$(INSTALL_PROG) $(VIMTARGET) $(DEST_BIN)
+-	$(STRIP) $(DEST_BIN)/$(VIMTARGET)
+ 	chmod $(BINMOD) $(DEST_BIN)/$(VIMTARGET)
+ # may create a link to the new executable from /usr/bin/vi
+ 	-$(LINKIT)
+@@ -1889,7 +1888,6 @@
+ 	  rm -f $(DEST_BIN)/xxd.rm; \
+ 	fi
+ 	$(INSTALL_PROG) xxd/xxd$(EXEEXT) $(DEST_BIN)
+-	$(STRIP) $(DEST_BIN)/xxd$(EXEEXT)
+ 	chmod $(BINMOD) $(DEST_BIN)/xxd$(EXEEXT)
+ 	-$(SHELL) ./installman.sh xxd $(DEST_MAN) "" $(INSTALLMANARGS)
+ 
diff --git a/data/vorbis/_metadata/ogg.dep b/data/vorbis/_metadata/ogg.dep
new file mode 120000
index 000000000..3ac0dd64e
--- /dev/null
+++ b/data/vorbis/_metadata/ogg.dep
@@ -0,0 +1 @@
+../../ogg
+\ No newline at end of file
diff --git a/data/vorbis/libogg.diff b/data/vorbis/libogg.diff
new file mode 100644
index 000000000..13183b7bb
--- /dev/null
+++ b/data/vorbis/libogg.diff
@@ -0,0 +1,12 @@
+diff -ru libvorbis-1.2.0/lib/Makefile.in libvorbis-1.2.0+iPhone/lib/Makefile.in
+--- libvorbis-1.2.0/lib/Makefile.in	2007-07-25 16:46:35.000000000 +0000
++++ libvorbis-1.2.0+iPhone/lib/Makefile.in	2008-03-30 21:00:31.000000000 +0000
+@@ -264,7 +264,7 @@
+ libvorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@
+ libvorbisfile_la_SOURCES = vorbisfile.c
+ libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+-libvorbisfile_la_LIBADD = libvorbis.la
++libvorbisfile_la_LIBADD = @OGG_LIBS@ libvorbis.la
+ libvorbisenc_la_SOURCES = vorbisenc.c 
+ libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+ libvorbisenc_la_LIBADD = libvorbis.la
diff --git a/data/vorbis/make.sh b/data/vorbis/make.sh
index df8e2a88c..1b3c1b776 100644
--- a/data/vorbis/make.sh
+++ b/data/vorbis/make.sh
@@ -1,7 +1,6 @@
 pkg:extract
 cd *
 pkg:patch
-autoconf
 pkg:configure
 make
 pkg:install
diff --git a/data/vorbis/optimizer.diff b/data/vorbis/optimizer.diff
deleted file mode 100644
index d323090d2..000000000
--- a/data/vorbis/optimizer.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru libvorbis-1.2.0/configure.in libvorbis-1.2.0+iPhone/configure.in
---- libvorbis-1.2.0/configure.in	2007-07-25 16:27:00.000000000 +0000
-+++ libvorbis-1.2.0+iPhone/configure.in	2008-02-27 02:24:20.000000000 +0000
-@@ -161,8 +161,8 @@
- 		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
- 	*-*-darwin*)
- 		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
--		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
--		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O4 -ffast-math -fsigned-char";;
-+		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3 -ffast-math -fsigned-char"
-+		PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -pg -O3 -ffast-math -fsigned-char";;
- 	*)
- 		DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
- 		CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char"
diff --git a/data/vpnc_/_metadata/section b/data/vpnc_/_metadata/section
index 8708e4b54..f3d9861c1 100644
--- a/data/vpnc_/_metadata/section
+++ b/data/vpnc_/_metadata/section
@@ -1 +1 @@
-Networking
+Network
diff --git a/data/vpnc_/make.sh b/data/vpnc_/make.sh
index d39d18719..df6b374c3 100644
--- a/data/vpnc_/make.sh
+++ b/data/vpnc_/make.sh
@@ -1,5 +1,5 @@
 pkg:extract
 cd *
 pkg:patch
-make CC=arm-apple-darwin-gcc PREFIX=/usr/local
+make CC=${PKG_TARG}-gcc PREFIX=/usr/local
 pkg:install
diff --git a/data/wget/make.sh b/data/wget/make.sh
index 1b3c1b776..c4eebd321 100644
--- a/data/wget/make.sh
+++ b/data/wget/make.sh
@@ -1,6 +1,6 @@
 pkg:extract
 cd *
 pkg:patch
-pkg:configure
+pkg:configure --with-libssl-prefix="$(PKG_DEST_ openssl)"
 make
 pkg:install
diff --git a/data/whois/make.sh b/data/whois/make.sh
index 3d2d0936e..cdb366196 100644
--- a/data/whois/make.sh
+++ b/data/whois/make.sh
@@ -1,4 +1,4 @@
-tar -zxvf "${PKG_DATA}/whois_4.7.24.tar.gz"
-cd whois-4.7.24
-make CC=arm-apple-darwin-gcc
+pkg:extract
+cd *
+make CC="${PKG_TARG}-gcc"
 pkg:usrbin whois
diff --git a/data/x11/_metadata/section b/data/x11/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/x11/_metadata/section
+++ b/data/x11/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/x264/assembly.diff b/data/x264/assembly.diff
new file mode 100644
index 000000000..c049f3f5c
--- /dev/null
+++ b/data/x264/assembly.diff
@@ -0,0 +1,14 @@
+diff -ru x264-snapshot-20080226-2245/configure x264-snapshot-20080226-2245+iPhone/configure
+--- x264-snapshot-20080226-2245/configure	2008-02-26 21:45:02.000000000 +0000
++++ x264-snapshot-20080226-2245+iPhone/configure	2008-03-20 19:56:40.000000000 +0000
+@@ -400,8 +400,8 @@
+ fi
+ 
+ if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
+-    CFLAGS="$CFLAGS -s -fomit-frame-pointer"
+-    LDFLAGS="$LDFLAGS -s"
++    CFLAGS="$CFLAGS -fomit-frame-pointer"
++    LDFLAGS="$LDFLAGS"
+ fi
+ 
+ if [ "$debug" = "yes" ]; then
diff --git a/data/x264/make.sh b/data/x264/make.sh
index fc5616b2b..96731bd62 100644
--- a/data/x264/make.sh
+++ b/data/x264/make.sh
@@ -1,6 +1,6 @@
 pkg:extract
 cd *
 pkg:patch
-CC=arm-apple-darwin-gcc pkg:configure
+CC=${PKG_TARG}-gcc pkg:configure
 make
 pkg:install
diff --git a/data/x264/optimizer.diff b/data/x264/optimizer.diff
deleted file mode 100644
index ca6e8441c..000000000
--- a/data/x264/optimizer.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru x264-snapshot-20080226-2245/configure x264-snapshot-20080226-2245+iPhone/configure
---- x264-snapshot-20080226-2245/configure	2008-02-26 21:45:02.000000000 +0000
-+++ x264-snapshot-20080226-2245+iPhone/configure	2008-02-27 08:09:51.000000000 +0000
-@@ -407,7 +407,7 @@
- if [ "$debug" = "yes" ]; then
-     CFLAGS="-O1 -g $CFLAGS"
- else
--    CFLAGS="-O4 -ffast-math $CFLAGS"
-+    CFLAGS="-O3 -ffast-math $CFLAGS"
- fi
- 
- if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then
diff --git a/data/x264/tools.diff b/data/x264/tools.diff
index 722e26e85..2974dbb44 100644
--- a/data/x264/tools.diff
+++ b/data/x264/tools.diff
@@ -7,8 +7,8 @@ diff -ru x264-snapshot-20080226-2245/Makefile x264-snapshot-20080226-2245+iPhone
  libx264.a: .depend $(OBJS) $(OBJASM)
 -	ar rc libx264.a $(OBJS) $(OBJASM)
 -	ranlib libx264.a
-+	arm-apple-darwin-ar rc libx264.a $(OBJS) $(OBJASM)
-+	arm-apple-darwin-ranlib libx264.a
++	"$${PKG_TARG}-ar" rc libx264.a $(OBJS) $(OBJASM)
++	"$${PKG_TARG}-ranlib" libx264.a
  
  $(SONAME): .depend $(OBJS) $(OBJASM)
  	$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
@@ -17,7 +17,7 @@ diff -ru x264-snapshot-20080226-2245/Makefile x264-snapshot-20080226-2245+iPhone
  	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
  	install x264 $(DESTDIR)$(bindir)
 -	ranlib $(DESTDIR)$(libdir)/libx264.a
-+	arm-apple-darwin-ranlib $(DESTDIR)$(libdir)/libx264.a
++	"$${PKG_TARG}-ranlib" $(DESTDIR)$(libdir)/libx264.a
  	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
  	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
  
diff --git a/data/xau/_metadata/section b/data/xau/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xau/_metadata/section
+++ b/data/xau/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xcb-proto/_metadata/section b/data/xcb-proto/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xcb-proto/_metadata/section
+++ b/data/xcb-proto/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xcb/_metadata/section b/data/xcb/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xcb/_metadata/section
+++ b/data/xcb/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xcb/_metadata/xcb-proto.dep b/data/xcb/_metadata/xcb-proto.dep
new file mode 120000
index 000000000..532c1038f
--- /dev/null
+++ b/data/xcb/_metadata/xcb-proto.dep
@@ -0,0 +1 @@
+../../xcb-proto
+\ No newline at end of file
diff --git a/data/xcb/make.sh b/data/xcb/make.sh
index 35a54076e..a9f265a6e 100644
--- a/data/xcb/make.sh
+++ b/data/xcb/make.sh
@@ -1,5 +1,5 @@
 pkg:extract
 cd *
 pkg:configure
-make
+make XCBPROTO_XCBINCLUDEDIR=$(PKG_DEST_ xcb-proto)/usr/share/xcb
 pkg:install
diff --git a/data/xext/_metadata/section b/data/xext/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xext/_metadata/section
+++ b/data/xext/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xextproto/_metadata/section b/data/xextproto/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xextproto/_metadata/section
+++ b/data/xextproto/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xeyes/_metadata/section b/data/xeyes/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xeyes/_metadata/section
+++ b/data/xeyes/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xi/_metadata/section b/data/xi/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xi/_metadata/section
+++ b/data/xi/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xineramaproto/_metadata/section b/data/xineramaproto/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xineramaproto/_metadata/section
+++ b/data/xineramaproto/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xml2/make.sh b/data/xml2/make.sh
index 9a580d2bd..d32ec9e88 100644
--- a/data/xml2/make.sh
+++ b/data/xml2/make.sh
@@ -1,5 +1,5 @@
 pkg:extract
 cd *
 pkg:patch
-make CC=arm-apple-darwin-gcc CFLAGS='-O2 -I/home/saurik/iphone/sysroot/usr/include/libxml2 -I/home/saurik/iphone/sysroot/usr/include/libxml2/libxml' LDLIBS=-lxml2
+make CC=${PKG_TARG}-gcc CFLAGS='-O2 -I/home/saurik/iphone/sysroot/usr/include/libxml2 -I/home/saurik/iphone/sysroot/usr/include/libxml2/libxml' LDLIBS=-lxml2
 pkg:usrbin 2html 2xml csv2 html2 xml2
diff --git a/data/xmu/_metadata/section b/data/xmu/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xmu/_metadata/section
+++ b/data/xmu/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xproto/_metadata/section b/data/xproto/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xproto/_metadata/section
+++ b/data/xproto/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xt/_metadata/section b/data/xt/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xt/_metadata/section
+++ b/data/xt/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/xtrans/_metadata/section b/data/xtrans/_metadata/section
index 42d22e0dd..0ee383e34 100644
--- a/data/xtrans/_metadata/section
+++ b/data/xtrans/_metadata/section
@@ -1 +1 @@
-X_Windows
+X_Window_Systems
diff --git a/data/zip/make.sh b/data/zip/make.sh
index 47e5baefa..48e47019b 100644
--- a/data/zip/make.sh
+++ b/data/zip/make.sh
@@ -1,5 +1,6 @@
 unzip "${PKG_DATA}/zip232.zip" -d zip-2.32
-cd zip-2.32
+cd *
+pkg:patch
 cp unix/Makefile .
-make zips CC=arm-apple-darwin-gcc CPP='arm-apple-darwin-gcc -E'
+make zips CC="${PKG_TARG}-gcc" CPP="${PKG_TARG}-gcc -E"
 pkg:usrbin zip zipcloak zipnote zipsplit
diff --git a/data/zip/strip.diff b/data/zip/strip.diff
new file mode 100644
index 000000000..d9f6b7b7a
--- /dev/null
+++ b/data/zip/strip.diff
@@ -0,0 +1,12 @@
+diff -ru zip-2.32/unix/Makefile zip-2.32+iPhone/unix/Makefile
+--- zip-2.32/unix/Makefile	2006-04-22 23:52:18.000000000 +0000
++++ zip-2.32+iPhone/unix/Makefile	2008-04-04 19:00:57.000000000 +0000
+@@ -49,7 +49,7 @@
+ CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+ CFLAGS = -O2 $(CFLAGS_NOOPT)
+ LFLAGS1 =
+-LFLAGS2 = -s
++LFLAGS2 =
+ 
+ # object file lists
+ OBJZ = zip.o zipfile.o zipup.o fileio.o util.o globals.o crypt.o ttyio.o \
diff --git a/exec.sh b/exec.sh
new file mode 100755
index 000000000..be9d554aa
--- /dev/null
+++ b/exec.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+set -e
+shopt -s extglob nullglob
+
+export PKG_NAME=${1%_}
+export PKG_BASE=$(realpath "$(dirname "$0")")
+export PATH=${PKG_BASE}/util:$PATH
+shift
+
+source "${PKG_BASE}/helper.sh"
+
+PKG_PATH=
+
+PKG_INCL=
+PKG_LIBS=
+PKG_PKGS=
+
+for dep in $(find -L "${PKG_DATA}"/_metadata -name '*.dep' | cut -d '/' -f - | sort -u); do
+    DEP_NAME=$(basename "${dep}" .dep)
+    DEP_DEST=$(PKG_DEST_ "${DEP_NAME}")
+    PKG_PATH=${PKG_PATH}:${DEP_DEST}
+
+    if [[ -d ${DEP_DEST}/usr/include ]]; then
+        PKG_INCL=${DEP_DEST}/usr/include:${PKG_INCL}
+    fi
+
+    if [[ -d ${DEP_DEST}/usr/lib ]]; then
+        PKG_LIBS=${DEP_DEST}/usr/lib:${PKG_LIBS}
+    fi
+
+    if [[ -d ${DEP_DEST}/usr/lib/pkgconfig ]]; then
+        PKG_PKGS=${DEP_DEST}/usr/lib/pkgconfig:${PKG_PKGS}
+    fi
+done
+
+PKG_PATH=${PKG_PATH}:${PKG_ROOT}
+export PKG_PATH=${PKG_PATH#:}
+
+PKG_INCL=${PKG_INCL%:}
+PKG_LIBS=${PKG_LIBS%:}
+PKG_PKGS=${PKG_PKGS%:}
+
+C_INCLUDE_PATH= \
+COMPILER_PATH=${PKG_BASE}/util \
+CPATH=${PKG_INCL} \
+CPLUS_INCLUDE_PATH= \
+GCC_EXEC_PREFIX=${PKG_PFIX}/lib/gcc \
+LD_LIBRARY_PATH=${PKG_LIBS} \
+LIBRARY_PATH=${PKG_LIBS} \
+PKG_CONFIG_PATH=${PKG_PKGS} \
+    "$@"
diff --git a/folders.sh b/folders.sh
new file mode 100755
index 000000000..0a3fcfc90
--- /dev/null
+++ b/folders.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+function PKG_DATA_() {
+    echo "${PKG_BASE}/data/$1"
+}
+
+export -f PKG_DATA_
+
+function PKG_WORK_() {
+    echo "${PKG_BASE}/work/${PKG_TARG}/$1"
+}
+
+export -f PKG_WORK_
+
+function PKG_DEST_() {
+    echo "${PKG_BASE}/dest/${PKG_TARG}/$1"
+}
+
+export -f PKG_DEST_
+
+function pkg_ {
+    case "${1:0:1}" in
+        (/) echo "${PKG_DEST}$1";;
+        (%) echo "${PKG_DATA}${1:1}";;
+        (*) echo -"$1" | sed -e 's/^.//';;
+    esac
+}
+
+export -f pkg_
+
+function pkg: {
+    declare -a argv
+    declare argc=$#
+
+    for ((i=0; $i != $argc; ++i)); do
+        argv[$i]=$(pkg_ "$1")
+        shift
+    done
+
+    "${argv[@]}"
+}
+
+export -f pkg:
diff --git a/helper.sh b/helper.sh
index 2db729b70..d02ccd8a2 100755
--- a/helper.sh
+++ b/helper.sh
@@ -1,10 +1,17 @@
 #!/bin/bash
 
-export PKG_ROOT=$(arm-apple-darwin-gcc -dumpspecs | grep '%{isysroot' | sed -e 's/.*%{isysroot\*:\([^}]*\)}.*/\1/; s/;:/\n/g' | sed -e 's/^-syslibroot //' | tail -n 1)
+export PKG_TARG=arm-apple-darwin
 
-export PKG_WORK=${PKG_BASE}/work/${PKG_NAME}
-export PKG_DEST=${PKG_BASE}/dest/${PKG_NAME}
-export PKG_STAT=${PKG_BASE}/stat/${PKG_NAME}
+export PKG_ROOT=$("${PKG_TARG}-gcc" -dumpspecs | grep '%{isysroot' | sed -e 's/.*%{isysroot\*:\([^}]*\)}.*/\1/; s/;:/\n/g' | sed -e 's/^-syslibroot //' | tail -n 1)
+export PKG_PFIX=$("${PKG_TARG}-gcc" -v 2>&1 | grep -- --prefix | sed -e 's/.*--prefix=\([^ ]*\).*/\1/')
+
+source "${PKG_BASE}/folders.sh"
+
+export PKG_DATA=$(PKG_DATA_ "${PKG_NAME}")
+export PKG_WORK=$(PKG_WORK_ "${PKG_NAME}")
+export PKG_DEST=$(PKG_DEST_ "${PKG_NAME}")
+
+export PKG_STAT=${PKG_BASE}/stat/${PKG_TARG}/${PKG_NAME}
 export PKG_DATA=$(echo "${PKG_BASE}"/data/"${PKG_NAME}"?(_))
 export PKG_VRSN=$(cat "${PKG_DATA}/_metadata/version")
 export PKG_PRIO=$(cat "${PKG_DATA}/_metadata/priority")
@@ -15,24 +22,7 @@ if [[ ! -e ${PKG_DATA} ]]; then
     exit 1
 fi
 
-PKG_DEPS=("${PKG_DATA}"/_metadata/*.dep)
-
-function pkg_ {
-    if [[ ${1:0:1} = / ]]; then
-        echo "${PKG_DEST}$1"
-    else
-        echo $1
-    fi
-}
-
-function pkg: {
-    declare -a argv
-    declare argc=$#
-
-    for ((i=0; $i != $argc; ++i)); do
-        argv[$i]=$(pkg_ $1)
-        shift
-    done
-
-    "${argv[@]}"
-}
+declare -a PKG_DEPS
+for dep in "${PKG_DATA}"/_metadata/*.dep; do
+    PKG_DEPS[${#PKG_DEPS[@]}]=$(basename "${dep}" .dep)
+done
diff --git a/make.sh b/make.sh
index 2ec6845bc..1519ed394 100755
--- a/make.sh
+++ b/make.sh
@@ -9,21 +9,23 @@ fi
 
 export PKG_MAKE=$0
 export PKG_NAME=${1%_}
-
 export PKG_BASE=$(realpath "$(dirname "$0")")
-#export PATH=${PKG_BASE}/util:$PATH
+
 . "${PKG_BASE}/helper.sh"
 
-for dep in "${PKG_DEPS[@]}"; do
-    "${PKG_MAKE}" "$(basename "${dep}" .dep)"
-done
+if [[ ! -x ${PKG_BASE}/util/ldid || ${PKG_BASE}/util/ldid -ot ${PKG_BASE}/util/ldid.cpp ]]; then
+    g++ -I ~/menes -o "${PKG_BASE}"/util/ldid{,.cpp} -x c "${PKG_BASE}"/util/lookup2.c
+fi
+
+#for DEP_NAME in "${PKG_DEPS[@]}"; do
+#    "${PKG_MAKE}" "${DEP_NAME}"
+#done
 
 export PKG_HASH=$({
-    find -L "${PKG_DATA}" \( -name '.svn' -o -name '_*' \) -prune -o -type f -print0 | sort -z | xargs -0 cat
-    for dep in "${PKG_DEPS[@]}"; do
-        DEP_NAME=$(basename "${dep}" .dep)
-        DEP_DEST=${PKG_BASE}/dest/${DEP_NAME}
-        "${PKG_BASE}"/util/catdir.sh "${DEP_DEST}"
+    "${PKG_BASE}"/util/catdir.sh -L "${PKG_DATA}" \( -name '.svn' -o -name '_*' \) -prune -o
+
+    for DEP_NAME in "${PKG_DEPS[@]}"; do
+        "${PKG_BASE}"/util/catdir.sh "$(PKG_DEST_ "${DEP_NAME}")"
     done
 } | md5sum | cut -d ' ' -f 1)
 
@@ -38,18 +40,10 @@ mkdir -p "${PKG_STAT}"
 rm -f "${PKG_STAT}/data-md5"
 
 rm -rf "${PKG_DEST}"
-mkdir "${PKG_DEST}"
+mkdir -p "${PKG_DEST}"
 
 rm -rf "${PKG_WORK}"
-mkdir "${PKG_WORK}"
-
-function PKG_DATA_() {
-    echo "${PKG_BASE}/data/$1"
-}
-
-function PKG_WORK_() {
-    echo "${PKG_BASE}/work/$1"
-}
+mkdir -p "${PKG_WORK}"
 
 function pkg:patch() {
     for diff in "${PKG_DATA}"/*.diff; do
@@ -57,6 +51,8 @@ function pkg:patch() {
     done
 }
 
+export -f pkg:patch
+
 function pkg:bin() {
     if [[ $# -eq 0 ]]; then
         pushd "${PKG_DEST}/usr/bin"
@@ -72,17 +68,28 @@ function pkg:bin() {
     rmdir --ignore-fail-on-non-empty -p "${PKG_DEST}/usr/bin"
 }
 
+export -f pkg:bin
+
+function pkg:autoconf() {
+    for m4 in $(find -name "*.m4"); do
+        patch -r/dev/null "${m4}" "${PKG_BASE}/util/libtool.m4.diff" || true
+    done
+
+    autoconf
+}
+
+export -f pkg:autoconf
+
 export PKG_CONF=./configure
 
 function pkg:configure() {
     for ltmain in $(find -name ltmain.sh); do
-        patch "${ltmain}" "${PKG_BASE}/util/libtool.diff" || true
+        patch -r/dev/null "${ltmain}" "${PKG_BASE}/util/libtool.diff" || true
     done
 
-    PKG_CONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh") --define-variable=prefix=${PKG_ROOT}/usr" \
-    PKG_CONFIG_PATH=${PKG_ROOT}/usr/lib/pkgconfig \
+    PKG_CONFIG="$(realpath "${PKG_BASE}/util/pkg-config.sh")" \
     "${PKG_CONF}" \
-        --host=arm-apple-darwin \
+        --host="${PKG_TARG}" \
         --enable-static=no \
         --enable-shared=yes \
         --prefix=/usr \
@@ -90,65 +97,39 @@ function pkg:configure() {
         "$@"
 }
 
+export -f pkg:configure
+
 function pkg:install() {
     make install DESTDIR="${PKG_DEST}" "$@"
 }
 
-function pkg_ {
-    case "${1:0:1}" in
-        (/) echo "${PKG_DEST}$1";;
-        (%) echo "${PKG_DATA}${1:1}";;
-        (*) echo -"$1" | sed -e 's/^.//';;
-    esac
-}
-
-function pkg: {
-    declare -a argv
-    declare argc=$#
-
-    for ((i=0; $i != $argc; ++i)); do
-        argv[$i]=$(pkg_ "$1")
-        shift
-    done
-
-    "${argv[@]}"
-}
+export -f pkg:install
 
 function pkg:extract() {
     for tgz in "${PKG_DATA}"/{*.tar.gz,*.tgz}; do
         tar -zxvf "${tgz}"
     done
+
     for zip in "${PKG_DATA}"/*.zip; do
         unzip "${zip}"
     done
+
     for tbz2 in "${PKG_DATA}"/*.tar.bz2; do
         tar -jxvf "${tbz2}"
     done
 }
 
-function pkg:owner() {
-    owner=$1
-    shift
-
-    for file in "$@"; do
-        chown "${owner}" "${PKG_DEST}${file}"
-    done
-}
+export -f pkg:extract
 
 function pkg:usrbin() {
     pkg: mkdir -p /usr/bin
     pkg: cp -a "$@" /usr/bin
 }
 
-function pkg:mkdir() {
-    for dir in "$@"; do
-        mkdir -p "${PKG_DEST}${dir}"
-    done
-}
+export -f pkg:usrbin
 
 cd "${PKG_WORK}"
-. "${PKG_DATA}/make.sh"
-tar -zcf- -C "${PKG_DEST}" . | tar -zxf- -C "${PKG_ROOT}"
+"${PKG_BASE}/exec.sh" "${PKG_NAME}" . "${PKG_DATA}/make.sh"
 
 function rmdir_() {
     if [[ -d "$1" ]]; then
@@ -176,9 +157,14 @@ rmdir_ "${PKG_DEST}/usr/local"
 rmdir_ "${PKG_DEST}/usr/lib"
 rmdir_ "${PKG_DEST}/usr"
 
-if [[ -e "${PKG_DEST}"{/usr,}/?(s)bin ]]; then
-    find "${PKG_DEST}"{/usr,}/?(s)bin -type f -exec arm-apple-darwin-strip {} \;
-fi
+find "${PKG_DEST}" -type f -perm -0500 -print0 | while read -r -d $'\0' bin; do
+    case "$(file "${bin}")" in (\
+        *': Mach-O executable acorn' |\
+        *': Mach-O dynamically linked shared library acorn'\
+    );; (*) continue;; esac
+
+    "${PKG_TARG}-strip" -x -no_uuid "${bin}"
+done
 
 cp -a "${PKG_DATA}/_metadata/version" "${PKG_STAT}/data-ver"
 echo "${PKG_HASH}" >"${PKG_STAT}/data-md5"
diff --git a/over/usr/libexec/cydia_/space.sh b/over/usr/libexec/cydia_/space.sh
index 6f3b29ade..a8148fd52 100755
--- a/over/usr/libexec/cydia_/space.sh
+++ b/over/usr/libexec/cydia_/space.sh
@@ -1,61 +1,14 @@
 #!/usr/libexec/cydia_/bash
 export PATH=/usr/libexec/cydia_
 
-shopt -s extglob nullglob
-
-function df_() {
-    free=$(df -B1 "$1")
-    free=${free% *%*}
-    free=${free%%*( )}
-    free=${free##* }
-    echo "${free}"
-}
-
-function mv_() {
-    src=$1
-    dst=/var/$(basename "${src}")
-
-    if [[ -e ${dst} ]]; then
-        dst=$(mktemp -d /var/cydia.XXXXXX)
-    else
-        mkdir -p "${dst}"
-    fi
-
-    if [[ -e ${src} ]]; then
-        chmod --reference="${src}" "${dst}"
-        chown --reference="${src}" "${dst}"
-
-        cp -aT "${src}" "${dst}" || {
-            rm -rf "${dst}"
-            exit 1
-        }
-
-        rm -rf "${src}"
-    else
-        chmod 775 "${dst}"
-        chown root.admin "${dst}"
-    fi
-
-    ln -s "${dst}" "${src}"
-}
-
 for dir in \
     /Applications \
     /Library/Ringtones \
     /Library/Wallpaper \
     /System/Library/Fonts \
     /usr/share
-do if [[ -d ${dir} && ! -h ${dir} ]]; then
-    used=$(du -bs "${dir}")
-    used=${used%%$'\t'*}
-    free=$(df_ /var)
-
-    if [[ $((used + 524288)) -lt ${free} ]]; then
-        mv_ "${dir}"
-    fi
-elif [[ -h ${dir} && ! -e ${dir} ]]; then
-    rm -f "${dir}"
-    mv_ "${dir}"
-fi; done
+do
+    . /usr/libexec/cydia/move.sh "${dir}" /var/"$(basename "${src}")"
+done
 
 [[ $(df_ /) -gt 35651584 && $(df_ /var) -gt 35651584 ]]
diff --git a/people/francis b/people/francis
new file mode 100644
index 000000000..6936b959d
--- /dev/null
+++ b/people/francis
@@ -0,0 +1 @@
+Youssef Francis <francisois@gmail.com>
diff --git a/people/sakurina b/people/sakurina
new file mode 100644
index 000000000..1f37f874b
--- /dev/null
+++ b/people/sakurina
@@ -0,0 +1 @@
+Yanik Magnan <kirbykirbykirby@gmail.com>
diff --git a/util/catdir.sh b/util/catdir.sh
index dd10be199..b23b94125 100755
--- a/util/catdir.sh
+++ b/util/catdir.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-find -H "$1" -type l -printf '%p -> %l\n' | sort
-find -H "$1" -type f -print0 | sort -z | xargs -0 cat
+find -H "$@" -type l -printf '%p -> %l\n' -o -printf '%p (%U/%G/%#m)\n' | sort
+find -H "$@" -type f -print0 | sort -z | xargs -0 cat
diff --git a/util/collect2 b/util/collect2
new file mode 100755
index 000000000..30cacb773
--- /dev/null
+++ b/util/collect2
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+unset GCC_EXEC_PREFIX
+unset COMPILER_PATH
+
+unset aspen_version_min
+unset macosx_version_min
+unset o
+
+#export | grep 'GCC\|PATH\|PKG'
+
+function parse() {
+    while [[ $# -ne 0 ]]; do
+        if [[ $1 = -maspen-version-min=* ]]; then
+            maspen_version_min=${1#-maspen-version-min=}
+        elif [[ $1 = -mmacosx-version-min=* ]]; then
+            mmacosx_version_min=${1#-mmacosx-version-min=}
+        elif [[ $1 == -o ]]; then
+            o=$2
+            shift
+        fi; shift
+    done
+}
+
+set -e
+
+eval "parse ${COLLECT_GCC_OPTIONS}"
+
+if [[ "${maspen_version_min+@}" || "${mmacosx_version_min+@}" ]]; then
+    darwin=
+else
+    unset darwin
+fi
+
+declare -a flags
+if [[ "${darwin+@}" ]]; then
+    flags[${#flags[@]}]=-no_uuid
+
+    if [[ "${PKG_PATH+@}" ]]; then
+        flags=("${flags[@]}"$(echo "${PKG_PATH}:" | while read -r -d ':' path; do
+            find "${path}" -name '*.dylib' -print0 | while read -r -d $'\0' dylib_file; do
+                dylib_name=${dylib_file#${path}}
+                echo " -dylib_file ${dylib_name}:${dylib_file}"
+            done
+        done))
+    fi
+fi
+
+#echo ::: "$("${COLLECT_GCC}" -print-prog-name=collect2)" "$@" "${flags[@]}"
+"$("${COLLECT_GCC}" -print-prog-name=collect2)" "$@" "${flags[@]}"
+
+if [[ "${o+@}" && "${darwin+@}" ]]; then
+    ldid -T- "$o"
+fi
diff --git a/util/configure.sh b/util/configure.sh
index 1a7efc6b0..162ea207c 100755
--- a/util/configure.sh
+++ b/util/configure.sh
@@ -7,4 +7,4 @@ if [[ -z $PKG_CONF ]]; then
     PKG_CONF=./configure
 fi
 
-PKG_ROOT=/home/saurik/iphone/sysroot PKG_CONFIG="$(realpath ../../../util/pkg-config.sh) --define-variable=prefix=/home/saurik/iphone/sysroot/usr" PKG_CONFIG_PATH=/home/saurik/iphone/sysroot/usr/lib/pkgconfig $PKG_CONF --prefix=/usr --host=arm-apple-darwin --enable-static=no --enable-shared=yes "$@"
+PKG_ROOT=/home/saurik/iphone/sysroot PKG_CONFIG="$(realpath ../../../util/pkg-config.sh) --define-variable=prefix=/home/saurik/iphone/sysroot/usr" PKG_CONFIG_PATH=/home/saurik/iphone/sysroot/usr/lib/pkgconfig $PKG_CONF --prefix=/usr --host=arm-apple-darwin8 --enable-static=no --enable-shared=yes "$@"
diff --git a/util/find.sh b/util/find.sh
new file mode 100755
index 000000000..d45bea76b
--- /dev/null
+++ b/util/find.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+#echo 1>&2
+#echo ::: find.sh "$@" 1>&2
+
+while [[ $# -ne 0 ]]; do
+    if [[ $1 == /* ]]; then
+        unset found
+
+        found=$(echo "${PKG_PATH}:" | while read -r -d ':' path; do
+            if [[ -e ${path}$1 ]]; then
+                if [[ ${found+@} ]]; then
+                    echo -n ':'
+                else
+                    found=
+                fi
+
+                echo -n "${path}$1"
+            fi
+        done)
+
+        #echo "=== ${found:=$1}" 1>&2
+        echo "${found:=$1}"
+    else
+        echo "$1"
+    fi
+
+    shift
+done
+
+#echo 1>&2
diff --git a/util/ldid.cpp b/util/ldid.cpp
new file mode 100644
index 000000000..b1c114a8c
--- /dev/null
+++ b/util/ldid.cpp
@@ -0,0 +1,297 @@
+/* JocStrap - Java/Objective-C Bootstrap
+ * Copyright (C) 2007  Jay Freeman (saurik)
+*/
+
+/*
+ *        Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer in the documentation
+ *    and/or other materials provided with the
+ *    distribution.
+ * 3. The name of the author may not be used to endorse
+ *    or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "minimal/stdlib.h"
+#include "minimal/mapping.h"
+
+#include <cstring>
+#include <string>
+#include <vector>
+
+struct fat_header {
+    uint32_t magic;
+    uint32_t nfat_arch;
+};
+
+#define FAT_MAGIC 0xcafebabe
+#define FAT_CIGAM 0xbebafeca
+
+struct fat_arch {
+    uint32_t cputype;
+    uint32_t cpusubtype;
+    uint32_t offset;
+    uint32_t size;
+    uint32_t align;
+};
+
+struct mach_header {
+    uint32_t magic;
+    uint32_t cputype;
+    uint32_t cpusubtype;
+    uint32_t filetype;
+    uint32_t ncmds;
+    uint32_t sizeofcmds;
+    uint32_t flags;
+};
+
+#define	MH_MAGIC 0xfeedface
+#define MH_CIGAM 0xcefaedfe
+
+#define	MH_EXECUTE 0x2
+#define	MH_DYLIB   0x6
+#define	MH_BUNDLE  0x8
+
+struct load_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+};
+
+#define LC_REQ_DYLD  0x80000000
+
+#define	LC_LOAD_DYLIB	   0x0c
+#define	LC_ID_DYLIB	   0x0d
+#define LC_UUID		   0x1b
+#define LC_REEXPORT_DYLIB (0x1f | LC_REQ_DYLD)
+
+struct dylib {
+    uint32_t name;
+    uint32_t timestamp;
+    uint32_t current_version;
+    uint32_t compatibility_version;
+};
+
+struct dylib_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    struct dylib dylib;
+};
+
+struct uuid_command {
+    uint32_t cmd;
+    uint32_t cmdsize;
+    uint8_t uuid[16];
+};
+
+class Framework {
+  private:
+    void *base_;
+    size_t size_;
+    mach_header *mach_header_;
+    bool swapped_;
+
+  public:
+    int16_t Swap(int16_t value) const {
+        return Swap(static_cast<uint16_t>(value));
+    }
+
+    int32_t Swap(int32_t value) const {
+        return Swap(static_cast<uint32_t>(value));
+    }
+
+    uint16_t Swap(uint16_t value) const {
+        return !swapped_ ? value :
+            ((value >>  8) & 0x00ff) |
+            ((value <<  8) & 0xff00);
+    }
+
+    uint32_t Swap(uint32_t value) const {
+        if (!swapped_)
+            return value;
+        else {
+            value = ((value >>  8) & 0x00ff00ff) |
+                    ((value <<  8) & 0xff00ff00);
+            value = ((value >> 16) & 0x0000ffff) |
+                    ((value << 16) & 0xffff0000);
+            return value;
+        }
+    }
+
+    Framework(const char *framework_path) :
+        swapped_(false)
+    {
+        base_ = map(framework_path, 0, _not(size_t), &size_, false);
+        fat_header *fat_header = reinterpret_cast<struct fat_header *>(base_);
+
+        if (Swap(fat_header->magic) == FAT_CIGAM) {
+            swapped_ = !swapped_;
+            goto fat;
+        } else if (Swap(fat_header->magic) != FAT_MAGIC)
+            mach_header_ = (mach_header *) base_;
+        else fat: {
+            size_t fat_narch = Swap(fat_header->nfat_arch);
+            fat_arch *fat_arch = reinterpret_cast<struct fat_arch *>(fat_header + 1);
+            size_t arch;
+            for (arch = 0; arch != fat_narch; ++arch) {
+                uint32_t arch_offset = Swap(fat_arch->offset);
+                mach_header_ = (mach_header *) ((uint8_t *) base_ + arch_offset);
+                goto found;
+                ++fat_arch;
+            }
+
+            _assert(false);
+        }
+
+      found:
+        if (Swap(mach_header_->magic) == MH_CIGAM)
+            swapped_ = !swapped_;
+        else _assert(Swap(mach_header_->magic) == MH_MAGIC);
+
+        _assert(
+            Swap(mach_header_->filetype) == MH_EXECUTE ||
+            Swap(mach_header_->filetype) == MH_DYLIB ||
+            Swap(mach_header_->filetype) == MH_BUNDLE
+        );
+    }
+
+    void *GetBase() {
+        return base_;
+    }
+
+    size_t GetSize() {
+        return size_;
+    }
+
+    std::vector<struct load_command *> GetLoadCommands() {
+        std::vector<struct load_command *> load_commands;
+
+        struct load_command *load_command = reinterpret_cast<struct load_command *>(mach_header_ + 1);
+        for (uint32_t cmd = 0; cmd != Swap(mach_header_->ncmds); ++cmd) {
+            load_commands.push_back(load_command);
+            load_command = (struct load_command *) ((uint8_t *) load_command + Swap(load_command->cmdsize));
+        }
+
+        return load_commands;
+    }
+};
+
+extern "C" uint32_t hash(uint8_t *k, uint32_t length, uint32_t initval);
+
+int main(int argc, const char *argv[]) {
+    bool flag_R(false);
+    bool flag_t(false);
+    bool flag_p(false);
+    bool flag_u(false);
+
+    bool flag_T(false);
+
+    bool timeh(false);
+    uint32_t timev(0);
+
+    std::vector<std::string> files;
+
+    _assert(argc != 0);
+    for (int argi(1); argi != argc; ++argi)
+        if (argv[argi][0] != '-')
+            files.push_back(argv[argi]);
+        else switch (argv[argi][1]) {
+            case 'R': flag_R = true; break;
+            case 't': flag_t = true; break;
+            case 'u': flag_u = true; break;
+            case 'p': flag_p = true; break;
+
+            case 'T': {
+                flag_T = true;
+                if (argv[argi][2] == '-')
+                    timeh = true;
+                else {
+                    char *arge;
+                    timev = strtoul(argv[argi] + 2, &arge, 0);
+                    _assert(arge == argv[argi] + strlen(argv[argi]));
+                }
+            } break;
+
+            default:
+                goto usage;
+            break;
+        }
+
+    if (files.empty()) usage: {
+        exit(0);
+    }
+
+    size_t filei(0), filee(0);
+    _foreach (file, files) try {
+        Framework framework(file->c_str());
+
+        if (flag_p)
+            printf("path%zu='%s'\n", filei, file->c_str());
+
+        _foreach (load_command, framework.GetLoadCommands()) {
+            uint32_t cmd(framework.Swap((*load_command)->cmd));
+
+            if (flag_R && cmd == LC_REEXPORT_DYLIB)
+                (*load_command)->cmd = framework.Swap(LC_LOAD_DYLIB);
+            else if (cmd == LC_UUID) {
+                volatile struct uuid_command *uuid_command(reinterpret_cast<struct uuid_command *>(*load_command));
+
+                if (flag_u) {
+                    printf("uuid%zu=%.2x%.2x%.2x%.2x-%.2x%.2x-%.2x%.2x-%.2x%.2x-%.2x%.2x%.2x%.2x%.2x%.2x\n", filei,
+                        uuid_command->uuid[ 0], uuid_command->uuid[ 1], uuid_command->uuid[ 2], uuid_command->uuid[ 3],
+                        uuid_command->uuid[ 4], uuid_command->uuid[ 5], uuid_command->uuid[ 6], uuid_command->uuid[ 7],
+                        uuid_command->uuid[ 8], uuid_command->uuid[ 9], uuid_command->uuid[10], uuid_command->uuid[11],
+                        uuid_command->uuid[12], uuid_command->uuid[13], uuid_command->uuid[14], uuid_command->uuid[15]
+                    );
+                }
+            } else if (cmd == LC_ID_DYLIB) {
+                volatile struct dylib_command *dylib_command(reinterpret_cast<struct dylib_command *>(*load_command));
+
+                if (flag_t)
+                    printf("time%zu=0x%.8x\n", filei, framework.Swap(dylib_command->dylib.timestamp));
+
+                if (flag_T) {
+                    uint32_t timed;
+
+                    if (!timeh)
+                        timed = timev;
+                    else {
+                        dylib_command->dylib.timestamp = 0;
+                        timed = hash(reinterpret_cast<uint8_t *>(framework.GetBase()), framework.GetSize(), timev);
+                    }
+
+                    dylib_command->dylib.timestamp = framework.Swap(timed);
+                }
+            }
+        }
+
+        ++filei;
+    } catch (const char *) {
+        ++filee;
+        ++filei;
+    }
+
+    return filee;
+}
diff --git a/util/libtool.diff b/util/libtool.diff
index a3b4513ee..59e210084 100644
--- a/util/libtool.diff
+++ b/util/libtool.diff
@@ -5,7 +5,7 @@
  	  continue
  	  ;;
 -	*.la) lib="$deplib" ;;
-+	*.la) if [[ ${deplib:0:1} == '/' ]]; then lib="$PKG_ROOT$deplib"; else lib="$deplib"; fi ;;
++	*.la) lib="$("${PKG_BASE}/util/find.sh" "$deplib")" ;;
  	*.$libext)
  	  if test "$pass" = conv; then
  	    deplibs="$deplib $deplibs"
@@ -14,7 +14,7 @@
  		  path="$absdir/$objdir"
  		else
 -		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $PKG_ROOT$deplib`
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' "$("${PKG_BASE}/util/find.sh" "$deplib")"`
  		  if test -z "$libdir"; then
  		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		    exit $EXIT_FAILURE
@@ -23,7 +23,7 @@
  	      *.la)
  		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
 -		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $PKG_ROOT$deplib`
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' "$("${PKG_BASE}/util/find.sh" "$deplib")"`
  		if test -z "$libdir"; then
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
  		  exit $EXIT_FAILURE
diff --git a/util/libtool.m4.diff b/util/libtool.m4.diff
new file mode 100644
index 000000000..ac837e4fc
--- /dev/null
+++ b/util/libtool.m4.diff
@@ -0,0 +1,11 @@
+--- m4/libtool.m4	2005-07-29 13:31:15.000000000 +0000
++++ m4/libtool.m4_	2008-03-28 15:05:28.000000000 +0000
+@@ -1267,7 +1267,7 @@
+   shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
+   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+   if test "$GCC" = yes; then
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g"`
+   else
+     sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+   fi
diff --git a/util/pkg-config.sh b/util/pkg-config.sh
index d9e64d22d..22d2815b3 100755
--- a/util/pkg-config.sh
+++ b/util/pkg-config.sh
@@ -1,3 +1,63 @@
 #!/bin/bash
-echo "$@" | grep -- --atleast >/dev/null && exit 0
-exec pkg-config "$@"
+
+#echo 1>&2
+#echo ::: "$@" 1>&2
+
+declare -a args
+declare -a pkgs
+unset dbpf
+
+while [[ $# -ne 0 ]]; do case "$1" in
+    (--atleast-pkgconfig-version)
+        exec pkg-config "$1" "$2"
+    ;;
+
+    (--cflags|--libs|--variable=*)
+        dbpf=
+        args[${#args[@]}]=$1
+    ;;
+
+    (--errors-to-stdout|--exists|--modversion|--print-errors|--short-errors|--uninstalled)
+        args[${#args[@]}]=$1
+    ;;
+
+    (--atleast-version|--exact-version|--max-version)
+        args[${#args[@]}]=$1
+        args[${#args[@]}]=$2
+        shift
+    ;;
+
+    (--*)
+        echo "unknown pkg-config option $1" 1>&2
+        exit 1
+    ;;
+
+    (*)
+        pkgs[${#pkgs[@]}]=$1
+    ;;
+esac; shift; done
+
+if [[ ${dbpf+@} ]]; then
+    source "${PKG_BASE}/folders.sh"
+fi
+
+outs=
+for pkg in "${pkgs[@]}"; do
+    args_=("${args[@]}")
+
+    if [[ ${dbpf+@} ]]; then
+        dest=$(for dep in $(find -L "${PKG_DATA}"/_metadata -name '*.dep' | cut -d '/' -f -); do
+            DEP_NAME=$(basename "${dep}" .dep)
+            DEP_DEST=$(PKG_DEST_ "${DEP_NAME}")
+
+            find "${DEP_DEST}" -name "${pkg}.pc" -printf "${DEP_DEST}\n"
+        done) && args_=(--define-variable=prefix="${dest}/usr" "${args_[@]}")
+    fi
+
+    #echo @@@ pkg-config "${args_[@]}" "${pkg}" 1>&2
+    out=$(pkg-config "${args_[@]}" "${pkg}") || exit $?
+    #echo "=== ${out}" 1>&2
+    outs+=\ ${out}
+done
+
+echo "${out#\ }"
diff --git a/util/uname b/util/uname.sh
index db07673fc..db07673fc 100755
--- a/util/uname
+++ b/util/uname.sh
author	Jay Freeman <saurik@saurik.com>	2008-04-06 10:28:29 +0000
committer	Jay Freeman <saurik@saurik.com>	2008-04-06 10:28:29 +0000
commit	d699a01fabaa04a1aad60f6ca5777f82ee24839a (patch)
tree	1eb62bad23b14a0877c5b9171f2a5f9358c8d592
parent	8a49e427447f40fdd43fc4b5f513b166dd639e2a (diff)