Arch Linux User Repository

The list of required fixes is only getting bigger...

diff --git a/PKGBUILD b/PKGBUILD
index 0b1fe40..6d7ed9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,21 +7,28 @@ arch=('x86_64')
 pkgdesc='Userland tools for Distributed Replicated Block Device. (Git)'
 url='https://www.drbd.org'
 license=('GPL2')
-depends=('perl' 'bash')
+depends=('perl' 'bash' 'po4a')
 makedepends=('git' 'libxslt' 'systemd')
 provides=('drbd-utils=${pkgver}')
 conflicts=('drbd-utils')
 replaces=('drbd-utils')
-source=("git+https://github.com/LINBIT/drbd-utils.git")
+source=("git+https://github.com/LINBIT/drbd-utils.git"
+        "drbd-headers.git::git+https://github.com/LINBIT/drbd-headers.git")
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
-md5sums=('SKIP')
+md5sums=('SKIP' 'SKIP')
+
+prepare() {
+  cd $srcdir/drbd-utils
+  git submodule init
+  git -c protocol.file.allow=always submodule update
+}

 build() {
   cd $srcdir/drbd-utils
   ./autogen.sh
   ./configure \
     --prefix=/usr \
-    --localstatedir=/var \
+    --runstatedir=/run \
     --sysconfdir=/etc \
     --sbindir=/usr/bin \
     --libdir=/usr/lib \
@@ -33,7 +40,8 @@ build() {
     --without-pacemaker \
     --without-heartbeat \
     --without-83support \
-    --without-xen
+    --without-xen \
+    --without-manual
   make
 }

@@ -51,7 +59,7 @@ package() {
   mv etc/bash_completion.d usr/share/bash-completion/completions

   # remove /var/lock
-  rmdir var/lock
+  rmdir usr/var/lock

   # autoload module
   install -Dm 644 /dev/null usr/lib/modules-load.d/drbd.conf

build breaks without drbd-headers.git and po4a

10c10,12
< depends=('perl' 'bash')
---
> depends=('perl' 
>          'bash'
>          'po4a')
15c17,18
< source=("git+https://github.com/LINBIT/drbd-utils.git")
---
> source=("git+https://github.com/LINBIT/drbd-utils.git"
>         "drbd-headers.git::git+https://github.com/LINBIT/drbd-headers.git")
17c20,21
< md5sums=('SKIP')
---
> md5sums=('SKIP'
>          'SKIP')
62d65
< 

There is also this error but my pkgbuild skills are fresh and its not obvious (to me at least) how to fix it)

error: failed to commit transaction (conflicting files)
drbd-utils-git: /var/run exists in filesystem (owned by filesystem)
Errors occurred, no packages were upgraded.
==> WARNING: Failed to install built package(s).