merge from masterpassword-cli-c-git

2 files changed, 25 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b717662859d7..d735f8b52244 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,20 @@
 # Generated by mksrcinfo v8
-# Thu Feb 25 20:57:28 UTC 2016
+# Sun Jun 18 10:04:55 UTC 2017
 pkgbase = masterpassword-cli-git
 	pkgdesc = CLI version of Master Password. (git-version)
-	pkgver = 20160225.r987.b4da801
+	pkgver = 20170607.r1185.d3e3c9d7
 	pkgrel = 1
 	url = https://github.com/Lyndir/MasterPassword
 	arch = any
 	license = GPL3
-	makedepends = openssl
 	makedepends = gcc
 	makedepends = git
+	makedepends = libsodium
+	makedepends = openssl
 	optdepends = xclip: copy password to clipboard
 	conflicts = masterpassword-cli
-	source = masterpassword-cli::git+http://github.com/Lyndir/MasterPassword.git#branch=master
+	conflicts = masterpassword-cli-git
+	source = masterpassword-cli::git+https://github.com/Lyndir/MasterPassword.git#branch=master
 	sha256sums = SKIP
 
 pkgname = masterpassword-cli-git
diff --git a/PKGBUILD b/PKGBUILD
index c7b1f5fa0410..ed907b8afabb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Patrick Wozniak <email@patwoz.de>
+# Maintainer: Tom Nguyen <tom81094@gmail.com>
+# Contributor: Patrick Wozniak <email@patwoz.de>
 
 pkgname=masterpassword-cli-git
-pkgver=20160225.r987.b4da801
+pkgver=20170607.r1185.d3e3c9d7
 pkgrel=1
 pkgdesc="CLI version of Master Password. (git-version)"
 
@@ -10,39 +11,36 @@ url="https://github.com/Lyndir/MasterPassword"
 license=('GPL3')
 
 optdepends=(
-  'xclip: copy password to clipboard'
+    'xclip: copy password to clipboard'
 )
 makedepends=(
-  'openssl'
-  'gcc'
-  'git'
+    'gcc'
+    'git'
+    'libsodium'
+    'openssl'
 )
 conflicts=(
-  'masterpassword-cli'
+    'masterpassword-cli'
+    'masterpassword-cli-git'
 )
 
-source=("${pkgname%-git}::git+http://github.com/Lyndir/MasterPassword.git#branch=master")
+source=("${pkgname%-git}::git+https://github.com/Lyndir/MasterPassword.git#branch=master")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "${pkgname%-git}"
-  printf "%s.r%s.%s" "$(date +%Y%m%d)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd "${pkgname%-git}/MasterPassword/C"
-  sed -i '/^svn=/d' ./lib/scrypt/.source
+    cd "${pkgname%-git}"
+    printf "%s.r%s.%s" "$(date +%Y%m%d)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd "${pkgname%-git}/MasterPassword/C"
-  targets="mpw" ./build
+    cd "${pkgname%-git}/platform-independent/cli-c"
+    targets="mpw" ./build
 }
 
 package() {
-  cd "${pkgname%-git}"
-  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
+    cd "${pkgname%-git}"
+    install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/${pkgname%-git}/LICENSE"
 
-  cd "MasterPassword/C"
-  /usr/bin/install -Dm755 "mpw" "$pkgdir/usr/bin/mpw"
+    cd "platform-independent/cli-c"
+    /usr/bin/install -Dm755 "mpw" "$pkgdir/usr/bin/mpw"
 }