Sun Apr 21 01:12:25 PDT 2013

3 files changed, 16 insertions, 15 deletions

diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD
index dc61fe518..75cb2ecb3 100644
--- a/community/emacs-nox/PKGBUILD
+++ b/community/emacs-nox/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 76185 2012-09-12 20:05:28Z jlichtblau $
+# $Id: PKGBUILD 88621 2013-04-20 17:17:19Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Chris Brannon <cmbrannon@cox.net>
 
 pkgname=emacs-nox
-pkgver=24.2
+pkgver=24.3
 pkgrel=1
-pkgdesc="The Emacs Editor, without X11 support"
+pkgdesc="The extensible, customizable, self-documenting real-time display editor, without X11 support"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('dbus-core' 'ncurses' 'perl')
 provides=('emacs')
-conflicts=('emacs' 'emacs-cvs')
-options=('docs')
+conflicts=('emacs')
 changelog=$pkgname.changelog
 install=$pkgname.install
 source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz)
-sha256sums=('6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357')
+sha256sums=('0098ca3204813d69cd8412045ba33e8701fa2062f4bff56bedafc064979eef41')
 
 build() {
   cd ${srcdir}/emacs-$pkgver
@@ -33,9 +32,8 @@ package() {
   # remove conflict with ctags package
   mv ${pkgdir}/usr/bin/{ctags,ctags.emacs}
   mv ${pkgdir}/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-
-  # fix all the 777 perms on directories
-  find ${pkgdir}/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \;
+  # remove conflict with texinfo
+  rm "$pkgdir"/usr/share/info/info.info.gz
   # fix user/root permissions on usr/share files
   find ${pkgdir}/usr/share/emacs/$pkgver -exec chown root.root {} \;
   # remove .desktop file and icons
diff --git a/community/emacs-nox/emacs-nox.changelog b/community/emacs-nox/emacs-nox.changelog
index 9fe1ae221..ffae307fa 100644
--- a/community/emacs-nox/emacs-nox.changelog
+++ b/community/emacs-nox/emacs-nox.changelog
@@ -1,3 +1,6 @@
+2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* emacs-nox 24.3-1
+
 2012-09-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* emacs-nox 24.2-1
 
diff --git a/community/emacs-nox/emacs-nox.install b/community/emacs-nox/emacs-nox.install
index 740640994..06dc781ee 100644
--- a/community/emacs-nox/emacs-nox.install
+++ b/community/emacs-nox/emacs-nox.install
@@ -1,15 +1,15 @@
 INFO_DIR=usr/share/info
 
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake
+forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode
 org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
+speedbar srecode tramp url vip viper widget wisent woman)
 
 post_install() {
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -20,6 +20,6 @@ post_upgrade() {
 pre_remove() {
   [[ -x usr/bin/install-info ]] || return 0
   for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+    install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }