kea: fix varbase installation

[Niclas Rosenvik <nros%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%NetBSD.org@localhost>
Pushed By:	nros
Date:		Tue Dec 3 21:25:31 2019 +0000
Changeset:	1a4a4cd06c87ebcbff7856c65b68f16f23f276ef

Modified Files:
	kea/Makefile
	kea/PLIST
	kea/TODO
	kea/distinfo
Added Files:
	kea/patches/patch-Makefile.in
	kea/patches/patch-src_lib_dhcpsrv_Makefile.in

Log Message:
kea: fix varbase installation

Fix installation of directories in varbase the pkgsrc way in the kea package.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a4a4cd06c87ebcbff7856c65b68f16f23f276ef

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 kea/Makefile                                  |  4 ++++
 kea/PLIST                                     |  3 ---
 kea/TODO                                      |  1 -
 kea/distinfo                                  |  2 ++
 kea/patches/patch-Makefile.in                 | 12 ++++++++++++
 kea/patches/patch-src_lib_dhcpsrv_Makefile.in | 13 +++++++++++++
 6 files changed, 31 insertions(+), 4 deletions(-)

diffs:
diff --git a/kea/Makefile b/kea/Makefile
index ad9d37f32a..bd071b2270 100644
--- a/kea/Makefile
+++ b/kea/Makefile
@@ -31,6 +31,10 @@ KEA_CONF+=	keactrl.conf
 CONF_FILES+=	${EGDIR}/${cf} ${PKG_SYSCONFDIR}/${cf}
 .endfor
 
+OWN_DIRS+=	${VARBASE}/run/kea
+OWN_DIRS+=	${VARBASE}/lib/kea
+OWN_DIRS+=	${VARBASE}/log
+
 .include "options.mk"
 
 .include "../../devel/log4cplus/buildlink3.mk"
diff --git a/kea/PLIST b/kea/PLIST
index 1d34cc16a8..012bd59265 100644
--- a/kea/PLIST
+++ b/kea/PLIST
@@ -536,6 +536,3 @@ share/kea/scripts/pgsql/upgrade_3.3_to_4.0.sh
 share/kea/scripts/pgsql/upgrade_4.0_to_5.0.sh
 share/kea/scripts/pgsql/upgrade_5.0_to_5.1.sh
 share/kea/scripts/pgsql/wipe_data.sh
-@pkgdir var/run/kea
-@pkgdir var/log
-@pkgdir var/lib/kea
diff --git a/kea/TODO b/kea/TODO
index e8523e89ef..e8ee250022 100644
--- a/kea/TODO
+++ b/kea/TODO
@@ -1,2 +1 @@
 install users to run kea with ??
-fix files in varbase
diff --git a/kea/distinfo b/kea/distinfo
index 440da9462b..01bc760d2d 100644
--- a/kea/distinfo
+++ b/kea/distinfo
@@ -4,6 +4,7 @@ SHA1 (kea-1.6.1.tar.gz) = 165ee499c40a1033d733e8a5197522562804a19b
 RMD160 (kea-1.6.1.tar.gz) = 261b0ea1bca0a70034532112011c64ad809c37ec
 SHA512 (kea-1.6.1.tar.gz) = 4220f46fc185f4434ad01886d2d43ba1f9dcca57f5afa33235c8593269220a79e2dcb4ad71298dec868444c29e7cb6febe66a1456fdc116a2d9fd3f019f740d8
 Size (kea-1.6.1.tar.gz) = 7155604 bytes
+SHA1 (patch-Makefile.in) = 4fb86d228f7b481613a574cfa8f38ec8073b9a01
 SHA1 (patch-configure) = 53270e1f31426557781705b272dc8b9a3b7b3d62
 SHA1 (patch-src_bin_keactrl_Makefile.in) = 5dbf9e096f7da3edd497876c665c3d5b14399cf5
 SHA1 (patch-src_hooks_dhcp_high__availability_Makefile.in) = 1158d793f0511d2f5121bfc8396c54a842f63794
@@ -11,3 +12,4 @@ SHA1 (patch-src_hooks_dhcp_lease__cmds_Makefile.in) = 7440ac8d8e657703c87b704b11
 SHA1 (patch-src_hooks_dhcp_mysql__cb_Makefile.in) = 2bef7d52a8d7c8390400ae02c8ecc230aefa6e83
 SHA1 (patch-src_hooks_dhcp_stat__cmds_Makefile.in) = dc5dafedc2f743946806f9d4e62e510b804be6c9
 SHA1 (patch-src_hooks_dhcp_user__chk_Makefile.in) = 581c12c11c4dfc524d8b5ca1e0ab91a9ee799486
+SHA1 (patch-src_lib_dhcpsrv_Makefile.in) = 6129811a105adc7702fa7ef9a78991ffed0ffe57
diff --git a/kea/patches/patch-Makefile.in b/kea/patches/patch-Makefile.in
new file mode 100644
index 0000000000..3bebea325d
--- /dev/null
+++ b/kea/patches/patch-Makefile.in
@@ -0,0 +1,12 @@
+$NetBSD$
+* don't create directories in varbase
+--- Makefile.in.orig	2019-11-19 14:50:56.000000000 +0000
++++ Makefile.in
+@@ -961,7 +961,6 @@ install-dvi-am:
+ 
+ install-exec-am:
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-html: install-html-recursive
+ 
+ install-html-am:
diff --git a/kea/patches/patch-src_lib_dhcpsrv_Makefile.in b/kea/patches/patch-src_lib_dhcpsrv_Makefile.in
new file mode 100644
index 0000000000..a6aae20a64
--- /dev/null
+++ b/kea/patches/patch-src_lib_dhcpsrv_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+* don't create directories in varbase
+--- src/lib/dhcpsrv/Makefile.in.orig	2019-12-03 18:23:53.391046906 +0000
++++ src/lib/dhcpsrv/Makefile.in
+@@ -1825,7 +1825,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local \
++install-data-am: \
+ 	install-libkea_dhcpsrv_includeHEADERS \
+ 	install-libkea_dhcpsrv_parsers_includeHEADERS
+