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

[Allan McRae]

    Date: Friday, February 17, 2012 @ 18:21:23
  Author: allan
Revision: 150452

upgpkg: unzip 6.0-6

signing rebuild

Modified:
  unzip/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-17 23:16:31 UTC (rev 150451)
+++ PKGBUILD	2012-02-17 23:21:23 UTC (rev 150452)
@@ -1,11 +1,11 @@
 # $Id$
-# Maintainer: Thayer Williams <thayer at archlinux.org>
+# Maintainer:
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 # Contributor: Robson Peixoto
 
 pkgname=unzip
 pkgver=6.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Unpacks .zip archives such as those made by PKZIP"
 arch=('i686' 'x86_64')
 url="http://www.info-zip.org/"
@@ -23,18 +23,20 @@
   -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \
   -DUSE_BZIP2 -DNATIVE"
 
+  sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile
+
   # make -- from Debian
   make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \
-  D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips || return 1
+  D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips
+}
 
+package() {
+  cd ${srcdir}/${pkgname}${pkgver/./}
+
   # install -- from Debian
-  make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install || return 1
+  make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install
 
   # install the license file
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE || return 1
-
-  # fix manpage location
-  mkdir -p ${pkgdir}/usr/share || return 1
-  mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ || return 1
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE
 }