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

Sergej Pupykin spupykin at nymeria.archlinux.org
Mon Jan 20 11:00:54 UTC 2014


    Date: Monday, January 20, 2014 @ 12:00:54
  Author: spupykin
Revision: 104408

upgpkg: calc 2.12.4.13-1

upd

Modified:
  calc/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++----------------------------------------
 1 file changed, 6 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-20 01:50:45 UTC (rev 104407)
+++ PKGBUILD	2014-01-20 11:00:54 UTC (rev 104408)
@@ -3,56 +3,21 @@
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 
 pkgname=calc
-pkgver=2.12.4.8
+pkgver=2.12.4.13
 pkgrel=1
 pkgdesc="console calculator"
 arch=(i686 x86_64)
 url="http://www.isthe.com/chongo/tech/comp/calc/"
 license=('GPL')
-depends=(glibc)
+depends=('readline')
+makedepends=('chrpath')
 #source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2)
 source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2)
-md5sums=('38694f375e172f0b830d4dbf9d6f2dcc')
+md5sums=('7955e52ebd6b4f8482ef2b31c490eb35')
 
 build() {
   cd $srcdir/calc-$pkgver
-
-  patch -p0 Makefile <<EOF
-1146c1146
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1180c1180
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH= \${PWD}:\${LIBDIR}
-1233c1233
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1275c1275
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1312c1312
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1350c1350
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1406c1406
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-1443c1443
-< DEFAULT_LIB_INSTALL_PATH= \${PWD}:/lib:/usr/lib:\${LIBDIR}:/usr/local/lib
----
-> DEFAULT_LIB_INSTALL_PATH=/lib:/usr/lib:\${LIBDIR}
-EOF
-
-  make -j1
+  make USE_READLINE="-DUSE_READLINE" READLINE_LIB="-lreadline" READLINE_EXTRAS="-lhistory -lncurses" -j1
 }
 
 package() {
@@ -59,4 +24,5 @@
   cd $srcdir/calc-$pkgver
   make T=$pkgdir install
   mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/
+  chrpath -d $pkgdir/usr/bin/calc
 }




More information about the arch-commits mailing list