diff options
author | Harley Wiltzer | 2016-08-28 12:26:32 -0400 |
---|---|---|
committer | Harley Wiltzer | 2016-08-28 12:26:32 -0400 |
commit | d47088158c9e166b5ef986d9447ce54ee1bfd4dd (patch) | |
tree | 30bd45c1a69a64985914449ec64278c031fb2f9c | |
parent | 274c3402d212ddcfcd2dd126fa459f421423bed1 (diff) | |
download | aur-d47088158c9e166b5ef986d9447ce54ee1bfd4dd.tar.gz |
Fixed PKGBUILD
-rw-r--r-- | .SRCINFO | 7 | ||||
-rwxr-xr-x | PKGBUILD | 14 |
2 files changed, 14 insertions, 7 deletions
@@ -1,15 +1,16 @@ -# Generated by mksrcinfo v8 -# Tue Mar 1 19:35:35 UTC 2016 pkgbase = hasklock pkgdesc = A binary clock in ncurses written in Haskell - pkgver = 0.1.0 + pkgver = 0.1.1 pkgrel = 1 url = https://github.com/DestructiveReasoning/hasklock install = hasklock.install arch = x86_64 license = BSD makedepends = git + makedepends = haskell-text + makedepends = haskell-hscurses depends = ncurses + provides = hasklock source = hasklock::git+https://github.com/DestructiveReasoning/hasklock.git md5sums = SKIP @@ -1,6 +1,6 @@ # Maintainer: Harley Wiltzer <harleyw@hotmail.com> pkgname=hasklock -pkgver=0.1.0 +pkgver=0.1.1 pkgrel=1 pkgdesc="A binary clock in ncurses written in Haskell" arch=('x86_64') @@ -8,8 +8,14 @@ url="https://github.com/DestructiveReasoning/hasklock" license=('BSD') groups=() depends=('ncurses') +<<<<<<< Updated upstream +#makedepends=('git','haskell-text','haskell-hscurses') makedepends=('git') -provides=() +======= +makedepends=('git' 'haskell-text' 'haskell-hscurses') +#makedepends=('git') +>>>>>>> Stashed changes +provides=('hasklock') conflicts=() replaces=() backup=() @@ -27,7 +33,7 @@ build() { msg "Connecting to GIT server...." if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin + cd "$_gitname" && git pull origin master msg "The local files are updated." else git clone "$_gitroot" "$_gitname" @@ -50,7 +56,7 @@ build() { package() { cd "$srcdir/$_gitname" -# make + make install -Dm 755 Hasklock "$pkgdir/usr/bin/$_gitname" #make DESTDIR="${pkgdir}" install } |