3 files changed, 16 insertions, 50 deletions
diff --git a/package/mksh/Config.in b/package/mksh/Config.in
deleted file mode 100644
index 50578b0d2..000000000
--- a/package/mksh/Config.in
+++ /dev/null
@@ -1,31 +0,0 @@
-config ADK_PACKAGE_MKSH
-	prompt "mksh................................. The MirBSD enhanced Korn Shell"
-	tristate
-	default n
-	help
-	  mksh is the MirBSD enhanced version of the Public Domain Korn
-	  shell (pdksh), a bourne-compatible shell which is largely si-
-	  milar to the original AT&T Korn shell.  It includes bug fixes
-	  and feature improvements in order to produce a modern, robust
-	  shell good for interactive and especially script use.  It has
-	  UTF-8 support in the emacs command line editing mode; corres-
-	  ponds to OpenBSD 4.4-beta ksh without GNU bash-like $PS1; the
-	  build environment requirements are autoconfigured; throughout
-	  code simplification/bugfix/enhancement has been done, and the
-	  shell has extended compatibility to other modern shells.
-
-	  This package also installs mksh as /bin/ash and /bin/sh (i.e.
-	  the default Bourne/POSIX shell) and creates a ~/.mkshrc file,
-	  which can be used to further customise the look and feel.
-
-	  http://mirbsd.de/mksh
-
-config ADK_PACKAGE_MKSH_FULL
-	bool "Include all features"
-	depends on ADK_PACKAGE_MKSH
-	default y
-	help
-	  Disable this to remove a few functions from mksh to make it smaller.
-	  Ideal for embedded systems. However, be aware you will lose some
-	  functionality you'd otherwise expect, among these is the vi command
-	  line editing mode.
diff --git a/package/mksh/Makefile b/package/mksh/Makefile
index aeb4fe44e..fe0288232 100644
--- a/package/mksh/Makefile
+++ b/package/mksh/Makefile
@@ -3,18 +3,21 @@
 
 include ${TOPDIR}/rules.mk
 
-PKG_NAME=		mksh
-PKG_VERSION=		39
-PKG_RELEASE=		1
-PKG_MD5SUM=		b2eeb4fe4ccac2704e1440e53cd2672c
+PKG_NAME:=		mksh
+PKG_VERSION:=		39c
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0c3cd172b47eefcdf9a302baa42f5092
 PKG_DESCR:=		MirBSD Korn Shell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org
-PKG_SITES=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
 
 DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.cpio.gz
 WRKDIST=		${WRKDIR}/${PKG_NAME}
 
+PKG_FLAVOURS:=		FULL
+PKGFD_FULL:=		Include all features
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MKSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -23,6 +26,10 @@ ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),)
 TCPPFLAGS+=		-DMKSH_SMALL=1
 endif
 
+CONFIG_STYLE:=		manual
+BUILD_STYLE:=		manual
+INSTALL_STYLE:=		manual
+
 do-build:
 	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' \
 	    CPPFLAGS='${TCPPFLAGS}' LDFLAGS='${TLDFLAGS}' \
diff --git a/package/mksh/patches/patch-dot_mkshrc b/package/mksh/patches/patch-dot_mkshrc
index 038050e7e..2b215b93e 100644
--- a/package/mksh/patches/patch-dot_mkshrc
+++ b/package/mksh/patches/patch-dot_mkshrc
@@ -1,21 +1,11 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mksh.orig/dot.mkshrc	2009-05-30 12:07:24.734860691 +0200
-+++ mksh/dot.mkshrc	2009-05-30 12:07:18.782465058 +0200
-@@ -20,7 +20,7 @@
+--- mksh/dot.mkshrc~	Thu Feb 25 20:48:10 2010
++++ mksh/dot.mkshrc	Sun Feb 28 18:05:10 2010
+@@ -21,7 +21,7 @@
  #-
- # ~/.mkshrc: mksh initialisation file for interactive shells
+ # ${ENV:-~/.mkshrc}: mksh initialisation file for interactive shells
  
 -: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)}
 +: ${EDITOR:=/bin/vi} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)}
  [[ $HOSTNAME = @(localhost|*([	 ])) ]] && HOSTNAME=$(ulimit -c 0;hostname 2>&-)
  : ${HOSTNAME:=nil}; if (( USER_ID )); then PS1='$'; else PS1='#'; fi
  function precmd {
-@@ -38,7 +38,7 @@ unalias ls
- alias l='ls -F'
- alias la='l -a'
- alias ll='l -l'
--alias lo='l -alo'
-+alias lo='l -al'
- alias which='whence -p'
- whence -p rot13 >&- || alias rot13='tr \
-     abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ \