main/drbd-utils: install to /usr

The mandir and infodir params were dropped since they are derived from prefix.

Part of https://gitlab.alpinelinux.org/groups/alpine/-/milestones/16

main/drbd-utils/0001-user-v84-makefile-use-libdir-when-installing.patch

@@ -0,0 +1,42 @@
+From d1de046822fad8e20fd01e57fde8f795118d94f4 Mon Sep 17 00:00:00 2001
+From: Clayton Craft <clayton@craftyguy.net>
+Date: Tue, 8 Oct 2024 10:23:51 -0700
+Subject: [PATCH] user/v84: makefile: use libdir when installing
+
+---
+ user/v84/Makefile.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in
+index 0fcefc5..4da53c5 100644
+--- a/user/v84/Makefile.in
++++ b/user/v84/Makefile.in
+@@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes)
+ 	install -d $(DESTDIR)$(localstatedir)/lib/drbd
+ 	install -d $(DESTDIR)$(localstatedir)/run/drbd
+ 	install -d $(DESTDIR)$(localstatedir)/lock
+-	install -d $(DESTDIR)/lib/drbd/
++	install -d $(DESTDIR)$(LIBDIR)
+ 	if getent group haclient > /dev/null 2> /dev/null ; then	\
+ 		install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ;	\
+-		install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ;		\
++		install -m 755 drbdadm-84 $(DESTDIR)$(LIBDIR)/ ;		\
+ 	else								\
+-		install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ;		\
+-		install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; 		\
++		install -m 755 drbdsetup-84 $(DESTDIR)$(LIBDIR)/ ;		\
++		install -m 755 drbdadm-84 $(DESTDIR)$(LIBDIR)/ ; 		\
+ 	fi
+ endif
+ 
+ uninstall:
+-	rm -f $(DESTDIR)/lib/drbd/drbdsetup-84
+-	rm -f $(DESTDIR)/lib/drbd/drbdadm-84
++	rm -f $(DESTDIR)$(LIBDIR)/drbdsetup-84
++	rm -f $(DESTDIR)$(LIBDIR)/drbdadm-84
+ 
+ spell:
+ 	for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \
+-- 
+2.46.2
+

main/drbd-utils/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=drbd-utils
 pkgver=9.28.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Network-based RAID 1"
 url="https://www.drbd.org"
 arch="all"
@@ -29,6 +29,7 @@ subpackages="
 source="https://pkg.linbit.com/downloads/drbd/utils/drbd-utils-$pkgver.tar.gz
 	drbdsetup-permissions.patch
 	drbd.initd
+	0001-user-v84-makefile-use-libdir-when-installing.patch
 	"
 
 build() {
@@ -39,10 +40,7 @@ build() {
 		--build=$CBUILD \
 		--disable-dependency-tracking \
 		--prefix=/usr \
-		--sbindir=/sbin \
 		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--with-pacemaker \
 		--with-drbdmon \
@@ -75,5 +73,6 @@ pacemaker() {
 sha512sums="
 57114bef36b09bcd17ff273c7c63c16cb68dfdb9b5eec71bc95780fd639ac40bd0ea5f388ae3fbed46770fdc0e7ba9bf9c712e4a915691fb55dc9576237470f2  drbd-utils-9.28.0.tar.gz
 39a64a59577a28f8dc5f968bcfd35ab04b010ec1b9390dcaedefa609b8999ec4aabf2cfaf2db7dfd8348d8d09aca5720839de51b3bfb093960b3c61f92ebe4f0  drbdsetup-permissions.patch
-f61a833dc5eea79000a7dd85e83ae10e284109c76b5d59974ed69f92dbab6c389d6d20f7ea374b7c066519c6d1d816ed27b48dbaee6b91fb9754974acf52f46e  drbd.initd
+0e2ff2244ec3f18944ff42609e9ec12de33d1b472fb9bb71f0f68ab67edfa2d2019059f405d58b33a43fcec6bf883f2be9ea3e7362d76f348b952a497a12757e  drbd.initd
+10c7e75ff75cb6843786af3522a3fac8911667de52dc8cc3f760d3a5bd780a30e46e298d6098a5f8d223a72251c0e98287d343e295fbd0bd9f6be507282a28f0  0001-user-v84-makefile-use-libdir-when-installing.patch
 "

main/drbd-utils/drbd.initd

@@ -13,7 +13,7 @@ depend() {
 }
 
 DEFAULTFILE="/etc/conf.d/drbd"
-DRBDADM="/sbin/drbdadm"
+DRBDADM="/usr/sbin/drbdadm"
 PROC_DRBD="/proc/drbd"
 MODPROBE="/sbin/modprobe"
 RMMOD="/sbin/rmmod"