Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk

3 files changed, 79 insertions, 0 deletions

diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index cf698f6d3..89d85d7c6 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -21,6 +21,7 @@ $(eval $(call PKG_template,MUTT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	--includedir=${WRKBUILD}/. \
 			--oldincludedir=${WRKBUILD}/. \
+			--with-homespool="~/Maildir" \
 			--enable-pop \
 			--enable-imap \
 			--with-ssl
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
new file mode 100644
index 000000000..16af3373b
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -0,0 +1,66 @@
+--- nfs-utils-1.2.1.orig/tools/rpcgen/Makefile.in	2009-11-04 12:15:52.000000000 +0100
++++ nfs-utils-1.2.1/tools/rpcgen/Makefile.in	2010-01-16 11:01:44.015625000 +0100
+@@ -66,21 +66,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
+ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
+ rpcgen_LDADD = $(LDADD)
+ rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
+-	$(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
++	--mode=link $(CCLD) $(rpcgen_CFLAGS) \
++	$(rpcgen_LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CFLAGS) $(HOSTCFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
++	--mode=link $(CCLD) $(AM_CFLAGS) $(HOSTCFLAGS) \
++	-o $@
+ SOURCES = $(rpcgen_SOURCES)
+ DIST_SOURCES = $(rpcgen_SOURCES)
+ ETAGS = etags
+@@ -100,10 +100,10 @@ AWK = @AWK@
+ CC = $(CC_FOR_BUILD)
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS =
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS = 
+ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+@@ -136,10 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+ K5VERS = @K5VERS@
+ KRBCFLAGS = @KRBCFLAGS@
+ KRBDIR = @KRBDIR@
+-KRBLDFLAGS = @KRBLDFLAGS@
++KRBLDFLAGS = 
+ KRBLIBS = @KRBLIBS@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS =
+ LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+ LIBBLKID = @LIBBLKID@
+ LIBBSD = @LIBBSD@
+@@ -299,7 +299,7 @@ clean-noinstPROGRAMS:
+ 	rm -f $$list
+ rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) 
+ 	@rm -f rpcgen$(EXEEXT)
+-	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
++	$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
new file mode 100644
index 000000000..5bc54e758
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
@@ -0,0 +1,12 @@
+--- nfs-utils-1.2.1.orig/tools/rpcgen/rpc_main.c	2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/tools/rpcgen/rpc_main.c	2010-01-16 11:22:02.359375000 +0100
+@@ -562,9 +562,6 @@ s_output(int argc, char **argv, char *in
+ 	  f_print(fout, "#include <sys/types.h>\n");
+ 
+ 	f_print(fout, "#include <memory.h>\n");
+-#ifndef linux
+-	f_print(fout, "#include <stropts.h>\n");
+-#endif
+ 	if (inetdflag || !tirpcflag ) {
+ 		f_print(fout, "#include <sys/socket.h>\n");
+ 		f_print(fout, "#include <netinet/in.h>\n");