summaryrefslogtreecommitdiff
path: root/community/emacs-nox/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-06-14 18:16:51 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-06-14 18:16:51 +0200
commitb32e36625b44b5c002c417ab4faf6311258c7671 (patch)
tree87f91f6f7d9ccb229f9c7613f5411534bd504f5e /community/emacs-nox/PKGBUILD
parent1a274201c465801ed2271018f426f0eaf7098215 (diff)
parent35c30674b2b901077a809a6f1d8e5a0115098c8b (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/mplayer2/PKGBUILD community/pcmanfm/PKGBUILD extra/liblrdf/PKGBUILD extra/php-apc/PKGBUILD extra/sqlite/PKGBUILD kde-unstable/libkgapi/PKGBUILD kde-unstable/soprano/PKGBUILD multilib/lib32-libphobos-ldc/PKGBUILD multilib/lib32-pixman/PKGBUILD multilib/lib32-sqlite3/PKGBUILD
Diffstat (limited to 'community/emacs-nox/PKGBUILD')
-rw-r--r--community/emacs-nox/PKGBUILD41
1 files changed, 15 insertions, 26 deletions
diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD
index 1ec9cf40f..85a888af8 100644
--- a/community/emacs-nox/PKGBUILD
+++ b/community/emacs-nox/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 67599 2012-03-13 13:43:30Z lcarlier $
+# $Id: PKGBUILD 72353 2012-06-12 21:10:00Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Chris Brannon <cmbrannon@cox.net>
pkgname=emacs-nox
-pkgver=23.4
+pkgver=24.1
pkgrel=1
pkgdesc="The Emacs Editor, without X11 support"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/emacs/emacs.html"
license=('GPL')
-replaces=('cedet')
depends=('dbus-core' 'ncurses' 'perl')
provides=('emacs')
conflicts=('emacs' 'emacs-cvs')
@@ -17,43 +16,33 @@ options=('docs')
changelog=$pkgname.changelog
install=$pkgname.install
source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz)
-sha256sums=('b9a2b8434052771f797d2032772eba862ff9aa143029efc72295170607289c18')
+sha256sums=('60d26dd1d9c0b955543ae83a2f4dd7c8b6af59e16a06822cfb175f1bf97c8bab')
build() {
cd ${srcdir}/emacs-$pkgver
- # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904
- CFLAGS="${CFLAGS} -fno-optimize-sibling-calls"\
- ./configure --prefix=/usr --without-x --without-sound
-
- # we don't want to use /usr/libexec
- sed -i "s|\"/usr/libexec/emacs.*$|\"/usr/lib/emacs/$pkgver\"|g" src/epaths.h
- # mv newepaths.h src/epaths.h
-
- make libexecdir=/usr/lib archlibdir=/usr/lib/emacs/${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+ --localstatedir=/var --without-x --without-sound
+ make
}
package() {
cd ${srcdir}/emacs-$pkgver
-
- make prefix=${pkgdir}/usr libexecdir=${pkgdir}/usr/lib \
- archlibdir=${pkgdir}/usr/lib/emacs/${pkgver} install
-
+ make DESTDIR=${pkgdir} install
+
# remove conflict with ctags package
mv ${pkgdir}/usr/bin/{ctags,ctags.emacs}
- mv ${pkgdir}/usr/bin/{etags,etags.emacs}
- mv ${pkgdir}/usr/share/man/man1/{etags.1,etags.emacs.1}
- mv ${pkgdir}/usr/share/man/man1/{ctags.1,ctags.emacs.1}
+ 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 {} \;
# fix user/root permissions on usr/share files
find ${pkgdir}/usr/share/emacs/$pkgver -exec chown root.root {} \;
- # remove empty files
- rm -rf ${pkgdir}/usr/var
# remove .desktop file and icons
rm -rf ${pkgdir}/usr/share/{applications,icons}
-
- # get rid of the package's info directory, install-info adds entries for us at install-time
- rm ${pkgdir}/usr/share/info/dir
- gzip -9nf ${pkgdir}/usr/share/info/*
+ # fix perms on /var/games
+ chmod 775 ${pkgdir}/var/games
+ chmod 775 ${pkgdir}/var/games/emacs
+ chmod 664 ${pkgdir}/var/games/emacs/*
+ chown -R root:games ${pkgdir}/var/games
}