[arch-commits] Commit in help2man/repos (5 files)
Giovanni Scafora
giovanni at archlinux.org
Wed Feb 10 11:34:11 UTC 2010
Date: Wednesday, February 10, 2010 @ 06:34:11
Author: giovanni
Revision: 67994
Merged revisions 67993 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/help2man/trunk
........
r67993 | giovanni | 2010-02-10 12:33:29 +0100 (mer, 10 feb 2010) | 2 lines
upgpkg: help2man 1.37.1-1
upstream release
........
Added:
help2man/repos/extra-i686/help2man-1.37.1-respect-LDFLAGS.patch
(from rev 67993, help2man/trunk/help2man-1.37.1-respect-LDFLAGS.patch)
Modified:
help2man/repos/extra-i686/ (properties)
help2man/repos/extra-i686/PKGBUILD
Deleted:
help2man/repos/extra-i686/help2man-1.36.4-locale-gettext-import.patch
help2man/repos/extra-i686/help2man-1.36.4-respect-LDFLAGS.patch
---------------------------------------------+
PKGBUILD | 25 +++++++++++--------------
help2man-1.36.4-locale-gettext-import.patch | 11 -----------
help2man-1.36.4-respect-LDFLAGS.patch | 11 -----------
help2man-1.37.1-respect-LDFLAGS.patch | 11 +++++++++++
4 files changed, 22 insertions(+), 36 deletions(-)
Property changes on: help2man/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /help2man/trunk:1-54001
+ /help2man/trunk:1-67993
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-02-10 11:33:29 UTC (rev 67993)
+++ extra-i686/PKGBUILD 2010-02-10 11:34:11 UTC (rev 67994)
@@ -3,29 +3,26 @@
# Contributor: Paul Mattal <paul at mattal.com>
pkgname=help2man
-pkgver=1.36.4
-pkgrel=4
+pkgver=1.37.1
+pkgrel=1
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=()
+license=('GPL')
+depends=('perl-locale-gettext')
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')
+ help2man-1.37.1-respect-LDFLAGS.patch)
+md5sums=('371b5cc74fe9c2ea3ee1ca23c19b19a8'
+ '6f80dfd75b46c6bfbc2eeb5516771096')
build() {
- 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
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i ${srcdir}/help2man-1.37.1-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
+ make DESTDIR="${pkgdir}" install || return 1
}
Deleted: extra-i686/help2man-1.36.4-locale-gettext-import.patch
===================================================================
--- extra-i686/help2man-1.36.4-locale-gettext-import.patch 2010-02-10 11:33:29 UTC (rev 67993)
+++ extra-i686/help2man-1.36.4-locale-gettext-import.patch 2010-02-10 11:34:11 UTC (rev 67994)
@@ -1,11 +0,0 @@
---- 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;
- };
-
Deleted: extra-i686/help2man-1.36.4-respect-LDFLAGS.patch
===================================================================
--- extra-i686/help2man-1.36.4-respect-LDFLAGS.patch 2010-02-10 11:33:29 UTC (rev 67993)
+++ extra-i686/help2man-1.36.4-respect-LDFLAGS.patch 2010-02-10 11:34:11 UTC (rev 67994)
@@ -1,11 +0,0 @@
---- 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
Copied: help2man/repos/extra-i686/help2man-1.37.1-respect-LDFLAGS.patch (from rev 67993, help2man/trunk/help2man-1.37.1-respect-LDFLAGS.patch)
===================================================================
--- extra-i686/help2man-1.37.1-respect-LDFLAGS.patch (rev 0)
+++ extra-i686/help2man-1.37.1-respect-LDFLAGS.patch 2010-02-10 11:34:11 UTC (rev 67994)
@@ -0,0 +1,11 @@
+--- 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
More information about the arch-commits
mailing list