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

23 files changed, 1 insertions, 612 deletions

diff --git a/TODO b/TODO
index c08ff3ffb..893baa011 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1 @@
-- automatic subpackage of development files
-- toolchain rebuild when changes to config require it
-- man pages in ipkg/tgz packages (automatic)
-- automate /etc handling via conffiles
-- distcc evaluation
-- openssl ocf support check
-- new package minidlna
-- mirror only option, for no internet access
-- help text for config/ needs adoption
-- diet libc / klibc / newlib support
+nothing right now.
diff --git a/mk/build.mk b/mk/build.mk
index dc79691af..207cd8c53 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -21,7 +21,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_PACKAGE_PACEMAKER_MGMTD=n \
 			ADK_PACKAGE_OPENJDK=n \
 			ADK_PACKAGE_CLASSPATH=n \
-			ADK_PACKAGE_PCMANFM=n \
 			ADK_PACKAGE_GPSD=n \
 			ADK_PACKAGE_GPSD_CLIENTS=n \
 			ADK_PACKAGE_GRUB=n \
diff --git a/package/libfm/Makefile b/package/libfm/Makefile
deleted file mode 100644
index 0ef075cae..000000000
--- a/package/libfm/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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:=		libfm
-PKG_VERSION:=		0.1.16
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		c09bce415ff6dc2dd835e28aeddeabe3
-PKG_DESCR:=		libfm library
-PKG_SECTION:=		x11/lxde
-PKG_BUILDDEP:=		menu-cache libXcursor
-PKG_DEPENDS:=		menu-cache libxcursor
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
-
-PKG_SUBPKGS:=		LIBFM LIBFM_DEV
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LIBFM,libfm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,LIBFM_DEV,libfm-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CPPFLAGS_FOR_BUILD+=	$(shell pkg-config --cflags glib-2.0)
-LDFLAGS_FOR_BUILD+=	$(shell pkg-config --libs glib-2.0) -L/usr/lib
-CONFIGURE_ARGS+=	--disable-gtk-doc
-
-libfm-install:
-	$(INSTALL_DIR) $(IDIR_LIBFM)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libfm*.so* \
-		$(IDIR_LIBFM)/usr/lib
-
-libfm-install-dev:
-	$(INSTALL_DIR) $(IDIR_LIBFM_DEV)/usr/lib/pkgconfig
-	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
-		$(IDIR_LIBFM_DEV)/usr/lib/pkgconfig
-	$(INSTALL_DIR) $(IDIR_LIBFM_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* \
-		$(IDIR_LIBFM_DEV)/usr/include
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/libfm/patches/patch-configure b/package/libfm/patches/patch-configure
deleted file mode 100644
index 5886afec6..000000000
--- a/package/libfm/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- libfm-0.1.16.orig/configure	2011-08-09 23:25:14.000000000 +0200
-+++ libfm-0.1.16/configure	2011-09-13 10:20:35.697990682 +0200
-@@ -14181,7 +14181,7 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
--ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile libfm.pc libfm-gtk.pc"
-+ac_config_files="$ac_config_files Makefile src/Makefile src/tests/Makefile data/Makefile data/ui/Makefile po/Makefile.in libfm.pc libfm-gtk.pc"
- 
- 
- cat >confcache <<\_ACEOF
-@@ -15237,9 +15237,6 @@ do
-     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
-     "data/ui/Makefile") CONFIG_FILES="$CONFIG_FILES data/ui/Makefile" ;;
-     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
--    "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
--    "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
--    "docs/reference/libfm/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/libfm/Makefile" ;;
-     "libfm.pc") CONFIG_FILES="$CONFIG_FILES libfm.pc" ;;
-     "libfm-gtk.pc") CONFIG_FILES="$CONFIG_FILES libfm-gtk.pc" ;;
-     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
diff --git a/package/lxappearance/Makefile b/package/lxappearance/Makefile
deleted file mode 100644
index b3aff2ce0..000000000
--- a/package/lxappearance/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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:=		lxappearance
-PKG_VERSION:=		0.5.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		7eabab6f4a358dbc6a84e260a0e7f6c2
-PKG_DESCR:=		LXDE ...
-PKG_SECTION:=		x11/lxde
-PKG_BUILDDEP:=		gtk+
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://netcologne.dl.sourceforge.net/project/lxde/LXAppearance/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LXAPPEARANCE,lxappearance,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CPPFLAGS_FOR_BUILD+=	$(shell pkg-config --cflags glib-2.0)
-LDFLAGS_FOR_BUILD+=	$(shell pkg-config --libs glib-2.0)
-
-lxappearance-install:
-	$(INSTALL_DIR) $(IDIR_LXAPPEARANCE)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/lxappearance \
-		$(IDIR_LXAPPEARANCE)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxappearance/patches/patch-src_Makefile_in b/package/lxappearance/patches/patch-src_Makefile_in
deleted file mode 100644
index 409681df8..000000000
--- a/package/lxappearance/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,36 +0,0 @@
---- lxappearance-0.5.0.orig/src/Makefile.in	2010-10-12 17:20:51.000000000 +0200
-+++ lxappearance-0.5.0/src/Makefile.in	2011-03-18 00:11:21.983370811 +0100
-@@ -68,8 +68,8 @@ lxappearance_LINK = $(CCLD) $(lxappearan
- am_xml_purge_OBJECTS = xml_purge-xml-purge.$(OBJEXT)
- xml_purge_OBJECTS = $(am_xml_purge_OBJECTS)
- xml_purge_DEPENDENCIES = $(am__DEPENDENCIES_1)
--xml_purge_LINK = $(CCLD) $(xml_purge_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+xml_purge_LINK = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
-+	-o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -347,7 +347,7 @@ lxappearance$(EXEEXT): $(lxappearance_OB
- 	$(lxappearance_LINK) $(lxappearance_OBJECTS) $(lxappearance_LDADD) $(LIBS)
- xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) 
- 	@rm -f xml-purge$(EXEEXT)
--	$(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS)
-+	$(xml_purge_LINK) $(xml_purge_OBJECTS) $(LIBS) -lgmodule-2.0 -lglib-2.0
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -492,11 +492,11 @@ lxappearance-plugin.obj: plugin.c
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-plugin.obj `if test -f 'plugin.c'; then $(CYGPATH_W) 'plugin.c'; else $(CYGPATH_W) '$(srcdir)/plugin.c'; fi`
- 
- xml_purge-xml-purge.o: $(top_srcdir)/src/xml-purge.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f '$(top_srcdir)/src/xml-purge.c' || echo '$(srcdir)/'`$(top_srcdir)/src/xml-purge.c
-+@am__fastdepCC_TRUE@	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f '$(top_srcdir)/src/xml-purge.c' || echo '$(srcdir)/'`$(top_srcdir)/src/xml-purge.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f '$(top_srcdir)/src/xml-purge.c' || echo '$(srcdir)/'`$(top_srcdir)/src/xml-purge.c
-+@am__fastdepCC_FALSE@	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o xml_purge-xml-purge.o `test -f '$(top_srcdir)/src/xml-purge.c' || echo '$(srcdir)/'`$(top_srcdir)/src/xml-purge.c
- 
- xml_purge-xml-purge.obj: $(top_srcdir)/src/xml-purge.c
- @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f '$(top_srcdir)/src/xml-purge.c'; then $(CYGPATH_W) '$(top_srcdir)/src/xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/xml-purge.c'; fi`
diff --git a/package/lxde-common/Makefile b/package/lxde-common/Makefile
deleted file mode 100644
index b59a4b91a..000000000
--- a/package/lxde-common/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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:=		lxde-common
-PKG_VERSION:=		0.5.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		aac2f6f2efa53a6ac92e47e7f2a0c602
-PKG_DESCR:=		LXDE de-common manager
-PKG_SECTION:=		x11/lxde
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://openadk.org/distfiles/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LXDE_COMMON,lxde-common,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-lxde-common-install:
-	$(INSTALL_DIR) $(IDIR_LXDE_COMMON)/etc/xdg
-	$(CP) $(WRKINST)/etc/xdg/* $(IDIR_LXDE_COMMON)/etc/xdg
-	$(INSTALL_DIR) $(IDIR_LXDE_COMMON)/usr/bin
-	$(CP) $(WRKINST)/usr/bin/* \
-		$(IDIR_LXDE_COMMON)/usr/bin
-	$(INSTALL_DIR) $(IDIR_LXDE_COMMON)/usr/share/lxpanel/profile/LXDE
-	$(CP) $(WRKINST)/usr/share/lxpanel/profile/LXDE/* \
-		$(IDIR_LXDE_COMMON)/usr/share/lxpanel/profile/LXDE
-	$(INSTALL_DIR) $(IDIR_LXDE_COMMON)/usr/share/lxde
-	$(CP) $(WRKINST)/usr/share/lxde/* \
-		$(IDIR_LXDE_COMMON)/usr/share/lxde
-	$(INSTALL_DIR) $(IDIR_LXDE_COMMON)/usr/share/xsessions
-	$(CP) $(WRKINST)/usr/share/xsessions/* \
-		$(IDIR_LXDE_COMMON)/usr/share/xsessions
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxdm/Makefile b/package/lxdm/Makefile
deleted file mode 100644
index 4f0036360..000000000
--- a/package/lxdm/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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:=		lxdm
-PKG_VERSION:=		0.3.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		1d0688e088edab7c3c563263eb2f9654
-PKG_DESCR:=		LXDE display manager
-PKG_SECTION:=		x11/lxde
-PKG_BUILDDEP:=		libX11 glib gtk+ ConsoleKit
-PKG_DEPENDS:=		libx11 glib libgtk consolekit dbus
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://openadk.org/distfiles/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LXDM,lxdm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-lxdm-install:
-	$(INSTALL_DIR) $(IDIR_LXDM)/etc
-	$(CP) $(WRKINST)/etc/* $(IDIR_LXDM)/etc
-	$(INSTALL_DIR) $(IDIR_LXDM)/usr/libexec
-	$(CP) $(WRKINST)/usr/libexec/* \
-		$(IDIR_LXDM)/usr/libexec
-	$(INSTALL_DIR) $(IDIR_LXDM)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/lxdm* \
-		$(IDIR_LXDM)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_LXDM)/usr/share/lxdm/themes
-	$(CP) $(WRKINST)/usr/share/lxdm/themes/* \
-		$(IDIR_LXDM)/usr/share/lxdm/themes
-	$(INSTALL_DIR) $(IDIR_LXDM)/usr/share/backgrounds
-	$(CP) ./files/openadk.png \
-		$(IDIR_LXDM)/usr/share/backgrounds/default.png
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxdm/files/lxdm.init b/package/lxdm/files/lxdm.init
deleted file mode 100644
index 40ece255b..000000000
--- a/package/lxdm/files/lxdm.init
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#PKG lxdm
-#INIT 95
-
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${lxdm:-NO}" = x"NO" && exit 0
-	exec sh $0 start
-	;;
-start)
-	/usr/sbin/lxdm
-	;;
-stop)
-	kill $(pgrep -f /usr/sbin/lxdm)
-	;;
-restart)
-	sh $0 stop
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start | stop | restart}"
-	exit 1
-	;;
-esac
-exit $?
diff --git a/package/lxdm/files/lxdm.postinst b/package/lxdm/files/lxdm.postinst
deleted file mode 100644
index 4a038c74d..000000000
--- a/package/lxdm/files/lxdm.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf lxdm lxdm YES
diff --git a/package/lxdm/files/openadk.png b/package/lxdm/files/openadk.png
deleted file mode 100644
index 70f9c3bcd..000000000
--- a/package/lxdm/files/openadk.png
+++ /dev/null
diff --git a/package/lxdm/patches/patch-src_lxdm_c b/package/lxdm/patches/patch-src_lxdm_c
deleted file mode 100644
index b5eeaa4de..000000000
--- a/package/lxdm/patches/patch-src_lxdm_c
+++ /dev/null
@@ -1,43 +0,0 @@
---- lxdm-0.3.0.orig/src/lxdm.c	2010-09-24 17:43:49.000000000 +0200
-+++ lxdm-0.3.0/src/lxdm.c	2011-03-17 23:15:35.093370316 +0100
-@@ -51,8 +51,6 @@
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- 
--#include <execinfo.h>
--
- #include <utmp.h>
- 
- #if HAVE_LIBPAM
-@@ -150,6 +148,7 @@ void stop_pid(int pid)
-     while( waitpid(-1, 0, WNOHANG) > 0 ) ;
- }
- 
-+#if HAVE_LIBPAM
- static void close_pam_session(pam_handle_t *pamh)
- {
-     int err;
-@@ -159,6 +158,7 @@ static void close_pam_session(pam_handle
-     pam_end(pamh, err);
-     pamh = NULL;
- }
-+#endif
- 
- static LXSession *lxsession_find_greeter(void)
- {
-@@ -1480,6 +1480,7 @@ int lxdm_do_auto_login(void)
- 
- static void log_sigsegv(void)
- {
-+/*
- 	void *array[40];
- 	size_t size;
- 	char **bt_strs;
-@@ -1492,6 +1493,7 @@ static void log_sigsegv(void)
- 	    fprintf(stderr, "%s\n", bt_strs[i]);
- 
- 	free(bt_strs);
-+*/
- }
- 
- static void sigsegv_handler(int sig)
diff --git a/package/lxmenu-data/Makefile b/package/lxmenu-data/Makefile
deleted file mode 100644
index 5199baa7f..000000000
--- a/package/lxmenu-data/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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:=		lxmenu-data
-PKG_VERSION:=		0.1.1
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		75b7fee16ef05e96b7ce3607eee3cc93
-PKG_DESCR:=		LXDE menu data
-PKG_SECTION:=		x11/lxde
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://openadk.org/distfiles/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LXMENU_DATA,lxmenu-data,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-lxde-common-install:
-	$(INSTALL_DIR) $(IDIR_LXMENU_DATA)/etc/xdg
-	$(CP) $(WRKINST)/etc/xdg/* $(IDIR_LXMENU_DATA)/etc/xdg
-	$(INSTALL_DIR) $(IDIR_LXMENU_DATA)/usr/share/desktop-directories
-	$(CP) $(WRKINST)/usr/share/desktop-directories/* \
-		$(IDIR_LXMENU_DATA)/usr/share/desktop-directories
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxpanel/Makefile b/package/lxpanel/Makefile
deleted file mode 100644
index 45ad3a8b0..000000000
--- a/package/lxpanel/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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:=		lxpanel
-PKG_VERSION:=		0.5.6
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		4c51dfdc0d15851d331905cfa00cc025
-PKG_DESCR:=		graphical panel
-PKG_SECTION:=		x11/lxde
-PKG_DEPENDS:=		gdk-pixbuf menu-cache glib libintl libgtk
-PKG_DEPENDS+=		libx11
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://openadk.org/distfiles/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LXPANEL,lxpanel,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-lxpanel-install:
-	$(INSTALL_DIR) $(IDIR_LXPANEL)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/lxpanel* \
-		$(IDIR_LXPANEL)/usr/bin
-	$(INSTALL_DIR) $(IDIR_LXPANEL)/usr/share/lxpanel
-	$(CP) $(WRKINST)/usr/share/lxpanel/* \
-		$(IDIR_LXPANEL)/usr/share/lxpanel
-	$(INSTALL_DIR) $(IDIR_LXPANEL)/usr/lib/lxpanel
-	$(CP) $(WRKINST)/usr/lib/lxpanel/* \
-		$(IDIR_LXPANEL)/usr/lib/lxpanel
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxpanel/patches/patch-src_plugins_batt_batt_c b/package/lxpanel/patches/patch-src_plugins_batt_batt_c
deleted file mode 100644
index 33467abc1..000000000
--- a/package/lxpanel/patches/patch-src_plugins_batt_batt_c
+++ /dev/null
@@ -1,29 +0,0 @@
---- lxpanel-0.5.6.orig/src/plugins/batt/batt.c	2010-02-08 07:37:52.000000000 +0100
-+++ lxpanel-0.5.6/src/plugins/batt/batt.c	2011-04-14 22:05:34.617672290 +0200
-@@ -95,7 +95,7 @@ typedef struct {
- typedef struct {
-     char *command;
-     sem_t *lock;
--} alarm;
-+} alarms;
- 
- static void destructor(Plugin *p);
- static void update_display(lx_battery *lx_b, gboolean repaint);
-@@ -103,7 +103,7 @@ static void update_display(lx_battery *l
- /* alarmProcess takes the address of a dynamically allocated alarm struct (which
-    it must free). It ensures that alarm commands do not run concurrently. */
- static void * alarmProcess(void *arg) {
--    alarm *a = (alarm *) arg;
-+    alarms *a = (alarms *) arg;
- 
-     sem_wait(a->lock);
-     system(a->command);
-@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gb
- 	/* Run the alarm command if it isn't already running */
- 	if (alarmCanRun) {
- 	    
--	    alarm *a = (alarm *) malloc(sizeof(alarm));
-+	    alarms *a = (alarms *) malloc(sizeof(alarms));
- 	    a->command = lx_b->alarmCommand;
- 	    a->lock = &(lx_b->alarmProcessLock);
- 	    
diff --git a/package/lxsession/Makefile b/package/lxsession/Makefile
deleted file mode 100644
index cfdc47ddc..000000000
--- a/package/lxsession/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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:=		lxsession
-PKG_VERSION:=		0.4.5
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		d5cd0cb733748191b2c7371c9efda155
-PKG_DESCR:=		LXDE session manager
-PKG_SECTION:=		x11/lxde
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://sourceforge.net/projects/lxde/files/LXSession%20%28session%20manager%29/LXSession%200.4.5/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LXSESSION,lxsession,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-lxsession-install:
-	$(INSTALL_DIR) $(IDIR_LXSESSION)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/lxsession* \
-		$(IDIR_LXSESSION)/usr/bin
-	$(INSTALL_DIR) $(IDIR_LXSESSION)/usr/share/lxsession/images
-	$(CP) $(WRKINST)/usr/share/lxsession/images/* \
-		$(IDIR_LXSESSION)/usr/share/lxsession/images
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxtask/Makefile b/package/lxtask/Makefile
deleted file mode 100644
index 0869805cd..000000000
--- a/package/lxtask/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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:=		lxtask
-PKG_VERSION:=		0.1.3
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		5e54e91b09864c917e91ccafff61de9c
-PKG_DESCR:=		graphical task manager
-PKG_SECTION:=		x11/lxde
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://openadk.org/distfiles/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LXTASK,lxtask,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-lxtask-install:
-	$(INSTALL_DIR) $(IDIR_LXTASK)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/lxtask \
-		$(IDIR_LXTASK)/usr/bin
-	$(INSTALL_DIR) $(IDIR_LXTASK)/usr/share/applications
-	$(CP) $(WRKINST)/usr/share/applications/* \
-		$(IDIR_LXTASK)/usr/share/applications
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxterminal/Makefile b/package/lxterminal/Makefile
deleted file mode 100644
index 80ce979d3..000000000
--- a/package/lxterminal/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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:=		lxterminal
-PKG_VERSION:=		0.1.9
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		cb10cc667611dce3c141294712049c43
-PKG_DESCR:=		LXDE terminal
-PKG_SECTION:=		x11/lxde
-PKG_BUILDDEP:=		vte
-PKG_DEPENDS:=		vte
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://netcologne.dl.sourceforge.net/project/lxde/LXTerminal%20%28terminal%20emulator%29/LXTerminal%200.1.9/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,LXTERMINAL,lxterminal,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-lxterminal-install:
-	$(INSTALL_DIR) $(IDIR_LXTERMINAL)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/lxterminal \
-		$(IDIR_LXTERMINAL)/usr/bin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/lxterminal/patches/patch-src_Makefile_in b/package/lxterminal/patches/patch-src_Makefile_in
deleted file mode 100644
index f9285dc4a..000000000
--- a/package/lxterminal/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,45 +0,0 @@
---- lxterminal-0.1.9.orig/src/Makefile.in	2010-09-01 14:23:17.000000000 +0200
-+++ lxterminal-0.1.9/src/Makefile.in	2011-03-18 11:44:58.343370425 +0100
-@@ -55,8 +55,8 @@ lxterminal_DEPENDENCIES = $(am__DEPENDEN
- am_xml_purge_OBJECTS = xml_purge-xml-purge.$(OBJEXT)
- xml_purge_OBJECTS = $(am_xml_purge_OBJECTS)
- xml_purge_DEPENDENCIES =
--xml_purge_LINK = $(CCLD) $(xml_purge_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+xml_purge_LINK = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \
-+	-o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -215,8 +215,6 @@ lxterminal_LDADD = \
- 		$(INTLLIBS)
- 
- xml_purge_SOURCES = xml-purge.c
--xml_purge_CFLAGS = @CFLAGS@
--xml_purge_LDADD = @LIBS@
- all: all-am
- 
- .SUFFIXES:
-@@ -296,7 +294,7 @@ lxterminal$(EXEEXT): $(lxterminal_OBJECT
- 	$(LINK) $(lxterminal_OBJECTS) $(lxterminal_LDADD) $(LIBS)
- xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) 
- 	@rm -f xml-purge$(EXEEXT)
--	$(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS)
-+	$(xml_purge_LINK) $(xml_purge_OBJECTS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -325,11 +323,11 @@ distclean-compile:
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- xml_purge-xml-purge.o: xml-purge.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
-+@am__fastdepCC_TRUE@	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
-+@am__fastdepCC_FALSE@	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
- 
- xml_purge-xml-purge.obj: xml-purge.c
- @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi`
diff --git a/package/menu-cache/Makefile b/package/menu-cache/Makefile
deleted file mode 100644
index f455642e2..000000000
--- a/package/menu-cache/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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:=		menu-cache
-PKG_VERSION:=		0.3.2
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		bf5efbbb520bee2a35dc4f3005816cf0
-PKG_DESCR:=		menu-cache library
-PKG_SECTION:=		x11/lxde
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://openadk.org/distfiles/
-
-PKG_SUBPKGS:=		MENU_CACHE MENU_CACHE_DEV
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,MENU_CACHE,menu-cache,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,MENU_CACHE_DEV,menu-cache-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-menu-cache-install:
-	$(INSTALL_DIR) $(IDIR_MENU_CACHE)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libmenu-cache.so* \
-		$(IDIR_MENU_CACHE)/usr/lib
-	$(INSTALL_DIR) $(IDIR_MENU_CACHE)/usr/libexec
-	$(INSTALL_BIN) $(WRKINST)/usr/libexec/menu-cache* \
-		$(IDIR_MENU_CACHE)/usr/libexec
-
-menu-cache-dev-install:
-	$(INSTALL_DIR) $(IDIR_MENU_CACHE_DEV)/usr/lib/pkgconfig
-	$(CP) $(WRKINST)/usr/lib/pkgconfig/*.pc \
-		$(IDIR_MENU_CACHE_DEV)/usr/lib/pkgconfig
-	$(INSTALL_DIR) $(IDIR_MENU_CACHE_DEV)/usr/include
-	$(CP) $(WRKINST)/usr/include/* \
-		$(IDIR_MENU_CACHE_DEV)/usr/include
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pcmanfm/Makefile b/package/pcmanfm/Makefile
deleted file mode 100644
index dfca642f9..000000000
--- a/package/pcmanfm/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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:=		pcmanfm
-PKG_VERSION:=		0.9.9
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		f31ed6defb600f7046a456220d8efa3a
-PKG_DESCR:=		graphical file manager
-PKG_SECTION:=		x11/lxde
-PKG_BUILDDEP:=		libfm atk glib gtk+
-PKG_DEPENDS:=		libfm libatk libxcomposite cairo libx11
-PKG_DEPENDS+=		libxrender libgtk glib libxfixes fontconfig
-PKG_DEPENDS+=		libintl pango menu-cache libfreetype libxext
-PKG_DEPENDS+=		libxdamage gdk-pixbuf libpthread
-PKG_URL:=		http://lxde.org/
-PKG_SITES:=		http://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,PCMANFM,pcmanfm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CPPFLAGS_FOR_BUILD+=	$(shell pkg-config --cflags glib-2.0)
-LDFLAGS_FOR_BUILD+=	$(shell pkg-config --libs glib-2.0) -L/usr/lib
-CONFIGURE_ARGS+=	--disable-gtk-doc
-
-pcmanfm-install:
-	$(INSTALL_DIR) $(IDIR_PCMANFM)/etc/xdg/pcmanfm
-	$(CP) $(WRKINST)/etc/xdg/pcmanfm/* \
-		$(IDIR_PCMANFM)/etc/xdg/pcmanfm
-	$(INSTALL_DIR) $(IDIR_PCMANFM)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/pcmanfm \
-		$(IDIR_PCMANFM)/usr/bin
-	$(INSTALL_DIR) $(IDIR_PCMANFM)/usr/share/pcmanfm/ui
-	$(CP) $(WRKINST)/usr/share/pcmanfm/ui/* \
-		$(IDIR_PCMANFM)/usr/share/pcmanfm/ui
-	$(INSTALL_DIR) $(IDIR_PCMANFM)/usr/share/applications
-	$(CP) $(WRKINST)/usr/share/applications/* \
-		$(IDIR_PCMANFM)/usr/share/applications
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pcmanfm/patches/patch-src_Makefile_in b/package/pcmanfm/patches/patch-src_Makefile_in
deleted file mode 100644
index f7c2ff5ac..000000000
--- a/package/pcmanfm/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,36 +0,0 @@
---- pcmanfm-2.0.orig/src/Makefile.in	2011-04-14 20:46:33.000000000 +0200
-+++ pcmanfm-2.0/src/Makefile.in	2011-04-16 11:58:00.000000000 +0200
-@@ -67,8 +67,8 @@ am_xml_purge_OBJECTS = xml_purge-xml-pur
- xml_purge_OBJECTS = $(am_xml_purge_OBJECTS)
- xml_purge_DEPENDENCIES = $(am__DEPENDENCIES_1)
- xml_purge_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(xml_purge_CFLAGS) \
--	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+	$(LIBTOOLFLAGS) --mode=link $(CC_FOR_BUILD) \
-+	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -373,7 +373,7 @@ pcmanfm$(EXEEXT): $(pcmanfm_OBJECTS) $(p
- 	$(pcmanfm_LINK) $(pcmanfm_OBJECTS) $(pcmanfm_LDADD) $(LIBS)
- xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) 
- 	@rm -f xml-purge$(EXEEXT)
--	$(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS)
-+	$(xml_purge_LINK) $(xml_purge_OBJECTS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -525,11 +525,11 @@ pcmanfm-single-inst.obj: single-inst.c
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pcmanfm_CFLAGS) $(CFLAGS) -c -o pcmanfm-single-inst.obj `if test -f 'single-inst.c'; then $(CYGPATH_W) 'single-inst.c'; else $(CYGPATH_W) '$(srcdir)/single-inst.c'; fi`
- 
- xml_purge-xml-purge.o: xml-purge.c
--@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
-+@am__fastdepCC_TRUE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='xml-purge.c' object='xml_purge-xml-purge.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
-+@am__fastdepCC_FALSE@	$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c
- 
- xml_purge-xml-purge.obj: xml-purge.c
- @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi`
diff --git a/package/section.lst b/package/section.lst
index b29d9dcb5..7fc2667ab 100644
--- a/package/section.lst
+++ b/package/section.lst
@@ -40,7 +40,6 @@ admin	System Administration
 utils	Utilities
 www	HTTP / FTP
 wifi	Wireless
-x11/lxde	Lightweight X Desktop Environment
 x11/apps	X applications
 x11/drivers	X drivers
 x11/server	X server