[arch-commits] Commit in nftables/trunk (02-manpages.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Thursday, February 13, 2014 @ 02:48:57
  Author: seblu
Revision: 105652

upgpkg: nftables 0.099-2

- FS#38706

Added:
  nftables/trunk/02-manpages.patch
Modified:
  nftables/trunk/PKGBUILD

-------------------+
 02-manpages.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 PKGBUILD          |   10 +++++++---
 2 files changed, 47 insertions(+), 3 deletions(-)

Added: 02-manpages.patch
===================================================================
--- 02-manpages.patch	                        (rev 0)
+++ 02-manpages.patch	2014-02-13 01:48:57 UTC (rev 105652)
@@ -0,0 +1,40 @@
+# https://bugzilla.netfilter.org/show_bug.cgi?id=893
+
+diff -r -u nftables-0.099/configure.ac nftables-0.099.new/configure.ac
+--- nftables-0.099/configure.ac	2014-01-20 08:15:16.000000000 -0500
++++ nftables-0.099.new/configure.ac	2014-02-02 13:01:39.355368732 -0500
+@@ -24,11 +24,19 @@
+ AC_PROG_MKDIR_P
+ AC_PROG_INSTALL
+ AC_PROG_SED
++AC_PROG_GREP
+ 
+-AC_CHECK_PROG(CONFIG_MAN, docbook2x-man, y, n)
+-if test "$CONFIG_MAN" != "y"
++AC_PATH_PROGS_FEATURE_CHECK([DOCBOOK2MAN], [docbook2x-man docbook2man], 
++        [$ac_path_DOCBOOK2MAN --version | grep -qm1 'part of docbook2X' \
++         && ac_cv_path_DOCBOOK2MAN=$ac_path_DOCBOOK2MAN ac_path_DOCBOOK2MAN_found=:])
++
++if test -n "$ac_cv_path_DOCBOOK2MAN"
+ then
+-	AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
++    AC_SUBST([CONFIG_MAN], "y")
++    AC_SUBST([DOCBOOK2MAN], [$ac_cv_path_DOCBOOK2MAN])
++else
++    AC_SUBST([CONFIG_MAN], "n")
++    AC_MSG_WARN([docbookx2-man not found, no manpages will be built])
+ fi
+ 
+ AC_CHECK_PROG(CONFIG_PDF, db2pdf, y, n)
+diff -r -u nftables-0.099/Makefile.rules.in nftables-0.099.new/Makefile.rules.in
+--- nftables-0.099/Makefile.rules.in	2014-01-20 08:15:16.000000000 -0500
++++ nftables-0.099.new/Makefile.rules.in	2014-02-02 13:02:53.660639570 -0500
+@@ -37,7 +37,7 @@
+ 
+ %.8:			%.xml	$(makedeps)
+ 			@echo -e "  MAN\t\t$@"
+-			(cd $(SUBDIR); docbook2x-man ../$<)
++			(cd $(SUBDIR); @DOCBOOK2MAN@ ../$<)
+ 
+ %.pdf:			%.xml	$(makedeps)
+ 			@echo -e "  PDF\t\t$@"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-13 00:44:20 UTC (rev 105651)
+++ PKGBUILD	2014-02-13 01:48:57 UTC (rev 105652)
@@ -3,21 +3,25 @@
 
 pkgname=nftables
 pkgver=0.099
-pkgrel=1
+pkgrel=2
 pkgdesc='Netfilter nftables userspace tools'
 arch=('i686' 'x86_64')
 url='http://netfilter.org/projects/nftables/'
 license=('GPL2')
 depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses')
+makedepends=('docbook2x')
 source=("http://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig}
-        '01-fix-nftables-rename.patch')
+        '01-fix-nftables-rename.patch'
+        '02-manpages.patch')
 sha1sums=('c8fb650263f68f43498306af36910791871ec1e1'
           'SKIP'
-          '38d7c1e4bc8590a549e16a2385af37704460642b')
+          '38d7c1e4bc8590a549e16a2385af37704460642b'
+          '3ef58d5199b358ceb184307aca3e215c40ce3707')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p 1 -i "$srcdir/01-fix-nftables-rename.patch"
+  patch -p 1 -i "$srcdir/02-manpages.patch"
   ./autogen.sh
 }