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

andyrtr at archlinux.org andyrtr at archlinux.org
Wed Sep 2 18:19:39 UTC 2009


    Date: Wednesday, September 2, 2009 @ 14:19:39
  Author: andyrtr
Revision: 50885

upgpkg: man-db 2.5.6-1
    new version 2.5.6; removed patches that went upstream

Modified:
  man-db/trunk/PKGBUILD
Deleted:
  man-db/trunk/fix-14467.patch
  man-db/trunk/rev1051.diff

-----------------+
 PKGBUILD        |   27 ++++++---------------------
 fix-14467.patch |   46 ----------------------------------------------
 rev1051.diff    |   54 ------------------------------------------------------
 3 files changed, 6 insertions(+), 121 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-02 18:03:53 UTC (rev 50884)
+++ PKGBUILD	2009-09-02 18:19:39 UTC (rev 50885)
@@ -3,8 +3,8 @@
 # Contributor: Sergej Pupykin <sergej at aur.archlinux.org>
 
 pkgname=man-db
-pkgver=2.5.5
-pkgrel=2
+pkgver=2.5.6
+pkgrel=1
 pkgdesc="A utility for reading man pages"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/man-db/"
@@ -19,29 +19,14 @@
 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
-	rev1051.diff
-	fix-14467.patch)
-md5sums=('ca382dd934fc8b9e9a64d13354be48cf'
+        convert-mans man-db.cron.daily)
+md5sums=('69585b19c5600a863f1a0d7b7f283975'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'acdff891e224511cf26c92de77347db8'
-         '7dc2e8324cbc2ae777fe966ef7a7d0c8'
-         '90554646622ffc1258648bd79a2f8e4c')
-
+         'acdff891e224511cf26c92de77347db8')
+                                  
 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
-  # libdb/db_lookup.c (dblookup): In exact mode, make sure extensions                                                                                                   
-  # match exactly, rather than merely that the extension found is a                                                                                                     
-  # prefix of that which was requested (http://bugs.archlinux.org/task/14467).      
-  patch -Np0 -i ${srcdir}/fix-14467.patch || return 1
-  
-  autoreconf -fv
-  
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
 	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
 	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"

Deleted: fix-14467.patch
===================================================================
--- fix-14467.patch	2009-09-02 18:03:53 UTC (rev 50884)
+++ fix-14467.patch	2009-09-02 18:19:39 UTC (rev 50885)
@@ -1,46 +0,0 @@
-=== modified file 'libdb/db_lookup.c'
---- libdb/db_lookup.c	2008-12-25 22:13:50 +0000
-+++ libdb/db_lookup.c	2009-06-21 01:29:52 +0000
-@@ -323,11 +323,15 @@
- 		if (!info->name)
- 			info->name = xstrdup (page);
- 		if (!(flags & MATCH_CASE) || STREQ (info->name, page)) {
--			if (section == NULL ||
--			    STRNEQ (section, info->ext,
--				    flags & EXACT ? strlen (info->ext) :
--						    strlen (section))) {
-+			if (section == NULL)
- 				return info;
-+			if (flags & EXACT) {
-+				if (STREQ (section, info->ext))
-+					return info;
-+			} else {
-+				if (STRNEQ (section, info->ext,
-+					    strlen (section)))
-+					return info;
- 			}
- 		}
- 		free_mandata_struct (info);
-@@ -357,11 +361,16 @@
- 			if ((flags & MATCH_CASE) && !STREQ (names[i], page))
- 				continue;
- 
--			if (section != NULL &&
--			    !STRNEQ (section, ext[i],
--				     flags & EXACT ? strlen (ext[i])
--						   : strlen (section)))
--				continue;
-+			if (section != NULL) {
-+				if (flags & EXACT) {
-+					if (!STREQ (section, ext[i]))
-+						continue;
-+				} else {
-+					if (!STRNEQ (section, ext[i],
-+						     strlen (section)))
-+						continue;
-+				}
-+			}
- 
- 			/* So the key is suitable ... */
- 			key = make_multi_key (names[i], ext[i]);
-

Deleted: rev1051.diff
===================================================================
--- rev1051.diff	2009-09-02 18:03:53 UTC (rev 50884)
+++ rev1051.diff	2009-09-02 18:19:39 UTC (rev 50885)
@@ -1,54 +0,0 @@
-=== 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
-




More information about the arch-commits mailing list