Date: Friday, April 18, 2014 @ 17:35:23 Author: heftig Revision: 109772
remove unused patch Modified: nftables/trunk/PKGBUILD Deleted: nftables/trunk/02-manpages.patch -------------------+ 02-manpages.patch | 40 ---------------------------------------- PKGBUILD | 6 ++---- 2 files changed, 2 insertions(+), 44 deletions(-) Deleted: 02-manpages.patch =================================================================== --- 02-manpages.patch 2014-04-18 15:34:24 UTC (rev 109771) +++ 02-manpages.patch 2014-04-18 15:35:23 UTC (rev 109772) @@ -1,40 +0,0 @@ -# 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-04-18 15:34:24 UTC (rev 109771) +++ PKGBUILD 2014-04-18 15:35:23 UTC (rev 109772) @@ -11,11 +11,9 @@ license=('GPL2') depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses') makedepends=('docbook2x') -source=("http://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig} - '02-manpages.patch') +source=("http://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.bz2"{,.sig}) sha1sums=('1d1959e02e970b1de0e9435142a64d09240c0591' - 'SKIP' - '3ef58d5199b358ceb184307aca3e215c40ce3707') + 'SKIP') build() { cd $pkgname-$pkgver