Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/avifile/PKGBUILD
	community/blackbox/PKGBUILD
	community/blobby2/PKGBUILD
	community/chmsee/PKGBUILD
	community/extrema/PKGBUILD
	community/floyd/PKGBUILD
	community/gnash/PKGBUILD
	community/gq/PKGBUILD
	community/gsql/PKGBUILD
	community/haddock/PKGBUILD
	community/hashcash/PKGBUILD
	community/kvpnc/PKGBUILD
	community/uptimed/PKGBUILD
	community/wol/PKGBUILD
	core/jfsutils/PKGBUILD
	core/reiserfsprogs/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libffado/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/lua/PKGBUILD
	extra/mesa/PKGBUILD
	extra/valgrind/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD

2 files changed, 41 insertions, 24 deletions

diff --git a/community/xnc/PKGBUILD b/community/xnc/PKGBUILD
index edb37f897..43cb3b476 100644
--- a/community/xnc/PKGBUILD
+++ b/community/xnc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 8981 2010-01-23 01:17:11Z foutrelis $
+# $Id: PKGBUILD 58678 2011-11-17 15:02:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xnc
 pkgver=5.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="X nortern captain file manager"
 arch=(i686 x86_64 'mips64el')
 url="http://xnc.jinr.ru/"
@@ -12,12 +12,13 @@ depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7')
 makedepends=('libxt')
 options=('!makeflags')
 source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch)
-md5sums=('62446cdfdf5730f125fb351a658c0bd3' '60673809f2db3a8d9939e9f38ade59d2')
+md5sums=('62446cdfdf5730f125fb351a658c0bd3'
+         'c0037a081824bca691e59a4ec68b6686')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -p0 < ../xnc-gcc44.patch || return 1
-  ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+  patch -p1 <$srcdir/xnc-gcc44.patch
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/xnc/xnc-gcc44.patch b/community/xnc/xnc-gcc44.patch
index 5ce977850..120d9d467 100644
--- a/community/xnc/xnc-gcc44.patch
+++ b/community/xnc/xnc-gcc44.patch
@@ -1,5 +1,18 @@
---- src/lib/tool/commonfuncs.cxx.orig	2009-07-15 21:19:42.000000000 -0400
-+++ src/lib/tool/commonfuncs.cxx	2009-07-15 21:23:58.000000000 -0400
+diff -wbBur xnc-5.0.4/src/include/commonfuncs.h xnc-5.0.4.my/src/include/commonfuncs.h
+--- xnc-5.0.4/src/include/commonfuncs.h	2002-10-16 10:44:17.000000000 +0400
++++ xnc-5.0.4.my/src/include/commonfuncs.h	2011-11-17 18:59:19.000000000 +0400
+@@ -15,7 +15,7 @@
+ extern int   path_to_fullpath(char* dest, char *srcdir);
+ extern void  add_path_content(char *curdir, const char *cont, int vms_host=0);
+ extern void  upper_path(char *curdir, int vms_host=0);
+-extern char* get_first_content(const char *curdir, char *cont);
++extern const char* get_first_content(const char *curdir, char *cont);
+ extern void  get_last_content(char *curdir, char *cont);
+ extern void  get_last_and_rest_content(char* curdir, char* last, char* rest);
+ extern void  str_swap(char *str1, char *str2);
+diff -wbBur xnc-5.0.4/src/lib/tool/commonfuncs.cxx xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx
+--- xnc-5.0.4/src/lib/tool/commonfuncs.cxx	2002-10-16 10:44:20.000000000 +0400
++++ xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx	2011-11-17 18:59:19.000000000 +0400
 @@ -117,9 +117,9 @@
  }
  
@@ -12,19 +25,9 @@
          if(b)
            {
                    strncpy(cont,curdir,b-curdir);
---- src/include/commonfuncs.h.orig	2009-07-15 21:24:37.000000000 -0400
-+++ src/include/commonfuncs.h	2009-07-15 21:25:04.000000000 -0400
-@@ -15,7 +15,7 @@
- extern int   path_to_fullpath(char* dest, char *srcdir);
- extern void  add_path_content(char *curdir, const char *cont, int vms_host=0);
- extern void  upper_path(char *curdir, int vms_host=0);
--extern char* get_first_content(const char *curdir, char *cont);
-+extern const char* get_first_content(const char *curdir, char *cont);
- extern void  get_last_content(char *curdir, char *cont);
- extern void  get_last_and_rest_content(char* curdir, char* last, char* rest);
- extern void  str_swap(char *str1, char *str2);
---- src/lib/vfs/afs.cxx.orig	2009-07-15 21:47:44.000000000 -0400
-+++ src/lib/vfs/afs.cxx	2009-07-15 21:50:02.000000000 -0400
+diff -wbBur xnc-5.0.4/src/lib/vfs/afs.cxx xnc-5.0.4.my/src/lib/vfs/afs.cxx
+--- xnc-5.0.4/src/lib/vfs/afs.cxx	2003-11-27 18:36:43.000000000 +0300
++++ xnc-5.0.4.my/src/lib/vfs/afs.cxx	2011-11-17 18:59:19.000000000 +0400
 @@ -29,7 +29,7 @@
  // The return value is static, so copy it before using the
  // method again!
@@ -43,8 +46,9 @@
      if(*s)
      {
        do
---- src/lib/vfs/ftpfs.cxx.orig	2009-07-15 21:50:48.000000000 -0400
-+++ src/lib/vfs/ftpfs.cxx	2009-07-15 21:54:26.000000000 -0400
+diff -wbBur xnc-5.0.4/src/lib/vfs/ftpfs.cxx xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx
+--- xnc-5.0.4/src/lib/vfs/ftpfs.cxx	2002-10-30 15:47:38.000000000 +0300
++++ xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx	2011-11-17 18:59:19.000000000 +0400
 @@ -1413,7 +1413,7 @@
                   return;
           if(strcmp(dir,"/"))
@@ -54,3 +58,15 @@
                   if(*s=='/')         //Skip leading '/'
                           s++;
                   do
+diff -wbBur xnc-5.0.4/src/man_page.cxx xnc-5.0.4.my/src/man_page.cxx
+--- xnc-5.0.4/src/man_page.cxx	2002-10-02 16:54:33.000000000 +0400
++++ xnc-5.0.4.my/src/man_page.cxx	2011-11-17 18:59:00.000000000 +0400
+@@ -81,7 +81,7 @@
+       buf[j] = 0;
+       manf->size = j;
+       delete buf;
+-      fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC);
++      fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+       write(fp, buf2, j);
+       close(fp);
+       delete manf;