19 files changed, 2220 insertions, 0 deletions
diff --git a/package/confuse/Makefile b/package/confuse/Makefile
new file mode 100755
index 000000000..289bc0d0c
--- /dev/null
+++ b/package/confuse/Makefile
@@ -0,0 +1,25 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		confuse
+PKG_VERSION:=		2.7
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		45932fdeeccbb9ef4228f1c1a25e9c8f
+PKG_DESCR:=		a configuration file parser library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.nongnu.org/confuse/
+PKG_SITES:=		http://savannah.nongnu.org/download/confuse/
+
+PKG_SUBPKGS:=		LIBCONFUSE
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBCONFUSE,libconfuse,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libconfuse-install:
+	${INSTALL_DIR} ${IDIR_LIBCONFUSE}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libconfuse.so* ${IDIR_LIBCONFUSE}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/forked-daapd/Makefile b/package/forked-daapd/Makefile
new file mode 100644
index 000000000..7b11a7523
--- /dev/null
+++ b/package/forked-daapd/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		forked-daapd
+PKG_VERSION:=		0.16
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		cc35619babefea35db9ee22e6f1d036b
+PKG_DESCR:=		DAAPD server
+PKG_SECTION:=		multimedia
+PKG_DEPENDS:=		libunistring zlib libconfuse sqlite ffmpeg libgcrypt
+PKG_DEPENDS+=		libavahi libmxml libevent libavl libantlr3c alsa-lib
+PKG_DEPENDS+=		libsqlite libintl dbus
+PKG_BUILDDEP:=		libunistring zlib confuse avahi sqlite ffmpeg dbus
+PKG_BUILDDEP+=		mxml libevent libavl libantlr3c alsa-lib libgcrypt
+PKG_SITES:=		http://alioth.debian.org/~jblache/forked-daapd/
+
+PKG_CFLINE_FORKED_DAAPD:=	select ADK_KERNEL_INOTIFY_USER
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,FORKED_DAAPD,forked-daapd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+forked-daapd-install:
+	$(INSTALL_DIR) $(IDIR_FORKED_DAAPD)/etc
+	$(CP) ./files/forked-daapd.conf \
+		$(IDIR_FORKED_DAAPD)/etc
+	$(INSTALL_DIR) $(IDIR_FORKED_DAAPD)/usr/lib/forked-daapd
+	$(CP) $(WRKINST)/usr/lib/forked-daapd/*.so \
+		$(IDIR_FORKED_DAAPD)/usr/lib/forked-daapd
+	$(INSTALL_DIR) $(IDIR_FORKED_DAAPD)/usr/sbin
+	$(INSTALL_BIN) $(WRKINST)/usr/sbin/forked-daapd \
+		$(IDIR_FORKED_DAAPD)/usr/sbin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/forked-daapd/files/forked-daapd.conf b/package/forked-daapd/files/forked-daapd.conf
new file mode 100644
index 000000000..d684ec32a
--- /dev/null
+++ b/package/forked-daapd/files/forked-daapd.conf
@@ -0,0 +1,54 @@
+
+general {
+	# Username
+	uid = "daapd"
+	logfile = "/var/log/forked-daapd.log"
+	# Database location
+	db_path = "/srv/music/.forked-daapd/songs3.db"
+	# Available levels: fatal, log, warning, info, debug, spam
+	loglevel = log
+	# Admin password for the non-existent web interface
+	admin_password = "unused"
+	# Enable/disable IPv6
+	ipv6 = no
+}
+
+# Library configuration
+library {
+	# Name of the library as displayed by the clients
+	# %h: hostname, %v: version
+	name = "My Music on %h"
+	# TCP port to listen on. Default port is 3689 (daap)
+	port = 3689
+	# Password for the library. Optional.
+#	password = ""
+
+	# Directories to index
+	directories = { "/srv/music" }
+	# Directories containing compilations
+	# Matches anywhere in the path (not a regexp, though)
+#	compilations = { "/compilations/" }
+
+	# Should iTunes metadata override ours?
+#	itunes_overrides = true
+
+	# Formats: mp4a, mp4v, mpeg, alac, flac, mpc, ogg, wma, wmal, wmav, aif, wav
+	# Formats that should never be transcoded
+#	no_transcode = { "alac", "mp4a" }
+	# Formats that should always be transcoded
+#	force_transcode = { "ogg", "flac" }
+}
+
+# Local audio output
+audio {
+	# AirTunes name - used in the speaker list in Remote
+	nickname = "Computer"
+	# Audio device name for local audio output
+#	card = "default"
+}
+
+# Airport Express device
+#apex "ApEx" {
+	# AirTunes password
+#	password = "s1kr3t"
+#}
diff --git a/package/forked-daapd/files/forked-daapd.init b/package/forked-daapd/files/forked-daapd.init
new file mode 100644
index 000000000..5b4139ea6
--- /dev/null
+++ b/package/forked-daapd/files/forked-daapd.init
@@ -0,0 +1,28 @@
+#!/bin/sh
+#PKG forked-daapd
+#INIT 85
+
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+	test x"${forked_daapd:-NO}" = x"NO" && exit 0
+	exec sh $0 start
+	;;
+start)
+	/usr/sbin/forked-daapd
+	;;
+stop)
+	kill $(pgrep -f /usr/sbin/forked-daapd)
+	;;
+restart)
+	sh $0 stop
+	sh $0 start
+	;;
+*)
+	echo "Usage: $0 {start | stop | restart}"
+	exit 1
+	;;
+esac
+exit $?
diff --git a/package/forked-daapd/files/forked-daapd.postinst b/package/forked-daapd/files/forked-daapd.postinst
new file mode 100644
index 000000000..74a3b43bf
--- /dev/null
+++ b/package/forked-daapd/files/forked-daapd.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+gid=$(get_next_gid)
+add_group daapd $gid
+add_user daapd $(get_next_uid) $gid
+add_rcconf forked_daapd forked_daapd NO
+
diff --git a/package/forked-daapd/patches/patch-config_h_in b/package/forked-daapd/patches/patch-config_h_in
new file mode 100644
index 000000000..9088c47da
--- /dev/null
+++ b/package/forked-daapd/patches/patch-config_h_in
@@ -0,0 +1,10 @@
+--- forked-daapd-0.16.orig/config.h.in	2011-04-30 11:43:23.000000000 +0200
++++ forked-daapd-0.16/config.h.in	2011-05-10 14:39:41.000000000 +0200
+@@ -1,5 +1,7 @@
+ /* config.h.in.  Generated from configure.in by autoheader.  */
+ 
++#define pipe2(a,b) pipe(a)
++
+ /* Define to 1 if you have the <dirent.h> header file. */
+ #undef HAVE_DIRENT_H
+ 
diff --git a/package/libantlr3c/Makefile b/package/libantlr3c/Makefile
new file mode 100755
index 000000000..cb5d58571
--- /dev/null
+++ b/package/libantlr3c/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		libantlr3c
+PKG_VERSION:=		3.2
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		674646e1d1bf5c6015435480cead725a
+PKG_DESCR:=		ANother Tool for Language Recognition
+PKG_SECTION:=		libs
+PKG_SITES:=		http://www.antlr.org/download/C/
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBANTLR3C,libantlr3c,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ENV+=		OPTIMFLAGS="$(TARGET_CFLAGS)"
+
+libantlr3c-install:
+	${INSTALL_DIR} ${IDIR_LIBANTLR3C}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libantlr3c.so* ${IDIR_LIBANTLR3C}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libantlr3c/patches/patch-antlr3config_h b/package/libantlr3c/patches/patch-antlr3config_h
new file mode 100644
index 000000000..bf860a508
--- /dev/null
+++ b/package/libantlr3c/patches/patch-antlr3config_h
@@ -0,0 +1,11 @@
+--- libantlr3c-3.2.orig/antlr3config.h	2009-09-23 22:50:45.000000000 +0200
++++ libantlr3c-3.2/antlr3config.h	2011-05-10 14:06:43.000000000 +0200
+@@ -5,7 +5,7 @@
+ /* #undef ANTLR3_NODEBUGGER */
+ 
+ /* Define if 64 bit mode required */
+-#define ANTLR3_USE_64BIT 1
++/* #undef ANTLR3_USE_64BIT */
+ 
+ /* Define to 1 if you have the `accept' function. */
+ #define HAVE_ACCEPT 1
diff --git a/package/libantlr3c/patches/patch-configure b/package/libantlr3c/patches/patch-configure
new file mode 100644
index 000000000..4fd248902
--- /dev/null
+++ b/package/libantlr3c/patches/patch-configure
@@ -0,0 +1,20 @@
+--- libantlr3c-3.2.orig/configure	2009-12-11 23:55:07.000000000 +0100
++++ libantlr3c-3.2/configure	2011-05-10 14:08:20.000000000 +0200
+@@ -19533,7 +19533,7 @@ sparc*-*solaris*)
+ *)
+  CPPCMNTFLAGS=
+  CCFLAGS64=
+- OPTIMFLAGS="-O"
++ OPTIMFLAGS=""
+  if test x"$enable_debuginfo" = xyes; then
+   DEBUGFLAGS='-g'
+  fi
+@@ -19543,7 +19543,7 @@ esac
+  ;;
+ esac
+ 
+-CFLAGS="$CCFLAGS64 $CPPCMNTFLAGS $OPTIMFLAGS $DEBUGFLAGS $WARNFLAGS"
++CFLAGS="$CFLAGS $CCFLAGS64 $CPPCMNTFLAGS $OPTIMFLAGS $DEBUGFLAGS $WARNFLAGS"
+ { $as_echo "$as_me:$LINENO: result: $CFLAGS" >&5
+ $as_echo "$CFLAGS" >&6; }
+ 
diff --git a/package/libavl/Makefile b/package/libavl/Makefile
new file mode 100755
index 000000000..9ab1910c8
--- /dev/null
+++ b/package/libavl/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		libavl
+PKG_VERSION:=		0.3.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		882c68ea7f71876ca110f3b84d7ab12d
+PKG_DESCR:=		AVL library
+PKG_SECTION:=		libs
+PKG_SITES:=		http://libavl.sourcearchive.com/downloads/0.3.5/
+
+DISTFILES:=		$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
+WRKDIST=		$(WRKDIR)/avl-$(PKG_VERSION)
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBAVL,libavl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+MAKE_FILE:=		GNUmakefile
+CONFIG_STYLE:=		manual
+
+libavl-install:
+	${INSTALL_DIR} ${IDIR_LIBAVL}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libavl.so* ${IDIR_LIBAVL}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libavl/patches/patch-GNUmakefile b/package/libavl/patches/patch-GNUmakefile
new file mode 100644
index 000000000..f967ed68c
--- /dev/null
+++ b/package/libavl/patches/patch-GNUmakefile
@@ -0,0 +1,28 @@
+--- avl-0.3.5.orig/GNUmakefile	2002-11-15 19:57:48.000000000 +0100
++++ avl-0.3.5/GNUmakefile	2011-05-10 13:52:58.000000000 +0200
+@@ -15,7 +15,7 @@ CFLAGS ?= -O2 -fomit-frame-pointer -pipe
+ #CFLAGS = -g -pg -a -pipe -march=i686 -Wall
+ #LDFLAGS = -s
+ 
+-prefix ?= /usr/local
++prefix ?= /usr
+ libdir ?= $(prefix)/lib
+ includedir ?= $(prefix)/include
+ includedir ?= /usr/include
+@@ -41,13 +41,13 @@ clean:
+ 
+ install: all
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)
++	$(INSTALL) -d $(DESTDIR)$(includedir)
+ 	$(INSTALL) avl.h $(DESTDIR)$(includedir)
+-	$(INSTALL) $(LIBRARIES) $(DESTDIR)$(libdir)
+-	for i in $(LIBRARIES); do\
++	$(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)
++	for i in $(LIBRARY); do\
+ 		$(LN) -sf $$i $(DESTDIR)$(libdir)/$${i%.*};\
+ 		$(LN) -sf $${i%.*} $(DESTDIR)$(libdir)/$${i%.*.*};\
+ 	done
+-	-$(LDCONFIG)
+ 
+ .PHONY: clean install all
+ .PRECIOUS: %.h %.c
diff --git a/package/libavl/patches/patch-GNUmakefile.orig b/package/libavl/patches/patch-GNUmakefile.orig
new file mode 100644
index 000000000..88ca6044b
--- /dev/null
+++ b/package/libavl/patches/patch-GNUmakefile.orig
@@ -0,0 +1,26 @@
+--- avl-0.3.5.orig/GNUmakefile	2002-11-15 19:57:48.000000000 +0100
++++ avl-0.3.5/GNUmakefile	2011-05-10 13:51:44.000000000 +0200
+@@ -15,7 +15,7 @@ CFLAGS ?= -O2 -fomit-frame-pointer -pipe
+ #CFLAGS = -g -pg -a -pipe -march=i686 -Wall
+ #LDFLAGS = -s
+ 
+-prefix ?= /usr/local
++prefix ?= /usr
+ libdir ?= $(prefix)/lib
+ includedir ?= $(prefix)/include
+ includedir ?= /usr/include
+@@ -41,13 +41,13 @@ clean:
+ 
+ install: all
+ 	$(INSTALL) -d $(DESTDIR)$(libdir)
++	$(INSTALL) -d $(DESTDIR)$(includedir)
+ 	$(INSTALL) avl.h $(DESTDIR)$(includedir)
+ 	$(INSTALL) $(LIBRARIES) $(DESTDIR)$(libdir)
+ 	for i in $(LIBRARIES); do\
+ 		$(LN) -sf $$i $(DESTDIR)$(libdir)/$${i%.*};\
+ 		$(LN) -sf $${i%.*} $(DESTDIR)$(libdir)/$${i%.*.*};\
+ 	done
+-	-$(LDCONFIG)
+ 
+ .PHONY: clean install all
+ .PRECIOUS: %.h %.c
diff --git a/package/libunistring/Makefile b/package/libunistring/Makefile
new file mode 100755
index 000000000..908d2b614
--- /dev/null
+++ b/package/libunistring/Makefile
@@ -0,0 +1,23 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		libunistring
+PKG_VERSION:=		0.9.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		db8eca3b64163abadf8c40e5cecc261f
+PKG_DESCR:=		functions for manipulating Unicode strings
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.gnu.org/software/libunistring/
+PKG_SITES:=		${MASTER_SITE_GNU:=libunistring/}
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBUNISTRING,libunistring,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+libunistring-install:
+	${INSTALL_DIR} ${IDIR_LIBUNISTRING}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libunistring.so* ${IDIR_LIBUNISTRING}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mxml/Makefile b/package/mxml/Makefile
new file mode 100755
index 000000000..c64a58f73
--- /dev/null
+++ b/package/mxml/Makefile
@@ -0,0 +1,27 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include ${TOPDIR}/rules.mk
+
+PKG_NAME:=		mxml
+PKG_VERSION:=		2.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		68977789ae64985dddbd1a1a1652642e
+PKG_DESCR:=		lightweight XML library
+PKG_SECTION:=		libs
+PKG_URL:=		http://www.minixml.org/
+PKG_SITES:=		http://ftp.easysw.com/pub/mxml/2.6/
+
+PKG_SUBPKGS:=		LIBMXML
+
+include ${TOPDIR}/mk/package.mk
+
+$(eval $(call PKG_template,LIBMXML,libmxml,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+FAKE_FLAGS+=		BUILDROOT=${WRKINST}
+
+libmxml-install:
+	${INSTALL_DIR} ${IDIR_LIBMXML}/usr/lib
+	${CP} ${WRKINST}/usr/lib/libmxml.so* ${IDIR_LIBMXML}/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/mxml/patches/patch-Makefile_in b/package/mxml/patches/patch-Makefile_in
new file mode 100644
index 000000000..5ed9231f1
--- /dev/null
+++ b/package/mxml/patches/patch-Makefile_in
@@ -0,0 +1,103 @@
+--- mxml-2.6.orig/Makefile.in	2008-12-06 05:20:38.000000000 +0100
++++ mxml-2.6/Makefile.in	2011-05-10 13:06:25.000000000 +0200
+@@ -88,7 +88,7 @@ PUBLIBOBJS	=	mxml-attr.o mxml-entity.o m
+ 			mxml-node.o mxml-search.o mxml-set.o
+ LIBOBJS		=	$(PUBLIBOBJS) mxml-private.o mxml-string.o
+ OBJS		=	mxmldoc.o testmxml.o $(LIBOBJS)
+-TARGETS		=	$(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man
++TARGETS		=	$(LIBMXML)
+ 
+ 
+ #
+@@ -133,21 +133,21 @@ clang:
+ # Install everything...
+ #
+ 
+-install:	$(TARGETS) install-$(LIBMXML) install-libmxml.a
++install:	$(TARGETS) install-$(LIBMXML)
+ 	$(INSTALL_DIR) $(BUILDROOT)$(bindir)
+-	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
+-	$(INSTALL_DIR) $(BUILDROOT)$(docdir)
+-	for file in $(DOCFILES); do \
+-		$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
+-	done
++	#$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
++	#$(INSTALL_DIR) $(BUILDROOT)$(docdir)
++	#for file in $(DOCFILES); do \
++	#	$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
++	#done
+ 	$(INSTALL_DIR) $(BUILDROOT)$(includedir)
+ 	$(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
+ 	$(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
+ 	$(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig
+-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
+-	$(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1
+-	$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
+-	$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
++	#$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1
++	#$(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1
++	#$(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3
++	#$(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3
+ 
+ install-libmxml.a:
+ 	$(INSTALL_DIR) $(BUILDROOT)$(libdir)
+@@ -294,7 +294,7 @@ mxmldoc:	$(LIBMXML) mxmldoc.o
+ 	$(CC) -L. $(LDFLAGS) -o $@ mxmldoc.o -lmxml $(LIBS)
+ 
+ mxmldoc-static:	libmxml.a mxmldoc.o
+-	$(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a $(LIBS)
++	$(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ mxmldoc.o libmxml.a $(LIBS)
+ 
+ mxmldoc.o:	mxml.h
+ 
+@@ -304,28 +304,7 @@ mxmldoc.o:	mxml.h
+ #
+ 
+ testmxml:	libmxml.a testmxml.o
+-	$(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a $(LIBS)
+-	@echo Testing library...
+-	./testmxml test.xml >temp1.xml 2>temp1s.xml
+-	./testmxml temp1.xml >temp2.xml 2>temp2s.xml
+-	@if cmp temp1.xml temp2.xml; then \
+-		echo Stdio file test passed!; \
+-		$(RM) temp2.xml temp2s.xml; \
+-	else \
+-		echo Stdio file test failed!; \
+-	fi
+-	@if cmp temp1.xml temp1s.xml; then \
+-		echo String test passed!; \
+-		$(RM) temp1.xml temp1s.xml; \
+-	else \
+-		echo String test failed!; \
+-	fi
+-	@if cmp test.xml test.xmlfd; then \
+-		echo File descriptor test passed!; \
+-		$(RM) test.xmlfd; \
+-	else \
+-		echo File descriptor test failed!; \
+-	fi
++	$(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ testmxml.o libmxml.a $(LIBS)
+ 
+ testmxml.o:	mxml.h
+ 
+@@ -336,19 +315,7 @@ testmxml.o:	mxml.h
+ 
+ mxml.xml:	mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
+ 	$(RM) mxml.xml
+-	./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
+-	if test "x`uname`" = xDarwin; then \
+-		./mxmldoc-static --docset org.minixml.docset \
+-			--docversion @VERSION@ --feedname minixml.org \
+-			--feedurl http://www.minixml.org/org.minixml.atom \
+-			--header doc/docset.header --intro doc/docset.intro \
+-			--css doc/docset.css --title "Mini-XML API Reference" \
+-			mxml.xml || exit 1; \
+-		/Developer/usr/bin/docsetutil package --output org.minixml.xar \
+-			--atom org.minixml.atom \
+-			--download-url http://www.minixml.org/org.minixml.xar \
+-			org.minixml.docset || exit 1; \
+-	fi
++	#./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
+ 
+ valgrind:	mxmldoc-static
+ 	$(RM) valgrind.xml
diff --git a/package/mxml/patches/patch-Makefile_in.orig b/package/mxml/patches/patch-Makefile_in.orig
new file mode 100644
index 000000000..efe63f91a
--- /dev/null
+++ b/package/mxml/patches/patch-Makefile_in.orig
@@ -0,0 +1,91 @@
+--- mxml-2.6.orig/Makefile.in	2008-12-06 05:20:38.000000000 +0100
++++ mxml-2.6/Makefile.in	2011-05-10 13:05:50.000000000 +0200
+@@ -88,7 +88,7 @@ PUBLIBOBJS	=	mxml-attr.o mxml-entity.o m
+ 			mxml-node.o mxml-search.o mxml-set.o
+ LIBOBJS		=	$(PUBLIBOBJS) mxml-private.o mxml-string.o
+ OBJS		=	mxmldoc.o testmxml.o $(LIBOBJS)
+-TARGETS		=	$(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man
++TARGETS		=	$(LIBMXML)
+ 
+ 
+ #
+@@ -133,13 +133,13 @@ clang:
+ # Install everything...
+ #
+ 
+-install:	$(TARGETS) install-$(LIBMXML) install-libmxml.a
++install:	$(TARGETS) install-$(LIBMXML)
+ 	$(INSTALL_DIR) $(BUILDROOT)$(bindir)
+-	$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
+-	$(INSTALL_DIR) $(BUILDROOT)$(docdir)
+-	for file in $(DOCFILES); do \
+-		$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
+-	done
++	#$(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) 
++	#$(INSTALL_DIR) $(BUILDROOT)$(docdir)
++	#for file in $(DOCFILES); do \
++	#	$(INSTALL_MAN) $$file $(BUILDROOT)$(docdir); \
++	#done
+ 	$(INSTALL_DIR) $(BUILDROOT)$(includedir)
+ 	$(INSTALL_DATA) mxml.h $(BUILDROOT)$(includedir)
+ 	$(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig
+@@ -294,7 +294,7 @@ mxmldoc:	$(LIBMXML) mxmldoc.o
+ 	$(CC) -L. $(LDFLAGS) -o $@ mxmldoc.o -lmxml $(LIBS)
+ 
+ mxmldoc-static:	libmxml.a mxmldoc.o
+-	$(CC) $(LDFLAGS) -o $@ mxmldoc.o libmxml.a $(LIBS)
++	$(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ mxmldoc.o libmxml.a $(LIBS)
+ 
+ mxmldoc.o:	mxml.h
+ 
+@@ -304,28 +304,7 @@ mxmldoc.o:	mxml.h
+ #
+ 
+ testmxml:	libmxml.a testmxml.o
+-	$(CC) $(LDFLAGS) -o $@ testmxml.o libmxml.a $(LIBS)
+-	@echo Testing library...
+-	./testmxml test.xml >temp1.xml 2>temp1s.xml
+-	./testmxml temp1.xml >temp2.xml 2>temp2s.xml
+-	@if cmp temp1.xml temp2.xml; then \
+-		echo Stdio file test passed!; \
+-		$(RM) temp2.xml temp2s.xml; \
+-	else \
+-		echo Stdio file test failed!; \
+-	fi
+-	@if cmp temp1.xml temp1s.xml; then \
+-		echo String test passed!; \
+-		$(RM) temp1.xml temp1s.xml; \
+-	else \
+-		echo String test failed!; \
+-	fi
+-	@if cmp test.xml test.xmlfd; then \
+-		echo File descriptor test passed!; \
+-		$(RM) test.xmlfd; \
+-	else \
+-		echo File descriptor test failed!; \
+-	fi
++	$(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ testmxml.o libmxml.a $(LIBS)
+ 
+ testmxml.o:	mxml.h
+ 
+@@ -336,19 +315,7 @@ testmxml.o:	mxml.h
+ 
+ mxml.xml:	mxmldoc-static mxml.h $(PUBLIBOBJS:.o=.c)
+ 	$(RM) mxml.xml
+-	./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
+-	if test "x`uname`" = xDarwin; then \
+-		./mxmldoc-static --docset org.minixml.docset \
+-			--docversion @VERSION@ --feedname minixml.org \
+-			--feedurl http://www.minixml.org/org.minixml.atom \
+-			--header doc/docset.header --intro doc/docset.intro \
+-			--css doc/docset.css --title "Mini-XML API Reference" \
+-			mxml.xml || exit 1; \
+-		/Developer/usr/bin/docsetutil package --output org.minixml.xar \
+-			--atom org.minixml.atom \
+-			--download-url http://www.minixml.org/org.minixml.xar \
+-			org.minixml.docset || exit 1; \
+-	fi
++	#./mxmldoc-static --header doc/reference.heading mxml.xml mxml.h $(PUBLIBOBJS:.o=.c) >doc/reference.html
+ 
+ valgrind:	mxmldoc-static
+ 	$(RM) valgrind.xml
diff --git a/package/mxml/patches/patch-configure b/package/mxml/patches/patch-configure
new file mode 100644
index 000000000..5c8b5da9f
--- /dev/null
+++ b/package/mxml/patches/patch-configure
@@ -0,0 +1,30 @@
+--- mxml-2.6.orig/configure	2009-04-18 19:05:52.000000000 +0200
++++ mxml-2.6/configure	2011-05-10 12:55:05.000000000 +0200
+@@ -1778,8 +1778,8 @@ else
+ fi
+ 
+ 
+-uname=`uname`
+-uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
++uname=Linux
++uversion=2.6
+ if test x$uname = xIRIX64; then
+ 	uname="IRIX"
+ fi
+@@ -3479,15 +3479,7 @@ fi
+ 
+ 
+ 
+-case "$uname" in
+-        Darwin* | *BSD*)
+-                ARFLAGS="-rcv"
+-                ;;
+-        *)
+-                ARFLAGS="crvs"
+-                ;;
+-esac
+-
++ARFLAGS="crvs"
+ 
+ 
+ 
diff --git a/package/mxml/patches/patch-doc_reference_html b/package/mxml/patches/patch-doc_reference_html
new file mode 100644
index 000000000..0fa8d3521
--- /dev/null
+++ b/package/mxml/patches/patch-doc_reference_html
@@ -0,0 +1,1638 @@
+--- mxml-2.6.orig/doc/reference.html	2009-03-19 06:38:52.000000000 +0100
++++ mxml-2.6/doc/reference.html	2011-05-10 12:57:21.000000000 +0200
+@@ -1,1635 +0,0 @@
+-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+-<html>
+-<head>
+-<title>Documentation</title>
+-<meta name="creator" content="Mini-XML v2.6">
+-<style type="text/css"><!--
+-body, p, h1, h2, h3, h4 {
+-  font-family: lucida grande, geneva, helvetica, arial, sans-serif;
+-}
+-div.body h1 {
+-  font-size: 250%;
+-  font-weight: bold;
+-  margin: 0;
+-}
+-div.body h2 {
+-  font-size: 250%;
+-  margin-top: 1.5em;
+-}
+-div.body h3 {
+-  font-size: 150%;
+-  margin-bottom: 0.5em;
+-  margin-top: 1.5em;
+-}
+-div.body h4 {
+-  font-size: 110%;
+-  margin-bottom: 0.5em;
+-  margin-top: 1.5em;
+-}
+-div.body h5 {
+-  font-size: 100%;
+-  margin-bottom: 0.5em;
+-  margin-top: 1.5em;
+-}
+-div.contents {
+-  background: #e8e8e8;
+-  border: solid thin black;
+-  padding: 10px;
+-}
+-div.contents h1 {
+-  font-size: 110%;
+-}
+-div.contents h2 {
+-  font-size: 100%;
+-}
+-div.contents ul.contents {
+-  font-size: 80%;
+-}
+-.class {
+-  border-bottom: solid 2px gray;
+-}
+-.constants {
+-}
+-.description {
+-  margin-top: 0.5em;
+-}
+-.discussion {
+-}
+-.enumeration {
+-  border-bottom: solid 2px gray;
+-}
+-.function {
+-  border-bottom: solid 2px gray;
+-  margin-bottom: 0;
+-}
+-.members {
+-}
+-.method {
+-}
+-.parameters {
+-}
+-.returnvalue {
+-}
+-.struct {
+-  border-bottom: solid 2px gray;
+-}
+-.typedef {
+-  border-bottom: solid 2px gray;
+-}
+-.union {
+-  border-bottom: solid 2px gray;
+-}
+-.variable {
+-}
+-code, p.code, pre, ul.code li {
+-  font-family: monaco, courier, monospace;
+-  font-size: 90%;
+-}
+-a:link, a:visited {
+-  text-decoration: none;
+-}
+-span.info {
+-  background: black;
+-  border: solid thin black;
+-  color: white;
+-  font-size: 80%;
+-  font-style: italic;
+-  font-weight: bold;
+-  white-space: nowrap;
+-}
+-h3 span.info, h4 span.info {
+-  float: right;
+-  font-size: 100%;
+-}
+-ul.code, ul.contents, ul.subcontents {
+-  list-style-type: none;
+-  margin: 0;
+-  padding-left: 0;
+-}
+-ul.code li {
+-  margin: 0;
+-}
+-ul.contents > li {
+-  margin-top: 1em;
+-}
+-ul.contents li ul.code, ul.contents li ul.subcontents {
+-  padding-left: 2em;
+-}
+-div.body dl {
+-  margin-top: 0;
+-}
+-div.body dt {
+-  font-style: italic;
+-  margin-top: 0;
+-}
+-div.body dd {
+-  margin-bottom: 0.5em;
+-}
+-h1.title {
+-}
+-h2.title {
+-  border-bottom: solid 2px black;
+-}
+-h3.title {
+-  border-bottom: solid 2px black;
+-}
+---></style>
+-</head>
+-<body>
+-<div class='body'>
+-<h1 align='right'><a name='REFERENCE'><img src="C.gif" align="right"
+-hspace="10" width="100" height="100" alt="C"></a>Library
+-Reference</h1>
+-
+-<h2 class="title">Contents</h2>
+-<ul class="contents">
+-<li><a href="#FUNCTIONS">Functions</a><ul class="code">
+-<li><a href="#mxmlAdd" title="Add a node to a tree.">mxmlAdd</a></li>
+-<li><a href="#mxmlDelete" title="Delete a node and all of its children.">mxmlDelete</a></li>
+-<li><a href="#mxmlElementDeleteAttr" title="Delete an attribute.">mxmlElementDeleteAttr</a></li>
+-<li><a href="#mxmlElementGetAttr" title="Get an attribute.">mxmlElementGetAttr</a></li>
+-<li><a href="#mxmlElementSetAttr" title="Set an attribute.">mxmlElementSetAttr</a></li>
+-<li><a href="#mxmlElementSetAttrf" title="Set an attribute with a formatted value.">mxmlElementSetAttrf</a></li>
+-<li><a href="#mxmlEntityAddCallback" title="Add a callback to convert entities to Unicode.">mxmlEntityAddCallback</a></li>
+-<li><a href="#mxmlEntityGetName" title="Get the name that corresponds to the character value.">mxmlEntityGetName</a></li>
+-<li><a href="#mxmlEntityGetValue" title="Get the character corresponding to a named entity.">mxmlEntityGetValue</a></li>
+-<li><a href="#mxmlEntityRemoveCallback" title="Remove a callback.">mxmlEntityRemoveCallback</a></li>
+-<li><a href="#mxmlFindElement" title="Find the named element.">mxmlFindElement</a></li>
+-<li><a href="#mxmlIndexDelete" title="Delete an index.">mxmlIndexDelete</a></li>
+-<li><a href="#mxmlIndexEnum" title="Return the next node in the index.">mxmlIndexEnum</a></li>
+-<li><a href="#mxmlIndexFind" title="Find the next matching node.">mxmlIndexFind</a></li>
+-<li><a href="#mxmlIndexNew" title="Create a new index.">mxmlIndexNew</a></li>
+-<li><a href="#mxmlIndexReset" title="Reset the enumeration/find pointer in the index and
+-return the first node in the index.">mxmlIndexReset</a></li>
+-<li><a href="#mxmlLoadFd" title="Load a file descriptor into an XML node tree.">mxmlLoadFd</a></li>
+-<li><a href="#mxmlLoadFile" title="Load a file into an XML node tree.">mxmlLoadFile</a></li>
+-<li><a href="#mxmlLoadString" title="Load a string into an XML node tree.">mxmlLoadString</a></li>
+-<li><a href="#mxmlNewCDATA" title="Create a new CDATA node.">mxmlNewCDATA</a></li>
+-<li><a href="#mxmlNewCustom" title="Create a new custom data node.">mxmlNewCustom</a></li>
+-<li><a href="#mxmlNewElement" title="Create a new element node.">mxmlNewElement</a></li>
+-<li><a href="#mxmlNewInteger" title="Create a new integer node.">mxmlNewInteger</a></li>
+-<li><a href="#mxmlNewOpaque" title="Create a new opaque string.">mxmlNewOpaque</a></li>
+-<li><a href="#mxmlNewReal" title="Create a new real number node.">mxmlNewReal</a></li>
+-<li><a href="#mxmlNewText" title="Create a new text fragment node.">mxmlNewText</a></li>
+-<li><a href="#mxmlNewTextf" title="Create a new formatted text fragment node.">mxmlNewTextf</a></li>
+-<li><a href="#mxmlNewXML" title="Create a new XML document tree.">mxmlNewXML</a></li>
+-<li><a href="#mxmlRelease" title="Release a node.">mxmlRelease</a></li>
+-<li><a href="#mxmlRemove" title="Remove a node from its parent.">mxmlRemove</a></li>
+-<li><a href="#mxmlRetain" title="Retain a node.">mxmlRetain</a></li>
+-<li><a href="#mxmlSAXLoadFd" title="Load a file descriptor into an XML node tree
+-using a SAX callback.">mxmlSAXLoadFd</a></li>
+-<li><a href="#mxmlSAXLoadFile" title="Load a file into an XML node tree
+-using a SAX callback.">mxmlSAXLoadFile</a></li>
+-<li><a href="#mxmlSAXLoadString" title="Load a string into an XML node tree
+-using a SAX callback.">mxmlSAXLoadString</a></li>
+-<li><a href="#mxmlSaveAllocString" title="Save an XML node tree to an allocated string.">mxmlSaveAllocString</a></li>
+-<li><a href="#mxmlSaveFd" title="Save an XML tree to a file descriptor.">mxmlSaveFd</a></li>
+-<li><a href="#mxmlSaveFile" title="Save an XML tree to a file.">mxmlSaveFile</a></li>
+-<li><a href="#mxmlSaveString" title="Save an XML node tree to a string.">mxmlSaveString</a></li>
+-<li><a href="#mxmlSetCDATA" title="Set the element name of a CDATA node.">mxmlSetCDATA</a></li>
+-<li><a href="#mxmlSetCustom" title="Set the data and destructor of a custom data node.">mxmlSetCustom</a></li>
+-<li><a href="#mxmlSetCustomHandlers" title="Set the handling functions for custom data.">mxmlSetCustomHandlers</a></li>
+-<li><a href="#mxmlSetElement" title="Set the name of an element node.">mxmlSetElement</a></li>
+-<li><a href="#mxmlSetErrorCallback" title="Set the error message callback.">mxmlSetErrorCallback</a></li>
+-<li><a href="#mxmlSetInteger" title="Set the value of an integer node.">mxmlSetInteger</a></li>
+-<li><a href="#mxmlSetOpaque" title="Set the value of an opaque node.">mxmlSetOpaque</a></li>
+-<li><a href="#mxmlSetReal" title="Set the value of a real number node.">mxmlSetReal</a></li>
+-<li><a href="#mxmlSetText" title="Set the value of a text node.">mxmlSetText</a></li>
+-<li><a href="#mxmlSetTextf" title="Set the value of a text node to a formatted string.">mxmlSetTextf</a></li>
+-<li><a href="#mxmlSetWrapMargin" title="Set the the wrap margin when saving XML data.">mxmlSetWrapMargin</a></li>
+-<li><a href="#mxmlWalkNext" title="Walk to the next logical node in the tree.">mxmlWalkNext</a></li>
+-<li><a href="#mxmlWalkPrev" title="Walk to the previous logical node in the tree.">mxmlWalkPrev</a></li>
+-</ul></li>
+-<li><a href="#TYPES">Data Types</a><ul class="code">
+-	<li><a href="#mxml_attr_t" title="An XML element attribute value.">mxml_attr_t</a></li>
+-	<li><a href="#mxml_custom_destroy_cb_t" title="Custom data destructor">mxml_custom_destroy_cb_t</a></li>
+-	<li><a href="#mxml_custom_load_cb_t" title="Custom data load callback function">mxml_custom_load_cb_t</a></li>
+-	<li><a href="#mxml_custom_save_cb_t" title="Custom data save callback function">mxml_custom_save_cb_t</a></li>
+-	<li><a href="#mxml_custom_t" title="An XML custom value. ">mxml_custom_t</a></li>
+-	<li><a href="#mxml_element_t"