[arch-commits] Commit in man-db/trunk (PKGBUILD rev1051.diff)

[andyrtr at archlinux.org]

    Date: Wednesday, April 8, 2009 @ 17:19:12
  Author: andyrtr
Revision: 34271

upgpkg: man-db 2.5.5-1
    new version 2.55; fully support posix pages, add upstream "0"section - fixes #13734

Added:
  man-db/trunk/rev1051.diff
Modified:
  man-db/trunk/PKGBUILD

--------------+
 PKGBUILD     |   23 +++++++++++++++++------
 rev1051.diff |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-08 21:14:32 UTC (rev 34270)
+++ PKGBUILD	2009-04-08 21:19:12 UTC (rev 34271)
@@ -3,8 +3,8 @@
 # Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
 
 pkgname=man-db
-pkgver=2.5.4
-pkgrel=2
+pkgver=2.5.5
+pkgrel=1
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/man-db/"
@@ -19,15 +19,26 @@
 install=${pkgname}.install
 source=(#http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz
 	http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz
-        convert-mans man-db.cron.daily)
-md5sums=('591752c2bd003f7f2f5ca3387da3ddc9'
+        convert-mans man-db.cron.daily
+	rev1051.diff)
+md5sums=('ca382dd934fc8b9e9a64d13354be48cf'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'acdff891e224511cf26c92de77347db8')
+         'acdff891e224511cf26c92de77347db8'
+         '7dc2e8324cbc2ae777fe966ef7a7d0c8')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  
+  # fix missing sections from posix man-pages
+  # see http://bugs.archlinux.org/task/13734 and http://bugs.debian.org/519807 ; solved in 
+  # http://bzr.savannah.gnu.org/lh/man-db/trunk/revision/1051?start_revid=1055&filter_file_id=x_Arch_Librarian_<arch%40canonical.com>_Tue_Mar_22_20%3A41%3A03_2005_29634.0
+  patch -Np0 -i ${srcdir}/rev1051.diff || return 1
+  
+  autoreconf -fv
+  
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU
+	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
+	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
 

Added: rev1051.diff
===================================================================
--- rev1051.diff	                        (rev 0)
+++ rev1051.diff	2009-04-08 21:19:12 UTC (rev 34271)
@@ -0,0 +1,54 @@
+=== modified file 'configure'
+--- configure	2009-03-15 08:35:38 +0000
++++ configure	2009-03-15 13:13:54 +0000
+@@ -1677,8 +1677,8 @@
+                           db, gdbm, ndbm)
+   --with-config-file=CF   use config file CF [CF=SYSCONFDIR/man_db.conf]
+   --with-sections=SECTIONS
+-                          use manual page sections SECTIONS [1 n l 8 3 2 5 4 9
+-                          6 7]
++                          use manual page sections SECTIONS [1 n l 8 3 0 2 5 4
++                          9 6 7]
+   --with-browser=BROWSER  use BROWSER as default web browser
+   --with-pager=PAGER      use PAGER as default pager
+   --with-nroff=NROFF      use NROFF as roff formatter for character devices
+
+=== modified file 'configure.ac'
+--- configure.ac	2009-03-14 23:12:00 +0000
++++ configure.ac	2009-03-15 13:13:54 +0000
+@@ -85,7 +85,7 @@
+ config_file_basename=${withval##*/}
+ config_file_dirname=`AS_DIRNAME(["$config_file"])`
+ AC_ARG_WITH(sections,
+-[AS_HELP_STRING([--with-sections=SECTIONS], [use manual page sections SECTIONS @<:@1 n l 8 3 2 5 4 9 6 7@:>@])],
++[AS_HELP_STRING([--with-sections=SECTIONS], [use manual page sections SECTIONS @<:@1 n l 8 3 0 2 5 4 9 6 7@:>@])],
+ 	[if test "$withval" = "yes" || test "$withval" = "no"
+ 	 then
+ 		AC_MSG_ERROR(--with-sections requires an argument)
+
+=== modified file 'man/man5/manpath.man5'
+--- man/man5/manpath.man5	2008-12-30 12:58:00 +0000
++++ man/man5/manpath.man5	2009-03-15 13:13:54 +0000
+@@ -122,7 +122,7 @@
+ .PP
+ .RS
+ .nf
+-.if !'po4a'hide' SECTION 1 n l 8 3 2 5 4 9 6 7
++.if !'po4a'hide' SECTION 1 n l 8 3 0 2 5 4 9 6 7
+ .fi
+ .RE
+ .PP
+
+=== modified file 'src/man_db.conf.in'
+--- src/man_db.conf.in	2008-12-07 17:43:50 +0000
++++ src/man_db.conf.in	2009-03-15 13:13:54 +0000
+@@ -99,7 +99,7 @@
+ #DEFINE		apropos_regex_grep_flags	-iE
+ #---------------------------------------------------------
+ # Section names. Manual sections will be searched in the order listed here;
+-# the default is 1, n, l, 8, 3, 2, 5, 4, 9, 6, 7. Multiple SECTION
++# the default is 1, n, l, 8, 3, 0, 2, 5, 4, 9, 6, 7. Multiple SECTION
+ # directives may be given for clarity, and will be concatenated together in
+ # the expected way.
+ # If a particular extension is not in this list (say, 1mh), it will be
+