Various things I forgot to commit.

git-svn-id: http://svn.telesphoreo.org/trunk@669 514c082c-b64e-11dc-b46d-3d985efe055d

23 files changed, 28 insertions, 33 deletions

diff --git a/data/nail/_metadata/description b/data/nail/_metadata/description
index 174cb7881..d298b7328 100644
--- a/data/nail/_metadata/description
+++ b/data/nail/_metadata/description
@@ -1 +1 @@
-modern implementation of mail
+modern implementation of traditional mail
diff --git a/data/nail/_metadata/name b/data/nail/_metadata/name
new file mode 100644
index 000000000..e1333492e
--- /dev/null
+++ b/data/nail/_metadata/name
@@ -0,0 +1 @@
+Heirloom mailx (nail)
diff --git a/data/nail/_metadata/openssl.dep b/data/nail/_metadata/openssl.dep
new file mode 120000
index 000000000..9b58fd56b
--- /dev/null
+++ b/data/nail/_metadata/openssl.dep
@@ -0,0 +1 @@
+../../openssl
\ No newline at end of file
diff --git a/data/nail/_metadata/version b/data/nail/_metadata/version
index 556633d32..800fd35ee 100644
--- a/data/nail/_metadata/version
+++ b/data/nail/_metadata/version
@@ -1 +1 @@
-12.3
+12.4
diff --git a/data/nail/mailx-12.3.tar.bz2 b/data/nail/mailx-12.3.tar.bz2
deleted file mode 100644
index 73c11844e..000000000
--- a/data/nail/mailx-12.3.tar.bz2
+++ /dev/null
diff --git a/data/nail/mailx-12.4.tar.bz2 b/data/nail/mailx-12.4.tar.bz2
new file mode 100644
index 000000000..e3b018445
--- /dev/null
+++ b/data/nail/mailx-12.4.tar.bz2
diff --git a/data/ncftp/_metadata/less.dep b/data/ncftp/_metadata/less.dep
new file mode 120000
index 000000000..821d1ff98
--- /dev/null
+++ b/data/ncftp/_metadata/less.dep
@@ -0,0 +1 @@
+../../less
\ No newline at end of file
diff --git a/data/ncftp/_metadata/version b/data/ncftp/_metadata/version
index e4604e3af..b347b11ea 100644
--- a/data/ncftp/_metadata/version
+++ b/data/ncftp/_metadata/version
@@ -1 +1 @@
-3.2.1
+3.2.3
diff --git a/data/ncftp/ncftp-3.2.3-src.tar.bz2 b/data/ncftp/ncftp-3.2.3-src.tar.bz2
new file mode 100644
index 000000000..d5d84cc94
--- /dev/null
+++ b/data/ncftp/ncftp-3.2.3-src.tar.bz2
diff --git a/data/netatalk/_metadata/description b/data/netatalk/_metadata/description
index e34c1a22b..0670c9ef0 100644
--- a/data/netatalk/_metadata/description
+++ b/data/netatalk/_metadata/description
@@ -1 +1 @@
-open-source ApplTalk implementation
+open-source AppleTalk implementation
diff --git a/data/netatalk/_metadata/gcrypt.dep b/data/netatalk/_metadata/gcrypt.dep
new file mode 120000
index 000000000..0a21c7b07
--- /dev/null
+++ b/data/netatalk/_metadata/gcrypt.dep
@@ -0,0 +1 @@
+../../gcrypt
\ No newline at end of file
diff --git a/data/netatalk/_metadata/version b/data/netatalk/_metadata/version
index 50ffc5aa7..2165f8f9b 100644
--- a/data/netatalk/_metadata/version
+++ b/data/netatalk/_metadata/version
@@ -1 +1 @@
-2.0.3
+2.0.4
diff --git a/data/netatalk/bdb.diff b/data/netatalk/bdb.diff
new file mode 100644
index 000000000..72e6c510f
--- /dev/null
+++ b/data/netatalk/bdb.diff
@@ -0,0 +1,13 @@
+diff -ru netatalk-2.0.4/macros/db3-check.m4 netatalk-2.0.4+iPhone/macros/db3-check.m4
+--- netatalk-2.0.4/macros/db3-check.m4	2009-03-29 07:23:24.000000000 +0000
++++ netatalk-2.0.4+iPhone/macros/db3-check.m4	2009-06-19 22:11:24.000000000 +0000
+@@ -33,7 +33,8 @@
+     for lib in $atalk_cv_bdb_try_libs ; do
+         LIBS="$lib $savedlibs"
+         AC_MSG_CHECKING([Berkeley DB library ($lib)])
+-        AC_TRY_RUN([
++        AC_LINK_IFELSE([
++            #include "confdefs.h"
+             #include <stdio.h>
+             #include <db.h>
+             int main(void) {
diff --git a/data/netatalk/dbstat.diff b/data/netatalk/dbstat.diff
deleted file mode 100644
index 15810c687..000000000
--- a/data/netatalk/dbstat.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru netatalk-2.0.3/bin/cnid/cnid_index.c netatalk-2.0.3+iPhone/bin/cnid/cnid_index.c
---- netatalk-2.0.3/bin/cnid/cnid_index.c	2005-04-10 12:49:18.000000000 +0000
-+++ netatalk-2.0.3+iPhone/bin/cnid/cnid_index.c	2008-07-11 01:15:39.000000000 +0000
-@@ -274,7 +274,7 @@
-     DB_BTREE_STAT *sp;
-     DB *db = db_table[dbi].db;
- 
--    ret = db->stat(db, &sp, 0);
-+    ret = db->stat(db, NULL, &sp, 0);
- 
-     if (ret) {
-         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
-diff -ru netatalk-2.0.3/etc/cnid_dbd/dbif.c netatalk-2.0.3+iPhone/etc/cnid_dbd/dbif.c
---- netatalk-2.0.3/etc/cnid_dbd/dbif.c	2004-12-21 13:36:12.000000000 +0000
-+++ netatalk-2.0.3+iPhone/etc/cnid_dbd/dbif.c	2008-07-11 01:16:01.000000000 +0000
-@@ -514,7 +514,7 @@
-     DB_BTREE_STAT *sp;
-     DB *db = db_table[dbi].db;
- 
--    ret = db->stat(db, &sp, 0);
-+    ret = db->stat(db, NULL, &sp, 0);
- 
-     if (ret) {
-         LOG(log_error, logtype_cnid, "error getting stat infotmation on database: %s", db_strerror(errno));
diff --git a/data/netatalk/make.sh b/data/netatalk/make.sh
index f786a3af2..3be5b21f3 100644
--- a/data/netatalk/make.sh
+++ b/data/netatalk/make.sh
@@ -1,5 +1,6 @@
 pkg:setup
-AR=$(which "${PKG_TARG}-ar") pkg:configure --enable-cups=no --sysconfdir=/etc
+autoconf
+AR=$(which "${PKG_TARG}-ar") pkg:configure --enable-cups=no --sysconfdir=/etc --with-bdb="$(PKG_DEST_ berkeleydb)/usr"
 make
 pkg:install
 
diff --git a/data/netatalk/netatalk-2.0.3.tar.gz b/data/netatalk/netatalk-2.0.3.tar.gz
deleted file mode 100644
index 8e75e66d5..000000000
--- a/data/netatalk/netatalk-2.0.3.tar.gz
+++ /dev/null
diff --git a/data/netatalk/netatalk-2.0.4.tar.bz2 b/data/netatalk/netatalk-2.0.4.tar.bz2
new file mode 100644
index 000000000..0b8e0fc01
--- /dev/null
+++ b/data/netatalk/netatalk-2.0.4.tar.bz2
diff --git a/data/openssh/make.sh b/data/openssh/make.sh
index ac2d1190d..d31209c6f 100644
--- a/data/openssh/make.sh
+++ b/data/openssh/make.sh
@@ -1,7 +1,7 @@
 pkg:setup
 autoconf
 pkg:configure --disable-strip --sysconfdir=/etc/ssh --disable-libutil --disable-utmp --disable-wtmp ac_cv_path_AR=arm-apple-darwin9-ar
-make
+pkg:make
 pkg:install INSTALL_SSH_RAND_HELPER=yes
 pkg: cp -a %/sshd-keygen-wrapper /usr/libexec
 pkg: mkdir -p /Library/LaunchDaemons
diff --git a/data/pcre/_metadata/version b/data/pcre/_metadata/version
index 37722ebbc..fbf1779b2 100644
--- a/data/pcre/_metadata/version
+++ b/data/pcre/_metadata/version
@@ -1 +1 @@
-7.4
+7.9
diff --git a/data/pcre/pcre-7.4.tar.gz b/data/pcre/pcre-7.4.tar.gz
deleted file mode 100644
index 515fccb92..000000000
--- a/data/pcre/pcre-7.4.tar.gz
+++ /dev/null
diff --git a/data/pcre/pcre-7.9.tar.bz2 b/data/pcre/pcre-7.9.tar.bz2
new file mode 100644
index 000000000..9dd36842d
--- /dev/null
+++ b/data/pcre/pcre-7.9.tar.bz2
diff --git a/data/php/_metadata/curl.dep b/data/php/_metadata/curl.dep
new file mode 120000
index 000000000..9c4438112
--- /dev/null
+++ b/data/php/_metadata/curl.dep
@@ -0,0 +1 @@
+../../curl
\ No newline at end of file
diff --git a/data/php/make.sh b/data/php/make.sh
index 71dc0d351..a46655ddb 100644
--- a/data/php/make.sh
+++ b/data/php/make.sh
@@ -1,5 +1,5 @@
 pkg:setup
 autoconf
-CC="${PKG_TARG}"-gcc pkg:configure --with-iconv="${PKG_ROOT}"/usr
+CC="${PKG_TARG}"-gcc pkg:configure --with-iconv="${PKG_ROOT}"/usr --with-curl="$(PKG_DEST_ curl)"/usr --enable-fastcgi
 make
 make install prefix="${PKG_DEST}"/usr datarootdir="${PKG_DEST}"/usr