20140421.224-1

- FORCE_{BA,F,Z}SHCOMP control whether to install completion files
  -> no need for Makefile.patch

3 files changed, 10 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 86aacad2fdec..ec933a7afc40 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pass-git
 	pkgdesc = Stores, retrieves, generates, and synchronizes passwords securely
-	pkgver = 20140419.220
-	pkgrel = 2
+	pkgver = 20140421.224
+	pkgrel = 1
 	url = http://zx2c4.com/projects/password-store/
 	arch = any
 	license = GPL2
@@ -16,9 +16,7 @@ pkgbase = pass-git
 	provides = pass
 	conflicts = pass
 	source = pass-git::git://git.zx2c4.com/password-store
-	source = Makefile.patch
 	sha256sums = SKIP
-	sha256sums = be01e83ff15b928b9518e49365587012287533543d68c41c65bcbce78fbeb63c
 
 pkgname = pass-git
 
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index cfd6341fc0b0..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 329d8b9..e7e716c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,15 +12,15 @@ all:
- 	@echo "Password store is a shell script, so there is nothing to do. Try \"make install\" instead."
- 
- install-common:
--	@mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/"
-+	@mkdir -p "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)" "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/" "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/" "$(DESTDIR)$(PREFIX)/share/fish/completions/"
- 	@install -m 0644 -v man/pass.1 "$(DESTDIR)$(MANDIR)/man1/pass.1"
- 	@install -m 0644 -v src/completion/pass.bash-completion "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass"
- 
- #	Uncomment to install the zsh completion file.
--#	@install -m 0644 -v src/completion/pass.zsh-completion "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass"
-+	@install -m 0644 -v src/completion/pass.zsh-completion "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass"
- #
- #	Uncomment to install the fish completion file.
--#	@install -m 0644 -v src/completion/pass.fish-completion "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish"
-+	@install -m 0644 -v src/completion/pass.fish-completion "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish"
- 
- ifneq ($(strip $(wildcard $(PLATFORMFILE))),)
- install: install-common
-@@ -36,4 +36,4 @@ install: install-common
- endif
- 
- uninstall:
--	@rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
-+	@rm -vf "$(DESTDIR)$(BINDIR)/pass" "$(DESTDIR)$(MANDIR)/man1/pass.1" "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/pass" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh" "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_pass" "$(DESTDIR)$(PREFIX)/share/fish/completions/pass.fish"
diff --git a/PKGBUILD b/PKGBUILD
index b2bbd0fb7584..95e2a6388e46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Simon Zimmermann <simon@insmo.com>
 
 pkgname=pass-git
-pkgver=20140419.220
-pkgrel=2
+pkgver=20140421.224
+pkgrel=1
 pkgdesc='Stores, retrieves, generates, and synchronizes passwords securely'
 url='http://zx2c4.com/projects/password-store/'
 license='GPL2'
@@ -12,10 +12,8 @@ depends=('bash' 'git' 'gnupg' 'grep' 'pwgen' 'tree' 'xclip')
 makedepends=('git')
 provides=('pass')
 conflicts=('pass')
-source=("$pkgname::git://git.zx2c4.com/password-store"
-        'Makefile.patch')
-sha256sums=('SKIP'
-            'be01e83ff15b928b9518e49365587012287533543d68c41c65bcbce78fbeb63c')
+source=("$pkgname::git://git.zx2c4.com/password-store")
+sha256sums=('SKIP')
 
 pkgver() {
     cd "$pkgname"
@@ -23,11 +21,10 @@ pkgver() {
     local _tmpver+="$(git rev-list --count HEAD)"
     echo "${_tmpver//-/}"
 }
-prepare() {
-    cd "$pkgname"
-    patch < "${srcdir}/Makefile.patch"
-}
 package() {
     cd "$pkgname"
-    make DESTDIR="${pkgdir}" install
+    make FORCE_BASHCOMP=1 \
+         FORCE_ZSHCOMP=1 \
+         FORCE_FISHCOMP=1 \
+         DESTDIR="${pkgdir}" install
 }