diff options
Diffstat (limited to 'package/mksh')
| -rw-r--r-- | package/mksh/Makefile | 16 | ||||
| -rw-r--r-- | package/mksh/files/mksh.conffiles (renamed from package/mksh/ipkg/mksh.conffiles) | 0 | ||||
| -rw-r--r-- | package/mksh/ipkg/mksh.control | 4 | ||||
| -rw-r--r-- | package/mksh/patches/patch-dot_mkshrc | 27 |
4 files changed, 16 insertions, 31 deletions
diff --git a/package/mksh/Makefile b/package/mksh/Makefile index b141d0693..1ef2368b0 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -6,16 +6,20 @@ include ${TOPDIR}/rules.mk PKG_NAME= mksh -PKG_VERSION= 35b -PKG_RELEASE= 2 +PKG_VERSION= 38 +PKG_RELEASE= 1 +PKG_MD5SUM= e2fa1f50690abf763cc3e4d8e1612728 +PKG_DESCR:= popular MirOS KSH +PKG_SECTION:= shells +PKG_URL:= http://www.mirbsd.org +PKG_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} + DISTFILES= ${PKG_NAME}-R${PKG_VERSION}.cpio.gz -PKG_MD5SUM= 0e96cd3f8141b7abc679bbb303a8be2c -MASTER_SITES= ${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/} WRKDIST= ${WRKDIR}/${PKG_NAME} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,MKSH,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),) TCPPFLAGS+= -DMKSH_SMALL=1 @@ -24,7 +28,7 @@ endif do-build: cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TCFLAGS}' \ CPPFLAGS='${TCPPFLAGS}' LDFLAGS='${TLDFLAGS}' \ - TARGET_OS=${UNAME_S} ${BASH} ${WRKSRC}/Build.sh -Q -r + TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r do-install: install -d -m 0755 ${IDIR_MKSH}/bin diff --git a/package/mksh/ipkg/mksh.conffiles b/package/mksh/files/mksh.conffiles index f139f0b55..f139f0b55 100644 --- a/package/mksh/ipkg/mksh.conffiles +++ b/package/mksh/files/mksh.conffiles diff --git a/package/mksh/ipkg/mksh.control b/package/mksh/ipkg/mksh.control deleted file mode 100644 index 40c076116..000000000 --- a/package/mksh/ipkg/mksh.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: mksh -Priority: optional -Section: misc -Description: MirBSD enhanced version of the Korn Shell diff --git a/package/mksh/patches/patch-dot_mkshrc b/package/mksh/patches/patch-dot_mkshrc index 13093bb79..038050e7e 100644 --- a/package/mksh/patches/patch-dot_mkshrc +++ b/package/mksh/patches/patch-dot_mkshrc @@ -1,31 +1,16 @@ -$Id$ - - • OpenADK patches: - – no hostname(1) - – ls has no -o - – yofuh doesn’t like $? in $PS1 - ---- mksh.orig/dot.mkshrc Sat May 17 18:27:55 2008 -+++ mksh/dot.mkshrc Mon Jul 21 21:02:05 2008 -@@ -2,13 +2,15 @@ +$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 @@ #- # ~/.mkshrc: mksh initialisation file for interactive shells -: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(ulimit -c 0;hostname -s 2>&-)} -+: ${EDITOR:=/bin/ed} ${TERM:=vt100} ${HOSTNAME:=$(</proc/sys/kernel/hostname)} ++: ${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 { - typeset -i e=$? - -- (( e )) && print -n "$e|" -+# enable this back if you want the errorlevel in your prompt -+# this is default in upstream mksh, disabled locally in fwrt -+# (( e )) && print -n "$e|" - } - PS1='$(precmd)${USER:=$(ulimit -c 0;id -un 2>&- || print \?)}@${HOSTNAME%%.*}:$( - typeset pfx=~ wd=${PWD:-?} -@@ -30,7 +32,7 @@ unalias ls +@@ -38,7 +38,7 @@ unalias ls alias l='ls -F' alias la='l -a' alias ll='l -l' |