From ba3afb3907fc927bd08713613d4a30a9479c715c Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Tue, 14 Jun 2011 22:59:43 +0000
Subject: Tue Jun 14 22:59:43 UTC 2011
---
extra/indent/PKGBUILD | 36 ++++++++++++++++---------------
extra/indent/indent-2.2.11-segfault.patch | 16 ++++++++++++++
extra/indent/indent.install | 4 +++-
3 files changed, 38 insertions(+), 18 deletions(-)
create mode 100644 extra/indent/indent-2.2.11-segfault.patch
(limited to 'extra/indent')
diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD
index de378611e..8ac2de017 100644
--- a/extra/indent/PKGBUILD
+++ b/extra/indent/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 53903 2009-10-03 20:21:21Z eric $
+# $Id: PKGBUILD 127328 2011-06-13 05:26:28Z eric $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Contributor: aurelien <aurelien@archlinux.org>
# Contributor: Herb Rose (hrose56@yahoo.com)
pkgname=indent
-pkgver=2.2.10
-pkgrel=4
-pkgdesc="The GNU Pretty-printer"
+pkgver=2.2.11
+pkgrel=1
+pkgdesc="A tool to change the appearance of a C program by inserting or deleting whitespace"
arch=('i686' 'x86_64')
url="http://indent.isidore-it.eu/beautify.html"
-depends=('glibc' 'texinfo')
+depends=('glibc')
+makedepends=('texi2html')
license=('GPL3')
install=indent.install
-source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz)
-md5sums=('be35ea62705733859fbf8caf816d8959')
-sha1sums=('20fa8a7a4af6670c3254c8b87020291c3db37ed1')
+source=(http://indent.isidore-it.eu/$pkgname-$pkgver.tar.gz indent-2.2.11-segfault.patch)
+md5sums=('98beafca62472805a3739d3867d5d70f'
+ 'e5ded8513547ff4555dec2bb805dd2ab')
+sha1sums=('9b242528bbc4914464117c69ffae9df24d3fa4a7'
+ '31a6dcd5edcac4decac81dbb52bc9415b8b148e4')
build() {
cd "$srcdir/$pkgname-$pkgver"
- # Fix doc install path
- sed -i 's|^docdir = .*$|docdir = @docdir@|' doc/Makefile.in || return 1
-
- # Fix manpage installation
- sed -i 's|\(info texinfo2man\)\.c Makefile\.am|\1|' man/Makefile.in || return 1
- rm man/indent.1
+ patch -p1 -i ../indent-2.2.11-segfault.patch
+ sed -i 's/-number/-number-sections/' doc/Makefile.in
+ ./configure --prefix=/usr
+ make
+}
- ./configure --prefix=/usr --datadir=/usr/share --docdir=/usr/share/doc/indent || return 1
- make || return 1
- make DESTDIR="$pkgdir" install || return 1
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" docdir=/usr/share/doc/indent install
}
diff --git a/extra/indent/indent-2.2.11-segfault.patch b/extra/indent/indent-2.2.11-segfault.patch
new file mode 100644
index 000000000..e91922480
--- /dev/null
+++ b/extra/indent/indent-2.2.11-segfault.patch
@@ -0,0 +1,16 @@
+--- a/man/texinfo2man.c
++++ b/man/texinfo2man.c
+@@ -287,6 +287,13 @@
+ char buf[1024];
+ int line_no = 0;
+
++ if (argc != 3)
++ {
++ fprintf(stderr, "Usage: %s <man template> <info file>\n", argv[0]);
++ fprintf(stderr, " The man page will be written to stdout.\n");
++ return -1;
++ }
++
+ texinfoname = argv[2];
+
+ in = fopen (argv[2], "r");
diff --git a/extra/indent/indent.install b/extra/indent/indent.install
index c48622c55..c5a87a6d9 100644
--- a/extra/indent/indent.install
+++ b/extra/indent/indent.install
@@ -1,7 +1,8 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
info_file=indent.info.gz
post_install() {
+ [ -x usr/bin/install-info ] || return 0
install-info ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
}
@@ -10,5 +11,6 @@ post_upgrade() {
}
pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
install-info --delete ${info_dir}/$info_file ${info_dir}/dir 2> /dev/null
}
--
cgit v1.2.3-54-g00ecf