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

[Giovanni Scafora]

    Date: Monday, October 5, 2009 @ 11:41:45
  Author: giovanni
Revision: 54002

Merged revisions 54000 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/help2man/trunk

........
  r54000 | giovanni | 2009-10-05 08:35:47 -0700 (lun, 05 ott 2009) | 2 lines
  
  upgpkg: help2man 1.36.4-4
      Fixed locale gettex import and respect LDFLAGS
........

Added:
  help2man/repos/extra-i686/help2man-1.36.4-locale-gettext-import.patch
    (from rev 54000, help2man/trunk/help2man-1.36.4-locale-gettext-import.patch)
  help2man/repos/extra-i686/help2man-1.36.4-respect-LDFLAGS.patch
    (from rev 54000, help2man/trunk/help2man-1.36.4-respect-LDFLAGS.patch)
Modified:
  help2man/repos/extra-i686/	(properties)
  help2man/repos/extra-i686/PKGBUILD

---------------------------------------------+
 PKGBUILD                                    |   15 ++++++++++-----
 help2man-1.36.4-locale-gettext-import.patch |   11 +++++++++++
 help2man-1.36.4-respect-LDFLAGS.patch       |   11 +++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)


Property changes on: help2man/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /help2man/trunk:1-53993
   + /help2man/trunk:1-54001

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-05 15:36:27 UTC (rev 54001)
+++ extra-i686/PKGBUILD	2009-10-05 15:41:45 UTC (rev 54002)
@@ -4,23 +4,28 @@
 
 pkgname=help2man
 pkgver=1.36.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/help2man/"
 license=('GPL2')
 depends=('glibc' 'perl-locale-gettext')
 makedepends=()
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d31a0a38c2ec71faa06723f6b8bd3076')
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        help2man-1.36.4-locale-gettext-import.patch
+        help2man-1.36.4-respect-LDFLAGS.patch)
+md5sums=('d31a0a38c2ec71faa06723f6b8bd3076'
+         '5b2f61291ca294690d2d6a3f5d857641'
+         'ae6566e565d75dbf33a1bdf0b3bda87a')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/help2man-1.36.4-locale-gettext-import.patch || return 1
+  patch -Np1 -i ${srcdir}/help2man-1.36.4-respect-LDFLAGS.patch || return 1
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
 	      --infodir=/usr/share/info \
 	      --libdir=/lib
   make || return 1
   make DESTDIR=${pkgdir} install
-  gzip -9 ${pkgdir}/usr/share/info/help2man.info
 }

Copied: help2man/repos/extra-i686/help2man-1.36.4-locale-gettext-import.patch (from rev 54000, help2man/trunk/help2man-1.36.4-locale-gettext-import.patch)
===================================================================
--- extra-i686/help2man-1.36.4-locale-gettext-import.patch	                        (rev 0)
+++ extra-i686/help2man-1.36.4-locale-gettext-import.patch	2009-10-05 15:41:45 UTC (rev 54002)
@@ -0,0 +1,11 @@
+--- a/help2man.PL	2005-10-16 08:38:47.000000000 -0700
++++ b/help2man.PL	2009-10-05 17:11:41.000000000 -0700
+@@ -102,7 +102,7 @@
+ BEGIN {
+     eval {
+ 	require Locale::gettext;
+-	Locale::gettext->import;
++	Locale::gettext->import (qw(gettext textdomain));
+ 	$have_gettext = 1;
+     };
+ 

Copied: help2man/repos/extra-i686/help2man-1.36.4-respect-LDFLAGS.patch (from rev 54000, help2man/trunk/help2man-1.36.4-respect-LDFLAGS.patch)
===================================================================
--- extra-i686/help2man-1.36.4-respect-LDFLAGS.patch	                        (rev 0)
+++ extra-i686/help2man-1.36.4-respect-LDFLAGS.patch	2009-10-05 15:41:45 UTC (rev 54002)
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -102,7 +102,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