Fixed some dependencies, removed mDNS fix for 2.0, and factored for multi-arch support.

git-svn-id: http://svn.telesphoreo.org/trunk@218 514c082c-b64e-11dc-b46d-3d985efe055d
author: Jay Freeman <saurik@saurik.com> 2008-04-14 23:22:48 +0000
committer: Jay Freeman <saurik@saurik.com> 2008-04-14 23:22:48 +0000
commit: 7817782b2837cf98f7566e13f80b9c071ff20139 (patch)
tree: 452a5677d990e0d9dc9c36ac08bd4204e447afc2 /data
parent: e615a71056dfae4f19dfef86331eb030494b79b7 (diff)
187 files changed, 451 insertions, 520 deletions
diff --git a/data/_/make.sh b/data/_/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/_/make.sh
+++ b/data/_/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/adv-cmds/make.sh b/data/adv-cmds/make.sh
index 5d0039951..385b9709a 100644
--- a/data/adv-cmds/make.sh
+++ b/data/adv-cmds/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 for tproj in finger fingerd last lsvfs md ps; do
     "${PKG_TARG}-gcc" -o "${tproj}" "${tproj}.tproj"/*.c -D'__FBSDID(x)='
 done
diff --git a/data/apr-util/_metadata/sqlite3.dep b/data/apr-util/_metadata/sqlite3.dep
new file mode 120000
index 000000000..071b20780
--- /dev/null
+++ b/data/apr-util/_metadata/sqlite3.dep
@@ -0,0 +1 @@
+../../sqlite3
+\ No newline at end of file
diff --git a/data/apr-util/make.sh b/data/apr-util/make.sh
index d39e41ed6..2a4ca3fa2 100644
--- a/data/apr-util/make.sh
+++ b/data/apr-util/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 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 70eecb6ba..44d069394 100644
--- a/data/apr/make.sh
+++ b/data/apr/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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/apt/cfnetwork.diff b/data/apt/cfnetwork.diff
index 6cdd2fc3b..84a545066 100644
--- a/data/apt/cfnetwork.diff
+++ b/data/apt/cfnetwork.diff
@@ -1,22 +1,23 @@
 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-04-06 10:00:37.000000000 +0000
-@@ -44,6 +48,10 @@
++++ apt-0.6.46.4.1+iPhone/methods/http.cc	2008-04-13 05:59:17.000000000 +0000
+@@ -43,6 +47,11 @@
+ 
  // Internet stuff
  #include <netdb.h>
- 
++#include <arpa/inet.h>
++
 +#include <CoreFoundation/CoreFoundation.h>
 +#include <CoreServices/CoreServices.h>
 +#include <SystemConfiguration/SystemConfiguration.h>
-+
+ 
  #include "connect.h"
  #include "rfc2553emu.h"
- #include "http.h"
-@@ -51,6 +59,47 @@
+@@ -51,6 +60,47 @@
  									/*}}}*/
  using namespace std;
  
-+void CfrsError(CFReadStreamRef rs) {
++void CfrsError(const char *name, CFReadStreamRef rs) {
 +    CFStreamError se = CFReadStreamGetError(rs);
 +
 +    if (se.domain == kCFStreamErrorDomainCustom) {
@@ -25,7 +26,7 @@ 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 == kCFStreamErrorDomainMacOSStatus) {
 +        _error->Error("MacOSStatus: %ld", se.error);
 +    } else if (se.domain == kCFStreamErrorDomainNetDB) {
-+        _error->Error("NetDB: %s", gai_strerror(se.error));
++        _error->Error("NetDB: %s %s", name, gai_strerror(se.error));
 +    } else if (se.domain == kCFStreamErrorDomainMach) {
 +        _error->Error("Mach: %ld", se.error);
 +    } else if (se.domain == kCFStreamErrorDomainHTTP) {
@@ -60,7 +61,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
  string HttpMethod::FailFile;
  int HttpMethod::FailFd = -1;
  time_t HttpMethod::FailTime = 0;
-@@ -1062,159 +1111,234 @@
+@@ -1062,159 +1112,251 @@
  
        if (Queue == 0)
  	 continue;
@@ -70,7 +71,20 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 -      {
 -	 delete Server;
 -	 Server = new ServerState(Queue->Uri,this);
--      }
++
++      CFStringEncoding se = kCFStringEncodingUTF8;
++
++      char *url = strdup(Queue->Uri.c_str());
++    url:
++      URI uri = Queue->Uri;
++      std::string hs = uri.Host;
++
++      struct hostent *he = gethostbyname(hs.c_str());
++      if (he == NULL || he->h_addr_list[0] == NULL) {
++         _error->Error(hstrerror(h_errno));
++         Fail(true);
++         free(url);
+       }
 -      
 -      /* If the server has explicitly said this is the last connection
 -         then we pre-emptively shut down the pipeline and tear down 
@@ -91,7 +105,31 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 -	 delete Server;
 -	 Server = 0;
 -	 continue;
--      }
++
++      uri.Host = inet_ntoa(* (struct in_addr *) he->h_addr_list[0]);
++
++      std::string urs = uri;
++
++      CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, urs.c_str(), se);
++      CFURLRef ur = CFURLCreateWithString(kCFAllocatorDefault, sr, NULL);
++      CFRelease(sr);
++      CFHTTPMessageRef hm = CFHTTPMessageCreateRequest(kCFAllocatorDefault, CFSTR("GET"), ur, kCFHTTPVersion1_1);
++      CFRelease(ur);
++
++      struct stat SBuf;
++      if (stat(Queue->DestFile.c_str(), &SBuf) >= 0 && SBuf.st_size > 0) {
++         sr = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("bytes=%li-"), (long) SBuf.st_size - 1);
++         CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Range"), sr);
++         CFRelease(sr);
++
++         sr = CFStringCreateWithCString(kCFAllocatorDefault, TimeRFC1123(SBuf.st_mtime).c_str(), se);
++         CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("If-Range"), sr);
++         CFRelease(sr);
++      } else if (Queue->LastModified != 0) {
++         sr = CFStringCreateWithCString(kCFAllocatorDefault, TimeRFC1123(SBuf.st_mtime).c_str(), se);
++         CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("If-Modified-Since"), sr);
++         CFRelease(sr);
+       }
  
 -      // Fill the pipeline.
 -      Fetch(0);
@@ -130,32 +168,12 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 -	    continue;
 -	 }
 -      };
-+      CFStringEncoding se = kCFStringEncodingUTF8;
++      CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("User-Agent"), CFSTR("Telesphoreo APT-HTTP/1.0.98"));
 +
-+      char *url = strdup(Queue->Uri.c_str());
-+    url:
-+      CFStringRef sr = CFStringCreateWithCString(kCFAllocatorDefault, url, se);
-+      CFURLRef ur = CFURLCreateWithString(kCFAllocatorDefault, sr, NULL);
++      sr = CFStringCreateWithCString(kCFAllocatorDefault, hs.c_str(), se);
++      CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Host"), sr);
 +      CFRelease(sr);
-+      CFHTTPMessageRef hm = CFHTTPMessageCreateRequest(kCFAllocatorDefault, CFSTR("GET"), ur, kCFHTTPVersion1_1);
-+      CFRelease(ur);
-+
-+      struct stat SBuf;
-+      if (stat(Queue->DestFile.c_str(), &SBuf) >= 0 && SBuf.st_size > 0) {
-+         sr = CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("bytes=%li-"), (long) SBuf.st_size - 1);
-+         CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("Range"), sr);
-+         CFRelease(sr);
 +
-+         sr = CFStringCreateWithCString(kCFAllocatorDefault, TimeRFC1123(SBuf.st_mtime).c_str(), se);
-+         CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("If-Range"), sr);
-+         CFRelease(sr);
-+      } else if (Queue->LastModified != 0) {
-+         sr = CFStringCreateWithCString(kCFAllocatorDefault, TimeRFC1123(SBuf.st_mtime).c_str(), se);
-+         CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("If-Modified-Since"), sr);
-+         CFRelease(sr);
-+      }
-+
-+      CFHTTPMessageSetHeaderFieldValue(hm, CFSTR("User-Agent"), CFSTR("Telesphoreo APT-HTTP/1.0.98"));
 +      CFReadStreamRef rs = CFReadStreamCreateForHTTPRequest(kCFAllocatorDefault, hm);
 +      CFRelease(hm);
 +
@@ -165,8 +183,6 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 +
 +      //CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPShouldAutoredirect, kCFBooleanTrue);
 +      CFReadStreamSetProperty(rs, kCFStreamPropertyHTTPAttemptPersistentConnection, kCFBooleanTrue);
-+
-+      URI uri = Queue->Uri;
  
 -      // Decide what to do.
        FetchResult Res;
@@ -176,10 +192,10 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 +      uint8_t data[10240];
 +      size_t offset = 0;
 +
-+      Status("Connecting to %s", uri.Host.c_str());
++      Status("Connecting to %s", hs.c_str());
 +
 +      if (!CFReadStreamOpen(rs)) {
-+         CfrsError(rs);
++         CfrsError("Open", rs);
 +         Fail(true);
 +         goto done;
 +      }
@@ -187,7 +203,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 +      rd = CFReadStreamRead(rs, data, sizeof(data));
 +
 +      if (rd == -1) {
-+         CfrsError(rs);
++         CfrsError(uri.Host.c_str(), rs);
 +         Fail(true);
 +         goto done;
 +      }
@@ -323,7 +339,7 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
 +	 URIStart(Res);
 +
 +         read: if (rd == -1) {
-+            CfrsError(rs);
++            CfrsError("rd", rs);
 +            Fail(true);
 +         } else if (rd == 0) {
  	    if (Res.Size == 0)
@@ -436,7 +452,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-04-06 09:55:04.000000000 +0000
++++ apt-0.6.46.4.1+iPhone/methods/makefile	2008-04-13 00:47:53.000000000 +0000
 @@ -47,7 +47,7 @@
  
  # The http method
diff --git a/data/apt/make.sh b/data/apt/make.sh
index 7c3f4d757..8e73d3ab4 100644
--- a/data/apt/make.sh
+++ b/data/apt/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure --disable-nls
 make
diff --git a/data/apt/mdns.diff b/data/apt/mdns.diff
index 20c349ad2..4c4b0846b 100644
--- a/data/apt/mdns.diff
+++ b/data/apt/mdns.diff
@@ -9,16 +9,18 @@ diff -ru apt-0.6.46.4.1/cmdline/apt-cache.cc apt-0.6.46.4.1+iPhone/cmdline/apt-c
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: apt-cache.cc,v 1.72 2004/04/30 04:34:03 mdz Exp $
-@@ -1706,6 +1710,13 @@
+@@ -1706,6 +1710,15 @@
  
  int main(int argc,const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     CommandLine::Args Args[] = {
        {'h',"help","help",0},
@@ -34,16 +36,18 @@ diff -ru apt-0.6.46.4.1/cmdline/apt-cdrom.cc apt-0.6.46.4.1+iPhone/cmdline/apt-c
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: apt-cdrom.cc,v 1.45 2003/11/19 23:50:51 mdz Exp $
-@@ -167,6 +171,13 @@
+@@ -167,6 +171,15 @@
  
  int main(int argc,const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     CommandLine::Args Args[] = {
        {'h',"help","help",0},
@@ -59,16 +63,18 @@ diff -ru apt-0.6.46.4.1/cmdline/apt-config.cc apt-0.6.46.4.1+iPhone/cmdline/apt-
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: apt-config.cc,v 1.11 2003/01/11 07:18:44 jgg Exp $
-@@ -91,6 +95,13 @@
+@@ -91,6 +95,15 @@
  
  int main(int argc,const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     CommandLine::Args Args[] = {
        {'h',"help","help",0},
@@ -84,16 +90,18 @@ diff -ru apt-0.6.46.4.1/cmdline/apt-extracttemplates.cc apt-0.6.46.4.1+iPhone/cm
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $
-@@ -351,6 +355,13 @@
+@@ -351,6 +355,15 @@
  
  int main(int argc, const char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
  	CommandLine::Args Args[] = {
  		{'h',"help","help",0},
@@ -109,16 +117,18 @@ diff -ru apt-0.6.46.4.1/cmdline/apt-get.cc apt-0.6.46.4.1+iPhone/cmdline/apt-get
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: apt-get.cc,v 1.156 2004/08/28 01:05:16 mdz Exp $
-@@ -2504,6 +2508,13 @@
+@@ -2504,6 +2508,15 @@
  
  int main(int argc,const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     CommandLine::Args Args[] = {
        {'h',"help","help",0},
@@ -134,16 +144,18 @@ diff -ru apt-0.6.46.4.1/cmdline/apt-sortpkgs.cc apt-0.6.46.4.1+iPhone/cmdline/ap
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: apt-sortpkgs.cc,v 1.5 2003/01/11 07:18:44 jgg Exp $
-@@ -164,6 +168,13 @@
+@@ -164,6 +168,15 @@
  
  int main(unsigned int argc,const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     CommandLine::Args Args[] = {
        {'h',"help","help",0},
@@ -159,16 +171,18 @@ diff -ru apt-0.6.46.4.1/ftparchive/apt-ftparchive.cc apt-0.6.46.4.1+iPhone/ftpar
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: apt-ftparchive.cc,v 1.8.2.3 2004/01/02 22:01:48 mdz Exp $
-@@ -901,6 +905,13 @@
+@@ -901,6 +905,15 @@
  
  int main(int argc, const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     CommandLine::Args Args[] = {
        {'h',"help","help",0},
@@ -184,16 +198,18 @@ diff -ru apt-0.6.46.4.1/methods/cdrom.cc apt-0.6.46.4.1+iPhone/methods/cdrom.cc
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: cdrom.cc,v 1.20.2.1 2004/01/16 18:58:50 mdz Exp $
-@@ -193,6 +197,13 @@
+@@ -193,6 +197,15 @@
  
  int main()
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     setlocale(LC_ALL, "");
  
@@ -209,16 +225,18 @@ diff -ru apt-0.6.46.4.1/methods/copy.cc apt-0.6.46.4.1+iPhone/methods/copy.cc
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: copy.cc,v 1.7.2.1 2004/01/16 18:58:50 mdz Exp $
-@@ -86,6 +90,13 @@
+@@ -86,6 +90,15 @@
  
  int main()
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     setlocale(LC_ALL, "");
  
@@ -234,16 +252,18 @@ diff -ru apt-0.6.46.4.1/methods/file.cc apt-0.6.46.4.1+iPhone/methods/file.cc
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: file.cc,v 1.9.2.1 2004/01/16 18:58:50 mdz Exp $
-@@ -89,6 +93,13 @@
+@@ -89,6 +93,15 @@
  
  int main()
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     setlocale(LC_ALL, "");
  
@@ -259,16 +279,18 @@ diff -ru apt-0.6.46.4.1/methods/ftp.cc apt-0.6.46.4.1+iPhone/methods/ftp.cc
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: ftp.cc,v 1.31.2.1 2004/01/16 18:58:50 mdz Exp $
-@@ -1086,6 +1090,13 @@
+@@ -1086,6 +1090,15 @@
  
  int main(int argc,const char *argv[])
  { 
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     setlocale(LC_ALL, "");
  
@@ -284,16 +306,18 @@ diff -ru apt-0.6.46.4.1/methods/gpgv.cc apt-0.6.46.4.1+iPhone/methods/gpgv.cc
  #include <apt-pkg/error.h>
  #include <apt-pkg/acquire-method.h>
  #include <apt-pkg/strutl.h>
-@@ -302,6 +306,13 @@
+@@ -302,6 +306,15 @@
  
  int main()
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     setlocale(LC_ALL, "");
     
@@ -309,16 +333,18 @@ diff -ru apt-0.6.46.4.1/methods/gzip.cc apt-0.6.46.4.1+iPhone/methods/gzip.cc
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: gzip.cc,v 1.17.2.1 2004/01/16 18:58:50 mdz Exp $
-@@ -162,6 +166,13 @@
+@@ -162,6 +166,15 @@
  
  int main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     setlocale(LC_ALL, "");
  
@@ -334,16 +360,18 @@ diff -ru apt-0.6.46.4.1/methods/http.cc apt-0.6.46.4.1+iPhone/methods/http.cc
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
-@@ -1224,6 +1228,13 @@
+@@ -1224,6 +1228,15 @@
  
  int main()
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     setlocale(LC_ALL, "");
  
@@ -359,16 +387,18 @@ diff -ru apt-0.6.46.4.1/methods/rred.cc apt-0.6.46.4.1+iPhone/methods/rred.cc
  #include <apt-pkg/fileutl.h>
  #include <apt-pkg/error.h>
  #include <apt-pkg/acquire-method.h>
-@@ -253,6 +257,13 @@
+@@ -253,6 +257,15 @@
  
  int main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     RredMethod Mth;
  
@@ -384,16 +414,18 @@ diff -ru apt-0.6.46.4.1/methods/rsh.cc apt-0.6.46.4.1+iPhone/methods/rsh.cc
  // -*- mode: cpp; mode: fold -*-
  // Description								/*{{{*/
  // $Id: rsh.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $
-@@ -511,6 +515,13 @@
+@@ -511,6 +515,15 @@
  
  int main(int argc, const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +   struct nlist nl[2];
 +   memset(nl, 0, sizeof(nl));
 +   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +   nlist("/usr/lib/libc.dylib", nl);
 +   if (nl[0].n_type != N_UNDF)
 +       *(int *) nl[0].n_value = 0;
++#endif
 +
     setlocale(LC_ALL, "");
  
diff --git a/data/apt/darwin.diff b/data/apt/ostable.diff
index b339b5ee7..18211fc7d 100644
--- a/data/apt/darwin.diff
+++ b/data/apt/ostable.diff
@@ -1,10 +1,11 @@
 diff -ru apt-0.6.46.4.1/buildlib/ostable apt-0.6.46.4.1+iPhone/buildlib/ostable
 --- apt-0.6.46.4.1/buildlib/ostable	2006-12-04 14:37:35.000000000 +0000
-+++ apt-0.6.46.4.1+iPhone/buildlib/ostable	2008-01-01 07:25:25.000000000 +0000
-@@ -11,6 +11,7 @@
++++ apt-0.6.46.4.1+iPhone/buildlib/ostable	2008-04-13 06:09:10.000000000 +0000
+@@ -11,6 +11,8 @@
  [^-]*-kfreebsd.*-gnu   kfreebsd
  [^-]*-knetbsd.*-gnu   knetbsd
  [^-]*-gnu[^-]*   hurd
++[^-]*-darwin9 iphoneos
 +[^-]*-darwin darwin
  
  # These are samples. 
diff --git a/data/autossh/make.sh b/data/autossh/make.sh
index ab2f4cf95..eaba182f1 100644
--- a/data/autossh/make.sh
+++ b/data/autossh/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes
 make
 pkg:install prefix="${PKG_DEST}/usr"
diff --git a/data/bash/make.sh b/data/bash/make.sh
index 9bd7173f8..98c71e9c6 100644
--- a/data/bash/make.sh
+++ b/data/bash/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure bash_cv_dev_fd=absent bash_cv_sys_named_pipes=missing bash_cv_job_control_missing=present bash_cv_func_sigsetjmp=present bash_cv_func_ctype_nonascii=no bash_cv_must_reinstall_sighandlers=no bash_cv_func_strcoll_broken=yes ac_cv_c_stack_direction=-1 ac_cv_func_mmap_fixed_mapped=yes gt_cv_int_divbyzero_sigfpe=no ac_cv_func_setvbuf_reversed=no ac_cv_func_strcoll_works=yes ac_cv_func_working_mktime=yes ac_cv_type_getgroups=gid_t bash_cv_dup2_broken=no
 #pgrp_pipe...
 make
diff --git a/data/bash/mdns.diff b/data/bash/mdns.diff
index af119ba1c..79cfb0389 100644
--- a/data/bash/mdns.diff
+++ b/data/bash/mdns.diff
@@ -7,16 +7,18 @@ diff -ru bash-3.2/shell.c bash-3.2+iPhone/shell.c
  /* shell.c -- GNU's idea of the POSIX shell specification. */
  
  /* Copyright (C) 1987-2005 Free Software Foundation, Inc.
-@@ -328,6 +330,13 @@
+@@ -328,6 +330,15 @@
       char **argv, **env;
  #endif /* !NO_MAIN_ENV_ARG */
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    register int i;
    int code, old_errexit_flag;
diff --git a/data/basic-cmds/make.sh b/data/basic-cmds/make.sh
index eceb9f5cb..9f1738b2c 100644
--- a/data/basic-cmds/make.sh
+++ b/data/basic-cmds/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 for bin in mesg write uudecode uuencode; do
     "${PKG_TARG}-gcc" -o "${bin}/${bin}" "${bin}"/*.c
     pkg:usrbin "${bin}/${bin}"
diff --git a/data/bc/make.sh b/data/bc/make.sh
index a2d6f6ae5..7dac292bc 100644
--- a/data/bc/make.sh
+++ b/data/bc/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 autoconf
 pkg:configure
 make
diff --git a/data/berkeleydb/make.sh b/data/berkeleydb/make.sh
index 7bdf244eb..9a39a18fe 100644
--- a/data/berkeleydb/make.sh
+++ b/data/berkeleydb/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 cd build_unix
 PKG_CONF=../dist/configure pkg:configure
 make
diff --git a/data/bind/gen.diff b/data/bind/gen.diff
deleted file mode 100644
index 9816fafba..000000000
--- a/data/bind/gen.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u bind-9.3.2-P2/lib/dns/Makefile.in bind-9.3.2-P2+iPhone/lib/dns/Makefile.in
---- bind-9.3.2-P2/lib/dns/Makefile.in	2004-12-09 04:07:15.000000000 +0000
-+++ bind-9.3.2-P2+iPhone/lib/dns/Makefile.in	2007-12-28 05:22:22.000000000 +0000
-@@ -156,7 +156,7 @@
- 	./gen -s ${srcdir} > code.h
- 
- gen: gen.c
--	${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
-+	gcc ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}
- 
- rbtdb64.@O@: rbtdb.c
- 
diff --git a/data/bind/make.sh b/data/bind/make.sh
index d697a3f20..950c5c6b5 100644
--- a/data/bind/make.sh
+++ b/data/bind/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --with-randomdev=/dev/random BUILD_CC=gcc
 make
 pkg:install
diff --git a/data/bison/make.sh b/data/bison/make.sh
index 8673eeaf1..4a7f580dd 100644
--- a/data/bison/make.sh
+++ b/data/bison/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure gl_cv_func_strndup=no ac_cv_func_obstack=no
 make
 pkg:install
diff --git a/data/bitchx/make.sh b/data/bitchx/make.sh
index bcac3cfc2..53ef8a373 100644
--- a/data/bitchx/make.sh
+++ b/data/bitchx/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd BitchX
-pkg:patch
+pkg:setup
 pkg:configure
 make
 make install prefix="${PKG_DEST}/usr"
diff --git a/data/bitchx/mdns.diff b/data/bitchx/mdns.diff
index b6566a3f9..12a95e9f8 100644
--- a/data/bitchx/mdns.diff
+++ b/data/bitchx/mdns.diff
@@ -7,16 +7,18 @@ diff -ru BitchX/source/irc.c BitchX+iPhone/source/irc.c
  /*
   * ircII: a new irc client.  I like it.  I hope you will too!
   *
-@@ -1464,6 +1466,13 @@
+@@ -1464,6 +1466,15 @@
  
  int main(int argc, char *argv[], char *envp[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
  	srand((unsigned)time(NULL));
  	time(&start_time);
diff --git a/data/boost_/make.sh b/data/boost_/make.sh
index b3ebe3312..483aa3d4c 100644
--- a/data/boost_/make.sh
+++ b/data/boost_/make.sh
@@ -1,7 +1,5 @@
 shopt -s extglob
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 ./configure --prefix=/usr --without-icu --without-libraries=python
 echo 'using darwin ;' >user-config.jam
 make
diff --git a/data/bootstrap-cmds/make.sh b/data/bootstrap-cmds/make.sh
index af6db12d1..ad3f9f865 100644
--- a/data/bootstrap-cmds/make.sh
+++ b/data/bootstrap-cmds/make.sh
@@ -1,6 +1,4 @@
-tar -zxvf "${PKG_DATA}/bootstrap_cmds-60.tar.gz"
-cd bootstrap_cmds-60
-pkg:patch
+pkg:setup
 cd migcom.tproj
 cat >ident.c <<EOF
 char *MigGenerationDate = "`date`";
diff --git a/data/bzip2/make.sh b/data/bzip2/make.sh
index 560f35a04..8c6921c09 100644
--- a/data/bzip2/make.sh
+++ b/data/bzip2/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 make bzip2 bzip2recover CC=${PKG_TARG}-gcc
 pkg: mkdir -p /bin
 pkg: cp -a bzip2 bzip2recover /bin
diff --git a/data/classpath/make.sh b/data/classpath/make.sh
index cdc300e7f..4fe9297de 100644
--- a/data/classpath/make.sh
+++ b/data/classpath/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/classpath-0.96.1.tar.gz"
-cd classpath-0.96.1
+pkg:setup
 pkg:configure --disable-examples --disable-gconf-peer --disable-gtk-peer --disable-plugin
 make
 pkg:install
diff --git a/data/coreutils/make.sh b/data/coreutils/make.sh
index 08dd4aab5..d7ceecf0b 100644
--- a/data/coreutils/make.sh
+++ b/data/coreutils/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/cpio/make.sh b/data/cpio/make.sh
index e100ef1b5..7c5a8023e 100644
--- a/data/cpio/make.sh
+++ b/data/cpio/make.sh
@@ -1,6 +1,5 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure ac_cv_func_obstack=no
 make
 pkg:install
+pkg: rm -f /usr/libexec/rmt
diff --git a/data/csu/make.sh b/data/csu/make.sh
index 1f03aa693..1a5833b61 100644
--- a/data/csu/make.sh
+++ b/data/csu/make.sh
@@ -1,4 +1,3 @@
-pkg:extract
-cd *
+pkg:setup
 pkg: mkdir -p /usr/lib
 cp -a *.o "${PKG_DEST}"/usr/lib
diff --git a/data/curl/make.sh b/data/curl/make.sh
index 281f9e970..f197f9077 100644
--- a/data/curl/make.sh
+++ b/data/curl/make.sh
@@ -1,6 +1,4 @@
-tar -zxvf "${PKG_DATA}/curl-7.17.1.tar.gz"
-cd curl-7.17.1
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure ac_cv_file___dev_urandom_=yes
 make
diff --git a/data/curl/mdns.diff b/data/curl/mdns.diff
index 0ac371e36..14b8dd67e 100644
--- a/data/curl/mdns.diff
+++ b/data/curl/mdns.diff
@@ -7,16 +7,18 @@ diff -ru curl-7.17.1/src/main.c curl-7.17.1+iPhone/src/main.c
  /***************************************************************************
   *                                  _   _ ____  _
   *  Project                     ___| | | |  _ \| |
-@@ -4712,6 +4714,13 @@
+@@ -4712,6 +4714,15 @@
  
  int main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int res;
    struct Configurable config;
diff --git a/data/cvs/make.sh b/data/cvs/make.sh
index 91571090e..a1eb6e34e 100644
--- a/data/cvs/make.sh
+++ b/data/cvs/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --without-gssapi
 make
 pkg:install
diff --git a/data/cvs/mdns.diff b/data/cvs/mdns.diff
index e7d651b20..b11a26a90 100644
--- a/data/cvs/mdns.diff
+++ b/data/cvs/mdns.diff
@@ -7,16 +7,18 @@ diff -ru cvs-1.11.22/src/main.c cvs-1.11.22+iPhone/src/main.c
  /*
   * Copyright (C) 1986-2006 The Free Software Foundation, Inc.
   *
-@@ -395,6 +397,13 @@
+@@ -395,6 +397,15 @@
      int argc;
      char **argv;
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
      cvsroot_t *CVSroot_parsed = NULL;
      int cvsroot_update_env = 1;
diff --git a/data/cydia/_metadata/version b/data/cydia/_metadata/version
index 1bac64c46..d1034047d 100644
--- a/data/cydia/_metadata/version
+++ b/data/cydia/_metadata/version
@@ -1 +1 @@
-1.0.2383
+1.0.2385
diff --git a/data/cydia/cydia-1.0.2383.tgz b/data/cydia/cydia-1.0.2383.tgz
deleted file mode 100644
index a02d70e70..000000000
--- a/data/cydia/cydia-1.0.2383.tgz
+++ /dev/null
diff --git a/data/cydia/cydia-1.0.2385.tgz b/data/cydia/cydia-1.0.2385.tgz
new file mode 100644
index 000000000..e4f6eb3a9
--- /dev/null
+++ b/data/cydia/cydia-1.0.2385.tgz
diff --git a/data/cydia/make.sh b/data/cydia/make.sh
index 1210bd838..069064425 100644
--- a/data/cydia/make.sh
+++ b/data/cydia/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 make
 
 pkg: mkdir -p /usr/libexec /var/lib/cydia
diff --git a/data/darwintools/make.sh b/data/darwintools/make.sh
index 297af9c33..1ae2f726b 100644
--- a/data/darwintools/make.sh
+++ b/data/darwintools/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg: mkdir -p /usr/bin
 
 for tool in startupfiletool sw_vers; do
diff --git a/data/developer-cmds/make.sh b/data/developer-cmds/make.sh
index 227ee9159..cc176fdf7 100644
--- a/data/developer-cmds/make.sh
+++ b/data/developer-cmds/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg: mkdir -p /usr/bin
 
 ${PKG_TARG}-gcc -o hexdump/hexdump hexdump/{conv,display,hexdump,hexsyntax,odsyntax,parse}.c -D'__FBSDID(x)='
diff --git a/data/dict/make.sh b/data/dict/make.sh
index 69cf25c8a..d1151073e 100644
--- a/data/dict/make.sh
+++ b/data/dict/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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/diffutils/make.sh b/data/diffutils/make.sh
index 7e498defb..0bf0c095a 100644
--- a/data/diffutils/make.sh
+++ b/data/diffutils/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 make install prefix="${PKG_DEST}/usr"
diff --git a/data/diskdev-cmds/make.sh b/data/diskdev-cmds/make.sh
index 735de086b..5c1c8d6c5 100644
--- a/data/diskdev-cmds/make.sh
+++ b/data/diskdev-cmds/make.sh
@@ -1,6 +1,5 @@
 shopt -s extglob
-pkg:extract
-cd *
+pkg:setup
 
 cd disklib
 rm -f mntopts.h getmntopts.c
diff --git a/data/dmg2img/make.sh b/data/dmg2img/make.sh
index e4dd86221..555578e2e 100644
--- a/data/dmg2img/make.sh
+++ b/data/dmg2img/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 make CC=${PKG_TARG}-gcc
 pkg: mkdir -p /usr/bin
 pkg: mv dmg2img /usr/bin
diff --git a/data/dpkg/make.sh b/data/dpkg/make.sh
index 9b4d86a95..1626f8178 100644
--- a/data/dpkg/make.sh
+++ b/data/dpkg/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 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
diff --git a/data/dpkg/telesphoreo.diff b/data/dpkg/telesphoreo.diff
new file mode 100644
index 000000000..a3b84c389
--- /dev/null
+++ b/data/dpkg/telesphoreo.diff
@@ -0,0 +1,11 @@
+diff -ru dpkg-1.13.25/ostable dpkg-1.13.25+iPhone/ostable
+--- dpkg-1.13.25/ostable	2006-06-21 13:33:54.000000000 +0000
++++ dpkg-1.13.25+iPhone/ostable	2008-04-11 16:12:36.000000000 +0000
+@@ -14,6 +14,7 @@
+ #
+ # <Debian name>	<GNU name>	<config.guess regex>
+ linux		linux-gnu	linux[^-]*(-gnu.*)?
++iphoneos	darwin9		darwin9
+ darwin		darwin		darwin[^-]*
+ freebsd		freebsd		freebsd[^-]*
+ kfreebsd	kfreebsd-gnu	kfreebsd[^-]*(-gnu.*)?
diff --git a/data/ed/make.sh b/data/ed/make.sh
index 26d2ee621..49631bf8b 100644
--- a/data/ed/make.sh
+++ b/data/ed/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 ./configure --prefix=/usr
 make CC="${PKG_TARG}-gcc"
 pkg:install
diff --git a/data/expat/make.sh b/data/expat/make.sh
index 395ac67cb..452a4bfd5 100644
--- a/data/expat/make.sh
+++ b/data/expat/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/expat-2.0.1.tar.gz"
-cd expat-2.0.1
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/faac/make.sh b/data/faac/make.sh
index 84759094a..8325cc734 100644
--- a/data/faac/make.sh
+++ b/data/faac/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 ./bootstrap
 pkg:configure
 make
diff --git a/data/faad/make.sh b/data/faad/make.sh
index 84759094a..8325cc734 100644
--- a/data/faad/make.sh
+++ b/data/faad/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 ./bootstrap
 pkg:configure
 make
diff --git a/data/fastjar/make.sh b/data/fastjar/make.sh
index a2d6f6ae5..7dac292bc 100644
--- a/data/fastjar/make.sh
+++ b/data/fastjar/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 autoconf
 pkg:configure
 make
diff --git a/data/file-cmds/make.sh b/data/file-cmds/make.sh
index 492dc9947..ff3dc8047 100644
--- a/data/file-cmds/make.sh
+++ b/data/file-cmds/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg: mkdir -p /usr/bin
 for bin in chflags compress ipcrm ipcs pax; do
     ${PKG_TARG}-gcc -o "${bin}/${bin}" "${bin}"/*.c -D'__FBSDID(x)=' -D__POSIX_C_SOURCE
diff --git a/data/file/make.sh b/data/file/make.sh
index 579e6daaa..b3898e369 100644
--- a/data/file/make.sh
+++ b/data/file/make.sh
@@ -1,10 +1,13 @@
+shopt -s extglob
+pkg:setup
+cd ..
+mv * target
 pkg:extract
-mv * native
-pkg:extract
-cd native
+mv !(target) host
+cd host
 ./configure
 make
-cd ../!(native)
+cd ../target
 pkg:configure
-make FILE_COMPILE="$(pwd)/../native/src/file"
+make FILE_COMPILE="$(pwd)"/../host/src/file
 pkg:install
diff --git a/data/findutils/make.sh b/data/findutils/make.sh
index fcd539415..452a4bfd5 100644
--- a/data/findutils/make.sh
+++ b/data/findutils/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/findutils-4.2.31.tar.gz"
-cd findutils-4.2.31
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/flex/make.sh b/data/flex/make.sh
index 06e876cc5..be55ecc37 100644
--- a/data/flex/make.sh
+++ b/data/flex/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes
 make
 pkg:install
diff --git a/data/flite/make.sh b/data/flite/make.sh
index 869d64da1..6353cd13d 100644
--- a/data/flite/make.sh
+++ b/data/flite/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 
 function pkg_:split {
diff --git a/data/gawk/make.sh b/data/gawk/make.sh
index ade52a1f8..523b99fce 100644
--- a/data/gawk/make.sh
+++ b/data/gawk/make.sh
@@ -1,6 +1,4 @@
-tar -zxvf "${PKG_DATA}/gawk-3.1.6.tar.gz"
-cd gawk-3.1.6
-pkg:patch
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/gcrypt/make.sh b/data/gcrypt/make.sh
index d2688436e..5686d8094 100644
--- a/data/gcrypt/make.sh
+++ b/data/gcrypt/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:autoconf
 pkg:configure --with-gpg-error-prefix="$(PKG_DEST_ libgpg-error)/usr"
 make
diff --git a/data/gettext/make.sh b/data/gettext/make.sh
index fb5de9343..343c574bf 100644
--- a/data/gettext/make.sh
+++ b/data/gettext/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure --without-libintl-prefix
 make
 pkg:install
diff --git a/data/glib/make.sh b/data/glib/make.sh
index b7b8ee6dc..8ade5d147 100644
--- a/data/glib/make.sh
+++ b/data/glib/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure glib_cv_stack_grows=no glib_cv_uscore=yes ac_cv_func_posix_getpwuid_r=yes
 make
diff --git a/data/gnupg/make.sh b/data/gnupg/make.sh
index e8049dedf..61b09bc52 100644
--- a/data/gnupg/make.sh
+++ b/data/gnupg/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/gnupg2/make.sh b/data/gnupg2/make.sh
index 124aa6f04..6c4c8cf74 100644
--- a/data/gnupg2/make.sh
+++ b/data/gnupg2/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 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
diff --git a/data/gnupth/make.sh b/data/gnupth/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/gnupth/make.sh
+++ b/data/gnupth/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/grep/make.sh b/data/grep/make.sh
index a035be7ae..38d617b80 100644
--- a/data/grep/make.sh
+++ b/data/grep/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure --disable-perl-regexp --bindir=/bin
 make
 pkg:install
diff --git a/data/gzip/make.sh b/data/gzip/make.sh
index c7939fef9..00bf96237 100644
--- a/data/gzip/make.sh
+++ b/data/gzip/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/gzip-1.3.12.tar.gz"
-cd gzip-1.3.12
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/ice/make.sh b/data/ice/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/ice/make.sh
+++ b/data/ice/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/indent/make.sh b/data/indent/make.sh
index db0c3a79d..11d339a61 100644
--- a/data/indent/make.sh
+++ b/data/indent/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure
 cd man
 make CC=gcc
diff --git a/data/inetutils/make.sh b/data/inetutils/make.sh
index e38e9f8f6..0cd6282c6 100644
--- a/data/inetutils/make.sh
+++ b/data/inetutils/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure ac_cv_type_sa_family_t=yes ac_cv_type_socklen_t=yes ac_cv_member_struct_utmp_ut_user=yes ac_cv_func_obstack=no --disable-ifconfig --disable-whois --disable-whois --disable-whois --disable-whois
 make
diff --git a/data/inetutils/mdns.diff b/data/inetutils/mdns.diff
index 4335d8934..8d9676010 100644
--- a/data/inetutils/mdns.diff
+++ b/data/inetutils/mdns.diff
@@ -7,16 +7,18 @@ diff -rui inetutils-1.5/ftp/main.c inetutils-1.5+iPhone/ftp/main.c
  /*
   * Copyright (c) 1985, 1989, 1993, 1994, 2002
   *	The Regents of the University of California.  All rights reserved.
-@@ -115,6 +117,13 @@
+@@ -115,6 +117,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int ch, top;
    struct passwd *pw = NULL;
@@ -30,16 +32,18 @@ diff -rui inetutils-1.5/ftpd/ftpd.c inetutils-1.5+iPhone/ftpd/ftpd.c
  /* - Ftp Server
   * Copyright (c) 1985, 1988, 1990, 1992, 1993, 1994, 2002
   *	The Regents of the University of California.  All rights reserved.
-@@ -328,6 +330,13 @@
+@@ -328,6 +330,15 @@
  int
  main(int argc, char *argv[], char **envp)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int option;
  
@@ -53,16 +57,18 @@ diff -rui inetutils-1.5/gwhois/whois.c inetutils-1.5+iPhone/gwhois/whois.c
  /* Copyright 1999 by Marco d'Itri <md@linux.it>.
   *
   * This program is free software; you can redistribute it and/or modify
-@@ -47,6 +49,13 @@
+@@ -47,6 +49,15 @@
  
  int main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
      int ch, nopar = 0;
      const char *server = NULL, *port = NULL;
@@ -76,16 +82,18 @@ diff -rui inetutils-1.5/ifconfig/ifconfig.c inetutils-1.5+iPhone/ifconfig/ifconf
  /* ifconfig.c -- network interface configuration utility
  
     Copyright (C) 2001, 2002, 2007 Free Software Foundation, Inc.
-@@ -56,6 +58,13 @@
+@@ -56,6 +58,15 @@
  int
  main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int err = 0;
    int sfd;
@@ -99,16 +107,18 @@ diff -rui inetutils-1.5/inetd/inetd.c inetutils-1.5+iPhone/inetd/inetd.c
  /* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
  
-@@ -386,6 +388,13 @@
+@@ -386,6 +388,15 @@
  int
  main (int argc, char *argv[], char *envp[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int option;
    struct servtab *sep;
@@ -122,16 +132,18 @@ diff -rui inetutils-1.5/logger/logger.c inetutils-1.5+iPhone/logger/logger.c
  /*
   * Copyright (c) 1983, 1993, 2002
   *	The Regents of the University of California.  All rights reserved.
-@@ -101,6 +103,13 @@
+@@ -101,6 +103,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int option, logflags, pri;
    char *tag, buf[1024];
@@ -145,16 +157,18 @@ diff -rui inetutils-1.5/ping/ping6.c inetutils-1.5+iPhone/ping/ping6.c
  /* Copyright (C) 1998, 2001, 2002, 2004, 2005, 2007 Free Software Foundation, Inc.
  
     This file is part of GNU Inetutils.
-@@ -81,6 +83,13 @@
+@@ -81,6 +83,15 @@
  int
  main (int argc, char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int c;
    char *p;
@@ -168,16 +182,18 @@ diff -rui inetutils-1.5/ping/ping.c inetutils-1.5+iPhone/ping/ping.c
  /* Copyright (C) 1998,2001, 2002, 2005, 2007 Free Software Foundation, Inc.
  
     This file is part of GNU Inetutils.
-@@ -106,6 +108,13 @@
+@@ -106,6 +108,15 @@
  int
  main (int argc, char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int c;
    char *p;
@@ -191,16 +207,18 @@ diff -rui inetutils-1.5/rcp/rcp.c inetutils-1.5+iPhone/rcp/rcp.c
  /*
   * Copyright (c) 1983, 1990, 1992, 1993, 2002
   *	The Regents of the University of California.  All rights reserved.
-@@ -156,6 +158,13 @@
+@@ -156,6 +158,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    struct servent *sp;
    int ch, fflag, tflag;
@@ -214,16 +232,18 @@ diff -rui inetutils-1.5/rexecd/rexecd.c inetutils-1.5+iPhone/rexecd/rexecd.c
  /*
   * Copyright (c) 1983, 1993
   *	The Regents of the University of California.  All rights reserved.
-@@ -105,6 +107,13 @@
+@@ -105,6 +107,15 @@
  int
  main (int argc, char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    struct sockaddr_in from;
    int fromlen, sockfd = STDIN_FILENO;
@@ -237,16 +257,18 @@ diff -rui inetutils-1.5/rlogin/rlogin.c inetutils-1.5+iPhone/rlogin/rlogin.c
  /*
   * Copyright (c) 1983, 1990, 1993, 2002
   *	The Regents of the University of California.  All rights reserved.
-@@ -236,6 +238,13 @@
+@@ -236,6 +238,15 @@
  int
  main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    struct passwd *pw;
    struct servent *sp;
@@ -260,16 +282,18 @@ diff -rui inetutils-1.5/rlogind/rlogind.c inetutils-1.5+iPhone/rlogind/rlogind.c
  /* Copyright (C) 1998,2001, 2002, 2007 Free Software Foundation, Inc.
  
     This file is part of GNU Inetutils.
-@@ -267,6 +269,13 @@
+@@ -267,6 +269,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int             port = 0;
    int             maxchildren = DEFMAXCHILDREN;
@@ -283,16 +307,18 @@ diff -rui inetutils-1.5/rsh/rsh.c inetutils-1.5+iPhone/rsh/rsh.c
  /*-
   * Copyright (c) 1983, 1990, 1993, 1994, 2002
   *	The Regents of the University of California.  All rights reserved.
-@@ -220,6 +222,13 @@
+@@ -220,6 +222,15 @@
  int
  main (int argc, char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    struct passwd *pw;
    struct servent *sp;
@@ -306,16 +332,18 @@ diff -rui inetutils-1.5/rshd/rshd.c inetutils-1.5+iPhone/rshd/rshd.c
  /*-
   * Copyright (c) 1988, 1989, 1992, 1993, 1994, 2002
   *	The Regents of the University of California.  All rights reserved.
-@@ -158,6 +160,13 @@
+@@ -158,6 +160,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    extern int __check_rhosts_file; /* hook in rcmd(3) */
    struct linger linger;
@@ -329,16 +357,18 @@ diff -rui inetutils-1.5/syslogd/syslogd.c inetutils-1.5+iPhone/syslogd/syslogd.c
  /* syslogd - log system messages
   *
   * Copyright (c) 1983, 1988, 1993, 1994, 2002
-@@ -353,6 +355,13 @@
+@@ -353,6 +355,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int option;
    size_t i;
@@ -352,16 +382,18 @@ diff -rui inetutils-1.5/talk/talk.c inetutils-1.5+iPhone/talk/talk.c
  /*
   * Copyright (c) 1983, 1993
   *	The Regents of the University of California.  All rights reserved.
-@@ -71,6 +73,13 @@
+@@ -71,6 +73,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int c;
  
@@ -375,16 +407,18 @@ diff -rui inetutils-1.5/talkd/talkd.c inetutils-1.5+iPhone/talkd/talkd.c
  /* Copyright (C) 1998,2001, 2002, 2007 Free Software Foundation, Inc.
  
     This file is part of GNU Inetutils.
-@@ -59,6 +61,13 @@
+@@ -59,6 +61,15 @@
  int
  main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int c;
    char *acl_file = NULL;
@@ -398,16 +432,18 @@ diff -rui inetutils-1.5/telnet/main.c inetutils-1.5+iPhone/telnet/main.c
  /*
   * Copyright (c) 1988, 1990, 1993
   *	The Regents of the University of California.  All rights reserved.
-@@ -180,6 +182,13 @@
+@@ -180,6 +182,15 @@
  int
  main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
  	extern char *optarg;
  	extern int optind;
@@ -421,16 +457,18 @@ diff -rui inetutils-1.5/telnetd/telnetd.c inetutils-1.5+iPhone/telnetd/telnetd.c
  /* Copyright (C) 1998, 2001, 2002, 2004, 2007x Free Software Foundation, Inc.
  
     This file is part of GNU Inetutils.
-@@ -112,6 +114,13 @@
+@@ -112,6 +114,15 @@
  int
  main (int argc, char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int c;
    program_name = argv[0];
@@ -444,16 +482,18 @@ diff -rui inetutils-1.5/tftp/main.c inetutils-1.5+iPhone/tftp/main.c
  /*
   * Copyright (c) 1983, 1993
   *	The Regents of the University of California.  All rights reserved.
-@@ -154,6 +156,13 @@
+@@ -154,6 +156,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    struct sockaddr_in sin;
  
@@ -467,16 +507,18 @@ diff -rui inetutils-1.5/tftpd/tftpd.c inetutils-1.5+iPhone/tftpd/tftpd.c
  /*
   * Copyright (c) 1983, 1993
   *	The Regents of the University of California.  All rights reserved.
-@@ -124,6 +126,13 @@
+@@ -124,6 +126,15 @@
  int
  main (int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    register struct tftphdr *tp;
    register int n;
@@ -490,16 +532,18 @@ diff -rui inetutils-1.5/uucpd/uucpd.c inetutils-1.5+iPhone/uucpd/uucpd.c
  /*
   * Copyright (c) 1985, 1993
   *	The Regents of the University of California.  All rights reserved.
-@@ -111,6 +113,13 @@
+@@ -111,6 +113,15 @@
  int
  main (int argc, char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
  #ifndef BSDINETD
    register int s, tcp_socket;
diff --git a/data/inputproto/make.sh b/data/inputproto/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/inputproto/make.sh
+++ b/data/inputproto/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/iokittools/make.sh b/data/iokittools/make.sh
index a846152d7..0815a52e9 100644
--- a/data/iokittools/make.sh
+++ b/data/iokittools/make.sh
@@ -1,7 +1,5 @@
 shopt -s extglob
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 for tproj in *.tproj; do
     tproj=$(basename "${tproj}" .tproj)
     ${PKG_TARG}-gcc -lcurses -o "${tproj}" "${tproj}.tproj"/*.c -framework CoreFoundation -framework IOKit
diff --git a/data/iphone-gcc/make.sh b/data/iphone-gcc/make.sh
index 9d8e4e221..eaf22c2f9 100755
--- a/data/iphone-gcc/make.sh
+++ b/data/iphone-gcc/make.sh
@@ -1,7 +1,7 @@
 shopt -s extglob
-pkg:extract
-mkdir llvm-gcc-bld
-cd llvm-gcc-bld
+pkg:setup
+mkdir ../llvm-gcc-bld
+cd ../llvm-gcc-bld
 PKG_CONF=../llvm-gcc-4.2/configure pkg:configure \
     --enable-languages="c,c++,objc,obj-c++" \
     --enable-wchar_t="no" \
@@ -9,3 +9,4 @@ PKG_CONF=../llvm-gcc-4.2/configure pkg:configure \
 make -j3
 pkg:install
 pkg: rm -f /usr/lib/libgcc_s.1.dylib
+pkg: rm -f /usr/lib/libiberty.a
diff --git a/data/irssi/make.sh b/data/irssi/make.sh
index 5b2761c57..13355cdca 100644
--- a/data/irssi/make.sh
+++ b/data/irssi/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:autoconf
 pkg:configure --enable-static
 make
diff --git a/data/irssi/mdns.diff b/data/irssi/mdns.diff
index 3afc026e1..50478e973 100644
--- a/data/irssi/mdns.diff
+++ b/data/irssi/mdns.diff
@@ -7,15 +7,18 @@ diff -ru irssi-0.8.12/src/fe-none/irssi.c irssi-0.8.12+iPhone/src/fe-none/irssi.
  /*
   irssi.c : irssi
  
-@@ -81,6 +83,12 @@
+@@ -81,6 +83,15 @@
  
  int main(int argc, char **argv)
  {
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    if (nlist("/usr/lib/libc.dylib", nl) != -1 && nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
++   struct nlist nl[2];
++   memset(nl, 0, sizeof(nl));
++   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
++   nlist("/usr/lib/libc.dylib", nl);
++   if (nl[0].n_type != N_UNDF)
++       *(int *) nl[0].n_value = 0;
++#endif
 +
  	static struct poptOption options[] = {
  		POPT_AUTOHELP
@@ -29,15 +32,18 @@ diff -ru irssi-0.8.12/src/fe-text/irssi.c irssi-0.8.12+iPhone/src/fe-text/irssi.
  /*
   irssi.c : irssi
  
-@@ -328,6 +330,12 @@
+@@ -328,6 +330,15 @@
  
  int main(int argc, char **argv)
  {
-+    struct nlist nl[2];
-+    memset(nl, 0, sizeof(nl));
-+    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
-+    if (nlist("/usr/lib/libc.dylib", nl) != -1 && nl[0].n_type != N_UNDF)
-+        *(int *) nl[0].n_value = 0;
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
++   struct nlist nl[2];
++   memset(nl, 0, sizeof(nl));
++   nl[0].n_un.n_name = (char *) "_useMDNSResponder";
++   nlist("/usr/lib/libc.dylib", nl);
++   if (nl[0].n_type != N_UNDF)
++       *(int *) nl[0].n_value = 0;
++#endif
 +
  	static int version = 0;
  	static struct poptOption options[] = {
diff --git a/data/jamvm/make.sh b/data/jamvm/make.sh
index 07e7447eb..5a4606496 100644
--- a/data/jamvm/make.sh
+++ b/data/jamvm/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 #PKG_CONF=./autogen.sh
 pkg:configure --with-classpath-install-dir=/usr --enable-ffi=no
 make with_classpath_install_dir="$(PKG_DEST_ classpath)/usr"
diff --git a/data/jamvm/mdns.diff b/data/jamvm/mdns.diff
index 8dbb978ae..37d92aff2 100644
--- a/data/jamvm/mdns.diff
+++ b/data/jamvm/mdns.diff
@@ -7,16 +7,18 @@ diff -ru jamvm-1.5.1/src/jam.c jamvm-1.5.1+iPhone/src/jam.c
  /*
   * Copyright (C) 2003, 2004, 2005, 2006, 2007
   * Robert Lougher <rob@lougher.org.uk>.
-@@ -292,6 +294,13 @@
+@@ -292,6 +294,15 @@
  }
  
  int main(int argc, char *argv[]) {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
      Class *array_class, *main_class;
      Object *system_loader, *array;
diff --git a/data/javasqlite/make.sh b/data/javasqlite/make.sh
index 9b67a553f..ee1c112e9 100644
--- a/data/javasqlite/make.sh
+++ b/data/javasqlite/make.sh
@@ -1,7 +1,5 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
-pkg:configure --with-sqlite="${PKG_ROOT}/usr" --with-sqlite3="${PKG_ROOT}/usr"
+pkg:configure --with-sqlite="$(PKG_DEST_ sqlite3)/usr" --with-sqlite3="$(PKG_DEST_ sqlite3)/usr"
 JAVAC_FLAGS='-source 1.5 -target 1.5' make
 pkg:install
diff --git a/data/jikes/make.sh b/data/jikes/make.sh
index 67ee2acb6..5cc237e1f 100644
--- a/data/jikes/make.sh
+++ b/data/jikes/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --enable-source15
 make
 pkg:install
diff --git a/data/kbproto/make.sh b/data/kbproto/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/kbproto/make.sh
+++ b/data/kbproto/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/kext-tools/make.sh b/data/kext-tools/make.sh
index 292ea7463..4b9f0242f 100755
--- a/data/kext-tools/make.sh
+++ b/data/kext-tools/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/kext_tools-117.tar.gz"
-cd kext_tools-117
+pkg:setup
 cp -a "${PKG_DATA}/getiopolicy_np.c" .
 #${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
diff --git a/data/krb5/make.sh b/data/krb5/make.sh
index 6d21ae0ee..dc67e8446 100644
--- a/data/krb5/make.sh
+++ b/data/krb5/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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 ${PKG_TARG}-ar)" krb5_cv_attr_constructor_destructor=yes,yes
 make
diff --git a/data/less/make.sh b/data/less/make.sh
index 3e560259c..da994a135 100644
--- a/data/less/make.sh
+++ b/data/less/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/libarchive/make.sh b/data/libarchive/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/libarchive/make.sh
+++ b/data/libarchive/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/libassuan/make.sh b/data/libassuan/make.sh
index a68682133..d1f03a780 100644
--- a/data/libassuan/make.sh
+++ b/data/libassuan/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure --with-pth-prefix="$(PKG_DEST_ gnupth)/usr"
 make
diff --git a/data/libdict/make.sh b/data/libdict/make.sh
index b93b9a065..60a745d08 100644
--- a/data/libdict/make.sh
+++ b/data/libdict/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 cd src
 make CC=${PKG_TARG}-gcc CXX=${PKG_TARG}-g++
 pkg: mkdir -p /usr/lib /usr/include
diff --git a/data/libffi/assembler.diff b/data/libffi/assembler.diff
index a6b6c6c18..8d46ac5f1 100644
--- a/data/libffi/assembler.diff
+++ b/data/libffi/assembler.diff
@@ -1,7 +1,7 @@
-Index: src/arm/sysv.S
+Index: libffi/src/arm/sysv.S
 ===================================================================
---- libffi/src/arm/sysv.S	(revision 130618)
-+++ libffi+iPhone/src/arm/sysv.S	(working copy)
+--- gcc/libffi/src/arm/sysv.S	(revision 130618)
++++ gcc+iPhone/libffi/src/arm/sysv.S	(working copy)
 @@ -38,7 +38,7 @@
  #else
  #define CNAME(x) x
diff --git a/data/libffi/make.sh b/data/libffi/make.sh
index cf3f0feca..d8fe64d54 100644
--- a/data/libffi/make.sh
+++ b/data/libffi/make.sh
@@ -1,9 +1,6 @@
-pkg:extract
-cd gcc/libffi
-pkg:patch
-cd ../..
-mkdir build
-cd build
+pkg:setup
+mkdir ../build
+cd ../build
 PKG_CONF=../gcc/libffi/configure pkg:configure --with-sysroot="${PKG_ROOT}"
 make
 pkg:install
diff --git a/data/libffi/private.diff b/data/libffi/private.diff
index cd3ee23a7..f30e5bdac 100644
--- a/data/libffi/private.diff
+++ b/data/libffi/private.diff
@@ -1,7 +1,7 @@
-Index: src/arm/ffi.c
+Index: libffi/src/arm/ffi.c
 ===================================================================
---- libffi/src/arm/ffi.c	(revision 130618)
-+++ libffi+iPhone/src/arm/ffi.c	(working copy)
+--- gcc/libffi/src/arm/ffi.c	(revision 130618)
++++ gcc+iPhone/libffi/src/arm/ffi.c	(working copy)
 @@ -199,6 +199,7 @@
  
  /* This function is jumped to by the trampoline */
diff --git a/data/libgcc/_metadata/description b/data/libgcc/_metadata/description
new file mode 100644
index 000000000..414120d54
--- /dev/null
+++ b/data/libgcc/_metadata/description
@@ -0,0 +1 @@
+core library used by everything
diff --git a/data/libgcc/_metadata/license b/data/libgcc/_metadata/license
new file mode 120000
index 000000000..9c13a9a0f
--- /dev/null
+++ b/data/libgcc/_metadata/license
@@ -0,0 +1 @@
+../../../licenses/gpl-2
+\ No newline at end of file
diff --git a/data/libgcc/_metadata/maintainer b/data/libgcc/_metadata/maintainer
new file mode 120000
index 000000000..0fa66e077
--- /dev/null
+++ b/data/libgcc/_metadata/maintainer
@@ -0,0 +1 @@
+../../../people/saurik
+\ No newline at end of file
diff --git a/data/libgcc/_metadata/priority b/data/libgcc/_metadata/priority
new file mode 100644
index 000000000..d0b3ce728
--- /dev/null
+++ b/data/libgcc/_metadata/priority
@@ -0,0 +1 @@
++required
diff --git a/data/libgcc/_metadata/section b/data/libgcc/_metadata/section
new file mode 100644
index 000000000..00b394251
--- /dev/null
+++ b/data/libgcc/_metadata/section
@@ -0,0 +1 @@
+System
diff --git a/data/libgcc/_metadata/version b/data/libgcc/_metadata/version
new file mode 100644
index 000000000..e68edd30e
--- /dev/null
+++ b/data/libgcc/_metadata/version
@@ -0,0 +1 @@
+4.2-20080410-1
diff --git a/data/libgcc/make.sh b/data/libgcc/make.sh
new file mode 100755
index 000000000..e08fc20df
--- /dev/null
+++ b/data/libgcc/make.sh
@@ -0,0 +1,8 @@
+pkg: mkdir -p /usr/lib
+prefix=$(dirname "$(which "${PKG_TARG}-gcc")")/..
+for ver in 1 10.4 10.5; do
+    libgcc=lib/libgcc_s.${ver}.dylib
+    cp -a "${prefix}/${PKG_TARG}/${libgcc}" "${PKG_DEST}/usr/lib"
+    #pkg: "${PKG_TARG}-strip" -x -no_uuid "/usr/${libgcc}"
+    #pkg: ldid -T- "/usr/${libgcc}"
+done
diff --git a/data/libgpg-error/make.sh b/data/libgpg-error/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/libgpg-error/make.sh
+++ b/data/libgpg-error/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/libksba/make.sh b/data/libksba/make.sh
index 30062eb73..a1589a105 100644
--- a/data/libksba/make.sh
+++ b/data/libksba/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:autoconf
 pkg:configure
 make
diff --git a/data/libpcap/make.sh b/data/libpcap/make.sh
index 8ab25ab77..c7c49419f 100644
--- a/data/libpcap/make.sh
+++ b/data/libpcap/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/libpcap-0.9.8.tar.gz"
-cd libpcap-0.9.8
+pkg:setup
 pkg:configure --with-pcap=bpf
 make
 mkdir -p "${PKG_DEST}/usr/lib"
diff --git a/data/libresolv/make.sh b/data/libresolv/make.sh
index 874174bc2..a4779ed62 100644
--- a/data/libresolv/make.sh
+++ b/data/libresolv/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 cp -a "${PKG_DATA}"/*.[ch] .
 declare -a flags
 # XXX: don't use this on darwin8
diff --git a/data/libutil/make.sh b/data/libutil/make.sh
index 3e867c082..69acb577f 100644
--- a/data/libutil/make.sh
+++ b/data/libutil/make.sh
@@ -1,5 +1,3 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 make CC="${PKG_TARG}-gcc"
 make install STRIP="${PKG_TARG}-strip" DSTROOT="${PKG_DEST}"
diff --git a/data/libxml2/make.sh b/data/libxml2/make.sh
index 67ec7bee3..457bfd295 100644
--- a/data/libxml2/make.sh
+++ b/data/libxml2/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --without-python
 make
 pkg:install
diff --git a/data/lighttpd/make.sh b/data/lighttpd/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/lighttpd/make.sh
+++ b/data/lighttpd/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/links/make.sh b/data/links/make.sh
index df8e2a88c..7dac292bc 100644
--- a/data/links/make.sh
+++ b/data/links/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure
 make
diff --git a/data/links/mdns.diff b/data/links/mdns.diff
index e03e19afd..c48de5c2f 100644
--- a/data/links/mdns.diff
+++ b/data/links/mdns.diff
@@ -7,16 +7,18 @@ diff -ru links-0.99/main.c links-0.99+iPhone/main.c
  #include "links.h"
  
  int retval = RET_OK;
-@@ -330,6 +332,13 @@
+@@ -330,6 +332,15 @@
  
  int main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
  	path_to_exe = argv[0];
  	ac = argc;
diff --git a/data/lynx/make.sh b/data/lynx/make.sh
index 8570529ba..b11b3f994 100644
--- a/data/lynx/make.sh
+++ b/data/lynx/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure --with-screen=ncurses --with-ssl
 make
 pkg:install
diff --git a/data/lynx/mdns.diff b/data/lynx/mdns.diff
index 4a3348fa8..cdd77d105 100644
--- a/data/lynx/mdns.diff
+++ b/data/lynx/mdns.diff
@@ -7,16 +7,18 @@ diff -ru lynx2-8-6/src/LYMain.c lynx2-8-6+iPhone/src/LYMain.c
  #include <HTUtils.h>
  #include <HTTP.h>
  #include <HTParse.h>
-@@ -961,6 +963,13 @@
+@@ -961,6 +963,15 @@
  int main(int argc,
  	 char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
      int i;			/* indexing variable */
      int status = 0;		/* exit status */
diff --git a/data/m4/make.sh b/data/m4/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/m4/make.sh
+++ b/data/m4/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/make/make.sh b/data/make/make.sh
index 2e15bb43c..452a4bfd5 100644
--- a/data/make/make.sh
+++ b/data/make/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/make-3.81.tar.gz"
-cd make-3.81
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/minicom/make.sh b/data/minicom/make.sh
index 1b3c1b776..452a4bfd5 100644
--- a/data/minicom/make.sh
+++ b/data/minicom/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/mobileterminal/make.sh b/data/mobileterminal/make.sh
index 28259fe4a..b4bb8862c 100644
--- a/data/mobileterminal/make.sh
+++ b/data/mobileterminal/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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 0e3f56bee..712cb87f9 100644
--- a/data/nail/make.sh
+++ b/data/nail/make.sh
@@ -1,5 +1,3 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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/nano/make.sh b/data/nano/make.sh
index daa5b3c61..ce61731da 100644
--- a/data/nano/make.sh
+++ b/data/nano/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --enable-all
 make
 pkg:install
diff --git a/data/ncftp/make.sh b/data/ncftp/make.sh
index 7da69beab..de71b27aa 100644
--- a/data/ncftp/make.sh
+++ b/data/ncftp/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 RANLIB=$(which "${PKG_TARG}-ranlib") CC=$(which "${PKG_TARG}-gcc") pkg:configure
 make
 mkdir -p "${PKG_DEST}/usr/share"
diff --git a/data/ncftp/mdns.diff b/data/ncftp/mdns.diff
index e9956b8eb..696ab5480 100644
--- a/data/ncftp/mdns.diff
+++ b/data/ncftp/mdns.diff
@@ -7,16 +7,18 @@ diff -ru ncftp-3.2.1/ncftp/main.c ncftp-3.2.1+iPhone/ncftp/main.c
  /* main.c
   *
   * Copyright (c) 1992-2005 by Mike Gleason.
-@@ -401,6 +403,13 @@
+@@ -401,6 +403,15 @@
  main_void_return_t
  main(int argc, char **const argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
  	int c;
  	int n;
diff --git a/data/ncurses/make.sh b/data/ncurses/make.sh
index 5fbd1dd65..60b4b1458 100644
--- a/data/ncurses/make.sh
+++ b/data/ncurses/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure --with-shared --without-normal --without-debug
 make
 pkg:install
diff --git a/data/neon/make.sh b/data/neon/make.sh
index e8ae8c356..1e712d5af 100644
--- a/data/neon/make.sh
+++ b/data/neon/make.sh
@@ -1,6 +1,4 @@
-tar -zxvf "${PKG_DATA}/neon-0.26.4.tar.gz"
-cd neon-0.26.4
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure --with-ssl
 #--with-expat="${PKG_ROOT}/usr/lib/libexpat.la"
diff --git a/data/netcat/make.sh b/data/netcat/make.sh
index 0750282e0..00bf96237 100644
--- a/data/netcat/make.sh
+++ b/data/netcat/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/netcat/mdns.diff b/data/netcat/mdns.diff
index 367f6166f..89cc0e2ed 100644
--- a/data/netcat/mdns.diff
+++ b/data/netcat/mdns.diff
@@ -7,16 +7,18 @@ diff -ru netcat-0.7.1/src/netcat.c netcat-0.7.1+iPhone/src/netcat.c
  /*
   * netcat.c -- main project file
   * Part of the GNU netcat project
-@@ -137,6 +139,13 @@
+@@ -137,6 +139,15 @@
  
  int main(int argc, char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    int c, glob_ret = EXIT_FAILURE;
    int total_ports, left_ports, accept_ret = -1, connect_ret = -1;
diff --git a/data/network-cmds/make.sh b/data/network-cmds/make.sh
index 7545bf0eb..e1b564df3 100644
--- a/data/network-cmds/make.sh
+++ b/data/network-cmds/make.sh
@@ -1,6 +1,5 @@
 shopt -s extglob
-tar -zxvf "${PKG_DATA}/network_cmds-306.tar.gz"
-cd network_cmds-306
+pkg:setup
 for tproj in !(natd|ping|spray).tproj; do
     tproj=$(basename "${tproj}" .tproj)
     "${PKG_TARG}-gcc" -o "${tproj}" "${tproj}.tproj"/*.c -DPRIVATE -Dether_ntohost=_old_ether_ntohost
diff --git a/data/ngrep/make.sh b/data/ngrep/make.sh
index 53af27b91..ace9ae521 100644
--- a/data/ngrep/make.sh
+++ b/data/ngrep/make.sh
@@ -1,6 +1,4 @@
-tar -jxvf "${PKG_DATA}/ngrep-1.45.tar.bz2"
-cd ngrep-1.45
-pkg:patch
+pkg:setup
 autoconf
 cd regex-0.12
 autoconf
diff --git a/data/nmap/make.sh b/data/nmap/make.sh
index e3a5e883d..491b00e3c 100644
--- a/data/nmap/make.sh
+++ b/data/nmap/make.sh
@@ -1,6 +1,4 @@
-tar -jxvf "${PKG_DATA}/nmap-4.50.tar.bz2"
-cd nmap-4.50
-pkg:patch
+pkg:setup
 autoconf
 cd libdnet-stripped
 autoconf
diff --git a/data/nvi/make.sh b/data/nvi/make.sh
index 0c2ecfc2e..e819fe396 100644
--- a/data/nvi/make.sh
+++ b/data/nvi/make.sh
@@ -1,5 +1,5 @@
-pkg:extract
-cd */build.unix
+pkg:setup
+cd build.unix
 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
diff --git a/data/odcctools/make.sh b/data/odcctools/make.sh
index d7405717e..94757a91a 100644
--- a/data/odcctools/make.sh
+++ b/data/odcctools/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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
diff --git a/data/ogg/make.sh b/data/ogg/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/ogg/make.sh
+++ b/data/ogg/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/openssh/make.sh b/data/openssh/make.sh
index e56d762e0..56c32ecb6 100644
--- a/data/openssh/make.sh
+++ b/data/openssh/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure --disable-strip --sysconfdir=/etc/ssh
 make
diff --git a/data/openssl/make.sh b/data/openssl/make.sh
index 48016981d..b7ddecc22 100644
--- a/data/openssl/make.sh
+++ b/data/openssl/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 ./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}"
diff --git a/data/p7zip/make.sh b/data/p7zip/make.sh
index 1d0ec501a..9a0847cf7 100644
--- a/data/p7zip/make.sh
+++ b/data/p7zip/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 mv -f makefile.macosx makefile.machine
 make all2
 make install DEST_HOME="${PKG_DEST}/usr"
diff --git a/data/patch/make.sh b/data/patch/make.sh
index 7e498defb..0bf0c095a 100644
--- a/data/patch/make.sh
+++ b/data/patch/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 make install prefix="${PKG_DEST}/usr"
diff --git a/data/pcre/make.sh b/data/pcre/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/pcre/make.sh
+++ b/data/pcre/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/png/make.sh b/data/png/make.sh
index df8e2a88c..7dac292bc 100644
--- a/data/png/make.sh
+++ b/data/png/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure
 make
diff --git a/data/psmisc_/make.sh b/data/psmisc_/make.sh
index 92c942f18..466385a3f 100644
--- a/data/psmisc_/make.sh
+++ b/data/psmisc_/make.sh
@@ -1,6 +1,4 @@
-tar -zxvf "${PKG_DATA}/psmisc-22.6.tar.gz"
-cd psmisc-22.6
-pkg:patch
+pkg:setup
 automake
 pkg:configure ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes
 make
diff --git a/data/pthread-stubs/make.sh b/data/pthread-stubs/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/pthread-stubs/make.sh
+++ b/data/pthread-stubs/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/pyobjc/make.sh b/data/pyobjc/make.sh
index 587ee450e..9ccc2f182 100644
--- a/data/pyobjc/make.sh
+++ b/data/pyobjc/make.sh
@@ -1,8 +1,6 @@
 shopt -s extglob
 
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 cd pyobjc-core
 
 $("${PKG_TARG}-gcc" -print-prog-name=cc1obj) -print-objc-runtime-info <(echo) >Modules/objc/objc-runtime-info.h
diff --git a/data/rdesktop/make.sh b/data/rdesktop/make.sh
index 886cecb4e..f7ca30387 100644
--- a/data/rdesktop/make.sh
+++ b/data/rdesktop/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure --with-openssl="${PKG_ROOT}/usr"
 make
 pkg:install
diff --git a/data/readline/make.sh b/data/readline/make.sh
index a1b07204a..3eab9f214 100644
--- a/data/readline/make.sh
+++ b/data/readline/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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/rpl/make.sh b/data/rpl/make.sh
index a2d6f6ae5..7dac292bc 100644
--- a/data/rpl/make.sh
+++ b/data/rpl/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 autoconf
 pkg:configure
 make
diff --git a/data/rsync/make.sh b/data/rsync/make.sh
index 9b2e673be..29be3d25b 100644
--- a/data/rsync/make.sh
+++ b/data/rsync/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/rsync-2.6.9.tar.gz"
-cd rsync-2.6.9
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/ruby/make.sh b/data/ruby/make.sh
index 49b8fc237..b99556a4b 100644
--- a/data/ruby/make.sh
+++ b/data/ruby/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure ac_cv_func_setpgrp_void=yes rb_cv_binary_elf=no rb_cv_stack_grow_dir=-1 rb_cv_bsd_signal=yes ac_cv_type_getgroups=gid_t ac_cv_c_stack_direction=-1 ac_cv_func_memcmp_working=yes --enable-wide-getaddrinfo
 make
diff --git a/data/ruby/mdns.diff b/data/ruby/mdns.diff
index c4445ed63..678511f41 100644
--- a/data/ruby/mdns.diff
+++ b/data/ruby/mdns.diff
@@ -7,16 +7,18 @@ diff -ru ruby-1.8.6-p111/main.c ruby-1.8.6-p111+iPhone/main.c
  /**********************************************************************
  
    main.c -
-@@ -34,6 +36,13 @@
+@@ -34,6 +36,15 @@
      int argc;
      char **argv, **envp;
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
  #ifdef _WIN32
      NtInitialize(&argc, &argv);
diff --git a/data/rubygems/make.sh b/data/rubygems/make.sh
index a8de2a0bc..ce845de8a 100644
--- a/data/rubygems/make.sh
+++ b/data/rubygems/make.sh
@@ -1,6 +1,5 @@
 shopt -s extglob
-pkg:extract
-cd *
+pkg:setup
 ruby setup.rb --prefix="${PKG_DEST}/usr"
 pkg: sed -i -e 's/^#!.*/#!\/usr\/bin\/ruby/' /usr/bin/gem /usr/bin/update_rubygems
 pkg: mkdir -p /usr/lib/ruby/site_ruby/1.8
diff --git a/data/rubyobjc_/make.sh b/data/rubyobjc_/make.sh
index bddcec3f2..454088fb6 100644
--- a/data/rubyobjc_/make.sh
+++ b/data/rubyobjc_/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg: cp -a %/UIKit.xml bridged
 cd objc
 for bridge in foundation uikit; do
diff --git a/data/rzip/make.sh b/data/rzip/make.sh
index 6f1113365..16c8773aa 100644
--- a/data/rzip/make.sh
+++ b/data/rzip/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 autoconf
 pkg:configure
 make
diff --git a/data/screen/make.sh b/data/screen/make.sh
index 2408fe6d3..58b56b640 100644
--- a/data/screen/make.sh
+++ b/data/screen/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure --disable-pam --with-sys-screenrc=/etc/screenrc
 make
diff --git a/data/sed/make.sh b/data/sed/make.sh
index 015b17dd2..38c45b684 100644
--- a/data/sed/make.sh
+++ b/data/sed/make.sh
@@ -1,6 +1,4 @@
-tar -zxvf "${PKG_DATA}/sed-4.1.5.tar.gz"
-cd sed-4.1.5
-pkg:patch
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/sgrep/make.sh b/data/sgrep/make.sh
index 8e0b49bb3..e1d044138 100644
--- a/data/sgrep/make.sh
+++ b/data/sgrep/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make CC="${PKG_TARG}"-gcc
 pkg:install
diff --git a/data/shell-cmds/make.sh b/data/shell-cmds/make.sh
index a22062488..a7c235486 100644
--- a/data/shell-cmds/make.sh
+++ b/data/shell-cmds/make.sh
@@ -1,5 +1,4 @@
-tar -zxvf "${PKG_DATA}/shell_cmds-116.tar.gz"
-cd shell_cmds-116
+pkg:setup
 mkdir -p "${PKG_DEST}/usr/bin"
 for bin in killall mktemp renice script time which; do
     ${PKG_TARG}-gcc -o "${bin}/${bin}" "${bin}"/*.c -D'__FBSDID(x)='
diff --git a/data/sm/make.sh b/data/sm/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/sm/make.sh
+++ b/data/sm/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/spidermonkey/make.sh b/data/spidermonkey/make.sh
index 75fce99de..0053653f1 100644
--- a/data/spidermonkey/make.sh
+++ b/data/spidermonkey/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd js
-pkg:patch
+pkg:setup
 cd src
 mkdir Darwin_DBG.OBJ
 cp -a "${PKG_DATA}"/jsautocfg.h Darwin_DBG.OBJ
diff --git a/data/spidermonkey/mdns.diff b/data/spidermonkey/mdns.diff
index 656531817..460ec73e3 100644
--- a/data/spidermonkey/mdns.diff
+++ b/data/spidermonkey/mdns.diff
@@ -7,16 +7,18 @@ diff -ru js/src/js.c js+iPhone/src/js.c
  /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
   * vim: set ts=8 sw=4 et tw=78:
   *
-@@ -3033,6 +3035,13 @@
+@@ -3033,6 +3035,15 @@
  int
  main(int argc, char **argv, char **envp)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
      int stackDummy;
      JSRuntime *rt;
diff --git a/data/sqlite3/_metadata/priority b/data/sqlite3/_metadata/priority
index ea5b3d7ee..1c96b78c1 100644
--- a/data/sqlite3/_metadata/priority
+++ b/data/sqlite3/_metadata/priority
@@ -1 +1 @@
-important
++important
diff --git a/data/sqlite3/make.sh b/data/sqlite3/make.sh
index dad8d87dc..452a4bfd5 100644
--- a/data/sqlite3/make.sh
+++ b/data/sqlite3/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
-rm -f "${PKG_DEST}"/usr/lib/libsqlite3*.dylib
diff --git a/data/srelay/make.sh b/data/srelay/make.sh
index 03a3e0119..21d0f77c9 100644
--- a/data/srelay/make.sh
+++ b/data/srelay/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure
 make
diff --git a/data/stunnel/make.sh b/data/stunnel/make.sh
index 05f3c03cc..eb4e10fef 100644
--- a/data/stunnel/make.sh
+++ b/data/stunnel/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure ac_cv_file___dev_urandom_=yes ac_cv_file___dev_ptmx_=yes ac_cv_file___dev_ptc_=no --with-ssl="${PKG_ROOT}/usr"
 touch stunnel.pem
 make openssl="$(which openssl)"
diff --git a/data/subversion/make.sh b/data/subversion/make.sh
index f28724ec4..96932fd82 100644
--- a/data/subversion/make.sh
+++ b/data/subversion/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 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
diff --git a/data/subversion/mdns.diff b/data/subversion/mdns.diff
index 5455cba9b..636a3aa37 100644
--- a/data/subversion/mdns.diff
+++ b/data/subversion/mdns.diff
@@ -7,16 +7,18 @@ diff -ru subversion-1.4.6/contrib/client-side/mucc.c subversion-1.4.6+iPhone/con
  /*  Multiple URL Command Client
  
      Combine a list of mv, cp and rm commands on URLs into a single commit.
-@@ -445,6 +447,13 @@
+@@ -445,6 +447,15 @@
  int
  main(int argc, const char **argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    apr_pool_t *pool = init("mucc");
    apr_array_header_t *actions = apr_array_make(pool, 1, sizeof(struct action*));
@@ -30,16 +32,18 @@ diff -ru subversion-1.4.6/subversion/svn/main.c subversion-1.4.6+iPhone/subversi
  /*
   * main.c:  Subversion command line client.
   *
-@@ -815,6 +817,13 @@
+@@ -815,6 +817,15 @@
  int
  main(int argc, const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    svn_error_t *err;
    apr_allocator_t *allocator;
@@ -53,16 +57,18 @@ diff -ru subversion-1.4.6/subversion/svnadmin/main.c subversion-1.4.6+iPhone/sub
  /*
   * main.c: Subversion server administration tool.
   *
-@@ -1148,6 +1150,13 @@
+@@ -1148,6 +1150,15 @@
  int
  main(int argc, const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    svn_error_t *err;
    apr_status_t apr_err;
@@ -76,16 +82,18 @@ diff -ru subversion-1.4.6/subversion/svnlook/main.c subversion-1.4.6+iPhone/subv
  /*
   * main.c: Subversion server inspection tool.
   *
-@@ -1858,6 +1860,13 @@
+@@ -1858,6 +1860,15 @@
  int
  main(int argc, const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    svn_error_t *err;
    apr_status_t apr_err;
@@ -99,16 +107,18 @@ diff -ru subversion-1.4.6/subversion/svnserve/main.c subversion-1.4.6+iPhone/sub
  /*
   * main.c :  Main control function for svnserve
   *
-@@ -297,6 +299,13 @@
+@@ -297,6 +299,15 @@
  
  int main(int argc, const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    enum run_mode run_mode = run_mode_unspecified;
    svn_boolean_t foreground = FALSE;
@@ -122,16 +132,18 @@ diff -ru subversion-1.4.6/subversion/svnsync/main.c subversion-1.4.6+iPhone/subv
  /*
   * ====================================================================
   * Copyright (c) 2005-2006 CollabNet.  All rights reserved.
-@@ -1295,6 +1297,13 @@
+@@ -1295,6 +1297,15 @@
  int
  main(int argc, const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    const svn_opt_subcommand_desc_t *subcommand = NULL;
    apr_array_header_t *received_opts;
@@ -145,16 +157,18 @@ diff -ru subversion-1.4.6/subversion/svnversion/main.c subversion-1.4.6+iPhone/s
  /*
   * ====================================================================
   * Copyright (c) 2003-2004 CollabNet.  All rights reserved.
-@@ -108,6 +110,13 @@
+@@ -108,6 +110,15 @@
  int
  main(int argc, const char *argv[])
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    const char *wc_path, *trail_url;
    apr_allocator_t *allocator;
diff --git a/data/sudo/_metadata/conffiles b/data/sudo/_metadata/conffiles
new file mode 100644
index 000000000..30897f878
--- /dev/null
+++ b/data/sudo/_metadata/conffiles
@@ -0,0 +1 @@
+/etc/sudoers
diff --git a/data/sudo/make.sh b/data/sudo/make.sh
index bd48d8d9e..60d618f78 100644
--- a/data/sudo/make.sh
+++ b/data/sudo/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure sudo_cv_uid_t_len=10 sudo_cv_type_long_is_quad=no --without-pam --with-env-editor
 make
 pkg:install
diff --git a/data/system-cmds/make.sh b/data/system-cmds/make.sh
index 4981007fa..329c7be27 100644
--- a/data/system-cmds/make.sh
+++ b/data/system-cmds/make.sh
@@ -1,7 +1,5 @@
 shopt -s extglob
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 
 cd getconf.tproj
 for gperf in *.gperf; do
diff --git a/data/tar/make.sh b/data/tar/make.sh
index 47db2f3eb..59120d0f1 100644
--- a/data/tar/make.sh
+++ b/data/tar/make.sh
@@ -1,6 +1,4 @@
-tar -zxvf "${PKG_DATA}/tar-1.19.tar.gz"
-cd tar-1.19
-pkg:patch
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/tcpdump/make.sh b/data/tcpdump/make.sh
index 470217b6c..f58a4da23 100644
--- a/data/tcpdump/make.sh
+++ b/data/tcpdump/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 Xprefix="$(PKG_DEST_ openssl)/usr" pkg:configure
 make
 pkg:install
diff --git a/data/tcsh/make.sh b/data/tcsh/make.sh
index 5e8066a60..fdcbce7d7 100644
--- a/data/tcsh/make.sh
+++ b/data/tcsh/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure ac_cv_func_setpgrp_void=yes
 make
 pkg:install
diff --git a/data/tiff/make.sh b/data/tiff/make.sh
index df8e2a88c..7dac292bc 100644
--- a/data/tiff/make.sh
+++ b/data/tiff/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 autoconf
 pkg:configure
 make
diff --git a/data/top/make.sh b/data/top/make.sh
index 072bcdce9..e7a07b185 100644
--- a/data/top/make.sh
+++ b/data/top/make.sh
@@ -1,5 +1,3 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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/uikittools/make.sh b/data/uikittools/make.sh
index 3ea6619c5..ec13c70bc 100644
--- a/data/uikittools/make.sh
+++ b/data/uikittools/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 make
 pkg: mkdir -p /usr/bin
 pkg: cp -a uialert /usr/bin
diff --git a/data/unrar/make.sh b/data/unrar/make.sh
index ab228ce28..d4a5d1755 100644
--- a/data/unrar/make.sh
+++ b/data/unrar/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 make -f makefile.unix CXX="${PKG_TARG}-g++" all
 pkg: mkdir -p /usr/bin
 pkg: cp -a unrar /usr/bin
diff --git a/data/unzip/make.sh b/data/unzip/make.sh
index 8a4b8a9b5..57f85234b 100644
--- a/data/unzip/make.sh
+++ b/data/unzip/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd  *
+pkg:setup
 cp unix/Makefile .
 make unzips CC=${PKG_TARG}-gcc CF='-O3 -Wall -I. -DBSD -DUNIX' LF2=
 pkg:usrbin unzip funzip unzipsfx
diff --git a/data/uuid/make.sh b/data/uuid/make.sh
index ea24fc844..17b01d5cb 100644
--- a/data/uuid/make.sh
+++ b/data/uuid/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure ac_cv_va_copy=yes
 make
 pkg:install
diff --git a/data/vfdecrypt/make.sh b/data/vfdecrypt/make.sh
index df7db7d63..e22c819f1 100644
--- a/data/vfdecrypt/make.sh
+++ b/data/vfdecrypt/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 make CC=${PKG_TARG}-gcc
 pkg: mkdir -p /usr/bin
 pkg: mv vfdecrypt /usr/bin
diff --git a/data/vim/make.sh b/data/vim/make.sh
index b8e239331..619621a3e 100644
--- a/data/vim/make.sh
+++ b/data/vim/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 cd src
 autoconf
 cd ..
diff --git a/data/vorbis/make.sh b/data/vorbis/make.sh
index 1b3c1b776..452a4bfd5 100644
--- a/data/vorbis/make.sh
+++ b/data/vorbis/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/vpnc_/make.sh b/data/vpnc_/make.sh
index df6b374c3..68beafe5e 100644
--- a/data/vpnc_/make.sh
+++ b/data/vpnc_/make.sh
@@ -1,5 +1,3 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 make CC=${PKG_TARG}-gcc PREFIX=/usr/local
 pkg:install
diff --git a/data/wget/make.sh b/data/wget/make.sh
index c4eebd321..a55060e86 100644
--- a/data/wget/make.sh
+++ b/data/wget/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 pkg:configure --with-libssl-prefix="$(PKG_DEST_ openssl)"
 make
 pkg:install
diff --git a/data/wget/mdns.diff b/data/wget/mdns.diff
index 0d19bf9a7..2ca9bc131 100644
--- a/data/wget/mdns.diff
+++ b/data/wget/mdns.diff
@@ -7,16 +7,18 @@ diff -ru wget-1.9.1/src/main.c wget-1.9.1+iPhone/src/main.c
  /* Command line parsing.
     Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002
     Free Software Foundation, Inc.
-@@ -267,6 +269,13 @@
+@@ -267,6 +269,15 @@
  int
  main (int argc, char *const *argv)
  {
++#if !defined(__ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__) || __ENVIRONMENT_ASPEN_VERSION_MIN_REQUIRED__ < 10200
 +    struct nlist nl[2];
 +    memset(nl, 0, sizeof(nl));
 +    nl[0].n_un.n_name = (char *) "_useMDNSResponder";
 +    nlist("/usr/lib/libc.dylib", nl);
 +    if (nl[0].n_type != N_UNDF)
 +        *(int *) nl[0].n_value = 0;
++#endif
 +
    char **url, **t;
    int i, c, nurl, status, append_to_log;
diff --git a/data/whois/make.sh b/data/whois/make.sh
index cdb366196..99d56c1f4 100644
--- a/data/whois/make.sh
+++ b/data/whois/make.sh
@@ -1,4 +1,3 @@
-pkg:extract
-cd *
+pkg:setup
 make CC="${PKG_TARG}-gcc"
 pkg:usrbin whois
diff --git a/data/x11/make.sh b/data/x11/make.sh
index d97871b34..e9f20e906 100644
--- a/data/x11/make.sh
+++ b/data/x11/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --enable-malloc0returnsnull
 gcc -c -o src/util/makekeys-makekeys.o src/util/makekeys.c
 gcc -o src/util/makekeys src/util/makekeys-makekeys.o
diff --git a/data/x264/make.sh b/data/x264/make.sh
index 96731bd62..81fa96b10 100644
--- a/data/x264/make.sh
+++ b/data/x264/make.sh
@@ -1,6 +1,4 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 CC=${PKG_TARG}-gcc pkg:configure
 make
 pkg:install
diff --git a/data/xau/make.sh b/data/xau/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/xau/make.sh
+++ b/data/xau/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/xcb-proto/make.sh b/data/xcb-proto/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/xcb-proto/make.sh
+++ b/data/xcb-proto/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/xcb/make.sh b/data/xcb/make.sh
index a9f265a6e..b72d32ad1 100644
--- a/data/xcb/make.sh
+++ b/data/xcb/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make XCBPROTO_XCBINCLUDEDIR=$(PKG_DEST_ xcb-proto)/usr/share/xcb
 pkg:install
diff --git a/data/xext/make.sh b/data/xext/make.sh
index 7fea028a0..8a5dec098 100644
--- a/data/xext/make.sh
+++ b/data/xext/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --enable-malloc0returnsnull
 make
 pkg:install
diff --git a/data/xextproto/make.sh b/data/xextproto/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/xextproto/make.sh
+++ b/data/xextproto/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/xeyes/make.sh b/data/xeyes/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/xeyes/make.sh
+++ b/data/xeyes/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/xi/make.sh b/data/xi/make.sh
index 7fea028a0..8a5dec098 100644
--- a/data/xi/make.sh
+++ b/data/xi/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --enable-malloc0returnsnull
 make
 pkg:install
diff --git a/data/xineramaproto/make.sh b/data/xineramaproto/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/xineramaproto/make.sh
+++ b/data/xineramaproto/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/xml2/make.sh b/data/xml2/make.sh
index d32ec9e88..b337ed376 100644
--- a/data/xml2/make.sh
+++ b/data/xml2/make.sh
@@ -1,5 +1,3 @@
-pkg:extract
-cd *
-pkg:patch
+pkg:setup
 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/make.sh b/data/xmu/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/xmu/make.sh
+++ b/data/xmu/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/xproto/make.sh b/data/xproto/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/xproto/make.sh
+++ b/data/xproto/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/xt/make.sh b/data/xt/make.sh
index d3d74b7b4..e16b4aa55 100644
--- a/data/xt/make.sh
+++ b/data/xt/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure --enable-malloc0returnsnull
 gcc -c -o util/makestrs-makestrs.o util/makestrs.c
 gcc -o util/makestrs util/makestrs-makestrs.o
diff --git a/data/xtrans/make.sh b/data/xtrans/make.sh
index 35a54076e..452a4bfd5 100644
--- a/data/xtrans/make.sh
+++ b/data/xtrans/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure
 make
 pkg:install
diff --git a/data/zsh/make.sh b/data/zsh/make.sh
index 99c609aec..aeea49c92 100644
--- a/data/zsh/make.sh
+++ b/data/zsh/make.sh
@@ -1,5 +1,4 @@
-pkg:extract
-cd *
+pkg:setup
 pkg:configure ac_cv_c_stack_direction=-1 zsh_cv_rlimit_vmem_is_rss=no zsh_cv_rlimit_vmem_is_as=no zsh_cv_rlimit_rss_is_as=yes zsh_cv_sys_fifo=no zsh_cv_sys_link=yes zsh_cv_sys_killesrch=yes zsh_cv_sys_sigsuspend=yes zsh_cv_sys_tcsetpgrp=yes zsh_cv_sys_getpwnam_faked=no zsh_cv_sys_elf=no zsh_cv_func_dlsym_needs_underscore=no --bindir=/bin
 make
 pkg:install
author	Jay Freeman <saurik@saurik.com>	2008-04-14 23:22:48 +0000
committer	Jay Freeman <saurik@saurik.com>	2008-04-14 23:22:48 +0000
commit	7817782b2837cf98f7566e13f80b9c071ff20139 (patch)
tree	452a5677d990e0d9dc9c36ac08bd4204e447afc2 /data
parent	e615a71056dfae4f19dfef86331eb030494b79b7 (diff)