[arch-commits] Commit in zip/repos (4 files)

[Gaetan Bisson]

    Date: Sunday, January 18, 2015 @ 06:57:13
  Author: bisson
Revision: 229510

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  zip/repos/extra-i686/PKGBUILD
    (from rev 229509, zip/trunk/PKGBUILD)
  zip/repos/extra-x86_64/PKGBUILD
    (from rev 229509, zip/trunk/PKGBUILD)
Deleted:
  zip/repos/extra-i686/PKGBUILD
  zip/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |   76 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   32 --------------------
 extra-x86_64/PKGBUILD |   32 --------------------
 3 files changed, 76 insertions(+), 64 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-01-18 05:56:41 UTC (rev 229509)
+++ extra-i686/PKGBUILD	2015-01-18 05:57:13 UTC (rev 229510)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=zip
-pkgver=3.0
-_pkgver=${pkgver/./}
-pkgrel=4
-pkgdesc='Compressor/archiver for creating and modifying zipfiles'
-url='http://www.info-zip.org/Zip.html'
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('bzip2')
-source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz")
-sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182')
-
-options=('!makeflags')
-
-build() {
-	cd "${srcdir}/${pkgname}${_pkgver}"
-	make -f unix/Makefile prefix=/usr \
-		LOCAL_ZIP="$CFLAGS $CPPFLAGS $LDFLAGS" \
-		generic_gcc
-}
-
-package() {
-	cd "${srcdir}/${pkgname}${_pkgver}"
-	make -f unix/Makefile prefix="${pkgdir}"/usr \
-		MANDIR=${pkgdir}/usr/share/man/man1 \
-		install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: zip/repos/extra-i686/PKGBUILD (from rev 229509, zip/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-01-18 05:57:13 UTC (rev 229510)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zip
+pkgver=3.0
+_pkgver=${pkgver/./}
+pkgrel=5
+pkgdesc='Compressor/archiver for creating and modifying zipfiles'
+url='http://www.info-zip.org/Zip.html'
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('bzip2')
+source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz")
+sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182')
+
+options=('!makeflags')
+
+prepare() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	sed \
+		-e "/^CFLAGS =/s/\$/ $CPPFLAGS $CFLAGS/" \
+		-e "/^LFALGS1 =/s/\$/ $LDFLAGS/" \
+		-i unix/Makefile
+}
+
+build() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	make -f unix/Makefile prefix=/usr generic_gcc
+}
+
+package() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	make -f unix/Makefile prefix="${pkgdir}"/usr \
+		MANDIR=${pkgdir}/usr/share/man/man1 \
+		install
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-01-18 05:56:41 UTC (rev 229509)
+++ extra-x86_64/PKGBUILD	2015-01-18 05:57:13 UTC (rev 229510)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: dorphell <dorphell at archlinux.org>
-
-pkgname=zip
-pkgver=3.0
-_pkgver=${pkgver/./}
-pkgrel=4
-pkgdesc='Compressor/archiver for creating and modifying zipfiles'
-url='http://www.info-zip.org/Zip.html'
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('bzip2')
-source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz")
-sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182')
-
-options=('!makeflags')
-
-build() {
-	cd "${srcdir}/${pkgname}${_pkgver}"
-	make -f unix/Makefile prefix=/usr \
-		LOCAL_ZIP="$CFLAGS $CPPFLAGS $LDFLAGS" \
-		generic_gcc
-}
-
-package() {
-	cd "${srcdir}/${pkgname}${_pkgver}"
-	make -f unix/Makefile prefix="${pkgdir}"/usr \
-		MANDIR=${pkgdir}/usr/share/man/man1 \
-		install
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}

Copied: zip/repos/extra-x86_64/PKGBUILD (from rev 229509, zip/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-01-18 05:57:13 UTC (rev 229510)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: dorphell <dorphell at archlinux.org>
+
+pkgname=zip
+pkgver=3.0
+_pkgver=${pkgver/./}
+pkgrel=5
+pkgdesc='Compressor/archiver for creating and modifying zipfiles'
+url='http://www.info-zip.org/Zip.html'
+arch=('i686' 'x86_64')
+license=('custom')
+depends=('bzip2')
+source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz")
+sha1sums=('c9f4099ecf2772b53c2dd4a8e508064ce015d182')
+
+options=('!makeflags')
+
+prepare() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	sed \
+		-e "/^CFLAGS =/s/\$/ $CPPFLAGS $CFLAGS/" \
+		-e "/^LFALGS1 =/s/\$/ $LDFLAGS/" \
+		-i unix/Makefile
+}
+
+build() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	make -f unix/Makefile prefix=/usr generic_gcc
+}
+
+package() {
+	cd "${srcdir}/${pkgname}${_pkgver}"
+	make -f unix/Makefile prefix="${pkgdir}"/usr \
+		MANDIR=${pkgdir}/usr/share/man/man1 \
+		install
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}