[arch-commits] Commit in module-init-tools/trunk (PKGBUILD docfix.patch)

Dave Reisner dreisner at archlinux.org
Sat Jun 25 14:35:01 UTC 2011 

    Date: Saturday, June 25, 2011 @ 10:35:00
  Author: dreisner
Revision: 128937

upstream release, 3.16

add docfix.patch as needed for manpage generation and remove old, unneeded sed
hack for fixing modprobe.d manpage.

Added:
  module-init-tools/trunk/docfix.patch
Modified:
  module-init-tools/trunk/PKGBUILD

--------------+
 PKGBUILD     |   24 +++++++--------
 docfix.patch |   90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-25 14:20:05 UTC (rev 128936)
+++ PKGBUILD	2011-06-25 14:35:00 UTC (rev 128937)
@@ -3,25 +3,28 @@
 # Contributor: judd <jvinet at zeroflux.org>
 
 pkgname=module-init-tools
-pkgver=3.13
+pkgver=3.16
 pkgrel=1
 pkgdesc="utilities needed by Linux systems for managing loadable kernel modules"
 arch=('i686' 'x86_64')
 url="http://kerneltools.org"
 license=('GPL')
 depends=('glibc')
+makedepends=('docbook2x')
 backup=('etc/modprobe.d/modprobe.conf')
 source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2
-        modprobe.conf)
-md5sums=('dc575e7df00d9f745bf23b32f927b7a6'
-         '316f1bda4c21af02b30252eb014a0a55')
+        modprobe.conf
+        docfix.patch)
+md5sums=('bc44832c6e41707b8447e2847d2019f5'
+         '316f1bda4c21af02b30252eb014a0a55'
+         '4320d19902ded43bed55c804b065cdc7')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  
-  # do not regenerate man pages
-  touch *.{5,8}
-  
+
+  # fix headers in SGML manpage sources and an XML typo
+  patch -Np0 < "$srcdir/docfix.patch"
+
   ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
   make
 }
@@ -30,10 +33,7 @@
   cd $srcdir/$pkgname-$pkgver
 
   make DESTDIR=$pkgdir install
- 
+
   # Install our custom (read: empty) modprobe.conf
   install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf
-  
-  # fix man page (FS#17559)
-  sed -i "s#mod#man5/mod#" $pkgdir/usr/share/man/man5/modprobe.d.5
 }

Added: docfix.patch
===================================================================
--- docfix.patch	                        (rev 0)
+++ docfix.patch	2011-06-25 14:35:00 UTC (rev 128937)
@@ -0,0 +1,90 @@
+--- doc/depmod.conf.sgml.orig	2011-06-25 10:07:15.897805024 -0400
++++ doc/depmod.conf.sgml	2011-06-25 10:07:48.810805020 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/depmod.sgml.orig	2011-06-25 10:07:15.898805024 -0400
++++ doc/depmod.sgml	2011-06-25 10:07:56.636805021 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+@@ -52,7 +52,7 @@
+       <arg><option>-n</option></arg>
+       <arg><option>-v</option></arg>
+       <arg><option>-P <replaceable>prefix</replaceable></option></arg>
+-      <arg><option>-w</option><arg>
++      <arg><option>-w</option></arg>
+       <arg><option><replaceable>version</replaceable></option></arg>
+       <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg>
+     </cmdsynopsis>
+--- doc/insmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
++++ doc/insmod.sgml	2011-06-25 10:07:59.228805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/lsmod.sgml.orig	2011-06-25 10:07:15.899805024 -0400
++++ doc/lsmod.sgml	2011-06-25 10:08:04.804805020 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modinfo.sgml.orig	2011-06-25 10:07:15.900805024 -0400
++++ doc/modinfo.sgml	2011-06-25 10:08:07.630805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modprobe.conf.sgml.orig	2011-06-25 10:07:15.901805024 -0400
++++ doc/modprobe.conf.sgml	2011-06-25 10:08:10.173805018 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modprobe.sgml.orig	2011-06-25 10:07:15.902805024 -0400
++++ doc/modprobe.sgml	2011-06-25 10:08:13.623805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/modules.dep.sgml.orig	2011-06-25 10:07:15.903805024 -0400
++++ doc/modules.dep.sgml	2011-06-25 10:08:19.323805019 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">
+--- doc/rmmod.sgml.orig	2011-06-25 10:07:15.904805024 -0400
++++ doc/rmmod.sgml	2011-06-25 10:08:27.691805017 -0400
+@@ -1,4 +1,5 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
++  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+   <!ENTITY debian  "<productname>Debian GNU/Linux</productname>">
+   <!ENTITY docbook "<productname>DocBook</productname>">
+   <!ENTITY sgml    "<abbrev>SGML</abbrev>">

More information about the arch-commits mailing list