Thu Jul 7 04:59:01 UTC 2011

2 files changed, 21 insertions, 35 deletions

diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD
index 2dcde06ee..8e7d3fe69 100644
--- a/community/xemacs/PKGBUILD
+++ b/community/xemacs/PKGBUILD
@@ -1,48 +1,37 @@
-# $Id: PKGBUILD 96361 2010-10-19 23:18:53Z stephane $
+# $Id: PKGBUILD 49690 2011-06-19 10:01:11Z ebelanger $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor : Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=xemacs
-pkgver=21.5.29
-pkgrel=3
-pkgdesc="highly customizable open source text editor and application development system forked from GNU Emacs"
-arch=(i686 x86_64)
+pkgver=21.5.31
+pkgrel=2
+pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
+arch=('i686' 'x86_64')
 url="http://www.xemacs.org/"
 license=('GPL')
-depends=('db' 'libpng' 'libtiff' 'gpm>=1.20.4' 'bash' 'ncurses>=5.6-7' 'desktop-file-utils' 'libxaw' 'libjpeg')
+depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
 optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface'
             'xorg-fonts-100dpi: X bitmap fonts needed for the interface')
-makedepends=('giflib' 'xbitmaps')
+makedepends=('xbitmaps')
 install=xemacs.install
 source=(http://ftp.xemacs.org/pub/xemacs/beta/$pkgname-$pkgver.tar.gz
         xemacs.desktop
-        xemacs-21.5.29-large-images.patch
-        xemacs-21.5.29-optimization-bug.patch
-        xemacs-21.5.29-vcdiff.patch)
-md5sums=('5364192ae0d3de23d9f4ce197e6493b5'
+        xemacs-21.5.29-optimization-bug.patch)
+md5sums=('0185fe905d0b8d8d094d9b60cf262d4a'
          'a4d3d5c0aa2c7ce7bec491f809ca3694'
-         '23ca5a7c50fe7ebebd9fc4525882cdf1'
-         'eb061b10ea3bbe1026df5326ae1618e3'
-         '4ada657a351b226cdd557f9faaeab075')
+         'eb061b10ea3bbe1026df5326ae1618e3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Fix security issue in vcdiff script
-  patch -Np0 -i ../xemacs-21.5.29-vcdiff.patch
-
-	# Fix problem caused by improper optimization with GCC>=4.1.2 on i686
- 	# (and possibly other arches). See
- 	# http://tracker.xemacs.org/XEmacs/its/issue354
-  # for the upstream bug report.
+# Fix problem caused by improper optimization with GCC>=4.1.2 on i686
+# (and possibly other arches). See
+# http://tracker.xemacs.org/XEmacs/its/issue354
+# for the upstream bug report.
   patch -Np0 -i ../xemacs-21.5.29-optimization-bug.patch
  	
- 	# Fix for security bug
-  # See http://bugs.gentoo.org/show_bug.cgi?id=275397
-  patch -Np1 -i ../xemacs-21.5.29-large-images.patch
-
   ./configure --build="${CHOST}" --prefix=/usr --with-dynamic \
-      --with-x11 --without-postgresql --with-athena=xaw \
+      --without-postgresql --with-athena=xaw \
       --enable-database=berkdb --without-ldap \
       --enable-menubars=lucid --enable-scrollbars=lucid \
       --enable-widgets=athena --enable-dialogs=athena \
@@ -60,20 +49,17 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make -j1 prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man1" infodir="${pkgdir}/usr/share/info" install gzip-el
 
-  rm ${pkgdir}/usr/bin/{b2m,ctags,etags,rcs-checkin}
-  rm ${pkgdir}/usr/share/man/man1/{ctags.1,etags.1}
+  rm "${pkgdir}"/usr/bin/{b2m,ctags,etags}
+  rm "${pkgdir}"/usr/share/man/man1/{ctags.1,etags.1}
 
   # fix  FS#7927
   install -d -m755 "${pkgdir}/usr/share/pixmaps"
-  install -d -m755 "${pkgdir}/usr/share/applications"
-  install -m644 "${srcdir}/${pkgname}.desktop" ${pkgdir}/usr/share/applications/ || return 1
-  ln -sf /usr/lib/xemacs-21.5-b28/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/" || return 1
+  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  ln -sf /usr/share/xemacs-${pkgver%.*}-b${pkgver##*.}/etc/xemacs-icon.xpm "${pkgdir}/usr/share/pixmaps/xemacs-icon.xpm"
 
   # correct permissions
   chown -R root:root "${pkgdir}"
 
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
-  rm ${pkgdir}/usr/share/info/{info.info.gz,texinfo.info-2.gz,cl.info.gz,texinfo.info-1.gz,texinfo.info.gz,standards.info.gz,widget.info.gz}
+  rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info}
 }
 # vim: ts=2 sw=2 et ft=sh
diff --git a/community/xemacs/xemacs.install b/community/xemacs/xemacs.install
index 2cdf5e488..a04ee187f 100644
--- a/community/xemacs/xemacs.install
+++ b/community/xemacs/xemacs.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(beta.info.gz custom.info.gz 
 	  emodules.info.gz external-widget.info.gz 
 	  internals.info-1.gz internals.info-2.gz