[arch-commits] Commit in (6 files)
Sébastien Luttringer
seblu at archlinux.org
Tue Jul 29 10:12:11 UTC 2014
Date: Tuesday, July 29, 2014 @ 12:12:10
Author: seblu
Revision: 218294
Summer cleanup
- Maintainer update
- Sebluify PKGBUILD
- Bashify .install
- Switch to aboslute deps
Modified:
gzip/trunk/PKGBUILD
gzip/trunk/gzip.install
less/trunk/PKGBUILD
sed/trunk/PKGBUILD
sed/trunk/sed.install
Deleted:
gzip/trunk/gzip-1.5-yesno-declaration.patch
---------------------------------------------+
gzip/trunk/PKGBUILD | 19 +++++++------
gzip/trunk/gzip-1.5-yesno-declaration.patch | 36 --------------------------
gzip/trunk/gzip.install | 17 ++++++++----
less/trunk/PKGBUILD | 2 -
sed/trunk/PKGBUILD | 2 -
sed/trunk/sed.install | 16 ++++++-----
6 files changed, 34 insertions(+), 58 deletions(-)
Modified: gzip/trunk/PKGBUILD
===================================================================
--- gzip/trunk/PKGBUILD 2014-07-29 10:12:10 UTC (rev 218293)
+++ gzip/trunk/PKGBUILD 2014-07-29 10:12:10 UTC (rev 218294)
@@ -1,33 +1,36 @@
# $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Mainainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
# Contributor: judd <jvinet at zeroflux.org>
pkgname=gzip
pkgver=1.6
pkgrel=1
-pkgdesc="GNU compression utility"
+pkgdesc='GNU compression utility'
arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gzip/"
+url='http://www.gnu.org/software/gzip/'
license=('GPL3')
groups=('base' 'base-devel')
depends=('glibc' 'bash' 'less')
install=gzip.install
-source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig})
+source=("ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz"{,.sig})
md5sums=('da981f86677d58a106496e68de6f8995'
'SKIP')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
}
check() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd $pkgname-$pkgver
make check
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make prefix=${pkgdir}/usr install
+ cd $pkgname-$pkgver
+ make prefix="$pkgdir/usr" install
}
+
+# vim:set ts=2 sw=2 et:
Deleted: gzip/trunk/gzip-1.5-yesno-declaration.patch
===================================================================
--- gzip/trunk/gzip-1.5-yesno-declaration.patch 2014-07-29 10:12:10 UTC (rev 218293)
+++ gzip/trunk/gzip-1.5-yesno-declaration.patch 2014-07-29 10:12:10 UTC (rev 218294)
@@ -1,36 +0,0 @@
-From e40a9b65ae95ed6face7ce1336905f0ab0a4992b Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert at cs.ucla.edu>
-Date: Tue, 05 Feb 2013 21:37:40 +0000
-Subject: gzip: fix bug where you say "n" and gzip acts as if you said "y"
-
-Problem reported for GCC 4.7 x86-64 -O2 by Allan McRae in
-<http://lists.gnu.org/archive/html/bug-gzip/2013-02/msg00000.html>.
-* NEWS: Document this. Use consistent format in earlier note.
-* gzip.c: Include yesno.h.
-* gzip.h (yesno): Remove decl; that's yesno.h's job.
----
-diff --git a/gzip.c b/gzip.c
-index b9b4d64..66529e0 100644
---- a/gzip.c
-+++ b/gzip.c
-@@ -74,6 +74,7 @@ static char const *const license_msg[] = {
- #include "ignore-value.h"
- #include "stat-time.h"
- #include "version.h"
-+#include "yesno.h"
-
- /* configuration */
-
-diff --git a/gzip.h b/gzip.h
-index bf253d0..648073e 100644
---- a/gzip.h
-+++ b/gzip.h
-@@ -321,6 +321,3 @@ extern void fprint_off (FILE *, off_t, int);
-
- /* in inflate.c */
- extern int inflate (void);
--
-- /* in yesno.c */
--extern int yesno (void);
---
-cgit v0.9.0.2
Modified: gzip/trunk/gzip.install
===================================================================
--- gzip/trunk/gzip.install 2014-07-29 10:12:10 UTC (rev 218293)
+++ gzip/trunk/gzip.install 2014-07-29 10:12:10 UTC (rev 218294)
@@ -1,15 +1,22 @@
+# vim:set ts=2 sw=2 et:
+
infodir=usr/share/info
+filelist=(gzip.info)
post_install() {
- [ -x usr/bin/install-info ] || return 0
- usr/bin/install-info $infodir/gzip.info.gz $infodir/dir 2> /dev/null
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
}
post_upgrade() {
- post_install $1
+ post_install "$1"
}
pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- usr/bin/install-info --delete $infodir/gzip.info.gz $infodir/dir 2> /dev/null
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
}
Modified: less/trunk/PKGBUILD
===================================================================
--- less/trunk/PKGBUILD 2014-07-29 10:12:10 UTC (rev 218293)
+++ less/trunk/PKGBUILD 2014-07-29 10:12:10 UTC (rev 218294)
@@ -11,7 +11,7 @@
arch=('i686' 'x86_64')
url='http://www.greenwoodsoftware.com/less'
groups=('base')
-depends=('ncurses' 'pcre')
+depends=('glibc' 'ncurses' 'pcre')
source=("http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
md5sums=('935b38aa2e73c888c210dedf8fd94f49'
'SKIP')
Modified: sed/trunk/PKGBUILD
===================================================================
--- sed/trunk/PKGBUILD 2014-07-29 10:12:10 UTC (rev 218293)
+++ sed/trunk/PKGBUILD 2014-07-29 10:12:10 UTC (rev 218294)
@@ -11,7 +11,7 @@
url='http://www.gnu.org/software/sed'
license=('GPL3')
groups=('base' 'base-devel')
-depends=('acl' 'sh')
+depends=('glibc' 'acl' 'attr')
makedepends=('gettext')
install=sed.install
source=("ftp://ftp.gnu.org/pub/gnu/sed/$pkgname-$pkgver.tar.gz"{,.sig})
Modified: sed/trunk/sed.install
===================================================================
--- sed/trunk/sed.install 2014-07-29 10:12:10 UTC (rev 218293)
+++ sed/trunk/sed.install 2014-07-29 10:12:10 UTC (rev 218294)
@@ -1,20 +1,22 @@
+# vim:set ts=2 sw=2 et:
+
infodir=/usr/share/info
filelist=(sed.info)
post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
done
}
post_upgrade() {
- post_install $1
+ post_install "$1"
}
pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
done
}
More information about the arch-commits
mailing list