diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 16:36:47 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 16:36:47 -0300 |
commit | 572f3b3bd973bfa7e64c4c42fe87c8e3a79b7c20 (patch) | |
tree | 89f43dd22eaacadfa97977de1f3b73285da15735 /community/mksh | |
parent | cebf33d7109e0157a80f34d6136e212f0a28d274 (diff) | |
parent | 5898d76e47144f2366f9acda9ab52827b696c2d5 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/ecryptfs-utils/PKGBUILD
community/erlang/PKGBUILD
community/esmtp/PKGBUILD
community/gmic/PKGBUILD
community/ibus-sunpinyin/PKGBUILD
community/libev/PKGBUILD
community/libmirage/PKGBUILD
community/libraw/PKGBUILD
community/lilypond/PKGBUILD
community/luajit/PKGBUILD
community/matchbox-window-manager/PKGBUILD
community/miniupnpc/PKGBUILD
community/mplayer2/PKGBUILD
community/mumble/PKGBUILD
community/oss/PKGBUILD
community/pidgin-lwqq/PKGBUILD
community/postgis/PKGBUILD
community/python2-pytables/PKGBUILD
community/qmc2/PKGBUILD
community/qtfm/PKGBUILD
community/ruby-gtk3/PKGBUILD
community/tea/PKGBUILD
community/yacpi/PKGBUILD
core/bridge-utils/PKGBUILD
core/gcc/PKGBUILD
core/libsasl/PKGBUILD
core/lvm2/PKGBUILD
core/net-tools/PKGBUILD
core/ppp/PKGBUILD
core/pptpclient/PKGBUILD
core/sdparm/PKGBUILD
core/systemd/PKGBUILD
core/sysvinit-tools/PKGBUILD
extra/aisleriot/PKGBUILD
extra/arora/PKGBUILD
extra/bluez-hcidump/PKGBUILD
extra/bluez/PKGBUILD
extra/cups/PKGBUILD
extra/cyrus-sasl/PKGBUILD
extra/dhcp/PKGBUILD
extra/gnome-bluetooth/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnutls/PKGBUILD
extra/gts/PKGBUILD
extra/guile/PKGBUILD
extra/harfbuzz/PKGBUILD
extra/iptraf-ng/PKGBUILD
extra/json-c/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/libatasmart/PKGBUILD
extra/libbsd/PKGBUILD
extra/libdmtx/PKGBUILD
extra/libhangul/PKGBUILD
extra/libindi/PKGBUILD
extra/libpeas/PKGBUILD
extra/libsmbios/PKGBUILD
extra/libspiro/PKGBUILD
extra/libsrtp/PKGBUILD
extra/libxml2/PKGBUILD
extra/libxrender/PKGBUILD
extra/libxvmc/PKGBUILD
extra/llvm/PKGBUILD
extra/maxima/PKGBUILD
extra/msmtp/PKGBUILD
extra/ortp/PKGBUILD
extra/perl-dbd-sqlite/PKGBUILD
extra/perl-yaml-syck/PKGBUILD
extra/php/PKGBUILD
extra/pm-utils/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt4/PKGBUILD
extra/scim-anthy/PKGBUILD
extra/scim-chewing/PKGBUILD
extra/scim-m17n/PKGBUILD
extra/scim/PKGBUILD
extra/ssmtp/PKGBUILD
extra/texmacs/PKGBUILD
extra/v86d/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webkitgtk2/PKGBUILD
extra/wireshark/PKGBUILD
extra/zsh/PKGBUILD
libre/bogofilter-libre/PKGBUILD
libre/ecasound-libre/PKGBUILD
libre/libretools/libretools.install
libre/mc-libre/PKGBUILD
Diffstat (limited to 'community/mksh')
-rw-r--r-- | community/mksh/PKGBUILD | 6 | ||||
-rw-r--r-- | community/mksh/mksh.install | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 7ff1623f2..7006cd73e 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 89988 2013-05-06 18:29:21Z ttoepper $ +# $Id: PKGBUILD 92251 2013-06-03 11:15:23Z allan $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh pkgver=R46 -pkgrel=2 +pkgrel=3 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' license=('custom') @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname" - install -D -m 755 mksh "$pkgdir/bin/mksh" + install -D -m 755 mksh "$pkgdir/usr/bin/mksh" install -D -m 644 mksh.1 "$pkgdir/usr/share/man/man1/mksh.1" install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc" install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt" diff --git a/community/mksh/mksh.install b/community/mksh/mksh.install index 3e5f2a924..f096a2b66 100644 --- a/community/mksh/mksh.install +++ b/community/mksh/mksh.install @@ -2,10 +2,6 @@ post_install() { grep -x /bin/mksh /etc/shells >/dev/null || echo /bin/mksh >>/etc/shells } -post_upgrade() { - post_install $1 -} - post_remove() { sed -i "/^\/bin\/mksh$/d" /etc/shells } |