From 28aa42b4982dd29a4b700fbe52e80521e1f16003 Mon Sep 17 00:00:00 2001 From: AlmAck Date: Mon, 18 Feb 2013 22:49:58 +0100 Subject: [PATCH] emacs-nox update to version 24.2, removed workaround and changelog (we use git), code/permissions cleanup extundelete update to version 0.2.4 --- emacs-nox/PKGBUILD | 56 ++++++++++++++--------------------- emacs-nox/emacs-nox.changelog | 20 ------------- extundelete/PKGBUILD | 14 +++++---- 3 files changed, 32 insertions(+), 58 deletions(-) delete mode 100644 emacs-nox/emacs-nox.changelog diff --git a/emacs-nox/PKGBUILD b/emacs-nox/PKGBUILD index a80803d72..df3283fd7 100644 --- a/emacs-nox/PKGBUILD +++ b/emacs-nox/PKGBUILD @@ -1,60 +1,50 @@ # # Apps Packages for Chakra, part of chakra-project.org # -# maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa -# include global config -source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=emacs-nox -pkgver=23.3 +pkgver=24.2 pkgrel=1 -pkgdesc="The Emacs Editor, without X11 support" -arch=('i686' 'x86_64') +pkgdesc='The Emacs Editor, without X11 support' +arch=('x86_64') url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL') -replaces=('cedet') +license=('GPL3') depends=('dbus-core' 'ncurses' 'perl') provides=('emacs') conflicts=('emacs' 'emacs-cvs') options=('docs') -categories=('office') -changelog=$pkgname.changelog install=$pkgname.install source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz) -sha256sums=('0038248a4299708a8717f2f5ba48f1c0f15e95ffc5fcfb08cbe5c3146757e34c') +sha256sums=('6d9892dff6e1761d4a5eba20712beba4f37d77a196f8021081a2e69fcb5bd357') 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 + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --localstatedir=/var --without-x --without-sound + make +} -#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 || return 1 +package() { + cd ${srcdir}/emacs-$pkgver + make DESTDIR=${pkgdir} install - make libexecdir=/usr/lib archlibdir=/usr/lib/emacs/${pkgver} - make prefix=${pkgdir}/usr libexecdir=${pkgdir}/usr/lib \ - archlibdir=${pkgdir}/usr/lib/emacs/${pkgver} install - -#remove conflict with ctags package + #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} -#fix all the 777 perms on directories + 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 + #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 + #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 } \ No newline at end of file diff --git a/emacs-nox/emacs-nox.changelog b/emacs-nox/emacs-nox.changelog deleted file mode 100644 index a2f5f3c01..000000000 --- a/emacs-nox/emacs-nox.changelog +++ /dev/null @@ -1,20 +0,0 @@ -2011-03-13 Jaroslav Lichtblau - * emacs-nox 23.3-1 - -2010-05-12 Jaroslav Lichtblau - * Update to major release 23.2 - -2010-03-17 Jaroslav Lichtblau - * 23.1-2 - fix for FS#18688 - [emacs-nox] compiled with SSE2 instructions - -2009-12-18 Jaroslav Lichtblau - * Update to major release 23.1 - -2008-11-01 Jaroslav Lichtblau - * New PKGBUILD/install method provided by Chris Brannon - * => Added an install script - * => Info files are now installed using install-info - -2008-09-08 Jaroslav Lichtblau - * Package moved to [community] - * Update to major release 22.3 \ No newline at end of file diff --git a/extundelete/PKGBUILD b/extundelete/PKGBUILD index f064fa7f5..707560d5b 100644 --- a/extundelete/PKGBUILD +++ b/extundelete/PKGBUILD @@ -1,25 +1,29 @@ # # Apps Packages for Chakra, part of chakra-project.org # -# maintainer (i686): Phil Miller # maintainer (x86_64): Manuel Tortosa pkgname=extundelete -pkgver=0.2.0 +pkgver=0.2.4 pkgrel=1 pkgdesc="Utility for recovering deleted files from ext2, ext3 or ext4 partitions by parsing the journal" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://extundelete.sourceforge.net" license=('GPL') makedepends=('e2fsprogs') categories=('system') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('6dac74b12a747f133326ff7b81fceedd') +md5sums=('77e626ad31433680c0a222069295d2ca') build() { cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install } \ No newline at end of file