Fix the building of docs by backporting a newer commit

1 files changed, 23 insertions, 11 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1c6ac31fa4bb..45932df8b467 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ntpsec
 pkgver=0.9.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Security-hardened Network Time Protocol implementation"
 arch=('i686' 'x86_64')
 url="https://www.ntpsec.org/"
@@ -12,23 +12,35 @@ makedepends=('asciidoc' 'pps-tools' 'w3m')
 optdepends=('gnuplot: for ntpviz'
             'libevent: for ntpdig'
             'python-psutil: Optional for ntpviz, allows running with ionice'
-	    'ttf-liberation: Improves font quality in ntpviz renderings')
+            'ttf-liberation: Improves font quality in ntpviz renderings')
 provides=('ntp')
 conflicts=('ntp')
 source=("ftp://ftp.ntpsec.org/pub/releases/ntpsec-$pkgver.tar.gz"
-	"ftp://ftp.ntpsec.org/pub/releases/ntpsec-$pkgver.tar.gz.sig"
-	"autorevision-cache")
+        "ftp://ftp.ntpsec.org/pub/releases/ntpsec-$pkgver.tar.gz.sig"
+        "autorevision-cache"
+        "0001-Python-3-portability-fix-for-waf-build.patch")
 sha256sums=('4ddfb2c500428b14c272d6ad600438dec6ca76f87b0b20015dddfe7a18e5b7e3'
             'SKIP'
-            '1c6d50ba5404ac0573b93fc12101be1028c3ea5740318576a8bf6479abda27dc')
+            '1c6d50ba5404ac0573b93fc12101be1028c3ea5740318576a8bf6479abda27dc'
+            'ad2ccebec3877832cc75802a39cec14dd8cc3fdde86ee9f59edb2e3e93ae19eb')
 noextract=("ntpsec-$pkgver.tar.gz")
 validpgpkeys=('DA3FDF774CC70FA64729EC4505D9B371477C7528')
 
 prepare() {
-  mkdir "$srcdir/ntpsec-$pkgver"
-  tar -xf ntpsec-$pkgver.tar.gz -C "$srcdir/ntpsec-$pkgver"
-  sed -i -e 's/sbin/bin/g' "$srcdir/ntpsec-$pkgver/etc/ntpd.service"
-  sed -i -e '/ExecStop/d' "$srcdir/ntpsec-$pkgver/etc/ntpd.service"
+  mkdir "ntpsec-$pkgver"
+  tar -xf ntpsec-$pkgver.tar.gz -C "ntpsec-$pkgver"
+  cd "ntpsec-$pkgver"
+
+  for patch in ../*.patch; do
+    if [ ! -f "$patch" ]; then
+      break;
+    else
+      patch -p1 -i "$patch"
+    fi
+  done
+
+  sed -i -e 's/sbin/bin/g' "etc/ntpd.service"
+  sed -i -e '/ExecStop/d' "etc/ntpd.service"
 }
 
 build() {
@@ -36,8 +48,8 @@ build() {
   mkdir -p "build/main/wafhelpers"
   cp "$srcdir/autorevision-cache" "build/main/wafhelpers/.autorevision-cache"
   ./waf configure --prefix=/usr --bindir=/usr/bin --libdir=/usr/lib \
-	--enable-debug-gdb --enable-seccomp --refclock=all \
-	--sbindir=/usr/bin
+        --enable-debug-gdb --enable-seccomp --refclock=all \
+        --sbindir=/usr/bin --enable-doc --path-doc=/usr/share/doc/ntpsec
   ./waf build
   a2x -f text docs/copyright.txt
 }