[arch-commits] Commit in truecrypt/trunk (PKGBUILD)

[Eric Bélanger]

    Date: Thursday, October 20, 2011 @ 22:52:39
  Author: eric
Revision: 140994

upgpkg: truecrypt 7.1-1

Upstream update, Clean up PKGBUILD

Modified:
  truecrypt/trunk/PKGBUILD

----------+
 PKGBUILD |   35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-20 23:02:24 UTC (rev 140993)
+++ PKGBUILD	2011-10-21 02:52:39 UTC (rev 140994)
@@ -2,8 +2,8 @@
 # Maintainer: Paul Mattal <paul.archlinux.org>
 
 pkgname=truecrypt
-pkgver=7.0a
-pkgrel=3
+pkgver=7.1
+pkgrel=1
 pkgdesc="Free open-source cross-platform disk encryption software"
 url="http://www.truecrypt.org/"
 arch=('i686' 'x86_64')
@@ -15,33 +15,36 @@
 replaces=('truecrypt-utils')
 # N.B. Truecrypt's web-based source download is incompatible with
 # makepkg. Source has been placed on ftp.archlinux.org instead
-source=('ftp://ftp.archlinux.org/other/tc/truecrypt-7.0a.tar.gz' \
+source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \
         'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \
         "${pkgname}.desktop" \
 	"${pkgname}-arch-detection.patch") 
+md5sums=('a8268630a870faff07af940f63fb29eb'
+         'ddee7c4b2419ecb44b02c8294a08fbed'
+         'ce6a707b79411e82e8e558aa03e764b0'
+         '183b9bf04a943454d4e216130bcbac01'
+         '00ea70fa8437de877b31b027ac2b4060')
 
 build() {
-  export PKCS11_INC="${srcdir}/pkcs-2.20"
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
 
-  cd ${srcdir}/${pkgname}-${pkgver}-source || return 1
-
   # Work around buggy CPU type detection
-  patch -Np1 -i ../${pkgname}-arch-detection.patch || return 1
+  patch -Np1 -i ../${pkgname}-arch-detection.patch
   
   # Build
-  make || return 1
+  make PKCS11_INC="${srcdir}/pkcs-2.20"
+}
 
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-source"
+
   # Install Binary
-  install -D -m755 Main/${pkgname} ${pkgdir}/usr/bin/${pkgname} || return 1
+  install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
 
   # Install Desktop file and Icon
-  install -D -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
-  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm ${pkgdir}/usr/share/pixmaps/truecrypt.xpm || return 1
+  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm"
 
   # Install License
-  install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/License.txt || return 1
+  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
 }
-md5sums=('0a61616bc5c5ad90e876b4014c004ac9'
-         'ce6a707b79411e82e8e558aa03e764b0'
-         '183b9bf04a943454d4e216130bcbac01'
-         '00ea70fa8437de877b31b027ac2b4060')