From cc0bc750391b32a9295430c488383eb73d6648b1 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 30 Jun 2014 12:06:22 -0300
Subject: unzip-libre-6.0-7: fix FS#41009 =>
 https://bugs.archlinux.org/task/41009

---
 libre/unzip-libre/PKGBUILD | 50 ++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

(limited to 'libre/unzip-libre/PKGBUILD')

diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
index 6b3cc76b0..6cdb2159d 100644
--- a/libre/unzip-libre/PKGBUILD
+++ b/libre/unzip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150452 2012-02-17 23:21:23Z allan $
+# $Id: PKGBUILD 215748 2014-06-30 11:29:59Z bisson $
 # Maintainer (Arch):
 # Contributor (Arch): Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor (Arch): Robson Peixoto
@@ -6,52 +6,46 @@
 _pkgname=unzip
 pkgname=unzip-libre
 pkgver=6.0
-pkgrel=6
-pkgdesc="Unpacks .zip archives such as those made by PKZIP"
+_pkgver=${pkgver/./}
+pkgrel=7
+pkgdesc='For extracting and viewing files in .zip archives'
+url='http://www.info-zip.org/UnZip.html'
 arch=('i686' 'x86_64')
-url="http://www.info-zip.org/"
 license=('custom')
 depends=('bzip2' 'bash')
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${_pkgname}")
 replaces=("${_pkgname}")
-mksource=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz'
+mksource=('http://downloads.sourceforge.net/infozip/${_pkgname}${_pkgver}.tar.gz'
           'match.patch')
-source=('https://repo.parabolagnulinux.org/other/$pkgname/unzip60-libre.tar.gz')
+source=('https://repo.parabolagnulinux.org/other/${pkgname}/${_pkgname}${_pkgver}-libre.tar.gz')
 mkmd5sums=('62b490407489521db863b523a7f86375'
            'e6d9f0c204c2abe6a57dc5e1637d5140')
 md5sums=('bbe4b7f4d48b2f939b5e43fde0ac7762')
 
 mksource() {
-  cd ${srcdir}/${_pkgname}${pkgver/./}
+	cd "${srcdir}/${_pkgname}${_pkgver}"
 
-  # from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch
-  patch -Np0 -i ${srcdir}/match.patch
+	# from http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/DATA/unzip/match.patch
+	patch -Np0 -i ${srcdir}/match.patch
 }
 
 build() {
-  cd ${srcdir}/${_pkgname}${pkgver/./}
+	cd "${srcdir}/${_pkgname}${_pkgver}"
 
-  # set CFLAGS -- from Debian
-  export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \
-  -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \
-  -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \
-  -DUSE_BZIP2 -DNATIVE"
+	# DEFINES, make, and install args from Debian
+	DEFINES='-DACORN_FTYPE_NFS -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT \
+		-DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD \
+		-DDATE_FORMAT=DF_YMD -DUSE_BZIP2 -DNOMEMCPY -DNO_WORKING_ISPRINT'
 
-  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
+	make -f unix/Makefile prefix=/usr \
+		D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 \
+		LF2="$LDFLAGS" CF="$CFLAGS $CPPFLAGS -I. $DEFINES" \
+		unzips
 }
 
 package(){
-  cd ${srcdir}/${_pkgname}${pkgver/./}
-
-  # install -- from Debian
-  make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install
-
-  # install the license file
-  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE
+	cd "${srcdir}/${_pkgname}${_pkgver}"
+	make -f unix/Makefile prefix="${pkgdir}"/usr install
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-
-- 
cgit v1.2.3-54-g00ecf