diff --git a/package/aircrack-ng/Makefile b/package/aircrack-ng/Makefile
index ff8e99cff..918bcd22b 100644
--- a/package/aircrack-ng/Makefile
+++ b/package/aircrack-ng/Makefile

-PKG_MD5SUM:= dafbfaf944ca9d523fde4bae86f0c067

diff --git a/package/apr-util/Makefile b/package/apr-util/Makefile
index 307853fab..2c0afd8bf 100644
--- a/package/apr-util/Makefile
+++ b/package/apr-util/Makefile

-PKG_VERSION:= 0.9.15

-PKG_MD5SUM:= dc772ae295f49ddb8ee8e69a9716c53b

@@ -21,11 +21,11 @@ $(eval $(call PKG_template,APR_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${

-XAKE_FLAGS+= apr_builddir=${STAGING_DIR}/usr/share/build \

- apr_builders=${STAGING_DIR}/usr/share/build

- ${CP} ${WRKINST}/usr/lib/libaprutil-0.so* ${IDIR_APR_UTIL}/usr/lib/

diff --git a/package/apr-util/patches/patch-uri_Makefile_in b/package/apr-util/patches/patch-uri_Makefile_in
deleted file mode 100644
index 670623ad0..000000000
--- a/package/apr-util/patches/patch-uri_Makefile_in
+++ /dev/null

---- apr-util-0.9.13.orig/uri/Makefile.in 2004-11-25 00:45:40.000000000 +0100

-+++ apr-util-0.9.13/uri/Makefile.in 2007-02-07 12:55:37.000000000 +0100

-@@ -3,7 +3,7 @@ VPATH = @srcdir@

- INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@ -I.

- TARGETS = uri_delims.h apr_uri.lo

--CLEAN_TARGETS = gen_uri_delims uri_delims.h

-+CLEAN_TARGETS = gen_uri_delims

- # bring in rules.mk for standard functionality

-@@ -13,6 +13,3 @@ gen_uri_delims: $(gen_uri_delims_OBJECTS

- $(LINK) $(EXTRA_LDFLAGS) $(gen_uri_delims_OBJECTS) $(EXTRA_LIBS)

- apr_uri.lo: uri_delims.h apr_uri.c

--uri_delims.h: gen_uri_delims

-- ./gen_uri_delims > uri_delims.h

diff --git a/package/apr-util/patches/uri_delim.patch b/package/apr-util/patches/uri_delim.patch
deleted file mode 100644
index 04ca4e1d8..000000000
--- a/package/apr-util/patches/uri_delim.patch
+++ /dev/null

-diff -Nur apr-util-0.9.13/uri/uri_delims.h build_mipsel/w-apr-util-0.9.13-1/apr-util-0.9.13/uri/uri_delims.h

---- apr-util-0.9.13/uri/uri_delims.h 1970-01-01 01:00:00.000000000 +0100

-+++ build_mipsel/w-apr-util-0.9.13-1/apr-util-0.9.13/uri/uri_delims.h 2007-02-07 13:06:56.000000000 +0100

-+/* this file is automatically generated by gen_uri_delims, do not edit */

-+static const unsigned char uri_delims[256] = {

-+ T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0,

-+ 0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0,

-+ 0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

-+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

diff --git a/package/apr/Makefile b/package/apr/Makefile
index 486a96842..4f65c5eef 100644
--- a/package/apr/Makefile
+++ b/package/apr/Makefile

-PKG_VERSION:= 0.9.17

-PKG_MD5SUM:= ca1e22d98081a03a33c2a0b8684eb192

-ifeq ($(ADK_PACKAGE_APR_THREADING),y)

-PKG_BUILDDEP+= libpthread

-PKG_FLAVOURS= THREADING

-PKGFD_FULL= Enable threading support

$(eval $(call PKG_template,APR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))

-ifeq (${ADK_PACKAGE_APR_THREADING},y)

-CONFIGURE_ARGS+= --disable-threads

- ${CP} ${WRKINST}/usr/lib/libapr-0.so* ${IDIR_APR}/usr/lib/

- ${INSTALL_DIR} ${STAGING_DIR}/usr/share/build

- ${CP} ${WRKINST}/usr/share/build/* ${STAGING_DIR}/usr/share/build/

- ${WRKINST}/usr/bin/apr-config

diff --git a/package/apr/patches/patch-include_apr_want_h b/package/apr/patches/patch-include_apr_want_h
new file mode 100644
index 000000000..5f1a11c5e
--- /dev/null
+++ b/package/apr/patches/patch-include_apr_want_h

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 425683f24..c35e686a5 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile

-PKG_VERSION:= 1.6.2.5

-PKG_MD5SUM:= 9d1f7bcf6833605ced4b2740d14bd576

diff --git a/package/asterisk/patches/patch-Makefile b/package/asterisk/patches/patch-Makefile
deleted file mode 100644
index 1ba02c900..000000000
--- a/package/asterisk/patches/patch-Makefile
+++ /dev/null

---- asterisk-1.6.2.1.orig/Makefile 2009-12-10 22:04:20.000000000 +0100

-+++ asterisk-1.6.2.1/Makefile 2010-02-05 21:05:41.313084404 +0100

-@@ -366,8 +366,8 @@ makeopts: configure

- menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)

-- menuselect/menuselect --check-deps $@

-- menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)

-+ ./menuselect/menuselect --check-deps $@

-+ ./menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)

- $(MOD_SUBDIRS_EMBED_LDSCRIPT):

- +@echo "EMBED_LDSCRIPTS+="`$(SILENTMAKE) -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules

diff --git a/package/asterisk/patches/patch-apps_app_followme_c b/package/asterisk/patches/patch-apps_app_followme_c
deleted file mode 100644
index 8ecfa9226..000000000
--- a/package/asterisk/patches/patch-apps_app_followme_c
+++ /dev/null

---- asterisk-1.6.2.1.orig/apps/app_followme.c 2009-09-15 18:06:24.000000000 +0200

-+++ asterisk-1.6.2.1/apps/app_followme.c 2010-02-14 10:33:51.540422962 +0100

-@@ -172,7 +172,9 @@ static int ynlongest = 0;

- static const char *featuredigittostr;

- static int featuredigittimeout = 5000; /*!< Feature Digit Timeout */

--static const char *defaultmoh = "default"; /*!< Default Music-On-Hold Class */

-+static const char *defaultmoh; /*!< Default Music-On-Hold Class */

- static char takecall[20] = "1", nextindp[20] = "2";

- static char callfromprompt[PATH_MAX] = "followme/call-from";

-@@ -236,6 +238,7 @@ static struct call_followme *alloc_profi

- static void init_profile(struct call_followme *f)

-+ defaultmoh = "default";

- ast_copy_string(f->moh, defaultmoh, sizeof(f->moh));

-@@ -1195,3 +1198,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MO

- .unload = unload_module,

diff --git a/package/curl/Makefile b/package/curl/Makefile
index 9f771defb..a7ddfb1d8 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile

-PKG_VERSION:= 7.19.7

-PKG_MD5SUM:= ecb2e37e45c9933e2a963cabe03670ab

diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile
index b6c026739..11e93d2ce 100644
--- a/package/davfs2/Makefile
+++ b/package/davfs2/Makefile

-PKG_MD5SUM= 57def26e4d6d63527e01612d10fd0515

-PKG_URL:= http://savannah.nongnu.org/projects/davfs2

-PKG_SITES= ${MASTER_SITE_SOURCEFORGE:=dav/}

-PKG_DEPENDS:= fuse-utils kmod-fuse-fs libiconv neon

-PKG_DEPENDS:= kmod-coda-fs libiconv neon

-PKG_DEPENDS:= kmod-coda-fs fuse-utils kmod-fuse-fs libiconv neon

diff --git a/package/davfs2/patches/patch-src_cache_c b/package/davfs2/patches/patch-src_cache_c
deleted file mode 100644
index ac8b0b4f1..000000000
--- a/package/davfs2/patches/patch-src_cache_c
+++ /dev/null

-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $

---- davfs2-1.3.3.orig/src/cache.c 2008-06-24 21:32:50.000000000 +0200

-+++ davfs2-1.3.3/src/cache.c 2008-12-08 00:06:51.000000000 +0100

- #include "config.h"

- #include <dirent.h>

- #include <errno.h>

- #include <error.h>

diff --git a/package/davfs2/patches/patch-src_dav_coda2_c b/package/davfs2/patches/patch-src_dav_coda2_c
deleted file mode 100644
index 1ef269348..000000000
--- a/package/davfs2/patches/patch-src_dav_coda2_c
+++ /dev/null

-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $

---- davfs2-1.3.3.orig/src/dav_coda2.c 2008-02-02 23:23:45.000000000 +0100

-+++ davfs2-1.3.3/src/dav_coda2.c 2008-12-08 00:07:35.000000000 +0100

- #include "config.h"

- #include <errno.h>

- #include <fcntl.h>

- #include <limits.h>

diff --git a/package/davfs2/patches/patch-src_dav_coda3_c b/package/davfs2/patches/patch-src_dav_coda3_c
deleted file mode 100644
index 9a4bee68b..000000000
--- a/package/davfs2/patches/patch-src_dav_coda3_c
+++ /dev/null

-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $

---- davfs2-1.3.3.orig/src/dav_coda3.c 2008-02-02 23:24:10.000000000 +0100

-+++ davfs2-1.3.3/src/dav_coda3.c 2008-12-08 00:08:00.000000000 +0100

- #include "config.h"

- #include <errno.h>

- #include <fcntl.h>

- #include <limits.h>

diff --git a/package/davfs2/patches/patch-src_dav_fuse5_c b/package/davfs2/patches/patch-src_dav_fuse5_c
deleted file mode 100644
index 21c92b9a5..000000000
--- a/package/davfs2/patches/patch-src_dav_fuse5_c
+++ /dev/null

-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $

---- davfs2-1.3.3.orig/src/dav_fuse5.c 2008-04-05 20:36:06.000000000 +0200

-+++ davfs2-1.3.3/src/dav_fuse5.c 2008-12-08 00:08:26.000000000 +0100

- #include "config.h"

- #include <errno.h>

- #include <fcntl.h>

- #include <stddef.h>

diff --git a/package/davfs2/patches/patch-src_dav_fuse7_c b/package/davfs2/patches/patch-src_dav_fuse7_c
deleted file mode 100644
index 846f4a98a..000000000
--- a/package/davfs2/patches/patch-src_dav_fuse7_c
+++ /dev/null

-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $

---- davfs2-1.3.3.orig/src/dav_fuse7.c 2008-04-09 21:43:34.000000000 +0200

-+++ davfs2-1.3.3/src/dav_fuse7.c 2008-12-08 00:08:32.000000000 +0100

- #include "config.h"

- #include <errno.h>

- #include <fcntl.h>

- #include <stddef.h>

diff --git a/package/davfs2/patches/patch-src_kernel_interface_c b/package/davfs2/patches/patch-src_kernel_interface_c
deleted file mode 100644
index 15d5c909b..000000000
--- a/package/davfs2/patches/patch-src_kernel_interface_c
+++ /dev/null

---- davfs2-1.3.3.orig/src/kernel_interface.c 2008-04-05 20:43:04.000000000 +0200

-+++ davfs2-1.3.3/src/kernel_interface.c 2008-12-08 00:09:01.000000000 +0100

- #include "config.h"

- #include <errno.h>

- #include <error.h>

- #include <fcntl.h>

-@@ -173,7 +172,8 @@ static int init_coda(int *dev, dav_run_m

-- system("/sbin/modprobe coda &>/dev/null");

-+ system("/sbin/insmod coda");

- while (*dev <= 0 && minor < MAX_CODADEVS) {

-@@ -240,7 +240,8 @@ static int init_fuse(int *dev, dav_run_m

- *dev = open(path, O_RDWR | O_NONBLOCK);

-- system("/sbin/modprobe fuse &>/dev/null");

-+ system("/sbin/insmod fuse");

- *dev = open(path, O_RDWR | O_NONBLOCK);

diff --git a/package/davfs2/patches/patch-src_mount_davfs_c b/package/davfs2/patches/patch-src_mount_davfs_c
index ba0c030f2..516604ffc 100644
--- a/package/davfs2/patches/patch-src_mount_davfs_c
+++ b/package/davfs2/patches/patch-src_mount_davfs_c

---- davfs2-1.3.3.orig/src/mount_davfs.c 2008-06-30 20:29:42.000000000 +0200

-+++ davfs2-1.3.3/src/mount_davfs.c 2008-12-08 00:20:01.000000000 +0100

-@@ -23,12 +23,10 @@

- #include "config.h"

- #include <ctype.h>

- #include <errno.h>

- #include <error.h>

- #include <limits.h>

-@@ -602,15 +600,18 @@ static char *check_double_mounts(dav_arg

- free to choose them. They should be configured in davfs2.conf anyway. */

- static void check_fstab(const dav_args *args) {

- struct fstab *ft = getfsfile(mpoint);

- error(EXIT_FAILURE, 0, _("no entry for %s found in %s"), url,

- if (strcmp(url, ft->fs_spec) != 0) {

- char *fstab_url = decode_octal(ft->fs_spec);

- if (strcmp(url, fstab_url) != 0)

-@@ -642,6 +643,7 @@ static void check_fstab(const dav_args *

-@@ -661,7 +663,7 @@ static void check_mountpoint(dav_args *a

-@@ -1754,6 +1756,7 @@ static dav_args *new_args(void) {

- static void log_dbg_config(char *argv[], dav_args *args) {

-@@ -1761,6 +1764,7 @@ static void log_dbg_config(char *argv[],

- syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG),

- "Configuration:");

diff --git a/package/davfs2/patches/patch-src_umount_davfs_c b/package/davfs2/patches/patch-src_umount_davfs_c
index 387476f39..9dd1978d4 100644
--- a/package/davfs2/patches/patch-src_umount_davfs_c
+++ b/package/davfs2/patches/patch-src_umount_davfs_c

-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $

---- davfs2-1.3.3.orig/src/umount_davfs.c 2008-01-11 22:40:18.000000000 +0100

-+++ davfs2-1.3.3/src/umount_davfs.c 2008-12-08 00:38:43.000000000 +0100

-@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) {

- if (mpoint == NULL)

- if (mpoint == NULL || *mpoint != '/')

diff --git a/package/davfs2/patches/patch-src_webdav_c b/package/davfs2/patches/patch-src_webdav_c
index 35ad27492..20b125f1a 100644
--- a/package/davfs2/patches/patch-src_webdav_c
+++ b/package/davfs2/patches/patch-src_webdav_c

- cf. http://sourceforge.net/tracker/index.php?func=detail&aid=1594808&group_id=26275&atid=386747

---- davfs2-1.3.3.orig/src/webdav.c 2008-06-28 19:20:07.000000000 +0200

-+++ davfs2-1.3.3/src/webdav.c 2008-12-08 00:37:23.000000000 +0100

- #include "config.h"

- #include <errno.h>

- #include <error.h>

- #include <fcntl.h>

- #include <stdlib.h>

- #include <string.h>

- #include <syslog.h>

- #include <unistd.h>

-@@ -406,6 +406,11 @@ void dav_init_webdav(const char *scheme,

- suri = (ne_uri *) ne_calloc(sizeof(ne_uri));

- ne_fill_server_uri(session, suri);

-+ /* begin of GMX hack */

-+ ne_server_capabilities caps;

-+ ne_options(session, "/", &caps);

-+ /* end of GMX hack */

- locks = ne_lockstore_create();

- if (lock_owner == NULL) {

-@@ -1859,13 +1864,18 @@ static int ssl_verify(void *userdata, in

- "or there might be a man-in-the-middle-attack.\n"));

- printf(_("Accept certificate for this session? [y,N] "));

-- if (rpmatch(s) < 1)

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 2bc49ab16..65714b2a5 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile

-PKG_VERSION:= 1.41.9

-PKG_MD5SUM:= 52f60a9e19a02f142f5546f1b5681927

diff --git a/package/git/Makefile b/package/git/Makefile
index fb9f114a3..a3c9a8fd6 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile

-PKG_VERSION:= 1.7.0.1

-PKG_MD5SUM:= 05485caf5c503ce378a87759bc3a0509

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index f65a61e2c..38902bf07 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile

-PKG_VERSION:= 2.6.29-1

-PKG_MD5SUM:= c1bc258a6c345905e79935ac7a3cc582

-PKG_SITES:= http://developer.osdl.org/dev/iproute2/download/

diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index b9efa2b2c..e7f3b1f22 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile

-PKG_MD5SUM:= 9f7b3402b4731a7fa543db193bf1b564

-PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.7/

diff --git a/package/krb5/patches/patch-src_Makefile_in b/package/krb5/patches/patch-src_Makefile_in
deleted file mode 100644
index ef48b68ed..000000000
--- a/package/krb5/patches/patch-src_Makefile_in
+++ /dev/null

---- krb5-1.7.orig/src/Makefile.in Wed Apr 15 22:07:03 2009

-+++ krb5-1.7/src/Makefile.in Mon Dec 28 16:13:47 2009

-@@ -13,7 +13,6 @@ SUBDIRS=util include lib kdc kadmin @ldap_plugin_dir@

- plugins/preauth/pkinit \

- plugins/preauth/encrypted_challenge \

- config-files gen-manpages

- BUILDTOP=$(REL)$(C)

- LOCALINCLUDES = -I$(srcdir)

diff --git a/package/krb5/patches/patch-src_include_osconf_hin b/package/krb5/patches/patch-src_include_osconf_hin
deleted file mode 100644
index 834f28292..000000000
--- a/package/krb5/patches/patch-src_include_osconf_hin
+++ /dev/null

---- krb5-1.7.orig/src/include/osconf.hin 2009-01-31 04:57:20.000000000 +0100

-+++ krb5-1.7/src/include/osconf.hin 2009-11-01 11:41:43.171362928 +0100

-@@ -61,14 +61,14 @@

- #define DEFAULT_LNAME_FILENAME "@PREFIX/lib/krb5.aname"

- #endif /* _WINDOWS */

--#define DEFAULT_KDB_FILE "@LOCALSTATEDIR/krb5kdc/principal"

--#define DEFAULT_KEYFILE_STUB "@LOCALSTATEDIR/krb5kdc/.k5."

--#define KRB5_DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"

-+#define DEFAULT_KDB_FILE "@SYSCONFDIR/krb5kdc/principal"

-+#define DEFAULT_KEYFILE_STUB "@SYSCONFDIR/krb5kdc/.k5."

-+#define KRB5_DEFAULT_ADMIN_ACL "@SYSCONFDIR/krb5kdc/krb5_adm.acl"

- /* Used by old admin server */

--#define DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/kadm_old.acl"

-+#define DEFAULT_ADMIN_ACL "@SYSCONFDIR/krb5kdc/kadm_old.acl"

- /* Location of KDC profile */

--#define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf"

-+#define DEFAULT_KDC_PROFILE "@SYSCONFDIR/krb5kdc/kdc.conf"

- #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE"

- * Defaults for the KADM5 admin system.

--#define DEFAULT_KADM5_KEYTAB "@LOCALSTATEDIR/krb5kdc/kadm5.keytab"

--#define DEFAULT_KADM5_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kadm5.acl"

-+#define DEFAULT_KADM5_KEYTAB "@SYSCONFDIR/krb5kdc/kadm5.keytab"

-+#define DEFAULT_KADM5_ACL_FILE "@SYSCONFDIR/krb5kdc/kadm5.acl"

- #define DEFAULT_KADM5_PORT 749 /* assigned by IANA */

- #define KRB5_DEFAULT_SUPPORTED_ENCTYPES \

-@@ -123,13 +123,13 @@

- * krb5 slave support follows

--#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans"

--#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master"

-+#define KPROP_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/slave_datatrans"

-+#define KPROPD_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/from_master"

- #define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"

- #define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit"

- #define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop"

- #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE

--#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"

-+#define KPROPD_ACL_FILE "@SYSCONFDIR/krb5kdc/kpropd.acl"

diff --git a/package/krb5/patches/patch-src_util_profile_prof_int_h b/package/krb5/patches/patch-src_util_profile_prof_int_h
deleted file mode 100644
index 5be692f11..000000000
--- a/package/krb5/patches/patch-src_util_profile_prof_int_h
+++ /dev/null

---- krb5-1.7.orig/src/util/profile/prof_int.h 2008-05-27 18:25:51.000000000 +0200

-+++ krb5-1.7/src/util/profile/prof_int.h 2009-11-19 20:20:53.000000000 +0100

- #include "k5-thread.h"

- #include "k5-platform.h"

--#include "com_err.h"

-+#include "et/com_err.h"

- #include "profile.h"

- typedef long prf_magic_t;

diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index 20fbc14cd..73b37eb9b 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile

-PKG_MD5SUM:= 62c0d09d1e76c5b6da8fff92314c4665

-PKG_DESCR:= an helper library for common error codes and descriptions

diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index 4325332db..a9f375ce8 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile

-PKG_VERSION:= 0.15.8

-PKG_MD5SUM:= 6680970274c389fd07e2b35721de1764

- --enable-vorbis-encoder \

- --with-lame-includes=${STAGING_DIR}/usr/include \

- --with-lame-libraries=${STAGING_DIR}/usr/lib

diff --git a/package/mpd/patches/autotool.patch b/package/mpd/patches/autotool.patch
deleted file mode 100644
index ab1aad556..000000000
--- a/package/mpd/patches/autotool.patch
+++ /dev/null

-diff -Nur mpd-0.15.8.orig/aclocal.m4 mpd-0.15.8/aclocal.m4

---- mpd-0.15.8.orig/aclocal.m4 2010-01-18 02:27:49.000000000 +0100

-+++ mpd-0.15.8/aclocal.m4 2010-02-18 23:51:59.208857762 +0100

--# generated automatically by aclocal 1.11 -*- Autoconf -*-

-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-

--# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

-+# 2005 Free Software Foundation, Inc.

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A

- # PARTICULAR PURPOSE.

--m4_ifndef([AC_AUTOCONF_VERSION],

-- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,

--[m4_warning([this file was generated for autoconf 2.65.

--You have another version of autoconf. It may work, but is not guaranteed to.

--If you have problems, you may need to regenerate the build system entirely.

--To do so, use the procedure documented by the package, typically `autoreconf'.])])

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

-@@ -29,31 +21,14 @@

- # ----------------------------

- # Automake X.Y traces this macro to ensure aclocal.m4 has been

- # generated from the m4 files accompanying Automake X.Y.

--# (This private macro should not be called outside this file.)

--AC_DEFUN([AM_AUTOMAKE_VERSION],

--[am__api_version='1.11'

--dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

--dnl require some minimum version. Point them to the right macro.

--m4_if([$1], [1.11], [],

-- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

--# _AM_AUTOCONF_VERSION(VERSION)

--# -----------------------------

--# aclocal traces this macro to find the Autoconf version.

--# This is a private macro too. Using m4_define simplifies

--# the logic in aclocal, which can simply ignore this definition.

--m4_define([_AM_AUTOCONF_VERSION], [])

-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])

- # AM_SET_CURRENT_AUTOMAKE_VERSION

- # -------------------------------

--# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

--# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.

-+# Call AM_AUTOMAKE_VERSION so it can be traced.

-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

--[AM_AUTOMAKE_VERSION([1.11])dnl

--m4_ifndef([AC_AUTOCONF_VERSION],

-- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl

--_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

-+ [AM_AUTOMAKE_VERSION([1.9.6])])

- # AM_AUX_DIR_EXPAND -*- Autoconf -*-

-@@ -110,14 +85,14 @@

- # AM_CONDITIONAL -*- Autoconf -*-

- # Free Software Foundation, Inc.

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

- # AM_CONDITIONAL(NAME, SHELL-CONDITION)

- # -------------------------------------

-@@ -126,11 +101,8 @@

- [AC_PREREQ(2.52)dnl

- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],

- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl

--AC_SUBST([$1_TRUE])dnl

--AC_SUBST([$1_FALSE])dnl

--_AM_SUBST_NOTMAKE([$1_TRUE])dnl

--_AM_SUBST_NOTMAKE([$1_FALSE])dnl

--m4_define([_AM_COND_VALUE_$1], [$2])dnl

-+AC_SUBST([$1_TRUE])

-+AC_SUBST([$1_FALSE])

-@@ -144,14 +116,15 @@

- Usually this means the macro was only invoked conditionally.]])

- # Free Software Foundation, Inc.

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be

- # written in clear, in which case automake, when reading aclocal.m4,

-@@ -179,7 +152,6 @@

- ifelse([$1], CC, [depcc="$CC" am_compiler_list=],

- [$1], CXX, [depcc="$CXX" am_compiler_list=],

- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],

-- [$1], UPC, [depcc="$UPC" am_compiler_list=],

- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],

- [depcc="$$1" am_compiler_list=])

-@@ -208,16 +180,6 @@

- if test "$am_compiler_list" = ""; then

- am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`

-- am__universal=false

-- m4_case([$1], [CC],

-- [case " $depcc " in #(

-- *\ -arch\ *\ -arch\ *) am__universal=true ;;

-- [case " $depcc " in #(

-- *\ -arch\ *\ -arch\ *) am__universal=true ;;

- for depmode in $am_compiler_list; do

- # Setup a source with many dependencies, because some compilers

- # like to wrap large dependency lists on column 80 (with \), and

-@@ -235,17 +197,7 @@

- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

-- # We check with `-c' and `-o' for the sake of the "dashmstdout"

-- # mode. It turns out that the SunPro C++ compiler does not properly

-- # handle `-M -o', and we need to detect this. Also, some Intel

-- # versions had trouble with output in subdirs

-- am__obj=sub/conftest.${OBJEXT-o}

-- am__minus_obj="-o $am__obj"

-- # This depmode causes a compiler race in universal mode.

-- test "$am__universal" = false || continue

- # after this tag, mechanisms are not by side-effect, so they'll

- # only be used when explicitly requested

-@@ -255,23 +207,18 @@

-- msvisualcpp | msvcmsys)

-- # This compiler won't grok `-c -o', but also, the minuso test has

-- # not run yet. These depmodes are late enough in the game, and

-- # so weak that their functioning should not be impacted.

-- am__obj=conftest.${OBJEXT-o}

-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

-+ # mode. It turns out that the SunPro C++ compiler does not properly

-+ # handle `-M -o', and we need to detect this.

- if depmode=$depmode \

-- source=sub/conftest.c object=$am__obj \

-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

-- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

- >/dev/null 2>conftest.err &&

-- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

-- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

- # icc doesn't choke on unknown options, it will just issue warnings

- # or remarks (even with -Werror). So we grep stderr for any message

-@@ -322,74 +269,61 @@

- AMDEPBACKSLASH='\'

- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])

--AC_SUBST([AMDEPBACKSLASH])dnl

--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl

-+AC_SUBST([AMDEPBACKSLASH])

- # Generate code to set up dependency tracking. -*- Autoconf -*-

- # Free Software Foundation, Inc.

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

- # _AM_OUTPUT_DEPENDENCY_COMMANDS

- # ------------------------------

- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

-- # Autoconf 2.62 quotes --file arguments for eval, but not when files

-- # are listed without --file. Let's play safe and only enable the eval

-- # if we detect the quoting.

-- case $CONFIG_FILES in

-- *\'*) eval set x "$CONFIG_FILES" ;;

-- *) set x $CONFIG_FILES ;;

-- # Strip MF so we end up with the name of the file.

-- mf=`echo "$mf" | sed -e 's/:.*$//'`

-- # Check whether this is an Automake generated Makefile or not.

-- # We used to match only the files named `Makefile.in', but

-- # some people rename them; so instead we look at the file content.

-- # Grep'ing the first line is not enough: some people post-process

-- # each Makefile.in and add a new line on top of each file to say so.

-- # Grep'ing the whole file is not good either: AIX grep has a line

-- # limit of 2048, but all sed's we know have understand at least 4000.

-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then

-- dirpart=`AS_DIRNAME("$mf")`

-- # Extract the definition of DEPDIR, am__include, and am__quote

-- # from the Makefile without running `make'.

-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

-- test -z "$DEPDIR" && continue

-- am__include=`sed -n 's/^am__include = //p' < "$mf"`

-- test -z "am__include" && continue

-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

-- # When using ansi2knr, U may be empty or an underscore; expand it

-- U=`sed -n 's/^U = //p' < "$mf"`

-- # Find all dependency output files, they are included files with

-- # $(DEPDIR) in their names. We invoke sed twice because it is the

-- # simplest approach to changing $(DEPDIR) to its actual value in the

-- for file in `sed -n "

-- s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

-- # Make sure the directory exists.

-- test -f "$dirpart/$file" && continue

-- fdir=`AS_DIRNAME(["$file"])`

-- AS_MKDIR_P([$dirpart/$fdir])

-- # echo "creating $dirpart/$file"

-- echo '# dummy' > "$dirpart/$file"

-+[for mf in $CONFIG_FILES; do

-+ # Strip MF so we end up with the name of the file.

-+ mf=`echo "$mf" | sed -e 's/:.*$//'`

-+ # Check whether this is an Automake generated Makefile or not.

-+ # We used to match only the files named `Makefile.in', but

-+ # some people rename them; so instead we look at the file content.

-+ # Grep'ing the first line is not enough: some people post-process

-+ # each Makefile.in and add a new line on top of each file to say so.

-+ # So let's grep whole file.

-+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then

-+ dirpart=`AS_DIRNAME("$mf")`

-+ # Extract the definition of DEPDIR, am__include, and am__quote

-+ # from the Makefile without running `make'.

-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`

-+ test -z "$DEPDIR" && continue

-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`

-+ test -z "am__include" && continue

-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`

-+ # When using ansi2knr, U may be empty or an underscore; expand it

-+ U=`sed -n 's/^U = //p' < "$mf"`

-+ # Find all dependency output files, they are included files with

-+ # $(DEPDIR) in their names. We invoke sed twice because it is the

-+ # simplest approach to changing $(DEPDIR) to its actual value in the

-+ for file in `sed -n "

-+ s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \

-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do

-+ # Make sure the directory exists.

-+ test -f "$dirpart/$file" && continue

-+ fdir=`AS_DIRNAME(["$file"])`

-+ AS_MKDIR_P([$dirpart/$fdir])

-+ # echo "creating $dirpart/$file"

-+ echo '# dummy' > "$dirpart/$file"

- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS

-@@ -420,14 +354,14 @@

- # Do all the work for Automake. -*- Autoconf -*-

--# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.

-+# Free Software Foundation, Inc.

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

- # This macro actually does too much. Some checks are only needed if

- # your package does certain things. But this isn't really a big deal.

-@@ -444,20 +378,16 @@

- # arguments mandatory, and then we can depend on a new Autoconf

- # release and drop the old call support.

- AC_DEFUN([AM_INIT_AUTOMAKE],

--[AC_PREREQ([2.62])dnl

-+[AC_PREREQ([2.58])dnl

- dnl Autoconf wants to disallow AM_ names. We explicitly allow

- dnl the ones we care about.

- m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

- AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl

- AC_REQUIRE([AC_PROG_INSTALL])dnl

--if test "`cd $srcdir && pwd`" != "`pwd`"; then

-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output

-- # is not polluted with repeated "-I."

-- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl

-- # test to see if srcdir already configured

-- if test -f $srcdir/config.status; then

-- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

-+# test to see if srcdir already configured

-+if test "`cd $srcdir && pwd`" != "`pwd`" &&

-+ test -f $srcdir/config.status; then

-+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

- # test whether we have cygpath

-@@ -477,9 +407,6 @@

- AC_SUBST([PACKAGE], [$1])dnl

- AC_SUBST([VERSION], [$2])],

- [_AM_SET_OPTIONS([$1])dnl

--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.

--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,

-- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl

- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl

- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl

-@@ -495,8 +422,8 @@

- AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})

- AM_MISSING_PROG(AUTOHEADER, autoheader)

- AM_MISSING_PROG(MAKEINFO, makeinfo)

--AC_REQUIRE([AM_PROG_INSTALL_SH])dnl

--AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl

-+AM_PROG_INSTALL_SH

-+AM_PROG_INSTALL_STRIP

- AC_REQUIRE([AM_PROG_MKDIR_P])dnl

- # We need awk for the "check" target. The system "awk" is bad on

-@@ -504,37 +431,20 @@

- AC_REQUIRE([AC_PROG_MAKE_SET])dnl

- AC_REQUIRE([AM_SET_LEADING_DOT])dnl

- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],

-- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

-- [_AM_PROG_TAR([v7])])])

-+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],

-+ [_AM_PROG_TAR([v7])])])

- _AM_IF_OPTION([no-dependencies],,

- [AC_PROVIDE_IFELSE([AC_PROG_CC],

-- [_AM_DEPENDENCIES(CC)],

-- [define([AC_PROG_CC],

-- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

-+ [_AM_DEPENDENCIES(CC)],

-+ [define([AC_PROG_CC],

-+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl

- AC_PROVIDE_IFELSE([AC_PROG_CXX],

-- [_AM_DEPENDENCIES(CXX)],

-- [define([AC_PROG_CXX],

-- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

--AC_PROVIDE_IFELSE([AC_PROG_OBJC],

-- [_AM_DEPENDENCIES(OBJC)],

-- [define([AC_PROG_OBJC],

-- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

-+ [_AM_DEPENDENCIES(CXX)],

-+ [define([AC_PROG_CXX],

-+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

--_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl

--dnl The `parallel-tests' driver may need to know about EXEEXT, so add the

--dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro

--dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.

--AC_CONFIG_COMMANDS_PRE(dnl

--[m4_provide_if([_AM_COMPILER_EXEEXT],

-- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl

--dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not

--dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further

--dnl mangled by Autoconf and run in a shell conditional statement.

--m4_define([_AC_COMPILER_EXEEXT],

--m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])

- # When config.status generates a header, we must update the stamp-h file.

- # This file resides in the same directory as the config header

-@@ -545,19 +455,18 @@

- # our stamp files there.

- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],

- [# Compute $1's index in $config_headers.

- for _am_header in $config_headers :; do

- case $_am_header in

-- $_am_arg | $_am_arg:* )

- _am_stamp_count=`expr $_am_stamp_count + 1` ;;

--echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])

-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

-@@ -568,14 +477,7 @@

- # Define $install_sh.

- AC_DEFUN([AM_PROG_INSTALL_SH],

- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

--if test x"${install_sh}" != xset; then

-- case $am_aux_dir in

-- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

-- install_sh="\${SHELL} $am_aux_dir/install-sh"

-+install_sh=${install_sh-"$am_aux_dir/install-sh"}

- AC_SUBST(install_sh)])

-@@ -601,13 +503,13 @@

- # Check to see how 'make' treats includes. -*- Autoconf -*-

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

- # AM_MAKE_INCLUDE()

- # -----------------

-@@ -616,7 +518,7 @@

- [am_make=${MAKE-make}

- cat > confinc << 'END'

-- @echo this is the am__doit target

- # If we don't find an include directive, just comment out the code.

-@@ -626,24 +528,24 @@

- # First try GNU make style include.

- echo "include confinc" > confmf

--# Ignore all kinds of additional output from `make'.

--case `$am_make -s -f confmf 2> /dev/null` in #(

--*the\ am__doit\ target*)

-- am__include=include

-+# We grep out `Entering directory' and `Leaving directory'

-+# messages which can occur if `w' ends up in MAKEFLAGS.

-+# In particular we don't look at `^make:' because GNU make might

-+# be invoked under some other name (usually "gmake"), in which

-+# case it prints its new name instead of `make'.

-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

-+ am__include=include

- # Now try BSD make style include.

- if test "$am__include" = "#"; then

- echo '.include "confinc"' > confmf

-- case `$am_make -s -f confmf 2> /dev/null` in #(

-- *the\ am__doit\ target*)

-- am__include=.include

-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

-+ am__include=.include

- AC_SUBST([am__include])

- AC_SUBST([am__quote])

-@@ -653,14 +555,14 @@

- # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-

- # Free Software Foundation, Inc.

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

- # AM_MISSING_PROG(NAME, PROGRAM)

- # ------------------------------

-@@ -676,15 +578,7 @@

- # If it does, set am_missing_run to use it, otherwise, to nothing.

- AC_DEFUN([AM_MISSING_HAS_RUN],

- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

--AC_REQUIRE_AUX_FILE([missing])dnl

--if test x"${MISSING+set}" != xset; then

-- case $am_aux_dir in

-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

-- MISSING="\${SHELL} $am_aux_dir/missing" ;;

-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

- # Use eval to expand $SHELL

- if eval "$MISSING --run true"; then

- am_missing_run="$MISSING --run "

-@@ -694,7 +588,7 @@

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

-@@ -702,33 +596,70 @@

--# Check for `mkdir -p'.

-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.

-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories

-+# created by `make install' are always world readable, even if the

-+# installer happens to have an overly restrictive umask (e.g. 077).

-+# This was a mistake. There are at least two reasons why we must not

-+# - it causes special bits like SGID to be ignored,

-+# - it may be too restrictive (some setups expect 775 directories).

-+# Do not use -m 0755 and let people choose whatever they expect by

-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.

-+# Some implementations (such as Solaris 8's) are not thread-safe: if a

-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'

-+# concurrently, both version can detect that a/ is missing, but only

-+# one can create it and the other will error out. Consequently we

-+# restrict ourselves to GNU make (using the --version option ensures

- AC_DEFUN([AM_PROG_MKDIR_P],

--[AC_PREREQ([2.60])dnl

--AC_REQUIRE([AC_PROG_MKDIR_P])dnl

--dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,

--dnl while keeping a definition of mkdir_p for backward compatibility.

--dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.

--dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of

--dnl Makefile.ins that do not define MKDIR_P, so we do our own

--dnl adjustment using top_builddir (which is defined more often than

--AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl

-- [[\\/$]]* | ?:[[\\/]]*) ;;

-- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;

-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then

-+ # We used to keeping the `.' as first argument, in order to

-+ # allow $(mkdir_p) to be used without argument. As in

-+ # $(mkdir_p) $(somedir)

-+ # where $(somedir) is conditionally defined. However this is wrong

-+ # for two reasons:

-+ # 1. if the package is installed by a user who cannot write `.'

-+ # make install will fail,

-+ # 2. the above comment should most certainly read

-+ # $(mkdir_p) $(DESTDIR)$(somedir)

-+ # so it does not work when $(somedir) is undefined and

-+ # $(DESTDIR) is not.

-+ # To support the latter case, we have to write

-+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),

-+ # so the `.' trick is pointless.

-+ mkdir_p='mkdir -p --'

-+ # On NextStep and OpenStep, the `mkdir' command does not

-+ # recognize any option. It will interpret all options as

-+ # directories to create, and then abort because `.' already

-+ for d in ./-p ./--version;

-+ test -d $d && rmdir $d

-+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.

-+ if test -f "$ac_aux_dir/mkinstalldirs"; then

-+ mkdir_p='$(mkinstalldirs)'

-+ mkdir_p='$(install_sh) -d'

-+AC_SUBST([mkdir_p])])

- # Helper functions for option handling. -*- Autoconf -*-

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

- # _AM_MANGLE_OPTION(NAME)

- # -----------------------

-@@ -745,7 +676,7 @@

- # ----------------------------------

- # OPTIONS is a space-separated list of Automake options.

- AC_DEFUN([_AM_SET_OPTIONS],

--[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])

- # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])

- # -------------------------------------------

-@@ -755,14 +686,14 @@

- # Check to make sure that the build environment is sane. -*- Autoconf -*-

- # Free Software Foundation, Inc.

- # This file is free software; the Free Software Foundation

- # gives unlimited permission to copy and/or distribute it,

- # with or without modifications, as long as this notice is preserved.

-@@ -771,29 +702,16 @@

- echo timestamp > conftest.file

--# Reject unsafe characters in $srcdir or the absolute working directory

--# name. Accept space and tab only in the latter.

-- *[[\\\"\#\$\&\'\`$am_lf]]*)

-- AC_MSG_ERROR([unsafe absolute working directory name]);;

-- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)

-- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;

- # Do `set' in a subshell so we don't clobber the current shell's

- # arguments. Must try -L first in case configure is actually a

- # symlink; some systems play weird games with the mod time of symlinks

- # (eg FreeBSD returns the mod time of the symlink's containing

-- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

-+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

- if test "$[*]" = "X"; then

-- set X `ls -t "$srcdir/configure" conftest.file`

-+ set X `ls -t $srcdir/configure conftest.file`

- rm -f conftest.file

- if test "$[*]" != "X $srcdir/configure conftest.file" \

-@@ -843,28 +761,9 @@

- if test "$cross_compiling" != no; then

- AC_CHECK_TOOL([STRIP], [strip], :)

--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"

- AC_SUBST([INSTALL_STRIP_PROGRAM])])

--# This file is free software; the Free Software Foundation

--# gives unlimited permission to copy and/or distribute it,

--# with or without modifications, as long as this notice is preserved.

--# _AM_SUBST_NOTMAKE(VARIABLE)

--# ---------------------------

--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.

--# This macro is traced by Automake.

--AC_DEFUN([_AM_SUBST_NOTMAKE])

--# AM_SUBST_NOTMAKE(VARIABLE)

--# ---------------------------

--# Public sister of _AM_SUBST_NOTMAKE.

--AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])

- # Check how to create a tarball. -*- Autoconf -*-

-diff -Nur mpd-0.15.8.orig/compile mpd-0.15.8/compile

---- mpd-0.15.8.orig/compile 1970-01-01 01:00:00.000000000 +0100

-+++ mpd-0.15.8/compile 2009-05-17 15:07:30.000000000 +0200

-+# Wrapper for compilers which do not understand `-c -o'.

-+scriptversion=2005-05-14.22

-+# Written by Tom Tromey <tromey@cygnus.com>.

-+# This program is free software; you can redistribute it and/or modify

-+# it under the terms of the GNU General Public License as published by

-+# the Free Software Foundation; either version 2, or (at your option)

-+# any later version.

-+# This program is distributed in the hope that it will be useful,

-+# but WITHOUT ANY WARRANTY; without even the implied warranty of

-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

-+# GNU General Public License for more details.

-+# You should have received a copy of the GNU General Public License

-+# along with this program; if not, write to the Free Software

-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

-+# As a special exception to the GNU General Public License, if you

-+# distribute this file as part of a program that contains a

-+# configuration script generated by Autoconf, you may include it under

-+# the same distribution terms that you use for the rest of that program.

-+# This file is maintained in Automake, please report

-+# bugs to <bug-automake@gnu.org> or send patches to

-+# <automake-patches@gnu.org>.

-+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2

-+Usage: compile [--help] [--version] PROGRAM [ARGS]

-+Wrapper for compilers which do not understand `-c -o'.

-+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining

-+arguments, and rename the output as expected.

-+If you are trying to build a whole package this is not the

-+right script to run: please start by reading the file `INSTALL'.

-+Report bugs to <bug-automake@gnu.org>.

-+ echo "compile $scriptversion"

-+ if test -n "$eat"; then

-+ # configure might choose to run compile as `compile cc -o foo foo.c'.

-+ # So we strip `-o arg' only if arg is an object.

-+ set x "$@" -o "$2"

-+if test -z "$ofile" || test -z "$cfile"; then

-+ # If no `-o' option was seen then we might have been invoked from a

-+ # pattern rule where we don't need one. That is ok -- this is a

-+ # normal compilation that the losing compiler can handle. If no

-+ # `.c' file was seen then we are probably linking. That is also

-+# Name of file we expect compiler to create.

-+cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`

-+# Create the lock directory.

-+# Note: use `[/.-]' here to ensure that we don't use the same name

-+# that we are using for the .o file. Also, base the name on the expected

-+# object file name, since that is what matters with a parallel build.

-+lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d

-+ if mkdir "$lockdir" >/dev/null 2>&1; then

-+# FIXME: race condition here if user kills between mkdir and trap.

-+trap "rmdir '$lockdir'; exit 1" 1 2 15

-+# Run the compile.

-+if test -f "$cofile"; then

-+ mv "$cofile" "$ofile"

-+elif test -f "${cofile}bj"; then

-+ mv "${cofile}bj" "$ofile"

-+# Local Variables:

-+# mode: shell-script

-+# sh-indentation: 2

-+# eval: (add-hook 'write-file-hooks 'time-stamp)

-+# time-stamp-start: "scriptversion="

-+# time-stamp-format: "%:y-%02m-%02d.%02H"

-+# time-stamp-end: "$"

-diff -Nur mpd-0.15.8.orig/configure mpd-0.15.8/configure

---- mpd-0.15.8.orig/configure 2010-01-18 02:27:53.000000000 +0100

-+++ mpd-0.15.8/configure 2010-02-18 23:52:08.980854427 +0100

-@@ -594,9 +594,7 @@

- # include <unistd.h>

--ac_subst_vars='am__EXEEXT_FALSE

-+ac_subst_vars='LTLIBOBJS

-@@ -806,7 +804,6 @@

- INSTALL_STRIP_PROGRAM

-@@ -818,7 +815,6 @@

-@@ -2703,8 +2699,7 @@

--am__api_version='1.11'

-+am__api_version="1.9"

- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do

- for ac_t in install-sh install.sh shtool; do

-@@ -2826,29 +2821,16 @@

- echo timestamp > conftest.file

--# Reject unsafe characters in $srcdir or the absolute working directory

--# name. Accept space and tab only in the latter.

-- *[\\\"\#\$\&\'\`$am_lf]*)

-- as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;

-- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)

-- as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;

- # Do `set' in a subshell so we don't clobber the current shell's

- # arguments. Must try -L first in case configure is actually a

- # symlink; some systems play weird games with the mod time of symlinks

- # (eg FreeBSD returns the mod time of the symlink's containing

-- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`

-+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`

- if test "$*" = "X"; then

-- set X `ls -t "$srcdir/configure" conftest.file`

-+ set X `ls -t $srcdir/configure conftest.file`

- rm -f conftest.file

- if test "$*" != "X $srcdir/configure conftest.file" \

-@@ -2886,14 +2868,7 @@

- # expand $ac_aux_dir to an absolute path

- am_aux_dir=`cd $ac_aux_dir && pwd`

--if test x"${MISSING+set}" != xset; then

-- case $am_aux_dir in

-- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;

-- MISSING="\${SHELL} $am_aux_dir/missing" ;;

-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"

- # Use eval to expand $SHELL

- if eval "$MISSING --run true"; then

- am_missing_run="$MISSING --run "

-@@ -2903,162 +2878,38 @@

- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}

--if test x"${install_sh}" != xset; then

-- case $am_aux_dir in

-- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;

-- install_sh="\${SHELL} $am_aux_dir/install-sh"

--# Installed binaries are usually stripped using `strip' when the user

--# run `make install-strip'. However `strip' might not be the right

--# tool to use in cross-compilation environments, therefore Automake

--# will honor the `STRIP' environment variable to overrule this program.

--if test "$cross_compiling" != no; then

-- if test -n "$ac_tool_prefix"; then

-- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

--set dummy ${ac_tool_prefix}strip; ac_word=$2

--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

--$as_echo_n "checking for $ac_word... " >&6; }

--if test "${ac_cv_prog_STRIP+set}" = set; then :

-- $as_echo_n "(cached) " >&6

-- if test -n "$STRIP"; then

-- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

--for as_dir in $PATH

-- test -z "$as_dir" && as_dir=.

-- for ac_exec_ext in '' $ac_executable_extensions; do

-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

-- ac_cv_prog_STRIP="${ac_tool_prefix}strip"

-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

--STRIP=$ac_cv_prog_STRIP

--if test -n "$STRIP"; then

-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

--$as_echo "$STRIP" >&6; }

-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

--$as_echo "no" >&6; }

--if test -z "$ac_cv_prog_STRIP"; then

-- ac_ct_STRIP=$STRIP

-- # Extract the first word of "strip", so it can be a program name with args.

--set dummy strip; ac_word=$2

--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

--$as_echo_n "checking for $ac_word... " >&6; }

--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

-- $as_echo_n "(cached) " >&6

-- if test -n "$ac_ct_STRIP"; then

-- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

--for as_dir in $PATH

-- test -z "$as_dir" && as_dir=.

-- for ac_exec_ext in '' $ac_executable_extensions; do

-- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

-- ac_cv_prog_ac_ct_STRIP="strip"

-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

--ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

--if test -n "$ac_ct_STRIP"; then

-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

--$as_echo "$ac_ct_STRIP" >&6; }

-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

--$as_echo "no" >&6; }

-- if test "x$ac_ct_STRIP" = x; then

-- case $cross_compiling:$ac_tool_warned in

--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

--ac_tool_warned=yes ;;

-- STRIP=$ac_ct_STRIP

-- STRIP="$ac_cv_prog_STRIP"

--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"

--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5

--$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }

--if test -z "$MKDIR_P"; then

-- if test "${ac_cv_path_mkdir+set}" = set; then :

-- $as_echo_n "(cached) " >&6

-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

--for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin

-- test -z "$as_dir" && as_dir=.

-- for ac_prog in mkdir gmkdir; do

-- for ac_exec_ext in '' $ac_executable_extensions; do

-- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue

-- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(

-- 'mkdir (GNU coreutils) '* | \

-- 'mkdir (coreutils) '* | \

-- 'mkdir (fileutils) '4.1*)

-- ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext

-+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then

-+ # We used to keeping the `.' as first argument, in order to

-+ # allow $(mkdir_p) to be used without argument. As in

-+ # $(mkdir_p) $(somedir)

-+ # where $(somedir) is conditionally defined. However this is wrong

-+ # for two reasons:

-+ # 1. if the package is installed by a user who cannot write `.'

-+ # make install will fail,

-+ # 2. the above comment should most certainly read

-+ # $(mkdir_p) $(DESTDIR)$(somedir)

-+ # so it does not work when $(somedir) is undefined and

-+ # $(DESTDIR) is not.

-+ # To support the latter case, we have to write

-+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),

-+ # so the `.' trick is pointless.

-+ mkdir_p='mkdir -p --'

-+ # On NextStep and OpenStep, the `mkdir' command does not

-+ # recognize any option. It will interpret all options as

-+ # directories to create, and then abort because `.' already

-+ for d in ./-p ./--version;

-+ test -d $d && rmdir $d

-- test -d ./--version && rmdir ./--version

-- if test "${ac_cv_path_mkdir+set}" = set; then

-- MKDIR_P="$ac_cv_path_mkdir -p"

-+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.

-+ if test -f "$ac_aux_dir/mkinstalldirs"; then

-+ mkdir_p='$(mkinstalldirs)'

-- # As a last resort, use the slow shell script. Don't cache a

-- # value for MKDIR_P within a source directory, because that will

-- # break other packages using the cache if that directory is

-- # removed, or if the value is a relative name.

-- MKDIR_P="$ac_install_sh -d"

-+ mkdir_p='$(install_sh) -d'

--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5

--$as_echo "$MKDIR_P" >&6; }

--mkdir_p="$MKDIR_P"

-- [\\/$]* | ?:[\\/]*) ;;

-- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;

- for ac_prog in gawk mawk nawk awk

-@@ -3142,14 +2993,10 @@

- rmdir .tst 2>/dev/null

--if test "`cd $srcdir && pwd`" != "`pwd`"; then

-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output

-- # is not polluted with repeated "-I."

-- am__isrc=' -I$(srcdir)'

-- # test to see if srcdir already configured

-- if test -f $srcdir/config.status; then

-- as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

-+# test to see if srcdir already configured

-+if test "`cd $srcdir && pwd`" != "`pwd`" &&

-+ test -f $srcdir/config.status; then

-+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5

- # test whether we have cygpath

-@@ -3192,6 +3039,108 @@

- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}

-+install_sh=${install_sh-"$am_aux_dir/install-sh"}

-+# Installed binaries are usually stripped using `strip' when the user

-+# run `make install-strip'. However `strip' might not be the right

-+# tool to use in cross-compilation environments, therefore Automake

-+# will honor the `STRIP' environment variable to overrule this program.

-+if test "$cross_compiling" != no; then

-+ if test -n "$ac_tool_prefix"; then

-+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

-+set dummy ${ac_tool_prefix}strip; ac_word=$2

-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

-+$as_echo_n "checking for $ac_word... " >&6; }

-+if test "${ac_cv_prog_STRIP+set}" = set; then :

-+ $as_echo_n "(cached) " >&6

-+ if test -n "$STRIP"; then

-+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.

-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-+for as_dir in $PATH

-+ test -z "$as_dir" && as_dir=.

-+ for ac_exec_ext in '' $ac_executable_extensions; do

-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

-+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"

-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

-+STRIP=$ac_cv_prog_STRIP

-+if test -n "$STRIP"; then

-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5

-+$as_echo "$STRIP" >&6; }

-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-+$as_echo "no" >&6; }

-+if test -z "$ac_cv_prog_STRIP"; then

-+ ac_ct_STRIP=$STRIP

-+ # Extract the first word of "strip", so it can be a program name with args.

-+set dummy strip; ac_word=$2

-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5

-+$as_echo_n "checking for $ac_word... " >&6; }

-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :

-+ $as_echo_n "(cached) " >&6

-+ if test -n "$ac_ct_STRIP"; then

-+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.

-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-+for as_dir in $PATH

-+ test -z "$as_dir" && as_dir=.

-+ for ac_exec_ext in '' $ac_executable_extensions; do

-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

-+ ac_cv_prog_ac_ct_STRIP="strip"

-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5

-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP

-+if test -n "$ac_ct_STRIP"; then

-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5

-+$as_echo "$ac_ct_STRIP" >&6; }

-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-+$as_echo "no" >&6; }

-+ if test "x$ac_ct_STRIP" = x; then

-+ case $cross_compiling:$ac_tool_warned in

-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5

-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}

-+ac_tool_warned=yes ;;

-+ STRIP=$ac_ct_STRIP

-+ STRIP="$ac_cv_prog_STRIP"

-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"

- # We need awk for the "check" target. The system "awk" is bad on

- # Always define AMTAR for backward compatibility.

-@@ -3222,7 +3171,7 @@

- am_make=${MAKE-make}

- cat > confinc << 'END'

-- @echo this is the am__doit target

- # If we don't find an include directive, just comment out the code.

-@@ -3233,24 +3182,24 @@

- # First try GNU make style include.

- echo "include confinc" > confmf

--# Ignore all kinds of additional output from `make'.

--case `$am_make -s -f confmf 2> /dev/null` in #(

--*the\ am__doit\ target*)

-- am__include=include

-+# We grep out `Entering directory' and `Leaving directory'

-+# messages which can occur if `w' ends up in MAKEFLAGS.

-+# In particular we don't look at `^make:' because GNU make might

-+# be invoked under some other name (usually "gmake"), in which

-+# case it prints its new name instead of `make'.

-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then

-+ am__include=include

- # Now try BSD make style include.

- if test "$am__include" = "#"; then

- echo '.include "confinc"' > confmf

-- case `$am_make -s -f confmf 2> /dev/null` in #(

-- *the\ am__doit\ target*)

-- am__include=.include

-+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then

-+ am__include=.include

-@@ -3267,7 +3216,9 @@

- am_depcomp="$ac_aux_dir/depcomp"

- AMDEPBACKSLASH='\'

-- if test "x$enable_dependency_tracking" != xno; then

-+if test "x$enable_dependency_tracking" != xno; then

-@@ -3276,6 +3227,7 @@

- ac_cpp='$CPP $CPPFLAGS'

- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

-@@ -4097,11 +4049,6 @@

- if test "$am_compiler_list" = ""; then

- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

-- am__universal=false

-- case " $depcc " in #(

-- *\ -arch\ *\ -arch\ *) am__universal=true ;;

- for depmode in $am_compiler_list; do

- # Setup a source with many dependencies, because some compilers

- # like to wrap large dependency lists on column 80 (with \), and

-@@ -4119,17 +4066,7 @@

- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

-- # We check with `-c' and `-o' for the sake of the "dashmstdout"

-- # mode. It turns out that the SunPro C++ compiler does not properly

-- # handle `-M -o', and we need to detect this. Also, some Intel

-- # versions had trouble with output in subdirs

-- am__obj=sub/conftest.${OBJEXT-o}

-- am__minus_obj="-o $am__obj"

-- # This depmode causes a compiler race in universal mode.

-- test "$am__universal" = false || continue

- # after this tag, mechanisms are not by side-effect, so they'll

- # only be used when explicitly requested

-@@ -4139,23 +4076,18 @@

-- msvisualcpp | msvcmsys)

-- # This compiler won't grok `-c -o', but also, the minuso test has

-- # not run yet. These depmodes are late enough in the game, and

-- # so weak that their functioning should not be impacted.

-- am__obj=conftest.${OBJEXT-o}

-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

-+ # mode. It turns out that the SunPro C++ compiler does not properly

-+ # handle `-M -o', and we need to detect this.

- if depmode=$depmode \

-- source=sub/conftest.c object=$am__obj \

-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

-- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

- >/dev/null 2>conftest.err &&

-- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

-- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

- # icc doesn't choke on unknown options, it will just issue warnings

- # or remarks (even with -Werror). So we grep stderr for any message

-@@ -4183,7 +4115,9 @@

- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }

- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type

- test "x$enable_dependency_tracking" != xno \

- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then

- am__fastdepCC_TRUE=

-@@ -4658,11 +4592,6 @@

- if test "$am_compiler_list" = ""; then

- am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`

-- am__universal=false

-- case " $depcc " in #(

-- *\ -arch\ *\ -arch\ *) am__universal=true ;;

- for depmode in $am_compiler_list; do

- # Setup a source with many dependencies, because some compilers

- # like to wrap large dependency lists on column 80 (with \), and

-@@ -4680,17 +4609,7 @@

- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf

-- # We check with `-c' and `-o' for the sake of the "dashmstdout"

-- # mode. It turns out that the SunPro C++ compiler does not properly

-- # handle `-M -o', and we need to detect this. Also, some Intel

-- # versions had trouble with output in subdirs

-- am__obj=sub/conftest.${OBJEXT-o}

-- am__minus_obj="-o $am__obj"

-- # This depmode causes a compiler race in universal mode.

-- test "$am__universal" = false || continue

- # after this tag, mechanisms are not by side-effect, so they'll

- # only be used when explicitly requested

-@@ -4700,23 +4619,18 @@

-- msvisualcpp | msvcmsys)

-- # This compiler won't grok `-c -o', but also, the minuso test has

-- # not run yet. These depmodes are late enough in the game, and

-- # so weak that their functioning should not be impacted.

-- am__obj=conftest.${OBJEXT-o}

-+ # We check with `-c' and `-o' for the sake of the "dashmstdout"

-+ # mode. It turns out that the SunPro C++ compiler does not properly

-+ # handle `-M -o', and we need to detect this.

- if depmode=$depmode \

-- source=sub/conftest.c object=$am__obj \

-+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \

- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

-- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \

-+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

- >/dev/null 2>conftest.err &&

-- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

-- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&

-+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

- # icc doesn't choke on unknown options, it will just issue warnings

- # or remarks (even with -Werror). So we grep stderr for any message

-@@ -4744,7 +4658,9 @@

- $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }

- CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type

- test "x$enable_dependency_tracking" != xno \

- && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then

- am__fastdepCXX_TRUE=

-@@ -6037,7 +5953,9 @@

-- if test x$enable_cue = xyes; then

-+if test x$enable_cue = xyes; then

- HAVE_CUE_FALSE='#'

-@@ -6217,7 +6135,9 @@

-- if test x$with_zeroconf != xno; then

-+if test x$with_zeroconf != xno; then

- HAVE_ZEROCONF_TRUE=

- HAVE_ZEROCONF_FALSE='#'

-@@ -6225,7 +6145,9 @@

- HAVE_ZEROCONF_FALSE=

-- if test x$with_zeroconf = xavahi; then

-+if test x$with_zeroconf = xavahi; then

- HAVE_AVAHI_FALSE='#'

-@@ -6233,7 +6155,9 @@

-- if test x$with_zeroconf = xbonjour; then

-+if test x$with_zeroconf = xbonjour; then

- HAVE_BONJOUR_TRUE=

- HAVE_BONJOUR_FALSE='#'

-@@ -6370,7 +6294,9 @@

-- if test x$enable_sqlite = xyes; then

-+if test x$enable_sqlite = xyes; then

- ENABLE_SQLITE_TRUE=

- ENABLE_SQLITE_FALSE='#'

-@@ -6508,7 +6434,9 @@

- $as_echo "#define HAVE_CURL 1" >>confdefs.h

-- if test x$enable_curl = xyes; then

-+if test x$enable_curl = xyes; then

- HAVE_CURL_FALSE='#'

-@@ -6534,7 +6462,9 @@

- $as_echo "#define ENABLE_LASTFM 1" >>confdefs.h

-- if test x$enable_lastfm = xyes; then

-+if test x$enable_lastfm = xyes; then

- ENABLE_LASTFM_TRUE=

- ENABLE_LASTFM_FALSE='#'

-@@ -6670,7 +6600,9 @@

- $as_echo "#define ENABLE_MMS 1" >>confdefs.h

-- if test x$enable_mms = xyes; then

-+if test x$enable_mms = xyes; then

- ENABLE_MMS_FALSE='#'

-@@ -6734,7 +6666,9 @@

-- if test x$enable_bzip2 = xyes; then

-+if test x$enable_bzip2 = xyes; then

- HAVE_BZ2_FALSE='#'

-@@ -6871,7 +6805,9 @@

-- if test x$enable_zip = xyes; then

-+if test x$enable_zip = xyes; then

- HAVE_ZIP_FALSE='#'

-@@ -7008,7 +6944,9 @@

-- if test x$enable_iso9660 = xyes; then

-+if test x$enable_iso9660 = xyes; then

- HAVE_ISO_FALSE='#'

-@@ -7034,7 +6972,9 @@

-- if test x$enable_archive = xyes; then

-+if test x$enable_archive = xyes; then

- ENABLE_ARCHIVE_TRUE=

- ENABLE_ARCHIVE_FALSE='#'

-@@ -7209,7 +7149,9 @@

- $as_echo "#define HAVE_MAD 1" >>confdefs.h

-- if test x$enable_mad = xyes; then

-+if test x$enable_mad = xyes; then

- HAVE_MAD_FALSE='#'

-@@ -7280,7 +7222,9 @@

-- if test x$enable_mikmod = xyes; then

-+if test x$enable_mikmod = xyes; then

- ENABLE_MIKMOD_DECODER_TRUE=

- ENABLE_MIKMOD_DECODER_FALSE='#'

-@@ -7436,7 +7380,9 @@

-- if test x$enable_modplug = xyes; then

-+if test x$enable_modplug = xyes; then

- HAVE_MODPLUG_TRUE=

- HAVE_MODPLUG_FALSE='#'

-@@ -7695,7 +7641,9 @@

-- if test x$enable_sidplay = xyes; then

-+if test x$enable_sidplay = xyes; then

- ENABLE_SIDPLAY_TRUE=

- ENABLE_SIDPLAY_FALSE='#'

-@@ -7936,7 +7884,9 @@

-- if test x$enable_lsr = xyes; then

-+if test x$enable_lsr = xyes; then

- HAVE_LIBSAMPLERATE_TRUE=

- HAVE_LIBSAMPLERATE_FALSE='#'

-@@ -8101,7 +8051,9 @@

-- if test x$enable_ao = xyes; then

-+if test x$enable_ao = xyes; then

-@@ -8131,7 +8083,9 @@

- $as_echo "#define ENABLE_PIPE_OUTPUT 1" >>confdefs.h

-- if test x$enable_pipe_output = xyes; then

-+if test x$enable_pipe_output = xyes; then

- ENABLE_PIPE_OUTPUT_TRUE=

- ENABLE_PIPE_OUTPUT_FALSE='#'

-@@ -8288,7 +8242,9 @@

-- if test x$enable_jack = xyes; then

-+if test x$enable_jack = xyes; then

- HAVE_JACK_FALSE='#'

-@@ -8441,7 +8397,9 @@

-- if test x$enable_pulse = xyes; then

-+if test x$enable_pulse = xyes; then

- HAVE_PULSE_FALSE='#'

-@@ -8468,7 +8426,9 @@

-- if test x$enable_osx = xyes; then

-+if test x$enable_osx = xyes; then

- HAVE_OSX_FALSE='#'

-@@ -8617,7 +8577,9 @@

-- if test x$enable_solaris_output = xyes; then

-+if test x$enable_solaris_output = xyes; then

- ENABLE_SOLARIS_OUTPUT_TRUE=

- ENABLE_SOLARIS_OUTPUT_FALSE='#'

-@@ -8641,7 +8603,9 @@

-- if test x$enable_oss = xyes; then

-+if test x$enable_oss = xyes; then

- HAVE_OSS_FALSE='#'

-@@ -8663,7 +8627,9 @@

-- if test x$enable_fifo = xyes; then

-+if test x$enable_fifo = xyes; then

- HAVE_FIFO_FALSE='#'

-@@ -8678,7 +8644,9 @@

-- if test x$enable_mvp = xyes; then

-+if test x$enable_mvp = xyes; then

- HAVE_MVP_FALSE='#'

-@@ -8808,7 +8776,9 @@

-- if test x$enable_alsa = xyes; then

-+if test x$enable_alsa = xyes; then

- HAVE_ALSA_FALSE='#'

-@@ -8979,7 +8949,9 @@

-- if test x$enable_id3 = xyes; then

-+if test x$enable_id3 = xyes; then

- HAVE_ID3TAG_FALSE='#'

-@@ -9081,7 +9053,9 @@

- CPPFLAGS=$oldcppflags

-- if test x$enable_mpc = xyes; then

-+if test x$enable_mpc = xyes; then

- HAVE_MPCDEC_FALSE='#'

-@@ -9169,7 +9143,9 @@

-- if test x$enable_wavpack = xyes; then

-+if test x$enable_wavpack = xyes; then

- HAVE_WAVPACK_TRUE=

- HAVE_WAVPACK_FALSE='#'

-@@ -9612,7 +9588,9 @@

-- if test x$enable_aac = xyes; then

-+if test x$enable_aac = xyes; then

- HAVE_FAAD_FALSE='#'

-@@ -9621,7 +9599,9 @@

-- if test x$enable_mp4 = xyes; then

-+if test x$enable_mp4 = xyes; then

- HAVE_MP4_FALSE='#'

-@@ -9773,7 +9753,9 @@

-- if test x$enable_vorbis = xyes; then

-+if test x$enable_vorbis = xyes; then

- ENABLE_VORBIS_DECODER_TRUE=

- ENABLE_VORBIS_DECODER_FALSE='#'

-@@ -9887,7 +9869,9 @@

-- if test x$enable_flac = xyes; then

-+if test x$enable_flac = xyes; then

- HAVE_FLAC_FALSE='#'

-@@ -10059,7 +10043,9 @@

-- if test x$enable_oggflac = xyes; then

-+if test x$enable_oggflac = xyes; then

- HAVE_OGGFLAC_TRUE=

- HAVE_OGGFLAC_FALSE='#'

-@@ -10068,7 +10054,9 @@

-- if test x$enable_flac = xyes || test x$enable_oggflac = xyes; then

-+if test x$enable_flac = xyes || test x$enable_oggflac = xyes; then

- HAVE_FLAC_COMMON_TRUE=

- HAVE_FLAC_COMMON_FALSE='#'

-@@ -10076,7 +10064,9 @@

- HAVE_FLAC_COMMON_FALSE=

-- if test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes; then

-+if test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes; then

- HAVE_OGG_COMMON_TRUE=

- HAVE_OGG_COMMON_FALSE='#'

-@@ -10161,7 +10151,9 @@

-- if test x$enable_audiofile = xyes; then

-+if test x$enable_audiofile = xyes; then

- HAVE_AUDIOFILE_TRUE=

- HAVE_AUDIOFILE_FALSE='#'

-@@ -10362,7 +10354,9 @@

-- if test x$enable_ffmpeg = xyes; then

-+if test x$enable_ffmpeg = xyes; then

- HAVE_FFMPEG_FALSE='#'

-@@ -10447,7 +10441,9 @@

-- if test x$enable_fluidsynth = xyes; then

-+if test x$enable_fluidsynth = xyes; then

- ENABLE_FLUIDSYNTH_TRUE=

- ENABLE_FLUIDSYNTH_FALSE='#'

-@@ -10522,7 +10518,9 @@

-- if test x$enable_wildmidi = xyes; then

-+if test x$enable_wildmidi = xyes; then

- ENABLE_WILDMIDI_TRUE=

- ENABLE_WILDMIDI_FALSE='#'

-@@ -10694,8 +10692,6 @@

- LAME_LIBS="-L$lame_libraries"

- elif test "x$lame_prefix" != "x" ; then

- LAME_LIBS="-L$lame_prefix/lib"

-- elif test "x$prefix" != "xNONE" ; then

-- LAME_LIBS="-L$prefix/lib"

- LAME_LIBS="$LAME_LIBS -lmp3lame -lm"

-@@ -10704,8 +10700,6 @@

- LAME_CFLAGS="-I$lame_includes"

- elif test "x$lame_prefix" != "x" ; then

- LAME_CFLAGS="-I$lame_prefix/include"

-- elif test "x$prefix" != "xNONE"; then

-- LAME_CFLAGS="-I$prefix/include"

- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblame" >&5

-@@ -10890,7 +10884,9 @@

-- if test x$enable_shout = xyes; then

-+if test x$enable_shout = xyes; then

- HAVE_SHOUT_FALSE='#'

-@@ -10904,7 +10900,9 @@

-- if test x$enable_httpd_output = xyes; then

-+if test x$enable_httpd_output = xyes; then

- ENABLE_HTTPD_OUTPUT_TRUE=

- ENABLE_HTTPD_OUTPUT_FALSE='#'

-@@ -10918,7 +10916,9 @@

-- if test x$enable_encoder = xyes; then

-+if test x$enable_encoder = xyes; then

- ENABLE_ENCODER_TRUE=

- ENABLE_ENCODER_FALSE='#'

-@@ -10927,7 +10927,9 @@

-- if test x$enable_vorbis_encoder = xyes; then

-+if test x$enable_vorbis_encoder = xyes; then

- ENABLE_VORBIS_ENCODER_TRUE=

- ENABLE_VORBIS_ENCODER_FALSE='#'

-@@ -10941,7 +10943,9 @@

-- if test x$enable_lame_encoder = xyes; then

-+if test x$enable_lame_encoder = xyes; then

- ENABLE_LAME_ENCODER_TRUE=

- ENABLE_LAME_ENCODER_FALSE='#'

-@@ -11007,7 +11011,9 @@

-- if test x$XMLTO != x; then

-+if test x$XMLTO != x; then

- HAVE_XMLTO_FALSE='#'

-@@ -11062,7 +11068,9 @@

- HAVE_XMLTO_FALSE='#'

-@@ -11072,7 +11080,9 @@

-- if test x$enable_documentation = xyes; then

-+if test x$enable_documentation = xyes; then

- ENABLE_DOCUMENTATION_TRUE=

- ENABLE_DOCUMENTATION_FALSE='#'

-@@ -11129,7 +11139,9 @@

-- if test "x$enable_test" = xyes; then

-+if test "x$enable_test" = xyes; then

- ENABLE_TEST_FALSE='#'

-@@ -11925,14 +11937,6 @@

- LTLIBOBJS=$ac_ltlibobjs

-- if test -n "$EXEEXT"; then

-- am__EXEEXT_FALSE='#'

-- am__EXEEXT_TRUE='#'

-- am__EXEEXT_FALSE=

- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then

- as_fn_error "conditional \"AMDEP\" was never defined.

- Usually this means the macro was only invoked conditionally." "$LINENO" 5

-@@ -12630,7 +12634,6 @@

- INSTALL='$INSTALL'

--MKDIR_P='$MKDIR_P'

- test -n "\$AWK" || AWK=awk

-@@ -13183,11 +13186,6 @@

- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;

- *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;

-- ac_MKDIR_P=$MKDIR_P

-- [\\/$]* | ?:[\\/]* ) ;;

-- */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;

- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1

-@@ -13242,7 +13240,6 @@

- s&@abs_builddir@&$ac_abs_builddir&;t t

- s&@abs_top_builddir@&$ac_abs_top_builddir&;t t

- s&@INSTALL@&$ac_INSTALL&;t t

--s&@MKDIR_P@&$ac_MKDIR_P&;t t

- $ac_datarootdir_hack

- eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \

-@@ -13287,22 +13284,21 @@

- || as_fn_error "could not create -" "$LINENO" 5

- # Compute "$ac_file"'s index in $config_headers.

--_am_arg="$ac_file"

- for _am_header in $config_headers :; do

- case $_am_header in

-- $_am_arg | $_am_arg:* )

-+ "$ac_file" | "$ac_file":* )

- _am_stamp_count=`expr $_am_stamp_count + 1` ;;

--echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||

--$as_expr X"$_am_arg" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

-- X"$_am_arg" : 'X$//$[^/]' \| \

-- X"$_am_arg" : 'X$//$$' \| \

-- X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||

--$as_echo X"$_am_arg" |

-+echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" ||

-+$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \

-+ X"$ac_file" : 'X$//$[^/]' \| \

-+ X"$ac_file" : 'X$//$$' \| \

-+ X"$ac_file" : 'X$/$' \| . 2>/dev/null ||

-+$as_echo X"$ac_file" |

- sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{

-@@ -13329,28 +13325,17 @@

- case $ac_file$ac_mode in

-- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {