9 files changed, 14 insertions, 58 deletions
diff --git a/package/Config.in b/package/Config.in
index d3ae75e61..225d8739f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -80,7 +80,6 @@ endmenu
 menu "Games"
 source "package/games/ace_of_penguins/Config.in"
 source "package/games/gnuchess/Config.in"
-source "package/games/magiccube4d/Config.in"
 source "package/games/prboom/Config.in"
 source "package/games/doom-wad/Config.in"
 source "package/games/rubix/Config.in"
diff --git a/package/games/magiccube4d/Config.in b/package/games/magiccube4d/Config.in
deleted file mode 100644
index 871c3c76b..000000000
--- a/package/games/magiccube4d/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_MAGICCUBE4D
-	bool "magiccube4d"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_PACKAGE_XORG7
-	help
-	  Another rubiks cube-like game in 4D
-
-	  http://avr32linux.org/twiki/bin/viewfile/Main
-
-comment "magiccube4d requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7
diff --git a/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch b/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch
deleted file mode 100644
index afe543ba3..000000000
--- a/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile.in	2000-04-01 22:45:36.000000000 -0500
-+++ b/Makefile.in	2008-02-29 13:18:24.000000000 -0500
-@@ -126,6 +126,10 @@ tgz: $(SRCTGZ)
- 
- bindist: $(BINTGZ)
- 
-+install :
-+	mkdir -p $(GAMESDIR)
-+	install -c magiccube4d $(GAMESDIR)
-+
- rpm: $(SRCTGZ)
- 	rpm -ta $(SRCTGZ)
- 
diff --git a/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch b/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch
deleted file mode 100644
index 8bbc483ab..000000000
--- a/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure	2000-02-10 23:19:34.000000000 -0500
-+++ b/configure	2008-02-29 13:12:33.000000000 -0500
-@@ -686,7 +686,7 @@ fi
- 
- 
- if test "$GXX" = "yes" ; then
--   WFLAGS="$WFLAGS -pedantic -Wall -W -Wunused -Werror"
-+   WFLAGS="$WFLAGS -pedantic -Wall -W -Wunused"
- fi
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:693: checking how to run the C preprocessor" >&5
diff --git a/package/games/magiccube4d/magiccube4d.mk b/package/games/magiccube4d/magiccube4d.mk
deleted file mode 100644
index 20b42317b..000000000
--- a/package/games/magiccube4d/magiccube4d.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-#############################################################
-#
-# magiccube4d
-#
-#############################################################
-MAGICCUBE4D_VERSION = 2_2
-MAGICCUBE4D_SOURCE = magiccube4d-src-$(MAGICCUBE4D_VERSION).tar.gz
-MAGICCUBE4D_SITE = http://avr32linux.org/twiki/pub/Main/MagicCube4D
-MAGICCUBE4D_INSTALL_STAGING = NO
-MAGICCUBE4D_INSTALL_TARGET = YES
-MAGICCUBE4D_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install
-MAGICCUBE4D_DEPENDENCIES = xserver_xorg-server
-
-$(eval $(call AUTOTARGETS,package/games,magiccube4d))
-
diff --git a/package/grep/grep.mk b/package/grep/grep.mk
index e323b1de9..bfc911663 100644
--- a/package/grep/grep.mk
+++ b/package/grep/grep.mk
@@ -9,4 +9,10 @@ GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_CONF_OPT = --disable-perl-regexp --without-included-regex
 GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
+# link with iconv if enabled
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+GREP_CONF_ENV += LIBS=-liconv
+GREP_DEPENDENCIES += libiconv
+endif
+
 $(eval $(call AUTOTARGETS,package,grep))
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 05365dae3..167cb2041 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -18,16 +18,16 @@ endif
 ifeq ($(BR2_USE_WCHAR),)
 define LSOF_CONFIGURE_WCHAR_FIXUPS
 	$(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \
-		$(@D)/lsof_$(LSOF_VERSION)_src/machine.h
+		$(@D)/machine.h
 	$(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' \
-		$(@D)/lsof_$(LSOF_VERSION)_src/machine.h
+		$(@D)/machine.h
 endef
 endif
 
 ifeq ($(BR2_ENABLE_LOCALE),)
 define LSOF_CONFIGURE_LOCALE_FIXUPS
 	$(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' \
-		$(@D)/lsof_$(LSOF_VERSION)_src/machine.h
+		$(@D)/machine.h
 endef
 endif
 
@@ -60,7 +60,7 @@ define LSOF_UNINSTALL_TARGET_CMDS
 endef
 
 define LSOF_CLEAN_CMDS
-	-$(MAKE) -C $(@D)/lsof_$(LSOF_VERSION)_src clean
+	-$(MAKE) -C $(@D) clean
 endef
 
 $(eval $(call GENTARGETS,package,lsof))
diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk
index da4ef72f3..9ebb85779 100644
--- a/package/mrouted/mrouted.mk
+++ b/package/mrouted/mrouted.mk
@@ -4,9 +4,9 @@
 #
 #
 #############################################################
-MROUTED_VERSION     = 3.9.4
-MROUTED_SITE        = https://github.com/troglobit/mrouted.git
-MROUTED_SITE_METHOD = git
+MROUTED_VERSION = 3.9.4
+MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2
+MROUTED_SITE = http://ftp.vmlinux.org/pub/People/jocke/mrouted
 
 define MROUTED_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
index 52876e335..596eea391 100644
--- a/package/x11r7/mesa3d/Config.in
+++ b/package/x11r7/mesa3d/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_EXPAT
 	depends on BR2_PACKAGE_XSERVER_XORG_SERVER
+	depends on BR2_PACKAGE_XSERVER_xorg
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Mesa 3D, an open-source implementation of the OpenGL specification.