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

Conflicts:
	community/bwbar/PKGBUILD
	community/dosbox/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/fbgrab/PKGBUILD
	community/fbv/PKGBUILD
	community/flam3/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gdk-pixbuf/PKGBUILD
	community/ghemical/PKGBUILD
	community/gmic/PKGBUILD
	community/gnash/PKGBUILD
	community/gnustep-base/PKGBUILD
	community/guvcview/PKGBUILD
	community/keepassx/PKGBUILD
	community/kvpnc/PKGBUILD
	community/libghemical/PKGBUILD
	community/liboglappth/PKGBUILD
	community/png2ico/PKGBUILD
	community/shapelib/PKGBUILD
	community/sloccount/PKGBUILD
	community/tmw/PKGBUILD
	community/xmoto/PKGBUILD
	core/links/PKGBUILD
	extra/amule/PKGBUILD
	extra/cairomm/PKGBUILD
	extra/calligra/PKGBUILD
	extra/evas/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gd/PKGBUILD
	extra/gif2png/PKGBUILD
	extra/glhack/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/imlib/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/lbreakout2/PKGBUILD
	extra/libgdiplus/PKGBUILD
	extra/libkate/PKGBUILD
	extra/libpano13/PKGBUILD
	extra/libwebp/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxslt/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/ntp/PKGBUILD
	extra/nx/PKGBUILD
	extra/openjpeg/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/sdl_image/PKGBUILD
	extra/vice/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wv/PKGBUILD
	extra/wxgtk/PKGBUILD
	extra/xaos/PKGBUILD
	extra/xsane/PKGBUILD
	extra/zvbi/PKGBUILD

1 files changed, 14 insertions, 14 deletions

diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 68c6465d0..b6cb2551c 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180808 2013-03-26 11:49:39Z foutrelis $
+# $Id: PKGBUILD 184431 2013-05-06 19:39:38Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=2.15.3
+pkgver=3.0.0
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,28 +15,28 @@ depends=('blas' 'lapack' 'bzip2'  'libpng' 'libjpeg' 'libtiff'
          'libxt' 'libxmu' 'pango' 'xz' 'desktop-file-utils')
 makedepends=('jdk7-openjdk' 'gcc-fortran' 'tk')
 optdepends=('tk: tcl/tk interface' 'texlive-bin: latex sty files')
-backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories')
+backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories' 'etc/R/javaconf')
 options=('!makeflags' '!emptydirs')
 install=r.install
-source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz"
+source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png'
 	'R.conf')
-sha1sums=('a05b68f31b00d8038d9f0a8562cfc0c8e32d9621'
+sha1sums=('0cb1d1b815af4ce640ceafd5402a2eb94924c945'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
           '43668da6cfd1b4455a99f23e79e2059294dddac9')
 
-build() {
-   cd "${srcdir}/R-${pkgver}"
-   sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
-
-  # set texmf dir correctly in makefile
-  sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
-
+prepare() {
+   cd R-${pkgver}
+# set texmf dir correctly in makefile
+   sed -i 's|$(rsharedir)/texmf|${datarootdir}/texmf|' share/Makefile.in
 # fix for texinfo 5.X
-  sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
+   sed -i 's|test ${makeinfo_version_min} -lt 7|test ${makeinfo_version_min} -lt 0|' configure
+}
 
+build() {
+   cd R-${pkgver}
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
 		--sysconfdir=/etc/R \
@@ -58,7 +58,7 @@ build() {
 }
 
 package() {
-   cd "${srcdir}/R-${pkgver}"
+   cd R-${pkgver}
    make DESTDIR="${pkgdir}" install
 
 # install libRmath.so