Fix version comparison issues reported in FS#25408; also a handful of fixes from FS#23435

git-svn-id: file:///srv/repos/svn-packages/svn@135730 eb2447ed-0c53-47e4-bac8-5bc4a241df78

trunk/PKGBUILD

@@ -2,7 +2,12 @@
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 pkgname=emacs
-pkgver=23.3a
+_majorver=23.3
+_minorver=a
+# We want something like "23.3.a" so pacman version comparison works, but
+# upstream uses "23.3a", which is a bit silly and interpreted as alpha.
+pkgver=$_majorver.$_minorver
+_realver=$_majorver$_minorver
 pkgrel=1
 pkgdesc="The Emacs Editor"
 arch=(i686 x86_64)
@@ -10,41 +15,39 @@ url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL')
 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)
+depends=('dbus-core' 'librsvg' 'gpm' 'giflib' 'libtiff'  'libxpm' 'libjpeg' 'libxft' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf')
+source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$_realver.tar.gz emacs.desktop)
 md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
          '8af038d2ba4561271e935bb444ceb4e3')
 install=emacs.install
 
 build() {
-  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
+  cd "$srcdir"/$pkgname-$_majorver
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --mandir=/usr/share/man --without-sound \
+    --with-x-toolkit=gtk --with-xft
   make
-  make DESTDIR=$startdir/pkg install
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$_majorver
+  make DESTDIR="$pkgdir" 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 "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1,ctags.emacs.1}
   # fix all the 777 perms on directories
-  find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \;
+  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files
-  find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \;
+  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
   # fix perms on /var/games
-  chmod 775 ${startdir}/pkg/var/games
-  chmod 775 ${startdir}/pkg/var/games/emacs
-  chmod 664 ${startdir}/pkg/var/games/emacs/*
-  chown -R root:50 ${startdir}/pkg/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
 
   # 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%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png
+  mkdir -p "$pkgdir"/usr/share/pixmaps "$pkgdir"/usr/share/applications
+  install -D -m644 "$srcdir"/$pkgname.desktop   "$pkgdir"/usr/share/applications
+  ln -s  ../emacs/$_majorver/etc/images/icons/hicolor/48x48/apps/emacs.png "$pkgdir"/usr/share/pixmaps/emacs-icon.png
 }