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

2 files changed, 21 insertions, 22 deletions

diff --git a/community/tcsh/PKGBUILD b/community/tcsh/PKGBUILD
index 94379970c..74754de30 100644
--- a/community/tcsh/PKGBUILD
+++ b/community/tcsh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66330 2012-02-23 15:37:07Z lfleischer $
+# $Id: PKGBUILD 92256 2013-06-03 11:15:29Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=tcsh
 pkgver=6.18.01
-pkgrel=1
+pkgrel=2
 pkgdesc='Enhanced version of the Berkeley C shell.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.tcsh.org/Welcome'
@@ -24,19 +24,20 @@ md5sums=('6eed09dbd4223ab5b6955378450d228a'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --bindir=/bin
+  ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  install -dm0755 "${pkgdir}/bin/"
-
   make DESTDIR="${pkgdir}" mandir=/usr/share/man install install.man
 
   install -Dm0644 "${srcdir}/csh.cshrc" "${pkgdir}/etc/csh.cshrc"
   install -Dm0644 "${srcdir}/csh.login" "${pkgdir}/etc/csh.login"
   install -Dm0644 Copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  ln -s tcsh "${pkgdir}/bin/csh"
+  ln -s tcsh "${pkgdir}/usr/bin/csh"
+  ln -s tcsh.1 "${pkgdir}/usr/share/man/man1/csh.1"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/tcsh/tcsh.install b/community/tcsh/tcsh.install
index 023ddd115..00911470f 100644
--- a/community/tcsh/tcsh.install
+++ b/community/tcsh/tcsh.install
@@ -1,25 +1,23 @@
 post_install() {
-  if [ ! "`grep /bin/tcsh etc/shells`" ]; then
-    echo "updating /etc/shells... done."
-    sed -i "s|/bin/bash|/bin/bash\n/bin/tcsh\n/bin/csh|" etc/shells
-  else
-    sed -i "s|/usr/bin/tcsh|/bin/tcsh|" etc/shells
-    sed -i "s|/usr/bin/csh|/bin/csh|" etc/shells
-
-    echo ""
-    echo ">> WARNING: /usr/bin/tcsh has moved to /bin/tcsh,"
-    echo ">> WARNING: /usr/bin/csh has moved to /bin/csh,"
-    echo ">> please update your user accounts as needed"
-    echo ""
+  if ! grep -q /bin/tcsh etc/shells; then
+    echo /bin/tcsh >> etc/shells
+    echo /bin/csh >> etc/shells
+    echo 'Added to /etc/shells.'
   fi
 }
 
 post_upgrade() {
-	post_install $1
+  if grep -q /usr/bin/tcsh etc/shells; then
+    sed -i 's|/usr/bin/tcsh|/bin/tcsh|' etc/shells
+    sed -i 's|/usr/bin/csh|/bin/csh|' etc/shells
+    echo 'Fixed path in /etc/shells.'
+  fi
 }
 
 pre_remove() {
-  echo "updating /etc/shells... done."
-  sed -i "\|/bin/tcsh|d" etc/shells
-  sed -i "\|/bin/csh|d" etc/shells
+  sed -i '\|/bin/tcsh|d' etc/shells
+  sed -i '\|/bin/csh|d' etc/shells
+  echo 'Removed from /etc/shells.'
 }
+
+# vim:set ts=2 sw=2 et: