summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarley Wiltzer2016-08-28 12:26:32 -0400
committerHarley Wiltzer2016-08-28 12:26:32 -0400
commitd47088158c9e166b5ef986d9447ce54ee1bfd4dd (patch)
tree30bd45c1a69a64985914449ec64278c031fb2f9c
parent274c3402d212ddcfcd2dd126fa459f421423bed1 (diff)
downloadaur-d47088158c9e166b5ef986d9447ce54ee1bfd4dd.tar.gz
Fixed PKGBUILD
-rw-r--r--.SRCINFO7
-rwxr-xr-xPKGBUILD14
2 files changed, 14 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8dce9087d874..550ad400b517 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 0cb8ef1a2742..3d0082d323a0 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
}