Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 9 insertions, 9 deletions

diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD
index 0819548b5..2dffb2fb8 100644
--- a/extra/nedit/PKGBUILD
+++ b/extra/nedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 135019 2011-08-09 21:15:50Z eric $
+# $Id: PKGBUILD 191231 2013-07-21 23:04:03Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=nedit
 pkgver=5.5
-pkgrel=6.2
+pkgrel=7
 pkgdesc="A Unix text editor for programmers and general users"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nedit.org/"
@@ -11,25 +11,25 @@ license=('GPL')
 depends=('lesstif' 'libxpm')
 source=(http://www.nedit.org/${pkgname}-${pkgver}-src.tar.bz2 
 	nedit_xorg_composite_fix.patch)
-md5sums=('48cb3dce52d44988f3a4d7c6f47b6bbe'
-         'ae1f56ae9b23163882051720ac52412d')
 sha1sums=('7d3c87a793a5047cf857af1ac82e39f3b33e8a87'
           '1f6c75075a6bdc7b0dd8ca89d8117d68af8fc54e')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../nedit_xorg_composite_fix.patch
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/nedit_xorg_composite_fix.patch"
   sed -i 's/-Wl,-Bstatic//' makefiles/Makefile.linux
   sed -i 's|fgets|//fgets|' util/check_lin_tif.c
   sed -i "s/CFLAGS=-O/CFLAGS=${CFLAGS} -DBUILD_UNTESTED_NEDIT/" makefiles/Makefile.linux
   sed -i 's|"/bin/csh"|"/bin/sh"|' source/preferences.c
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   make linux docs
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+  cd ${pkgname}-${pkgver}
   install -Dm755 source/nedit "${pkgdir}/usr/bin/nedit"
   install -Dm755 source/nc "${pkgdir}/usr/bin/nedit-client"
   install -Dm644 doc/nedit.man "${pkgdir}/usr/share/man/man1/nedit.1"