help2man: Bump to latest.

3 files changed, 12 insertions, 73 deletions

diff --git a/abs/extra/help2man/PKGBUILD b/abs/extra/help2man/PKGBUILD
index c9dc9fb..fff2829 100644
--- a/abs/extra/help2man/PKGBUILD
+++ b/abs/extra/help2man/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 83522 2010-06-21 22:45:22Z giovanni $
+# $Id$
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.38.2
+pkgver=1.40.4
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/help2man/"
 license=('GPL')
 depends=('perl-locale-gettext')
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('426671c6fe79e5ef2233303367eab5a6')
+install=help2man.install
+source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('4d79dc7cb7c20019c2a3650d35259c45')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +21,11 @@ build() {
               --mandir=/usr/share/man \
 	      --infodir=/usr/share/info \
 	      --libdir=/lib
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch b/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch
deleted file mode 100644
index a314c27..0000000
--- a/abs/extra/help2man/help2man-1.37.1-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2009-11-14 07:21:34.000000000 +0100
-+++ b/Makefile.in	2010-02-10 12:23:35.000000000 +0100
-@@ -103,7 +103,7 @@
- 
- preload: $(preload).so
- $(preload).so: $(srcdir)/$(preload).c
--	$(CC) $(CFLAGS) -o $@ -fPIC -shared $? $(LIBS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -fPIC -shared $? $(LIBS)
- 
- man: $(target).1
- $(target).1: $(srcdir)/$(target).PL $(srcdir)/$(target).h2m
diff --git a/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1 b/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1
deleted file mode 100644
index 2f886ba..0000000
--- a/abs/extra/help2man/help2man-1.38.2-1-i686-build.log.1
+++ /dev/null
@@ -1,56 +0,0 @@
-checking for perl... perl
-checking for module Locale::gettext... yes
-checking for msgfmt... /usr/bin/msgfmt
-checking for gcc... gcc
-checking whether the C compiler works... yes
-checking for C compiler default output file name... a.out
-checking for suffix of executables... 
-checking whether we are cross compiling... no
-checking for suffix of object files... o
-checking whether we are using the GNU C compiler... yes
-checking whether gcc accepts -g... yes
-checking for gcc option to accept ISO C89... none needed
-checking for library containing dlsym... -ldl
-checking for library containing bindtextdomain... none required
-checking for a BSD-compatible install... /bin/install -c
-checking for makeinfo... /usr/bin/makeinfo
-checking for install-info... /usr/bin/install-info
-configure: creating ./config.status
-config.status: creating Makefile
-perl help2man.PL --with-gettext
-gcc -march=i686 -mtune=generic -O2 -pipe -o bindtextdomain.so -fPIC -shared bindtextdomain.c -ldl 
-Extracting help2man (with variable substitutions)
-./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/bin
-/bin/install -c bindtextdomain.so /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib
-for lang in de fi fr pl pt_BR ru sv vi; \
-	do \
-	    ./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/$lang/LC_MESSAGES; \
-	    /bin/install -c -m 644 $(perl -e 'print +(grep -f, map "$_/$ARGV[0]", map +(length) ? $_ : ".", split ":", $ENV{VPATH} || ".")[0]' po/$lang.gmo) \
-		/data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/$lang/LC_MESSAGES/help2man.mo; \
-	    ./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/$lang/man1; \
-	    /bin/install -c -m 644 $(perl -e 'print +(grep -f, map "$_/$ARGV[0]", map +(length) ? $_ : ".", split ":", $ENV{VPATH} || ".")[0]' help2man.$lang.1) \
-		/data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/$lang/man1/help2man.1; \
-	done
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/bin
-./mkinstalldirs /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/de/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/lib
-mkdir: cannot create directory `/data/linhes_pkgbuild/abs/extra/help2man/pkg/lib': File exists
-make: *** [install_base] Error 1
-make: *** Waiting for unfinished jobs....
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/de/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/fi/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/fi/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/fr/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/fr/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/pl/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/pl/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/pt_BR/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/pt_BR/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/ru/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/ru/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/sv/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/sv/man1
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/locale/vi/LC_MESSAGES
-mkdir -p -- /data/linhes_pkgbuild/abs/extra/help2man/pkg/usr/share/man/vi/man1
-    Aborting...(B