summaryrefslogtreecommitdiff
path: root/community/units
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-03-22 00:05:48 -0700
committerroot <root@rshg054.dnsready.net>2013-03-22 00:05:48 -0700
commit6b3123e5628817e3cef9c44989dffd21c49b0817 (patch)
tree4f90f61ad34554f75c2ae8b435b6e0d2d8b480e0 /community/units
parent76b6359ba6b2c7cce2f0b0725c7ecd831563cabf (diff)
Fri Mar 22 00:05:47 PDT 2013
Diffstat (limited to 'community/units')
-rw-r--r--community/units/PKGBUILD12
-rw-r--r--community/units/build-fix.patch27
2 files changed, 5 insertions, 34 deletions
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index ebf819493..c9be463ad 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84848 2013-02-25 10:40:35Z spupykin $
+# $Id: PKGBUILD 86729 2013-03-21 15:11:16Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jeff Mickey <jeff@archlinux.org>
# Contributor: Steve Sansom <snsansom@gmail.com>
pkgname=units
pkgver=2.01
-pkgrel=1
+pkgrel=2
pkgdesc="converts between different units"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/units/units.html"
@@ -13,14 +13,12 @@ depends=('readline')
license=("GPL")
options=('!makeflags')
install=units.install
-source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
- build-fix.patch)
-md5sums=('81bf85937c56fbbd04b16f2f3f9d8526'
- 'dbb20e628ce0879fe82393f585e9dab6')
+source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz)
+md5sums=('81bf85937c56fbbd04b16f2f3f9d8526')
build() {
cd $srcdir/$pkgname-$pkgver
-# patch -p1 <$srcdir/build-fix.patch
+ sed -i 's|/usr/bin/python|/usr/bin/python2|' units_cur
./configure --prefix=/usr --datadir=/usr/share
make
}
diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch
deleted file mode 100644
index 7361a9e91..000000000
--- a/community/units/build-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
---- units-2.00.org/Makefile.in 2012-05-03 00:37:55.000000000 +0400
-+++ units-2.00/Makefile.in 2012-07-04 12:54:20.000000000 +0400
-@@ -84,10 +84,10 @@
- sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
-
- install-support: definitions.units currency.units units_cur_inst
-- $(srcdir)/mkinstalldirs @UDAT@ $(DESTDIR)$(bindir)
-- $(INSTALL_DATA) $(srcdir)/definitions.units @UDAT@definitions.units
-- $(INSTALL_DATA) $(srcdir)/currency.units @UDAT@currency.units
-- $(INSTALL_DATA) $(srcdir)/locale.map @UDAT@locale.map
-+ $(srcdir)/mkinstalldirs $(DESTDIR)/@UDAT@ $(DESTDIR)$(bindir)
-+ $(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)/@UDAT@definitions.units
-+ $(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)/@UDAT@currency.units
-+ $(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)/@UDAT@locale.map
- $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
-
- install: units@EXEEXT@ install-doc install-support
-diff -wbBur units-2.00.org/units_cur units-2.00/units_cur
---- units-2.00.org/units_cur 2012-05-01 04:51:35.000000000 +0400
-+++ units-2.00/units_cur 2012-07-04 12:53:47.000000000 +0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
-
- import urllib
- import datetime