From 7f2d7bd11daf0c654d4147cb91f9913bc587c276 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 6 Aug 2011 23:14:28 +0000 Subject: Sat Aug 6 23:14:27 UTC 2011 --- extra/emacs/PKGBUILD | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'extra/emacs/PKGBUILD') diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 88b2e2eb0..c411dd4fc 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 113641 2011-03-10 11:31:08Z juergen $ +# $Id: PKGBUILD 134523 2011-08-05 07:55:30Z juergen $ # Maintainer: Juergen Hoetzel # Contributor: Renchi Raju pkgname=emacs -pkgver=23.3 +pkgver=23.3a pkgrel=1 pkgdesc="The Emacs Editor" arch=(i686 x86_64) @@ -12,30 +12,30 @@ options=(docs) replaces=(cedet) depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff' 'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf') source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop) -md5sums=('bf07c01ef473d8540c9c39f94506b1e6' +md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04' '8af038d2ba4561271e935bb444ceb4e3') install=emacs.install build() { - cd $startdir/src/$pkgname-$pkgver + cd $startdir/src/$pkgname-${pkgver%[a-z]} mandir=/usr/share/man - + # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904 CFLAGS="${CFLAGS} -fno-optimize-sibling-calls"\ ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ --localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk - make - make DESTDIR=$startdir/pkg install + make + make DESTDIR=$startdir/pkg install # remove conflict with ctags package - mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} - mv $startdir/pkg/usr/bin/{etags,etags.emacs} - mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} - mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} + mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} + mv $startdir/pkg/usr/bin/{etags,etags.emacs} + mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} + mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} # fix all the 777 perms on directories - find $startdir/pkg/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \; + find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \; # fix user/root permissions on usr/share files - find $startdir/pkg/usr/share/emacs/$pkgver -exec chown root.root {} \; + find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \; # fix perms on /var/games chmod 775 ${startdir}/pkg/var/games chmod 775 ${startdir}/pkg/var/games/emacs @@ -43,8 +43,8 @@ build() { chown -R root:50 ${startdir}/pkg/var/games - # fix FS#9253 + # fix FS#9253 mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications install -D -m644 ${startdir}/src/${pkgname}.desktop ${startdir}/pkg/usr/share/applications - ln -s ../emacs/${pkgver}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png + ln -s ../emacs/${pkgver%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png } -- cgit v1.2.3-54-g00ecf