[arch-commits] Commit in r/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Thursday, January 26, 2012 @ 19:28:03
  Author: eric
Revision: 147683

upgpkg: r 2.14.0-2

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  r/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-01-26 19:27:33 UTC (rev 147682)
+++ PKGBUILD	2012-01-27 00:28:03 UTC (rev 147683)
@@ -5,7 +5,7 @@
 
 pkgname=r
 pkgver=2.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -25,7 +25,7 @@
           'a69a07ec363440efc18ce0a7f2af103375dea978')
 
 build() {
-   cd ${srcdir}/R-${pkgver}
+   cd "${srcdir}/R-${pkgver}"
    sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c
    ./configure  --prefix=/usr \
 		--libdir=/usr/lib \
@@ -44,26 +44,26 @@
 }
 
 package() {
-   cd ${srcdir}/R-${pkgver}
-   make -j1 DESTDIR=${pkgdir} install
+   cd "${srcdir}/R-${pkgver}"
+   make -j1 DESTDIR="${pkgdir}" install
 
    #  Fixup R wrapper scripts.
-   sed -i "s|${pkgdir} ||" ${pkgdir}/usr/bin/R
-   rm ${pkgdir}/usr/lib/R/bin/R
-   cd ${pkgdir}/usr/lib/R/bin
+   sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R"
+   rm "${pkgdir}/usr/lib/R/bin/R"
+   cd "${pkgdir}/usr/lib/R/bin"
    ln -s ../../../bin/R
 
   # install some freedesktop.org compatibility
-  install -Dm644 ${srcdir}/r.desktop \
-	${pkgdir}/usr/share/applications/r.desktop
-  install -Dm644 ${srcdir}/r.png \
-	${pkgdir}/usr/share/pixmaps/r.png
+  install -Dm644 "${srcdir}/r.desktop" \
+	"${pkgdir}/usr/share/applications/r.desktop"
+  install -Dm644 "${srcdir}/r.png" \
+	"${pkgdir}/usr/share/pixmaps/r.png"
 
   # move the config directory to /etc and create symlinks
-  install -d ${pkgdir}/etc/R
-  cd ${pkgdir}/usr/lib/R/etc
+  install -d "${pkgdir}/etc/R"
+  cd "${pkgdir}/usr/lib/R/etc"
   for i in *; do
-    mv -f ${i} ${pkgdir}/etc/R
+    mv -f ${i} "${pkgdir}/etc/R"
     ln -s /etc/R/${i} ${i}
   done
 }